mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-22 07:09:54 +00:00
Code Issues Releases Activity

2002-11-17 Michael Kifer <kifer@cs.stonybrook.edu>

Browse Source 
* ediff-diff.el (ediff-setup-diff-regions): change regexp.

	* ediff-mult.el: comments.

	* ediff.el: comments.
This commit is contained in:
Michael Kifer 2002-11-17 22:26:48 +00:00
parent d283d229dc
commit 6dfd1bcc54
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ediff-diff.el
View File

@ -225,7 +225,8 @@ one optional arguments, diff-number to refine.")
;; ediff-setup-diff-regions-function, which can also have the value
;; ediff-setup-diff-regions3, which takes 4 arguments.
(defun ediff-setup-diff-regions (file-A file-B file-C)
(if (string-match "c" ediff-diff-options)
;; looking either for '-c' or a 'c' in a set of clustered non-long options
(if (string-match "^-c\\| -c\\|-[^- ]+c" ediff-diff-options)
(error "Option `-c' is not allowed in `ediff-diff-options'"))
;; create, if it doesn't exist

3
lisp/ediff-mult.el
View File

@ -505,7 +505,8 @@ behavior."
;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil.
;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
;; Can be nil.
;; REGEXP is a regexp used to filter out files in the directories.
;; REGEXP is nil or a filter regexp; only file names that match the regexp
;; are considered.
;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not
;; included in the intersection. However, a regular file that is a dir in dir3
;; is included, since dir3 files are supposed to be ancestors for merging.

21
lisp/ediff.el
View File

@ -497,8 +497,8 @@ If this file is a backup, `ediff' it with its original."
;;;###autoload
(defun ediff-directories (dir1 dir2 regexp)
"Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
the same name in both. The third argument, REGEXP, is a regular expression
that can be used to filter out certain file names."
the same name in both. The third argument, REGEXP, is nil or a regular
expression; only file names that match the regexp are considered."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
@ -542,8 +542,9 @@ names. Only the files that are under revision control are taken into account."
;;;###autoload
(defun ediff-directories3 (dir1 dir2 dir3 regexp)
"Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
have the same name in all three. The last argument, REGEXP, is a regular
expression that can be used to filter out certain file names."
have the same name in all three. The last argument, REGEXP, is nil or a
regular expression; only file names that match the regexp are considered."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
@ -571,8 +572,8 @@ expression that can be used to filter out certain file names."
;;;###autoload
(defun ediff-merge-directories (dir1 dir2 regexp &optional merge-autostore-dir)
"Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
the same name in both. The third argument, REGEXP, is a regular expression
that can be used to filter out certain file names."
the same name in both. The third argument, REGEXP, is nil or a regular
expression; only file names that match the regexp are considered."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
@ -600,8 +601,8 @@ that can be used to filter out certain file names."
"Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
without ancestor. The fourth argument, REGEXP, is a regular expression that
can be used to filter out certain file names."
without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
only file names that match the regexp are considered."
(interactive
(let ((dir-A (ediff-get-default-directory-name))
f)
@ -676,8 +677,8 @@ names. Only the files that are under revision control are taken into account."
;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
;; on a pair of directories (three directories, in case of ancestor).
;; The third argument, REGEXP, is a regular expression that can be used to
;; filter out certain file names.
;; The third argument, REGEXP, is nil or a regular expression;
;; only file names that match the regexp are considered.
;; JOBNAME is the symbol indicating the meta-job to be performed.
;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
(defun ediff-directories-internal (dir1 dir2 dir3 regexp action jobname