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

[Michael Kifer]

Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.33 emacs/lisp/ediff-mult.el:1.34
*** emacs/lisp/ediff-mult.el:1.33       Mon Sep  1 11:45:11 2003
--- emacs/lisp/ediff-mult.el    Sun Oct 12 21:28:49 2003
***************
*** 1689,1694 ****
--- 1689,1695 ----
         (info (ediff-get-meta-info meta-buf pos))
         (session-buf (ediff-get-session-buffer info))
         (session-number (ediff-get-session-number-at-pos pos meta-buf))
+        (default-regexp (eval ediff-default-filtering-regexp))
         merge-autostore-dir file1 file2 file3 regexp)
  
      (setq file1 (ediff-get-session-objA-name info)
***************
*** 1717,1724 ****
             ;; do ediff/ediff-merge on subdirectories
             (if (ediff-buffer-live-p session-buf)
                 (ediff-show-meta-buffer session-buf)
!              (setq regexp (read-string "Filter through regular expression: "
!                                        nil 'ediff-filtering-regexp-history))
               (ediff-directories-internal
                file1 file2 file3 regexp
                ediff-session-action-function
--- 1718,1733 ----
             ;; do ediff/ediff-merge on subdirectories
             (if (ediff-buffer-live-p session-buf)
                 (ediff-show-meta-buffer session-buf)
!              (setq regexp
!                    (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
                file1 file2 file3 regexp
                ediff-session-action-function