* viper.el: Bumped up version/date of update to reflect the substantial

changes done in August 2006.

	* viper-cmd (viper-next-line-at-bol): make sure button-at, push-button
	are defined.

	* ediff-util.el (ediff-add-to-history): new function.

	* ediff.el: use ediff-add-to-history instead of add-to-history.

lisp/ChangeLog

@@ -1,3 +1,15 @@
+2006-09-18  Michael Kifer  <kifer@cs.stonybrook.edu>
+	
+	* viper.el: Bumped up version/date of update to reflect the substantial
+	changes done in August 2006.
+	
+	* viper-cmd (viper-next-line-at-bol): make sure button-at, push-button
+	are defined.
+	
+	* ediff-util.el (ediff-add-to-history): new function.
+	
+	* ediff.el: use ediff-add-to-history instead of add-to-history.
+	
 2006-09-18  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
 
 	* textmodes/conf-mode.el (conf-space-mode): Doc fix.

lisp/ediff-util.el

@@ -4281,6 +4281,11 @@ Mail anyway? (y or n) ")
       (setq lis1 (cdr lis1)))
     (cdr result)))
 
+(defun ediff-add-to-history (history-var newelt)
+  (if (fboundp 'add-to-history)
+      (add-to-history history-var newelt)
+    (set history-var (cons newelt (symbol-value history-var)))))
+
 (if (fboundp 'copy-sequence)
     (defalias 'ediff-copy-list 'copy-sequence)
   (defun ediff-copy-list (list)

lisp/ediff.el

@@ -7,8 +7,8 @@
 ;; Created: February 2, 1994
 ;; Keywords: comparing, merging, patching, tools, unix
 
-(defconst ediff-version "2.81" "The current version of Ediff")
-(defconst ediff-date "February 18, 2006" "Date of last update")
+(defconst ediff-version "2.81.1" "The current version of Ediff")
+(defconst ediff-date "September 18, 2006" "Date of last update")
 
 
 ;; This file is part of GNU Emacs.
@@ -210,11 +210,12 @@
 					   ediff-last-dir-B
 					 (file-name-directory f)))
 				 (progn
-				   (add-to-history 'file-name-history
-						   (ediff-abbreviate-file-name
-						    (expand-file-name
-						     (file-name-nondirectory f)
-						     dir-B)))
+				   (ediff-add-to-history
+				    'file-name-history
+				    (ediff-abbreviate-file-name
+				     (expand-file-name
+				      (file-name-nondirectory f)
+				      dir-B)))
 				   (ediff-get-default-file-name f 1)))
 	   )))
   (ediff-files-internal file-A
@@ -245,22 +246,24 @@
 						    ediff-last-dir-B
 						  (file-name-directory f)))
 					  (progn
-					    (add-to-history 'file-name-history
-							    (ediff-abbreviate-file-name
-							     (expand-file-name
-							      (file-name-nondirectory f)
-							      dir-B)))
+					    (ediff-add-to-history
+					     'file-name-history
+					     (ediff-abbreviate-file-name
+					      (expand-file-name
+					       (file-name-nondirectory f)
+					       dir-B)))
 					    (ediff-get-default-file-name f 1))))
 	   (ediff-read-file-name "File C to compare"
 				 (setq dir-C (if ediff-use-last-dir
 						 ediff-last-dir-C
 					       (file-name-directory ff)))
 				 (progn
-				   (add-to-history 'file-name-history
-						   (ediff-abbreviate-file-name
-						    (expand-file-name
-						     (file-name-nondirectory ff)
-						     dir-C)))
+				   (ediff-add-to-history
+				    'file-name-history
+				    (ediff-abbreviate-file-name
+				     (expand-file-name
+				      (file-name-nondirectory ff)
+				      dir-C)))
 				   (ediff-get-default-file-name ff 2)))
 	   )))
   (ediff-files-internal file-A
@@ -1103,11 +1106,12 @@ lines.  For small regions, use `ediff-regions-wordwise'."
 					   ediff-last-dir-B
 					 (file-name-directory f)))
 				 (progn
-				   (add-to-history 'file-name-history
-						   (ediff-abbreviate-file-name
-						    (expand-file-name
-						     (file-name-nondirectory f)
-						     dir-B)))
+				   (ediff-add-to-history
+				    'file-name-history
+				    (ediff-abbreviate-file-name
+				     (expand-file-name
+				      (file-name-nondirectory f)
+				      dir-B)))
 				   (ediff-get-default-file-name f 1)))
 	   )))
   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
@@ -1146,11 +1150,12 @@ lines.  For small regions, use `ediff-regions-wordwise'."
 						    ediff-last-dir-B
 						  (file-name-directory f)))
 					  (progn
-					    (add-to-history 'file-name-history
-							    (ediff-abbreviate-file-name
-							     (expand-file-name
-							      (file-name-nondirectory f)
-							      dir-B)))
+					    (ediff-add-to-history
+					     'file-name-history
+					     (ediff-abbreviate-file-name
+					      (expand-file-name
+					       (file-name-nondirectory f)
+					       dir-B)))
 					    (ediff-get-default-file-name f 1))))
 	   (ediff-read-file-name "Ancestor file"
 				 (setq dir-ancestor
@@ -1158,11 +1163,12 @@ lines.  For small regions, use `ediff-regions-wordwise'."
 					   ediff-last-dir-ancestor
 					 (file-name-directory ff)))
 				 (progn
-				   (add-to-history 'file-name-history
-						   (ediff-abbreviate-file-name
-						    (expand-file-name
-						     (file-name-nondirectory ff)
-						     dir-ancestor)))
+				   (ediff-add-to-history
+				    'file-name-history
+				    (ediff-abbreviate-file-name
+				     (expand-file-name
+				      (file-name-nondirectory ff)
+				      dir-ancestor)))
 				   (ediff-get-default-file-name ff 2)))
 	   )))
   (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))

lisp/emulation/viper-cmd.el

@@ -3098,7 +3098,7 @@ If point is on a widget or a button, simulate clicking on that widget/button."
                (and (consp widget)
                     (get (widget-type widget) 'widget-type))))
         (widget-button-press (point))
-      (if (button-at (point))
+      (if (and (fboundp 'button-at) (fboundp 'push-button) (button-at (point)))
           (push-button)
 	;; not a widget or a button
         (viper-leave-region-active)

lisp/emulation/viper.el

@@ -9,7 +9,7 @@
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
 
-(defconst viper-version "3.12 of February 18, 2006"
+(defconst viper-version "3.13 of September 18, 2006"
   "The current version of Viper")
 
 ;; This file is part of GNU Emacs.