From: Michael Kifer Date: Thu, 10 Jan 2008 06:54:12 +0000 (+0000) Subject: 2008-01-10 Michael Kifer X-Git-Tag: emacs-pretest-23.0.90~8612 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=acb93bb2a68eac61448a2da39e9f7f0b14d6869b;p=emacs.git 2008-01-10 Michael Kifer * ediff*.el: uncommented declare-function. * viper*.el: uncommented declare-function. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 798ed9ec3a6..e0244aa5d4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-01-10 Michael Kifer + + * ediff*.el: uncommented declare-function. + + * viper*.el: uncommented declare-function. + 2008-01-09 Tassilo Horn * doc-view.el (doc-view-mode): Support tramp, compressed files and 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. diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el index 7e5eff6392e..26aa19f38a4 100644 --- a/lisp/ediff-wind.el +++ b/lisp/ediff-wind.el @@ -40,6 +40,11 @@ (defvar frame-icon-title-format) (defvar ediff-diff-status) +;; declare-function does not exist in XEmacs +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + + (eval-when-compile (let ((load-path (cons (expand-file-name ".") load-path))) (or (featurep 'ediff-init) @@ -147,10 +152,9 @@ In this case, Ediff will use those frames to display these buffers." :type 'function :group 'ediff-window) -;; declare-function does not exist in XEmacs ;; Definitions hidden from the compiler by compat wrappers. -;;(declare-function ediff-display-pixel-width "ediff-init") -;;(declare-function ediff-display-pixel-height "ediff-init") +(declare-function ediff-display-pixel-width "ediff-init") +(declare-function ediff-display-pixel-height "ediff-init") (defconst ediff-control-frame-parameters (list diff --git a/lisp/ediff.el b/lisp/ediff.el index 2caa3715f48..cdfb66d9c00 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) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index fbebacb16b5..68116cde092 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -47,6 +47,9 @@ (defvar initial) (defvar undo-beg-posn) (defvar undo-end-posn) + +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) ;; end pacifier @@ -3083,10 +3086,9 @@ On reaching beginning of line, stop and signal error." (setq this-command 'next-line) (if com (viper-execute-com 'viper-next-line val com)))) -;; declare-function is not defined in XEmacs -;;(declare-function widget-type "wid-edit" (widget)) -;;(declare-function widget-button-press "wid-edit" (pos &optional event)) -;;(declare-function viper-set-hooks "viper" ()) +(declare-function widget-type "wid-edit" (widget)) +(declare-function widget-button-press "wid-edit" (pos &optional event)) +(declare-function viper-set-hooks "viper" ()) (defun viper-next-line-at-bol (arg) "Next line at beginning of line. diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el index 02df3fe3084..05c90f995ab 100644 --- a/lisp/emulation/viper-keym.el +++ b/lisp/emulation/viper-keym.el @@ -33,14 +33,16 @@ (defvar viper-expert-level) (defvar viper-ex-style-editing) (defvar viper-ex-style-motion) + +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) ;; end pacifier (require 'viper-util) -;; declare-function is not defined in XEmacs -;;(declare-function viper-ex "viper-ex" (arg &optional string)) -;;(declare-function viper-normalize-minor-mode-map-alist "viper-cmd" ()) -;;(declare-function viper-set-mode-vars-for "viper-cmd" (state)) +(declare-function viper-ex "viper-ex" (arg &optional string)) +(declare-function viper-normalize-minor-mode-map-alist "viper-cmd" ()) +(declare-function viper-set-mode-vars-for "viper-cmd" (state)) ;;; Variables diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 2bd2a3e276a..b838d8ce80e 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -44,6 +44,9 @@ (require 'ring) +(eval-and-compile + (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + ;; end pacifier (require 'viper-init) @@ -374,8 +377,7 @@ -;; declare-function is not defined in XEmacs -;;(declare-function viper-forward-Word "viper-cmd" (arg)) +(declare-function viper-forward-Word "viper-cmd" (arg)) ;;; Support for :e, :r, :w file globbing