[Emacs-diffs] Changes to emacs/lisp/ediff.el,v

[Michael Kifer]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Michael Kifer <kifer>   06/09/18 19:22:32

Index: ediff.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ediff.el,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- ediff.el    18 Jun 2006 17:08:24 -0000      1.80
+++ ediff.el    18 Sep 2006 19:22:31 -0000      1.81
@@ -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,7 +210,8 @@
                                           ediff-last-dir-B
                                         (file-name-directory f)))
                                 (progn
-                                  (add-to-history 'file-name-history
+                                  (ediff-add-to-history
+                                   'file-name-history
                                                   (ediff-abbreviate-file-name
                                                    (expand-file-name
                                                     (file-name-nondirectory f)
@@ -245,7 +246,8 @@
                                                    ediff-last-dir-B
                                                  (file-name-directory f)))
                                          (progn
-                                           (add-to-history 'file-name-history
+                                           (ediff-add-to-history
+                                            'file-name-history
                                                            
(ediff-abbreviate-file-name
                                                             (expand-file-name
                                                              
(file-name-nondirectory f)
@@ -256,7 +258,8 @@
                                                 ediff-last-dir-C
                                               (file-name-directory ff)))
                                 (progn
-                                  (add-to-history 'file-name-history
+                                  (ediff-add-to-history
+                                   'file-name-history
                                                   (ediff-abbreviate-file-name
                                                    (expand-file-name
                                                     (file-name-nondirectory ff)
@@ -1103,7 +1106,8 @@
                                           ediff-last-dir-B
                                         (file-name-directory f)))
                                 (progn
-                                  (add-to-history 'file-name-history
+                                  (ediff-add-to-history
+                                   'file-name-history
                                                   (ediff-abbreviate-file-name
                                                    (expand-file-name
                                                     (file-name-nondirectory f)
@@ -1146,7 +1150,8 @@
                                                    ediff-last-dir-B
                                                  (file-name-directory f)))
                                          (progn
-                                           (add-to-history 'file-name-history
+                                           (ediff-add-to-history
+                                            'file-name-history
                                                            
(ediff-abbreviate-file-name
                                                             (expand-file-name
                                                              
(file-name-nondirectory f)
@@ -1158,7 +1163,8 @@
                                           ediff-last-dir-ancestor
                                         (file-name-directory ff)))
                                 (progn
-                                  (add-to-history 'file-name-history
+                                  (ediff-add-to-history
+                                   'file-name-history
                                                   (ediff-abbreviate-file-name
                                                    (expand-file-name
                                                     (file-name-nondirectory ff)