Commit 737e3892 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(emerge-count-matches-string): Renamed from count-matches-string.

(emerge-command-prefix): Now C-c C-c.
emerge-shadow-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-recursively-substitute-key-definition): Deleted.
Callers use substitute-key-definition.
(emerge-unselect-hook): Renamed from emerge-unselect-hooks.
(emerge-files-internal): Use file-local-copy to handle remote files.
(emerge-files-with-ancestor-internal): Likewise.
(emerge-remote-file-p): Deleted.
(emerge-abort): New command.
(describe-mode): Deleted.
(emerge-hash-string-into-string): Renamed from hash-string-into-string.
(emerge-unslashify-name): Renamed from unslashify-name.
(emerge-write-and-delete): Don't write-file if file-out is nil.
parent 151e4b9c
;;; Emacs subsystem to merge two files, version 5 beta
;;; Written by Dale R. Worley <drw@math.mit.edu>.
;;; emerge.el --- merge diffs under Emacs control
;; WARRANTY DISCLAIMER
;;; The author has placed this file in the public domain.
;; Author: Dale R. Worley <drw@math.mit.edu>
;; Version: 5fsf
;; Keywords: unix, tools
;; This software was created by Dale R. Worley and is
;; distributed free of charge. It is placed in the public domain and
......@@ -16,19 +19,13 @@
;; LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL, INCIDENTAL OR CONSEQUENTIAL
;; DAMAGES.
;; Declare that we've got the subsystem loaded
(provide 'emerge)
;; LCD Archive Entry:
;; emerge|Dale R. Worley|drw@math.mit.edu
;; |File merge
;; |92-11-20|version 5 beta|~/packages/emerge.el.Z
;;; Code:
;;; Macros
(defmacro emerge-eval-in-buffer (buffer &rest forms)
"Macro to switch to BUFFER, evaluate FORMS, returns to original buffer.
Differs from save-excursion in that it doesn't save the point and mark."
Differs from `save-excursion' in that it doesn't save the point and mark."
(` (let ((StartBuffer (current-buffer)))
(unwind-protect
(progn
......@@ -37,10 +34,11 @@ Differs from save-excursion in that it doesn't save the point and mark."
(set-buffer StartBuffer)))))
(defmacro emerge-defvar-local (var value doc)
"Defines SYMBOL as an advertised variable. Performs a defvar, then
executes make-variable-buffer-local on the variable. Also sets the
'preserved' property, so that kill-all-local-variables (called by major-mode
setting commands) won't destroy Emerge control variables."
"Defines SYMBOL as an advertised variable.
Performs a defvar, then executes `make-variable-buffer-local' on
the variable. Also sets the `preserved' property, so that
`kill-all-local-variables' (called by major-mode setting commands)
won't destroy Emerge control variables."
(` (progn
(defvar (, var) (, value) (, doc))
(make-variable-buffer-local '(, var))
......@@ -58,28 +56,28 @@ setting commands) won't destroy Emerge control variables."
;; We need to define this function so describe-mode can describe Emerge mode.
(defun emerge-mode ()
"Emerge mode is used by the Emerge file-merging package. It is entered only
through one of the functions:
emerge-files
emerge-files-with-ancestor
emerge-buffers
emerge-buffers-with-ancestor
emerge-files-command
emerge-files-with-ancestor-command
emerge-files-remote
emerge-files-with-ancestor-remote
"Emerge mode is used by the Emerge file-merging package.
It is entered only through one of the functions:
`emerge-files'
`emerge-files-with-ancestor'
`emerge-buffers'
`emerge-buffers-with-ancestor'
`emerge-files-command'
`emerge-files-with-ancestor-command'
`emerge-files-remote'
`emerge-files-with-ancestor-remote'
Commands:
\\{emerge-basic-keymap}
Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in 'edit' mode, but can be invoked directly
in 'fast' mode.")
Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode,
but can be invoked directly in `fast' mode.")
(defvar emerge-version "5"
(defvar emerge-version "5fsf"
"The version of Emerge.")
(defun emerge-version ()
"Return string describing the version of Emerge. When called interactively,
displays the version."
"Return string describing the version of Emerge.
When called interactively, displays the version."
(interactive)
(if (interactive-p)
(message "Emerge version %s" (emerge-version))
......@@ -94,29 +92,29 @@ displays the version."
;; are given is fixed.
;; The file names are always expanded (see expand-file-name) before being
;; passed to diff, thus they need not be invoked under a shell that
;; understands '~'.
;; understands `~'.
;; The code which processes the diff/diff3 output depends on all the
;; finicky details of their output, including the somewhat strange
;; way they number lines of a file.
(defvar emerge-diff-program "diff"
"*Name of the program which compares two files.")
(defvar emerge-diff3-program "diff3"
"*Name of the program which compares an ancestor file (first argument)
and two variant files (second and third arguments).")
"*Name of the program which compares three files.
Its arguments are the ancestor file and the two variant files.")
(defvar emerge-diff-options ""
"*Options to be passed to emerge-diff/diff3-program.")
"*Options to pass to `emerge-diff-program' and `emerge-diff3-program'.")
(defvar emerge-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)"))
(concat "^" x "\\([acd]\\)" x "$"))
"*Pattern to match lines produced by diff that describe differences (as
opposed to lines from the source files).")
"*Pattern to match lines produced by diff that describe differences.
This is as opposed to lines from the source files.")
(defvar emerge-diff-ok-lines
"^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)"
"*Regexp that matches normal output lines from emerge-diff-program .
Lines that do not match are assumed to be error output.")
"*Regexp that matches normal output lines from `emerge-diff-program'.
Lines that do not match are assumed to be error messages.")
(defvar emerge-diff3-ok-lines
"^\\([1-3]:\\|====\\| \\)"
"*Regexp that matches normal output lines from emerge-diff3-program .
Lines that do not match are assumed to be error output.")
"*Regexp that matches normal output lines from `emerge-diff3-program'.
Lines that do not match are assumed to be error messages.")
(defvar emerge-rcs-ci-program "ci"
"*Name of the program that checks in RCS revisions.")
......@@ -124,69 +122,68 @@ Lines that do not match are assumed to be error output.")
"*Name of the program that checks out RCS revisions.")
(defvar emerge-process-local-variables nil
"*Non-nil if Emerge should process the local-variables list in newly created
merge buffers. (The local-variables list can be processed manually by
executing \"(hack-local-variables)\".)")
"*Non-nil if Emerge should process local-variables lists in merge buffers.
\(You can explicitly request processing the local-variables
by executing `(hack-local-variables)'.)")
(defvar emerge-execute-line-deletions nil
"*If non-nil: When emerge-execute-line discovers a situation which
appears to show that a file has been deleted from one version of the
files being merged (when an ancestor entry is present, only one
A or B entry is present, and an output entry is present), no output
file will be created.
"*If non-nil: `emerge-execute-line' makes no output if an input was deleted.
It concludes that an input version has been deleted when an ancestor entry
is present, only one A or B entry is present, and an output entry is present.
If nil: In such circumstances, the A or B file that is present will be
copied to the designated output file.")
;; Hook variables
(defvar emerge-startup-hooks nil
"*Hooks to run in the merge buffer after the merge has been set up.")
(defvar emerge-select-hooks nil
"*Hooks to run after a difference has been selected.
`n' is the (internal) number of the difference.")
(defvar emerge-unselect-hooks nil
"*Hooks to run after a difference has been unselected.
`n' is the (internal) number of the difference.")
(defvar emerge-startup-hook nil
"*Hook to run in the merge buffer after the merge has been set up.")
(defvar emerge-select-hook nil
"*Hook to run after a difference has been selected.
The variable `n' holds the (internal) number of the difference.")
(defvar emerge-unselect-hook nil
"*Hook to run after a difference has been unselected.
The variable `n' holds the (internal) number of the difference.")
;; Variables to control the default directories of the arguments to
;; Emerge commands.
(defvar emerge-default-last-directories nil
"*If nil, filenames for emerge-files-* commands complete in
default-directory (like an ordinary command).
"*If nil, default dir for filenames in emerge is `default-directory'.
If non-nil, filenames complete in the directory of the last argument of the
same type to an emerge-files-* command.")
same type to an `emerge-files...' command.")
(defvar emerge-last-dir-A nil
"Last directory for the first file of an emerge-files command.")
"Last directory for the first file of an `emerge-files...' command.")
(defvar emerge-last-dir-B nil
"Last directory for the second file of an emerge-files command.")
"Last directory for the second file of an `emerge-files...' command.")
(defvar emerge-last-dir-ancestor nil
"Last directory for the ancestor file of an emerge-files command.")
"Last directory for the ancestor file of an `emerge-files...' command.")
(defvar emerge-last-dir-output nil
"Last directory for the output file of an emerge-files command.")
"Last directory for the output file of an `emerge-files...' command.")
(defvar emerge-last-revision-A nil
"Last RCS revision use for the first file of an emerge-revisions command.")
"Last RCS revision used for first file of an `emerge-revisions...' command.")
(defvar emerge-last-revision-B nil
"Last RCS revision use for the second file of an emerge-revisions command.")
"Last RCS revision used for second file of an `emerge-revisions...' command.")
(defvar emerge-last-revision-ancestor nil
"Last RCS revision use for the ancestor file of an emerge-revisions command.")
"Last RCS revision used for ancestor file of an `emerge-revisions...' command.")
;; The flags used to mark differences in the buffers.
;; These function definitions need to be up here, because they are used
;; during loading.
(defun emerge-new-flags ()
"Function to be called after emerge-{before,after}-flag are changed to
compute values that depend on the flags."
"Function to be called after `emerge-{before,after}-flag'.
This is called after these functions are changed to compute values that
depend on the flags."
(setq emerge-before-flag-length (length emerge-before-flag))
(setq emerge-before-flag-lines
(count-matches-string emerge-before-flag "\n"))
(emerge-count-matches-string emerge-before-flag "\n"))
(setq emerge-before-flag-match (regexp-quote emerge-before-flag))
(setq emerge-after-flag-length (length emerge-after-flag))
(setq emerge-after-flag-lines
(count-matches-string emerge-after-flag "\n"))
(emerge-count-matches-string emerge-after-flag "\n"))
(setq emerge-after-flag-match (regexp-quote emerge-after-flag)))
(defun count-matches-string (string regexp)
(defun emerge-count-matches-string (string regexp)
"Return the number of matches in STRING for REGEXP."
(let ((i 0)
(count 0))
......@@ -221,18 +218,18 @@ displaying a difference.")
(setq d (substring d 0 -1)))
(concat d "/emerge"))
"*Prefix to put on Emerge temporary file names.
Do not start with '~/' or '~user-name/'.")
Do not start with `~/' or `~user-name/'.")
(defvar emerge-temp-file-mode 384 ; u=rw only
"*Mode for Emerge temporary files.")
(defvar emerge-combine-versions-template
"#ifdef NEW\n%b#else /* NEW */\n%a#endif /* NEW */\n"
"*Template for emerge-combine-versions to combine the two versions.
"*Template for `emerge-combine-versions' to combine the two versions.
The template is inserted as a string, with the following interpolations:
%a the A version of the difference
%b the B version of the difference
%% the character '%'
%% the character `%'
Don't forget to end the template with a newline.
Note that this variable can be made local to a particular merge buffer by
giving a prefix argument to emerge-set-combine-versions-template .")
......@@ -241,15 +238,15 @@ giving a prefix argument to emerge-set-combine-versions-template .")
(defvar emerge-basic-keymap nil
"Keymap of Emerge commands.
Directly available in 'fast' mode;
must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in 'edit' mode.")
Directly available in `fast' mode;
must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode.")
(defvar emerge-fast-keymap nil
"Local keymap used in Emerge 'fast' mode.
"Local keymap used in Emerge `fast' mode.
Makes Emerge commands directly available.")
(defvar emerge-command-prefix "\C-c"
"*Command prefix for Emerge commands in 'edit' mode.
(defvar emerge-command-prefix "\C-c\C-c"
"*Command prefix for Emerge commands in `edit' mode.
Must be set before Emerge is loaded.")
;; This function sets up the fixed keymaps. It is executed when the first
......@@ -309,10 +306,10 @@ Must be set before Emerge is loaded.")
;; Allow emerge-fast-keymap to be referenced indirectly
(fset 'emerge-fast-keymap emerge-fast-keymap)
;; Suppress write-file and save-buffer
(emerge-shadow-key-definition 'write-file 'emerge-query-write-file
(current-global-map) emerge-fast-keymap)
(emerge-shadow-key-definition 'save-buffer 'emerge-query-save-buffer
(current-global-map) emerge-fast-keymap))
(substitute-key-definition 'write-file 'emerge-query-write-file
emerge-fast-keymap (current-global-map))
(substitute-key-definition 'save-buffer 'emerge-query-save-buffer
emerge-fast-keymap (current-global-map)))
;; Variables which control each merge. They are local to the merge buffer.
......@@ -389,23 +386,22 @@ the next difference.")
(emerge-defvar-local emerge-skip-prefers nil
"*If non-nil, differences for which there is a preference are automatically
skipped.")
(emerge-defvar-local emerge-quit-hooks nil
(emerge-defvar-local emerge-quit-hook nil
"Hooks to run in the merge buffer after the merge has been finished.
emerge-prefix-argument will be bound to the prefix argument of the emerge-quit
`emerge-prefix-argument' will hold the prefix argument of the `emerge-quit'
command.
This is not a user option, since Emerge uses it for its own processing.")
This is *not* a user option, since Emerge uses it for its own processing.")
(emerge-defvar-local emerge-output-description nil
"Describes output destination of the merge, for the use of
emerge-file-names.")
"Describes output destination of emerge, for `emerge-file-names'.")
;;; Setup functions for two-file mode.
(defun emerge-files-internal (file-A file-B &optional startup-hooks quit-hooks
output-file)
(if (not (file-readable-p file-A))
(error "File '%s' does not exist or is not readable" file-A))
(error "File `%s' does not exist or is not readable" file-A))
(if (not (file-readable-p file-B))
(error "File '%s' does not exist or is not readable" file-B))
(error "File `%s' does not exist or is not readable" file-B))
(let ((buffer-A (find-file-noselect file-A))
(buffer-B (find-file-noselect file-B)))
;; Record the directories of the files
......@@ -417,29 +413,25 @@ emerge-file-names.")
(emerge-eval-in-buffer
buffer-A
(widen)
(if (emerge-remote-file-p)
(progn
;; Store in a local file
(setq file-A (emerge-make-temp-file "A"))
(write-region (point-min) (point-max) file-A nil 'no-message)
(setq startup-hooks
(let ((temp (file-local-copy file-A)))
(if temp
(setq file-A temp
startup-hooks
(cons (` (lambda () (delete-file (, file-A))))
startup-hooks)))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
(emerge-eval-in-buffer
buffer-B
(widen)
(if (emerge-remote-file-p)
(progn
;; Store in a local file
(setq file-B (emerge-make-temp-file "B"))
(write-region (point-min) (point-max) file-B nil 'no-message)
(setq startup-hooks
(let ((temp (file-local-copy file-B)))
(if temp
(setq file-B temp
startup-hooks
(cons (` (lambda () (delete-file (, file-B))))
startup-hooks)))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
(emerge-setup buffer-A file-A buffer-B file-B startup-hooks quit-hooks
output-file)))
......@@ -474,12 +466,12 @@ emerge-file-names.")
(setq emerge-difference-list (emerge-make-diff-list file-A file-B))
(setq emerge-number-of-differences (length emerge-difference-list))
(setq emerge-current-difference -1)
(setq emerge-quit-hooks quit-hooks)
(setq emerge-quit-hook quit-hooks)
(emerge-remember-buffer-characteristics)
(emerge-handle-local-variables))
(emerge-setup-windows buffer-A buffer-B merge-buffer t)
(emerge-eval-in-buffer merge-buffer
(run-hooks 'startup-hooks 'emerge-startup-hooks)
(run-hooks 'startup-hooks 'emerge-startup-hook)
(setq buffer-read-only t))))
;; Generate the Emerge difference list between two files
......@@ -554,14 +546,14 @@ emerge-file-names.")
;;; Top-level and setup functions for three-file mode.
(defun emerge-files-with-ancestor-internal (file-A file-B file-ancestor
&optional startup-hooks quit-hooks
output-file)
&optional startup-hooks quit-hooks
output-file)
(if (not (file-readable-p file-A))
(error "File '%s' does not exist or is not readable" file-A))
(error "File `%s' does not exist or is not readable" file-A))
(if (not (file-readable-p file-B))
(error "File '%s' does not exist or is not readable" file-B))
(error "File `%s' does not exist or is not readable" file-B))
(if (not (file-readable-p file-ancestor))
(error "File '%s' does not exist or is not readable" file-ancestor))
(error "File `%s' does not exist or is not readable" file-ancestor))
(let ((buffer-A (find-file-noselect file-A))
(buffer-B (find-file-noselect file-B))
(buffer-ancestor (find-file-noselect file-ancestor)))
......@@ -575,42 +567,36 @@ emerge-file-names.")
(emerge-eval-in-buffer
buffer-A
(widen)
(if (emerge-remote-file-p)
(progn
;; Store in a local file
(setq file-A (emerge-make-temp-file "A"))
(write-region (point-min) (point-max) file-A nil 'no-message)
(setq startup-hooks
(let ((temp (file-local-copy file-A)))
(if temp
(setq file-A temp
startup-hooks
(cons (` (lambda () (delete-file (, file-A))))
startup-hooks)))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
(emerge-eval-in-buffer
buffer-B
(widen)
(if (emerge-remote-file-p)
(progn
;; Store in a local file
(setq file-B (emerge-make-temp-file "B"))
(write-region (point-min) (point-max) file-B nil 'no-message)
(setq startup-hooks
(let ((temp (file-local-copy file-B)))
(if temp
(setq file-B temp
startup-hooks
(cons (` (lambda () (delete-file (, file-B))))
startup-hooks)))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
(emerge-eval-in-buffer
buffer-ancestor
(widen)
(if (emerge-remote-file-p)
(progn
;; Store in a local file
(Setq file-ancestor (emerge-make-temp-file "anc"))
(write-region (point-min) (point-max) file-ancestor nil 'no-message)
(setq startup-hooks
(let ((temp (file-local-copy file-ancestor)))
(if temp
(setq file-ancestor temp
startup-hooks
(cons (` (lambda () (delete-file (, file-ancestor))))
startup-hooks)))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer)))
startup-hooks))
;; Verify that the file matches the buffer
(emerge-verify-file-buffer))))
(emerge-setup-with-ancestor buffer-A file-A buffer-B file-B
buffer-ancestor file-ancestor
startup-hooks quit-hooks output-file)))
......@@ -650,13 +636,13 @@ emerge-file-names.")
(emerge-make-diff3-list file-A file-B file-ancestor))
(setq emerge-number-of-differences (length emerge-difference-list))
(setq emerge-current-difference -1)
(setq emerge-quit-hooks quit-hooks)
(setq emerge-quit-hook quit-hooks)
(emerge-remember-buffer-characteristics)
(emerge-select-prefer-Bs)
(emerge-handle-local-variables))
(emerge-setup-windows buffer-A buffer-B merge-buffer t)
(emerge-eval-in-buffer merge-buffer
(run-hooks 'startup-hooks 'emerge-startup-hooks)
(run-hooks 'startup-hooks 'emerge-startup-hook)
(setq buffer-read-only t))))
;; Generate the Emerge difference list between two files with an ancestor
......@@ -689,8 +675,11 @@ emerge-file-names.")
(if (not (string-equal agreement "1"))
(setq list
(cons
(let ((group-2 (emerge-get-diff3-group "2"))
(group-3 (emerge-get-diff3-group "3")))
(let (group-2 group-3 pos)
(setq pos (point))
(setq group-2 (emerge-get-diff3-group "2"))
(goto-char pos)
(setq group-3 (emerge-get-diff3-group "3"))
(vector (car group-2) (car (cdr group-2))
(car group-3) (car (cdr group-3))
(cond ((string-equal agreement "2") 'prefer-A)
......@@ -728,6 +717,7 @@ emerge-file-names.")
;;; Functions to start Emerge on files
;;;###autoload
(defun emerge-files (arg file-A file-B file-out &optional startup-hooks
quit-hooks)
"Run Emerge on two files."
......@@ -742,12 +732,13 @@ emerge-file-names.")
f f)))))
(emerge-files-internal
file-A file-B startup-hooks
(if arg
(if file-out
(cons (` (lambda () (emerge-files-exit (, file-out))))
quit-hooks)
quit-hooks)
file-out))
;;;###autoload
(defun emerge-files-with-ancestor (arg file-A file-B file-ancestor file-out
&optional startup-hooks quit-hooks)
"Run Emerge on two files, giving another file as the ancestor."
......@@ -764,7 +755,7 @@ emerge-file-names.")
f f)))))
(emerge-files-with-ancestor-internal
file-A file-B file-ancestor startup-hooks
(if arg
(if file-out
(cons (` (lambda () (emerge-files-exit (, file-out))))
quit-hooks)
quit-hooks)
......@@ -778,6 +769,7 @@ emerge-file-names.")
;;; Functions to start Emerge on buffers
;;;###autoload
(defun emerge-buffers (buffer-A buffer-B &optional startup-hooks quit-hooks)
"Run Emerge on two buffers."
(interactive "bBuffer A to merge: \nbBuffer B to merge: ")
......@@ -798,6 +790,7 @@ emerge-file-names.")
quit-hooks
nil)))
;;;###autoload
(defun emerge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor
&optional startup-hooks
quit-hooks)
......@@ -832,6 +825,7 @@ emerge-file-names.")
;;; Functions to start Emerge from the command line
;;;###autoload
(defun emerge-files-command ()
(let ((file-a (nth 0 command-line-args-left))
(file-b (nth 1 command-line-args-left))
......@@ -841,6 +835,7 @@ emerge-file-names.")
file-a file-b nil
(list (` (lambda () (emerge-command-exit (, file-out))))))))
;;;###autoload
(defun emerge-files-with-ancestor-command ()
(let (file-a file-b file-anc file-out)
;; check for a -a flag, for filemerge compatibility
......@@ -868,6 +863,7 @@ emerge-file-names.")
;;; Functions to start Emerge via remote request
;;;###autoload
(defun emerge-files-remote (file-a file-b file-out)
(setq emerge-file-out file-out)
(emerge-files-internal
......@@ -876,6 +872,7 @@ emerge-file-names.")
file-out)
(throw 'client-wait nil))
;;;###autoload
(defun emerge-files-with-ancestor-remote (file-a file-b file-anc file-out)
(setq emerge-file-out file-out)
(emerge-files-with-ancestor-internal
......@@ -914,8 +911,7 @@ emerge-file-names.")
revision-B ancestor
&optional
startup-hooks quit-hooks)
"Emerge two RCS revisions of a file, giving another revision as
the ancestor."
"Emerge two RCS revisions of a file, with another revision as ancestor."
(interactive
(list current-prefix-arg
(read-file-name "File to merge: " nil nil 'confirm)
......@@ -1021,17 +1017,17 @@ the ancestor."
;;; Function to start Emerge based on a line in a file
(defun emerge-execute-line ()
"Process the current line, looking for entries of the form:
"Run Emerge using files named in current text line.
Looks in that line for whitespace-separated entries of these forms:
a=file1
b=file2
ancestor=file3
output=file4
seperated by whitespace. Based on entries found, call emerge correctly
on the files files listed.
to specify the files to use in Emerge.
In addition, if only one of \"a=file\" or \"b=file\" is present, and \"output=file\"
In addition, if only one of `a=file' or `b=file' is present, and `output=file'
is present:
If emerge-execute-line-deletions is non-nil and \"ancestor=file\" is present,
If `emerge-execute-line-deletions' is non-nil and `ancestor=file' is present,
it is assumed that the file in question has been deleted, and it is
not copied to the output file.
Otherwise, the A or B file present is copied to the output file."
......@@ -1061,19 +1057,19 @@ Otherwise, the A or B file present is copied to the output file."
(cond
((string-equal tag "a")
(if file-A
(error "This line has two 'A' entries"))
(error "This line has two `A' entries"))
(setq file-A file))
((string-equal tag "b")
(if file-B
(error "This line has two 'B' entries"))
(error "This line has two `B' entries"))
(setq file-B file))
((or (string-equal tag "anc") (string-equal tag "ancestor"))
(if file-ancestor
(error "This line has two 'ancestor' entries"))
(error "This line has two `ancestor' entries"))
(setq file-ancestor file))
((or (string-equal tag "out") (string-equal tag "output"))
(if file-out
(error "This line has two 'output' entries"))
(error "This line has two `output' entries"))
(setq file-out file))
(t
(error "Unrecognized entry"))))
......@@ -1081,9 +1077,9 @@ Otherwise, the A or B file present is copied to the output file."
(error "Unparseable entry")))
;; Make sure that file-A and file-B are present
(if (not (or (and file-A file-B) file-out))
(error "Must have both 'A' and 'B' entries"))
(error "Must have both `A' and `B' entries"))
(if (not (or file-A file-B))
(error "Must have 'A' or 'B' entry"))
(error "Must have `A' or `B' entry"))
;; Go to the beginning of the next line, so next execution will use
;; next line in buffer.
(beginning-of-line 2)
......@@ -1124,7 +1120,7 @@ Otherwise, the A or B file present is copied to the output file."
;;; Sample function for creating information for emerge-execute-line
(defvar emerge-merge-directories-filename-regexp "[^.]"
"Regexp describing files to be processed by emerge-merge-directories.")
"Regexp describing files to be processed by `emerge-merge-directories'.")
(defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir)
(interactive
......@@ -1247,25 +1243,26 @@ Otherwise, the A or B file present is copied to the output file."