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

[Michael Kifer]

Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.61 emacs/lisp/ediff.el:1.62
*** emacs/lisp/ediff.el:1.61    Tue Feb  4 06:14:51 2003
--- emacs/lisp/ediff.el Sun May 18 13:18:09 2003
***************
*** 7,13 ****
  ;; Keywords: comparing, merging, patching, tools, unix
  
  (defconst ediff-version "2.78" "The current version of Ediff")
! (defconst ediff-date "January 25, 2003" "Date of last update")
  
  
  ;; This file is part of GNU Emacs.
--- 7,13 ----
  ;; Keywords: comparing, merging, patching, tools, unix
  
  (defconst ediff-version "2.78" "The current version of Ediff")
! (defconst ediff-date "May 18, 2003" "Date of last update")  
  
  
  ;; This file is part of GNU Emacs.
***************
*** 508,515 ****
                                     ediff-last-dir-B
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 nil regexp 'ediff-files 'ediff-directories
--- 508,518 ----
                                     ediff-last-dir-B
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 nil regexp 'ediff-files 'ediff-directories
***************
*** 528,535 ****
     (let ((dir-A (ediff-get-default-directory-name)))
       (list (ediff-read-file-name
            "Directory to compare with revision:" dir-A nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-revision 'ediff-directory-revisions
--- 531,541 ----
     (let ((dir-A (ediff-get-default-directory-name)))
       (list (ediff-read-file-name
            "Directory to compare with revision:" dir-A nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-revision 'ediff-directory-revisions
***************
*** 559,566 ****
                                     ediff-last-dir-C
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
--- 565,575 ----
                                     ediff-last-dir-C
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
***************
*** 583,590 ****
                                     ediff-last-dir-B
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
--- 592,602 ----
                                     ediff-last-dir-B
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
***************
*** 617,624 ****
                                     ediff-last-dir-C
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 ancestor-dir regexp
--- 629,639 ----
                                     ediff-last-dir-C
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directories-internal
     dir1 dir2 ancestor-dir regexp
***************
*** 636,643 ****
     (let ((dir-A (ediff-get-default-directory-name)))
       (list (ediff-read-file-name
            "Directory to merge with revisions:" dir-A nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
--- 651,661 ----
     (let ((dir-A (ediff-get-default-directory-name)))
       (list (ediff-read-file-name
            "Directory to merge with revisions:" dir-A nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
***************
*** 658,665 ****
     (let ((dir-A (ediff-get-default-directory-name)))
       (list (ediff-read-file-name
            "Directory to merge with revisions and ancestors:" dir-A nil)
!          (read-string "Filter through regular expression: "
!                       nil 'ediff-filtering-regexp-history)
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-merge-revisions-with-ancestor
--- 676,686 ----
     (let ((dir-A (ediff-get-default-directory-name)))
       (list (ediff-read-file-name
            "Directory to merge with revisions and ancestors:" dir-A nil)
!          (read-string (format
!                        "Filter through regular expression (default %S): "
!                        (eval ediff-default-filtering-regexp))
!                       (eval ediff-default-filtering-regexp)
!                       'ediff-filtering-regexp-history)
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-merge-revisions-with-ancestor