Mercurial > emacs
comparison lisp/ediff-util.el @ 87691:f2c8fd594360
2008-01-10 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*.el: uncommented declare-function.
* viper*.el: uncommented declare-function.
author | Michael Kifer <kifer@cs.stonybrook.edu> |
---|---|
date | Thu, 10 Jan 2008 06:54:12 +0000 |
parents | ae3fe9150b36 |
children | c70e45a7acfd 5fc145fcebe2 |
comparison
equal
deleted
inserted
replaced
87690:9cbad7267d3d | 87691:f2c8fd594360 |
---|---|
38 (defvar bottom-toolbar-visible-p) | 38 (defvar bottom-toolbar-visible-p) |
39 (defvar bottom-toolbar-height) | 39 (defvar bottom-toolbar-height) |
40 (defvar mark-active) | 40 (defvar mark-active) |
41 | 41 |
42 (defvar ediff-after-quit-hook-internal nil) | 42 (defvar ediff-after-quit-hook-internal nil) |
43 | |
44 (eval-and-compile | |
45 (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) | |
43 | 46 |
44 (eval-when-compile | 47 (eval-when-compile |
45 (let ((load-path (cons (expand-file-name ".") load-path))) | 48 (let ((load-path (cons (expand-file-name ".") load-path))) |
46 (provide 'ediff-util) ; to break recursive load cycle | 49 (provide 'ediff-util) ; to break recursive load cycle |
47 (or (featurep 'ediff-init) | 50 (or (featurep 'ediff-init) |
2818 (ediff-barf-if-not-control-buffer) | 2821 (ediff-barf-if-not-control-buffer) |
2819 (run-hooks 'ediff-suspend-hook) | 2822 (run-hooks 'ediff-suspend-hook) |
2820 (message | 2823 (message |
2821 "To resume, type M-x eregistry and select the desired Ediff session")) | 2824 "To resume, type M-x eregistry and select the desired Ediff session")) |
2822 | 2825 |
2823 | |
2824 ;; ediff-barf-if-not-control-buffer ensures only called from ediff. | 2826 ;; ediff-barf-if-not-control-buffer ensures only called from ediff. |
2825 ;; declare-function does not exist in XEmacs | 2827 (declare-function ediff-version "ediff" ()) |
2826 ;;(declare-function ediff-version "ediff" ())) | |
2827 | 2828 |
2828 (defun ediff-status-info () | 2829 (defun ediff-status-info () |
2829 "Show the names of the buffers or files being operated on by Ediff. | 2830 "Show the names of the buffers or files being operated on by Ediff. |
2830 Hit \\[ediff-recenter] to reset the windows afterward." | 2831 Hit \\[ediff-recenter] to reset the windows afterward." |
2831 (interactive) | 2832 (interactive) |