Merge from origin/emacs-25

[gnu-emacs] / lisp / vc / ediff-merg.el

diff --git a/lisp/vc/ediff-merg.el b/lisp/vc/ediff-merg.el
index 0f7d0628a1d0a3ab095cc8b0699fa59f99935db3..0af134ade143bb968b327276ac005c927da67f87 100644 (file)
--- a/lisp/vc/ediff-merg.el
+++ b/lisp/vc/ediff-merg.el
@@ -1,6 +1,6 @@
 ;;; ediff-merg.el --- merging utilities
 
-;; Copyright (C) 1994-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2016 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Package: ediff
@@ -268,8 +268,8 @@ Buffer B."
     (setq ediff-default-variant
          (intern
           (completing-read
-           (format "Current merge default is `%S'.  New default: "
-                   ediff-default-variant)
+           (format-message "Current merge default is `%S'.  New default: "
+                           ediff-default-variant)
            actual-alist nil 'must-match)))
     (ediff-do-merge ediff-current-difference 'remerge)
     (ediff-recenter)