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

[Miles Bader]

Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.29.2.1 emacs/lisp/ediff-mult.el:1.29.2.2
*** emacs/lisp/ediff-mult.el:1.29.2.1   Fri Apr  4 01:20:04 2003
--- emacs/lisp/ediff-mult.el    Tue Oct 14 19:50:58 2003
***************
*** 167,175 ****
  ;; buffer used to collect custom diffs from individual sessions in the group
  (ediff-defvar-local ediff-meta-diff-buffer nil "")
  
! ;; history var to use for filtering groups
  (defvar ediff-filtering-regexp-history nil "")
  
  ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
  ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
  ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2
--- 167,181 ----
  ;; buffer used to collect custom diffs from individual sessions in the group
  (ediff-defvar-local ediff-meta-diff-buffer nil "")
  
! ;; history var to use for filtering groups of files
  (defvar ediff-filtering-regexp-history nil "")
  
+ (defcustom ediff-default-filtering-regexp nil
+   "The default regular expression used as a filename filter in multifile 
comparisons.
+ Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil."
+   :type 'sexp
+   :group 'ediff-mult)
+ 
  ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
  ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
  ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2
***************
*** 1683,1688 ****
--- 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)
***************
*** 1711,1718 ****
             ;; 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
***************
*** 2357,2360 ****
--- 2372,2376 ----
  ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
  ;;; End:
  
+ ;;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
  ;;; ediff-mult.el ends here