Mercurial > emacs
changeset 93773:d7554c14325c
2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu>
* viper*.el (viper-search-wrap-around-t): replace with
viper-search-wrap-around.
* ediff*.el: replace 3-argument 'require' statements with 1-argument
ones (wrapped in if's). For compatibility with the current stable
version of XEmacs.
| author | Michael Kifer <kifer@cs.stonybrook.edu> |
|---|---|
| date | Sun, 06 Apr 2008 19:26:02 +0000 |
| parents | 061a2121a7e8 |
| children | 2604709dd36f |
| files | lisp/ChangeLog lisp/ediff-util.el lisp/ediff-vers.el lisp/ediff-wind.el lisp/ediff.el lisp/emulation/viper-cmd.el lisp/emulation/viper-ex.el lisp/emulation/viper-init.el lisp/emulation/viper.el |
| diffstat | 9 files changed, 33 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/ChangeLog Sun Apr 06 19:26:02 2008 +0000 @@ -1,3 +1,12 @@ +2008-04-06 Michael Kifer <kifer@cs.stonybrook.edu> + + * viper*.el (viper-search-wrap-around-t): replace with + viper-search-wrap-around. + + * ediff*.el: replace 3-argument 'require' statements with 1-argument + ones (wrapped in if's). For compatibility with the current stable + version of XEmacs. + 2008-04-06 Dan Nicolaescu <dann@ics.uci.edu> * vc.el (vc-status-prepare-status-buffer):
--- a/lisp/ediff-util.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/ediff-util.el Sun Apr 06 19:26:02 2008 +0000 @@ -57,7 +57,9 @@ (require 'ediff-diff)) (require 'ediff-merg) (require 'ediff) - (require 'ediff-tbar nil 'noerror) + ;; for compatibility with current stable version of xemacs + (if (featurep 'xemacs) + (require 'ediff-tbar)) ) ;; end pacifier @@ -69,6 +71,7 @@ (require 'ediff-diff) (require 'ediff-merg) +;; for compatibility with current stable version of xemacs (if (featurep 'xemacs) (require 'ediff-tbar))
--- a/lisp/ediff-vers.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/ediff-vers.el Sun Apr 06 19:26:02 2008 +0000 @@ -36,8 +36,14 @@ (and noninteractive (eval-when-compile - (require 'pcvs nil 'noerror) - (require 'rcs nil 'noerror) + (condition-case nil + ;; for compatibility with current stable version of xemacs + (progn + ;;(require 'pcvs nil 'noerror) + ;;(require 'rcs nil 'noerror) + (require 'pcvs) + (require 'rcs)) + (error nil)) (require 'vc) (require 'ediff-init) ))
--- a/lisp/ediff-wind.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/ediff-wind.el Sun Apr 06 19:26:02 2008 +0000 @@ -49,7 +49,8 @@ (require 'ediff-init) (require 'ediff-util) (require 'ediff-help) - (require 'ediff-tbar nil 'noerror) + (if (featurep 'xemacs) + (require 'ediff-tbar)) ) ;; end pacifier @@ -57,10 +58,7 @@ ;; be careful with ediff-tbar (if (featurep 'xemacs) - (condition-case nil - (require 'ediff-tbar) - (error - (defun ediff-compute-toolbar-width () 0))) + (require 'ediff-tbar) (defun ediff-compute-toolbar-width () 0)) (defgroup ediff-window nil
--- a/lisp/ediff.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/ediff.el Sun Apr 06 19:26:02 2008 +0000 @@ -8,7 +8,7 @@ ;; Keywords: comparing, merging, patching, tools, unix (defconst ediff-version "2.81.2" "The current version of Ediff") -(defconst ediff-date "January 09, 2008" "Date of last update") +(defconst ediff-date "April 06, 2008" "Date of last update") ;; This file is part of GNU Emacs.
--- a/lisp/emulation/viper-cmd.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/emulation/viper-cmd.el Sun Apr 06 19:26:02 2008 +0000 @@ -3898,7 +3898,7 @@ (if (not (equal start-point (point))) (push-mark start-point t))) (search-failed - (if (and (not fail-if-not-found) viper-search-wrap-around-t) + (if (and (not fail-if-not-found) viper-search-wrap-around) (progn (message "Search wrapped around BOTTOM of buffer") (goto-char (point-min)) @@ -3927,7 +3927,7 @@ (if (not (equal start-point (point))) (push-mark start-point t))) (search-failed - (if (and (not fail-if-not-found) viper-search-wrap-around-t) + (if (and (not fail-if-not-found) viper-search-wrap-around) (progn (message "Search wrapped around TOP of buffer") (goto-char (point-max)) @@ -4775,7 +4775,7 @@ (setq viper-no-multiple-ESC t viper-re-search t viper-vi-style-in-minibuffer t - viper-search-wrap-around-t t + viper-search-wrap-around t viper-electric-mode nil viper-want-emacs-keys-in-vi nil viper-want-emacs-keys-in-insert nil))
--- a/lisp/emulation/viper-ex.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/emulation/viper-ex.el Sun Apr 06 19:26:02 2008 +0000 @@ -1742,10 +1742,10 @@ (setq var "blink-matching-paren" val "nil")) ((member var '("ws" "wrapscan")) - (setq var "viper-search-wrap-around-t" + (setq var "viper-search-wrap-around" val "t")) ((member var '("nows" "nowrapscan")) - (setq var "viper-search-wrap-around-t" + (setq var "viper-search-wrap-around" val "nil"))) (if (and set-cmd (eq val 0)) ; value must be set by the user (let ((cursor-in-echo-area t)) @@ -2268,7 +2268,7 @@ (princ (if viper-re-search "magic\n" "nomagic\n")) (princ (if buffer-read-only "readonly\n" "noreadonly\n")) (princ (if blink-matching-paren "showmatch\n" "noshowmatch\n")) - (princ (if viper-search-wrap-around-t "wrapscan\n" "nowrapscan\n")) + (princ (if viper-search-wrap-around "wrapscan\n" "nowrapscan\n")) (princ (format "shiftwidth \t\t= %S\n" viper-shift-width)) (princ (format "tabstop (local) \t= %S\n" tab-width)) (princ (format "tabstop (global) \t= %S\n" (default-value 'tab-width)))
--- a/lisp/emulation/viper-init.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/emulation/viper-init.el Sun Apr 06 19:26:02 2008 +0000 @@ -765,7 +765,7 @@ :type '(choice (const nil) character) :group 'viper-search) -(defcustom viper-search-wrap-around-t t +(defcustom viper-search-wrap-around t "*If t, search wraps around." :type 'boolean :tag "Search Wraps Around"
--- a/lisp/emulation/viper.el Sun Apr 06 17:30:40 2008 +0000 +++ b/lisp/emulation/viper.el Sun Apr 06 19:26:02 2008 +0000 @@ -9,7 +9,7 @@ ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> ;; Keywords: emulations -(defconst viper-version "3.14 of January 09, 2008" +(defconst viper-version "3.14 of April 06, 2008" "The current version of Viper") ;; This file is part of GNU Emacs.