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.

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):

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))
 

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)
        ))

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)))
   (defun ediff-compute-toolbar-width () 0))
 
 (defgroup ediff-window nil

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.

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))

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)))

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"

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.