summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lisp/ChangeLog9
-rw-r--r--lisp/ediff-util.el5
-rw-r--r--lisp/ediff-vers.el10
-rw-r--r--lisp/ediff-wind.el8
-rw-r--r--lisp/ediff.el2
-rw-r--r--lisp/emulation/viper-cmd.el6
-rw-r--r--lisp/emulation/viper-ex.el6
-rw-r--r--lisp/emulation/viper-init.el2
-rw-r--r--lisp/emulation/viper.el2
9 files changed, 33 insertions, 17 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ac5f553f93..91bc68ddbde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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):
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index ef5032075e6..120228cca84 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -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))
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index 80a748ce65e..a7a8ff644a1 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -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)
))
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index e094c15bdfe..abbcd09521e 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -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
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 5ef234d69ba..e392920a480 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -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.
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index 26ae05c24fd..ccc93d4005d 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -3898,7 +3898,7 @@ Null string will repeat previous search."
(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 @@ Null string will repeat previous search."
(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 @@ sensitive for VI-style look-and-feel."
(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))
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 49988e285f0..54f8f23a0bc 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -1742,10 +1742,10 @@ reversed."
(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 @@ Type 'mak ' (including the space) to run make with no args."
(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)))
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index d14e34b1340..73be5dcdb67 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -765,7 +765,7 @@ If nil, the cursor will move backwards without deleting anything."
: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"
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index a3667aa5993..b1046bf6405 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -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.
View Lorry Controller Status