[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-util.el,v |
Date: |
Thu, 10 Jan 2008 06:54:16 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Michael Kifer <kifer> 08/01/10 06:54:14
Index: ediff-util.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff-util.el,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- ediff-util.el 9 Jan 2008 06:16:06 -0000 1.84
+++ ediff-util.el 10 Jan 2008 06:54:12 -0000 1.85
@@ -41,6 +41,9 @@
(defvar ediff-after-quit-hook-internal nil)
+(eval-and-compile
+ (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+
(eval-when-compile
(let ((load-path (cons (expand-file-name ".") load-path)))
(provide 'ediff-util) ; to break recursive load cycle
@@ -2820,10 +2823,8 @@
(message
"To resume, type M-x eregistry and select the desired Ediff session"))
-
;; ediff-barf-if-not-control-buffer ensures only called from ediff.
-;; declare-function does not exist in XEmacs
-;;(declare-function ediff-version "ediff" ()))
+(declare-function ediff-version "ediff" ())
(defun ediff-status-info ()
"Show the names of the buffers or files being operated on by Ediff.