diff options
author | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-01-09 06:16:07 +0000 |
---|---|---|
committer | Michael Kifer <kifer@cs.stonybrook.edu> | 2008-01-09 06:16:07 +0000 |
commit | 65efc5388d0c270796027bff3c4bb4b0b85dac16 (patch) | |
tree | ac702a060aea2375992bfe431b1ae337109d7674 /lisp/emulation/viper-util.el | |
parent | 218b3b7634bd5638c6f7b3fdb26c552127288bc6 (diff) | |
download | emacs-65efc5388d0c270796027bff3c4bb4b0b85dac16.tar.gz |
2008-01-09 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff*.el: commented out declare-function. "make bootstrap"
stops with an error and emacs does not compile with those things in.
Besides, declare-function is not defined in XEmacs.
* ediff-util (eqiff-quit): autoraise minibuffer.
* ediff-diff (ediff-convert-fine-diffs-to-overlays): make it a defin
* viper*.el: commented out declare-function -- not defined in XEmacs.
* viper-ex.el (viper-info-on-file): take care of indiret buffers.
* viper.el (viper-set-hooks, set-cursor-color): set viper-vi-state-cursor-color.
Diffstat (limited to 'lisp/emulation/viper-util.el')
-rw-r--r-- | lisp/emulation/viper-util.el | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el index 33061565196..2bd2a3e276a 100644 --- a/lisp/emulation/viper-util.el +++ b/lisp/emulation/viper-util.el @@ -374,7 +374,8 @@ -(declare-function viper-forward-Word "viper-cmd" (arg)) +;; declare-function is not defined in XEmacs +;;(declare-function viper-forward-Word "viper-cmd" (arg)) ;;; Support for :e, :r, :w file globbing @@ -713,7 +714,7 @@ (not (memq (vc-state file) '(edited needs-merge))) (not (stringp (vc-state file)))) ;; XEmacs has no vc-state - (if (featurep 'xemacs)(not (vc-locking-user file)))) + (if (featurep 'xemacs) (not (vc-locking-user file)))) )) ;; checkout if visited file is checked in |