/[emacs]/emacs/lisp/ediff-mult.el
ViewVC logotype

Diff of /emacs/lisp/ediff-mult.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.31 by kifer, Sun Nov 17 22:26:48 2002 UTC revision 1.32 by kifer, Sun May 18 17:18:09 2003 UTC
# Line 167  directories.") Line 167  directories.")
167  ;; buffer used to collect custom diffs from individual sessions in the group  ;; buffer used to collect custom diffs from individual sessions in the group
168  (ediff-defvar-local ediff-meta-diff-buffer nil "")  (ediff-defvar-local ediff-meta-diff-buffer nil "")
169    
170  ;; history var to use for filtering groups  ;; history var to use for filtering groups of files
171  (defvar ediff-filtering-regexp-history nil "")  (defvar ediff-filtering-regexp-history nil "")
172    
173    (defcustom ediff-default-filtering-regexp nil
174      "The default regular expression used as a filename filter in multifile comparisons.
175    Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil."
176      :type 'sexp
177      :group 'ediff-mult)
178    
179  ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)  ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
180  ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3  ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
181  ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2  ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2

Legend:
Removed from v.1.31  
changed lines
  Added in v.1.32

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26