summaryrefslogtreecommitdiff
path: root/lisp/vc/ediff-init.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/vc/ediff-init.el')
-rw-r--r--lisp/vc/ediff-init.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index d6b538cff2b..8c935bfab19 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -1719,6 +1719,9 @@ Unless optional argument INPLACE is non-nil, return a new string."
(aset newstr i tochar)))
newstr)))
+(unless (fboundp 'format-message)
+ (defalias 'format-message 'format))
+
(defun ediff-abbrev-jobname (jobname)
(cond ((eq jobname 'ediff-directories)
"Compare two directories")