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

[Michael Kifer]

Index: emacs/lisp/ediff.el
diff -c emacs/lisp/ediff.el:1.63 emacs/lisp/ediff.el:1.64
*** emacs/lisp/ediff.el:1.63    Mon Sep  1 11:45:11 2003
--- emacs/lisp/ediff.el Sun Oct 12 21:28:49 2003
***************
*** 501,506 ****
--- 501,507 ----
  expression; only file names that match the regexp are considered."
    (interactive
     (let ((dir-A (ediff-get-default-directory-name))
+        (default-regexp (eval ediff-default-filtering-regexp))
         f)
       (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
           (ediff-read-file-name "Directory B to compare:"
***************
*** 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
--- 509,522 ----
                                     ediff-last-dir-B
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directories-internal
     dir1 dir2 nil regexp 'ediff-files 'ediff-directories
***************
*** 528,541 ****
  The second argument, REGEXP, is a regular expression that filters the file
  names.  Only the files that are under revision control are taken into 
account."
    (interactive
!    (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
--- 532,550 ----
  The second argument, REGEXP, is a regular expression that filters the file
  names.  Only the files that are under revision control are taken into 
account."
    (interactive
!    (let ((dir-A (ediff-get-default-directory-name))
!        (default-regexp (eval ediff-default-filtering-regexp))
!        )
       (list (ediff-read-file-name
            "Directory to compare with revision:" dir-A nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-revision 'ediff-directory-revisions
***************
*** 553,558 ****
--- 562,568 ----
  
    (interactive
     (let ((dir-A (ediff-get-default-directory-name))
+        (default-regexp (eval ediff-default-filtering-regexp))
         f)
       (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
           (setq f (ediff-read-file-name "Directory B to compare:"
***************
*** 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
--- 575,588 ----
                                     ediff-last-dir-C
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directories-internal
     dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
***************
*** 585,590 ****
--- 598,604 ----
  expression; only file names that match the regexp are considered."
    (interactive
     (let ((dir-A (ediff-get-default-directory-name))
+        (default-regexp (eval ediff-default-filtering-regexp))
         f)
       (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
           (ediff-read-file-name "Directory B to merge:"
***************
*** 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
--- 606,619 ----
                                     ediff-last-dir-B
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directories-internal
     dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
***************
*** 617,622 ****
--- 634,640 ----
  only file names that match the regexp are considered."
    (interactive
     (let ((dir-A (ediff-get-default-directory-name))
+        (default-regexp (eval ediff-default-filtering-regexp))
         f)
       (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
           (setq f (ediff-read-file-name "Directory B to merge:"
***************
*** 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
--- 647,660 ----
                                     ediff-last-dir-C
                                   (ediff-strip-last-dir f))
                                 nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directories-internal
     dir1 dir2 ancestor-dir regexp
***************
*** 648,661 ****
  The second argument, REGEXP, is a regular expression that filters the file
  names.  Only the files that are under revision control are taken into 
account."
    (interactive
!    (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
--- 669,687 ----
  The second argument, REGEXP, is a regular expression that filters the file
  names.  Only the files that are under revision control are taken into 
account."
    (interactive
!    (let ((dir-A (ediff-get-default-directory-name))
!        (default-regexp (eval ediff-default-filtering-regexp))
!        )
       (list (ediff-read-file-name
            "Directory to merge with revisions:" dir-A nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
***************
*** 673,686 ****
  The second argument, REGEXP, is a regular expression that filters the file
  names.  Only the files that are under revision control are taken into 
account."
    (interactive
!    (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
--- 699,717 ----
  The second argument, REGEXP, is a regular expression that filters the file
  names.  Only the files that are under revision control are taken into 
account."
    (interactive
!    (let ((dir-A (ediff-get-default-directory-name))
!        (default-regexp (eval ediff-default-filtering-regexp))
!        )
       (list (ediff-read-file-name
            "Directory to merge with revisions and ancestors:" dir-A nil)
!          (read-string
!           (if (stringp default-regexp)
!               (format "Filter through regular expression (default %s): "
!                        default-regexp)
!             "Filter through regular expression: ")
!           nil
!           'ediff-filtering-regexp-history
!           (eval ediff-default-filtering-regexp))
           )))
    (ediff-directory-revisions-internal
     dir1 regexp 'ediff-merge-revisions-with-ancestor