diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-01-10 06:54:12 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-01-10 06:54:12 +0000 |
| commit | acb93bb2a68eac61448a2da39e9f7f0b14d6869b (patch) | |
| tree | 8fddf5d4d4fd25c4c1e05a52e25a5c50c98ff6e8 /lisp/ediff-util.el | |
| parent | c0323133334f70c2e25f4ace22084e3696bf2a5a (diff) | |
| download | emacs-acb93bb2a68eac61448a2da39e9f7f0b14d6869b.tar.gz | |
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*.el: uncommented declare-function.
* viper*.el: uncommented declare-function.
Diffstat (limited to 'lisp/ediff-util.el')
| -rw-r--r-- | lisp/ediff-util.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el index 94e0d87bf9c..058e20f6a19 100644 --- a/lisp/ediff-util.el +++ b/lisp/ediff-util.el @@ -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 @@ up an appropriate window config." (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. |