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.el | |
| parent | c0323133334f70c2e25f4ace22084e3696bf2a5a (diff) | |
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*.el: uncommented declare-function.
* viper*.el: uncommented declare-function.
Diffstat (limited to 'lisp/ediff.el')
| -rw-r--r-- | lisp/ediff.el | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lisp/ediff.el b/lisp/ediff.el index 2caa3715f4..cdfb66d9c0 100644 --- a/lisp/ediff.el +++ b/lisp/ediff.el @@ -113,6 +113,9 @@ (defvar ediff-last-dir-patch) (defvar ediff-patch-default-directory) +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (eval-when-compile (and noninteractive @@ -361,8 +364,7 @@ (list (cons 'ediff-job-name job-name)) merge-buffer-file))) -;; declare-function does not exist in XEmacs -;;(declare-function diff-latest-backup-file "diff" (fn))) +(declare-function diff-latest-backup-file "diff" (fn)) ;;;###autoload (defalias 'ediff 'ediff-files) @@ -1428,7 +1430,7 @@ When called interactively, displays the version." (format "Ediff %s of %s" ediff-version ediff-date))) ;; info is run first, and will autoload info.el. -;;(declare-function Info-goto-node "info" (nodename &optional fork)) +(declare-function Info-goto-node "info" (nodename &optional fork)) ;;;###autoload (defun ediff-documentation (&optional node) |