1 ;;; emerge.el --- merge diffs under Emacs control
3 ;;; The author has placed this file in the public domain.
5 ;; Author: Dale R. Worley <drw@math.mit.edu>
7 ;; Keywords: unix, tools
9 ;; This software was created by Dale R. Worley and is
10 ;; distributed free of charge. It is placed in the public domain and
11 ;; permission is granted to anyone to use, duplicate, modify and redistribute
12 ;; it provided that this notice is attached.
14 ;; Dale R. Worley provides absolutely NO WARRANTY OF ANY KIND
15 ;; with respect to this software. The entire risk as to the quality and
16 ;; performance of this software is with the user. IN NO EVENT WILL DALE
17 ;; R. WORLEY BE LIABLE TO ANYONE FOR ANY DAMAGES ARISING OUT THE
18 ;; USE OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION, DAMAGES RESULTING FROM
19 ;; LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL, INCIDENTAL OR CONSEQUENTIAL
26 (defmacro emerge-eval-in-buffer
(buffer &rest forms
)
27 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer.
28 Differs from `save-excursion' in that it doesn't save the point and mark."
29 (` (let ((StartBuffer (current-buffer)))
32 (set-buffer (, buffer
))
34 (set-buffer StartBuffer
)))))
36 (defmacro emerge-defvar-local
(var value doc
)
37 "Defines SYMBOL as an advertised variable.
38 Performs a defvar, then executes `make-variable-buffer-local' on
39 the variable. Also sets the `preserved' property, so that
40 `kill-all-local-variables' (called by major-mode setting commands)
41 won't destroy Emerge control variables."
43 (defvar (, var
) (, value
) (, doc
))
44 (make-variable-buffer-local '(, var
))
45 (put '(, var
) 'preserved t
))))
47 ;; Add entries to minor-mode-alist so that emerge modes show correctly
48 (setq emerge-minor-modes-list
'((emerge-mode " Emerge")
49 (emerge-fast-mode " F")
50 (emerge-edit-mode " E")
51 (emerge-auto-advance " A")
52 (emerge-skip-prefers " S")))
53 (if (not (assq 'emerge-mode minor-mode-alist
))
54 (setq minor-mode-alist
(append emerge-minor-modes-list
57 ;; We need to define this function so describe-mode can describe Emerge mode.
59 "Emerge mode is used by the Emerge file-merging package.
60 It is entered only through one of the functions:
62 `emerge-files-with-ancestor'
64 `emerge-buffers-with-ancestor'
65 `emerge-files-command'
66 `emerge-files-with-ancestor-command'
68 `emerge-files-with-ancestor-remote'
71 \\{emerge-basic-keymap}
72 Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode,
73 but can be invoked directly in `fast' mode.")
75 (defvar emerge-version
"5fsf"
76 "The version of Emerge.")
78 (defun emerge-version ()
79 "Return string describing the version of Emerge.
80 When called interactively, displays the version."
83 (message "Emerge version %s" (emerge-version))
86 ;;; Emerge configuration variables
88 ;; Commands that produce difference files
89 ;; All that can be configured is the name of the programs to execute
90 ;; (emerge-diff-program and emerge-diff3-program) and the options
91 ;; to be provided (emerge-diff-options). The order in which the file names
92 ;; are given is fixed.
93 ;; The file names are always expanded (see expand-file-name) before being
94 ;; passed to diff, thus they need not be invoked under a shell that
96 ;; The code which processes the diff/diff3 output depends on all the
97 ;; finicky details of their output, including the somewhat strange
98 ;; way they number lines of a file.
99 (defvar emerge-diff-program
"diff"
100 "*Name of the program which compares two files.")
101 (defvar emerge-diff3-program
"diff3"
102 "*Name of the program which compares three files.
103 Its arguments are the ancestor file and the two variant files.")
104 (defvar emerge-diff-options
""
105 "*Options to pass to `emerge-diff-program' and `emerge-diff3-program'.")
106 (defvar emerge-match-diff-line
(let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)"))
107 (concat "^" x
"\\([acd]\\)" x
"$"))
108 "*Pattern to match lines produced by diff that describe differences.
109 This is as opposed to lines from the source files.")
110 (defvar emerge-diff-ok-lines-regexp
111 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)"
112 "*Regexp that matches normal output lines from `emerge-diff-program'.
113 Lines that do not match are assumed to be error messages.")
114 (defvar emerge-diff3-ok-lines-regexp
115 "^\\([1-3]:\\|====\\| \\)"
116 "*Regexp that matches normal output lines from `emerge-diff3-program'.
117 Lines that do not match are assumed to be error messages.")
119 (defvar emerge-rcs-ci-program
"ci"
120 "*Name of the program that checks in RCS revisions.")
121 (defvar emerge-rcs-co-program
"co"
122 "*Name of the program that checks out RCS revisions.")
124 (defvar emerge-process-local-variables nil
125 "*Non-nil if Emerge should process local-variables lists in merge buffers.
126 \(You can explicitly request processing the local-variables
127 by executing `(hack-local-variables)'.)")
128 (defvar emerge-execute-line-deletions nil
129 "*If non-nil: `emerge-execute-line' makes no output if an input was deleted.
130 It concludes that an input version has been deleted when an ancestor entry
131 is present, only one A or B entry is present, and an output entry is present.
132 If nil: In such circumstances, the A or B file that is present will be
133 copied to the designated output file.")
137 (defvar emerge-startup-hook nil
138 "*Hook to run in the merge buffer after the merge has been set up.")
139 (defvar emerge-select-hook nil
140 "*Hook to run after a difference has been selected.
141 The variable `n' holds the (internal) number of the difference.")
142 (defvar emerge-unselect-hook nil
143 "*Hook to run after a difference has been unselected.
144 The variable `n' holds the (internal) number of the difference.")
146 ;; Variables to control the default directories of the arguments to
149 (defvar emerge-default-last-directories nil
150 "*If nil, default dir for filenames in emerge is `default-directory'.
151 If non-nil, filenames complete in the directory of the last argument of the
152 same type to an `emerge-files...' command.")
154 (defvar emerge-last-dir-A nil
155 "Last directory for the first file of an `emerge-files...' command.")
156 (defvar emerge-last-dir-B nil
157 "Last directory for the second file of an `emerge-files...' command.")
158 (defvar emerge-last-dir-ancestor nil
159 "Last directory for the ancestor file of an `emerge-files...' command.")
160 (defvar emerge-last-dir-output nil
161 "Last directory for the output file of an `emerge-files...' command.")
162 (defvar emerge-last-revision-A nil
163 "Last RCS revision used for first file of an `emerge-revisions...' command.")
164 (defvar emerge-last-revision-B nil
165 "Last RCS revision used for second file of an `emerge-revisions...' command.")
166 (defvar emerge-last-revision-ancestor nil
167 "Last RCS revision used for ancestor file of an `emerge-revisions...' command.")
169 ;; The flags used to mark differences in the buffers.
171 ;; These function definitions need to be up here, because they are used
173 (defun emerge-new-flags ()
174 "Function to be called after `emerge-{before,after}-flag'.
175 This is called after these functions are changed to compute values that
176 depend on the flags."
177 (setq emerge-before-flag-length
(length emerge-before-flag
))
178 (setq emerge-before-flag-lines
179 (emerge-count-matches-string emerge-before-flag
"\n"))
180 (setq emerge-before-flag-match
(regexp-quote emerge-before-flag
))
181 (setq emerge-after-flag-length
(length emerge-after-flag
))
182 (setq emerge-after-flag-lines
183 (emerge-count-matches-string emerge-after-flag
"\n"))
184 (setq emerge-after-flag-match
(regexp-quote emerge-after-flag
)))
186 (defun emerge-count-matches-string (string regexp
)
187 "Return the number of matches in STRING for REGEXP."
190 (while (string-match regexp string i
)
191 (setq count
(1+ count
))
192 (setq i
(match-end 0)))
195 (defvar emerge-before-flag
"vvvvvvvvvvvvvvvvvvvv\n"
196 "*Flag placed above the highlighted block of code. Must end with newline.
197 Must be set before Emerge is loaded, or emerge-new-flags must be run
199 (defvar emerge-after-flag
"^^^^^^^^^^^^^^^^^^^^\n"
200 "*Flag placed below the highlighted block of code. Must end with newline.
201 Must be set before Emerge is loaded, or emerge-new-flags must be run
204 ;; Calculate dependent variables
207 (defvar emerge-min-visible-lines
3
208 "*Number of lines that we want to show above and below the flags when we are
209 displaying a difference.")
211 (defvar emerge-temp-file-prefix
212 (let ((env (getenv "TMPDIR"))
214 (setq d
(if (and env
(> (length env
) 0))
217 (if (= (aref d
(1- (length d
))) ?
/)
218 (setq d
(substring d
0 -
1)))
219 (concat d
"/emerge"))
220 "*Prefix to put on Emerge temporary file names.
221 Do not start with `~/' or `~user-name/'.")
223 (defvar emerge-temp-file-mode
384 ; u=rw only
224 "*Mode for Emerge temporary files.")
226 (defvar emerge-combine-versions-template
227 "#ifdef NEW\n%b#else /* NEW */\n%a#endif /* NEW */\n"
228 "*Template for `emerge-combine-versions' to combine the two versions.
229 The template is inserted as a string, with the following interpolations:
230 %a the A version of the difference
231 %b the B version of the difference
233 Don't forget to end the template with a newline.
234 Note that this variable can be made local to a particular merge buffer by
235 giving a prefix argument to `emerge-set-combine-versions-template'.")
239 (defvar emerge-basic-keymap nil
240 "Keymap of Emerge commands.
241 Directly available in `fast' mode;
242 must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode.")
244 (defvar emerge-fast-keymap nil
245 "Local keymap used in Emerge `fast' mode.
246 Makes Emerge commands directly available.")
248 (defvar emerge-command-prefix
"\C-c\C-c"
249 "*Command prefix for Emerge commands in `edit' mode.
250 Must be set before Emerge is loaded.")
252 ;; This function sets up the fixed keymaps. It is executed when the first
253 ;; Emerge is done to allow the user maximum time to set up the global keymap.
254 (defun emerge-setup-fixed-keymaps ()
255 ;; Set up the basic keymap
256 (setq emerge-basic-keymap
(make-keymap))
257 (suppress-keymap emerge-basic-keymap
) ; this sets 0..9 to digit-argument and
258 ; - to negative-argument
259 (define-key emerge-basic-keymap
"p" 'emerge-previous-difference
)
260 (define-key emerge-basic-keymap
"n" 'emerge-next-difference
)
261 (define-key emerge-basic-keymap
"a" 'emerge-select-A
)
262 (define-key emerge-basic-keymap
"b" 'emerge-select-B
)
263 (define-key emerge-basic-keymap
"j" 'emerge-jump-to-difference
)
264 (define-key emerge-basic-keymap
"." 'emerge-find-difference
)
265 (define-key emerge-basic-keymap
"q" 'emerge-quit
)
266 (define-key emerge-basic-keymap
"\C-]" 'emerge-abort
)
267 (define-key emerge-basic-keymap
"f" 'emerge-fast-mode
)
268 (define-key emerge-basic-keymap
"e" 'emerge-edit-mode
)
269 (define-key emerge-basic-keymap
"s" nil
)
270 (define-key emerge-basic-keymap
"sa" 'emerge-auto-advance
)
271 (define-key emerge-basic-keymap
"ss" 'emerge-skip-prefers
)
272 (define-key emerge-basic-keymap
"l" 'emerge-recenter
)
273 (define-key emerge-basic-keymap
"d" nil
)
274 (define-key emerge-basic-keymap
"da" 'emerge-default-A
)
275 (define-key emerge-basic-keymap
"db" 'emerge-default-B
)
276 (define-key emerge-basic-keymap
"c" nil
)
277 (define-key emerge-basic-keymap
"ca" 'emerge-copy-as-kill-A
)
278 (define-key emerge-basic-keymap
"cb" 'emerge-copy-as-kill-B
)
279 (define-key emerge-basic-keymap
"i" nil
)
280 (define-key emerge-basic-keymap
"ia" 'emerge-insert-A
)
281 (define-key emerge-basic-keymap
"ib" 'emerge-insert-B
)
282 (define-key emerge-basic-keymap
"m" 'emerge-mark-difference
)
283 (define-key emerge-basic-keymap
"v" 'emerge-scroll-up
)
284 (define-key emerge-basic-keymap
"^" 'emerge-scroll-down
)
285 (define-key emerge-basic-keymap
"<" 'emerge-scroll-left
)
286 (define-key emerge-basic-keymap
">" 'emerge-scroll-right
)
287 (define-key emerge-basic-keymap
"|" 'emerge-scroll-reset
)
288 (define-key emerge-basic-keymap
"x" nil
)
289 (define-key emerge-basic-keymap
"x1" 'emerge-one-line-window
)
290 (define-key emerge-basic-keymap
"xc" 'emerge-combine-versions
)
291 (define-key emerge-basic-keymap
"xC" 'emerge-combine-versions-register
)
292 (define-key emerge-basic-keymap
"xf" 'emerge-file-names
)
293 (define-key emerge-basic-keymap
"xj" 'emerge-join-differences
)
294 (define-key emerge-basic-keymap
"xl" 'emerge-line-numbers
)
295 (define-key emerge-basic-keymap
"xm" 'emerge-set-merge-mode
)
296 (define-key emerge-basic-keymap
"xs" 'emerge-split-difference
)
297 (define-key emerge-basic-keymap
"xt" 'emerge-trim-difference
)
298 (define-key emerge-basic-keymap
"xx" 'emerge-set-combine-versions-template
)
299 ;; Allow emerge-basic-keymap to be referenced indirectly
300 (fset 'emerge-basic-keymap emerge-basic-keymap
)
301 ;; Set up the fast mode keymap
302 (setq emerge-fast-keymap
(copy-keymap emerge-basic-keymap
))
303 ;; Allow prefixed commands to work in fast mode
304 (define-key emerge-fast-keymap emerge-command-prefix
'emerge-basic-keymap
)
305 ;; Allow emerge-fast-keymap to be referenced indirectly
306 (fset 'emerge-fast-keymap emerge-fast-keymap
)
307 ;; Suppress write-file and save-buffer
308 (substitute-key-definition 'write-file
'emerge-query-write-file
309 emerge-fast-keymap
(current-global-map))
310 (substitute-key-definition 'save-buffer
'emerge-query-save-buffer
311 emerge-fast-keymap
(current-global-map)))
313 ;; Variables which control each merge. They are local to the merge buffer.
316 (emerge-defvar-local emerge-mode nil
317 "Indicator for emerge-mode.")
318 (emerge-defvar-local emerge-fast-mode nil
319 "Indicator for emerge-mode fast submode.")
320 (emerge-defvar-local emerge-edit-mode nil
321 "Indicator for emerge-mode edit submode.")
322 (emerge-defvar-local emerge-A-buffer nil
323 "The buffer in which the A variant is stored.")
324 (emerge-defvar-local emerge-B-buffer nil
325 "The buffer in which the B variant is stored.")
326 (emerge-defvar-local emerge-merge-buffer nil
327 "The buffer in which the merged file is manipulated.")
328 (emerge-defvar-local emerge-ancestor-buffer nil
329 "The buffer in which the ancestor variant is stored,
330 or nil if there is none.")
332 (defconst emerge-saved-variables
333 '((buffer-modified-p set-buffer-modified-p
)
335 buffer-auto-save-file-name
)
336 "Variables and properties of a buffer which are saved, modified and restored
338 (defconst emerge-merging-values
'(nil t nil
)
339 "Values to be assigned to emerge-saved-variables during a merge.")
341 (emerge-defvar-local emerge-A-buffer-values nil
342 "Remembers emerge-saved-variables for emerge-A-buffer.")
343 (emerge-defvar-local emerge-B-buffer-values nil
344 "Remembers emerge-saved-variables for emerge-B-buffer.")
346 (emerge-defvar-local emerge-difference-list nil
347 "Vector of differences between the variants, and markers in the buffers to
348 show where they are. Each difference is represented by a vector of seven
349 elements. The first two are markers to the beginning and end of the difference
350 section in the A buffer, the second two are markers for the B buffer, the third
351 two are markers for the merge buffer, and the last element is the \"state\" of
352 that difference in the merge buffer.
353 A section of a buffer is described by two markers, one to the beginning of
354 the first line of the section, and one to the beginning of the first line
355 after the section. (If the section is empty, both markers point to the same
356 point.) If the section is part of the selected difference, then the markers
357 are moved into the flags, so the user can edit the section without disturbing
360 A the merge buffer currently contains the A variant
361 B the merge buffer currently contains the B variant
362 default-A the merge buffer contains the A variant by default,
363 but this difference hasn't been selected yet, so
364 change-default commands can alter it
365 default-B the merge buffer contains the B variant by default,
366 but this difference hasn't been selected yet, so
367 change-default commands can alter it
368 prefer-A in a three-file merge, the A variant is the prefered
370 prefer-B in a three-file merge, the B variant is the prefered
372 (emerge-defvar-local emerge-current-difference -
1
373 "The difference that is currently selected.")
374 (emerge-defvar-local emerge-number-of-differences nil
375 "Number of differences found.")
376 (emerge-defvar-local emerge-edit-keymap nil
377 "The local keymap for the merge buffer, with the emerge commands defined in
378 it. Used to save the local keymap during fast mode, when the local keymap is
379 replaced by emerge-fast-keymap.")
380 (emerge-defvar-local emerge-old-keymap nil
381 "The original local keymap for the merge buffer.")
382 (emerge-defvar-local emerge-auto-advance nil
383 "*If non-nil, emerge-select-A and emerge-select-B automatically advance to
384 the next difference.")
385 (emerge-defvar-local emerge-skip-prefers nil
386 "*If non-nil, differences for which there is a preference are automatically
388 (emerge-defvar-local emerge-quit-hook nil
389 "Hooks to run in the merge buffer after the merge has been finished.
390 `emerge-prefix-argument' will hold the prefix argument of the `emerge-quit'
392 This is *not* a user option, since Emerge uses it for its own processing.")
393 (emerge-defvar-local emerge-output-description nil
394 "Describes output destination of emerge, for `emerge-file-names'.")
396 ;;; Setup functions for two-file mode.
398 (defun emerge-files-internal (file-A file-B
&optional startup-hooks quit-hooks
400 (if (not (file-readable-p file-A
))
401 (error "File `%s' does not exist or is not readable" file-A
))
402 (if (not (file-readable-p file-B
))
403 (error "File `%s' does not exist or is not readable" file-B
))
404 (let ((buffer-A (find-file-noselect file-A
))
405 (buffer-B (find-file-noselect file-B
)))
406 ;; Record the directories of the files
407 (setq emerge-last-dir-A
(file-name-directory file-A
))
408 (setq emerge-last-dir-B
(file-name-directory file-B
))
410 (setq emerge-last-dir-output
(file-name-directory output-file
)))
411 ;; Make sure the entire files are seen, and they reflect what is on disk
412 (emerge-eval-in-buffer
415 (let ((temp (file-local-copy file-A
)))
419 (cons (` (lambda () (delete-file (, file-A
))))
421 ;; Verify that the file matches the buffer
422 (emerge-verify-file-buffer))))
423 (emerge-eval-in-buffer
426 (let ((temp (file-local-copy file-B
)))
430 (cons (` (lambda () (delete-file (, file-B
))))
432 ;; Verify that the file matches the buffer
433 (emerge-verify-file-buffer))))
434 (emerge-setup buffer-A file-A buffer-B file-B startup-hooks quit-hooks
437 ;; Start up Emerge on two files
438 (defun emerge-setup (buffer-A file-A buffer-B file-B startup-hooks quit-hooks
440 (setq file-A
(expand-file-name file-A
))
441 (setq file-B
(expand-file-name file-B
))
442 (setq output-file
(and output-file
(expand-file-name output-file
)))
443 (let* ((merge-buffer-name (emerge-unique-buffer-name "*merge" "*"))
444 ;; create the merge buffer from buffer A, so it inherits buffer A's
445 ;; default directory, etc.
446 (merge-buffer (emerge-eval-in-buffer
448 (get-buffer-create merge-buffer-name
))))
449 (emerge-eval-in-buffer
451 (emerge-copy-modes buffer-A
)
452 (setq buffer-read-only nil
)
455 (setq emerge-A-buffer buffer-A
)
456 (setq emerge-B-buffer buffer-B
)
457 (setq emerge-ancestor-buffer nil
)
458 (setq emerge-merge-buffer merge-buffer
)
459 (setq emerge-output-description
461 (concat "Output to file: " output-file
)
462 (concat "Output to buffer: " (buffer-name merge-buffer
))))
463 (insert-buffer emerge-A-buffer
)
465 (setq emerge-difference-list
(emerge-make-diff-list file-A file-B
))
466 (setq emerge-number-of-differences
(length emerge-difference-list
))
467 (setq emerge-current-difference -
1)
468 (setq emerge-quit-hook quit-hooks
)
469 (emerge-remember-buffer-characteristics)
470 (emerge-handle-local-variables))
471 (emerge-setup-windows buffer-A buffer-B merge-buffer t
)
472 (emerge-eval-in-buffer merge-buffer
473 (run-hooks 'startup-hooks
'emerge-startup-hook
)
474 (setq buffer-read-only t
))))
476 ;; Generate the Emerge difference list between two files
477 (defun emerge-make-diff-list (file-A file-B
)
478 (setq emerge-diff-buffer
(get-buffer-create "*emerge-diff*"))
479 (emerge-eval-in-buffer
483 (format "%s %s %s %s"
484 emerge-diff-program emerge-diff-options
485 (emerge-protect-metachars file-A
)
486 (emerge-protect-metachars file-B
))
488 (emerge-prepare-error-list emerge-diff-ok-lines-regexp
)
489 (emerge-convert-diffs-to-markers
490 emerge-A-buffer emerge-B-buffer emerge-merge-buffer
491 (emerge-extract-diffs emerge-diff-buffer
)))
493 (defun emerge-extract-diffs (diff-buffer)
495 (emerge-eval-in-buffer
497 (goto-char (point-min))
498 (while (re-search-forward emerge-match-diff-line nil t
)
499 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
501 (a-end (let ((b (match-beginning 3))
504 (string-to-int (buffer-substring b e
))
506 (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
507 (b-begin (string-to-int (buffer-substring (match-beginning 5)
509 (b-end (let ((b (match-beginning 7))
512 (string-to-int (buffer-substring b e
))
514 ;; fix the beginning and end numbers, because diff is somewhat
515 ;; strange about how it numbers lines
516 (if (string-equal diff-type
"a")
518 (setq b-end
(1+ b-end
))
519 (setq a-begin
(1+ a-begin
))
520 (setq a-end a-begin
))
521 (if (string-equal diff-type
"d")
523 (setq a-end
(1+ a-end
))
524 (setq b-begin
(1+ b-begin
))
525 (setq b-end b-begin
))
526 ;; (string-equal diff-type "c")
528 (setq a-end
(1+ a-end
))
529 (setq b-end
(1+ b-end
)))))
530 (setq list
(cons (vector a-begin a-end
536 ;; Set up buffer of diff/diff3 error messages.
537 (defun emerge-prepare-error-list (ok-regexp)
538 (setq emerge-diff-error-buffer
(get-buffer-create "*emerge-diff-errors*"))
539 (emerge-eval-in-buffer
540 emerge-diff-error-buffer
542 (insert-buffer emerge-diff-buffer
)
543 (delete-matching-lines ok-regexp
)))
545 ;;; Top-level and setup functions for three-file mode.
547 (defun emerge-files-with-ancestor-internal (file-A file-B file-ancestor
548 &optional startup-hooks quit-hooks
550 (if (not (file-readable-p file-A
))
551 (error "File `%s' does not exist or is not readable" file-A
))
552 (if (not (file-readable-p file-B
))
553 (error "File `%s' does not exist or is not readable" file-B
))
554 (if (not (file-readable-p file-ancestor
))
555 (error "File `%s' does not exist or is not readable" file-ancestor
))
556 (let ((buffer-A (find-file-noselect file-A
))
557 (buffer-B (find-file-noselect file-B
))
558 (buffer-ancestor (find-file-noselect file-ancestor
)))
559 ;; Record the directories of the files
560 (setq emerge-last-dir-A
(file-name-directory file-A
))
561 (setq emerge-last-dir-B
(file-name-directory file-B
))
562 (setq emerge-last-dir-ancestor
(file-name-directory file-ancestor
))
564 (setq emerge-last-dir-output
(file-name-directory output-file
)))
565 ;; Make sure the entire files are seen, and they reflect what is on disk
566 (emerge-eval-in-buffer
569 (let ((temp (file-local-copy file-A
)))
573 (cons (` (lambda () (delete-file (, file-A
))))
575 ;; Verify that the file matches the buffer
576 (emerge-verify-file-buffer))))
577 (emerge-eval-in-buffer
580 (let ((temp (file-local-copy file-B
)))
584 (cons (` (lambda () (delete-file (, file-B
))))
586 ;; Verify that the file matches the buffer
587 (emerge-verify-file-buffer))))
588 (emerge-eval-in-buffer
591 (let ((temp (file-local-copy file-ancestor
)))
593 (setq file-ancestor temp
595 (cons (` (lambda () (delete-file (, file-ancestor
))))
597 ;; Verify that the file matches the buffer
598 (emerge-verify-file-buffer))))
599 (emerge-setup-with-ancestor buffer-A file-A buffer-B file-B
600 buffer-ancestor file-ancestor
601 startup-hooks quit-hooks output-file
)))
603 ;; Start up Emerge on two files with an ancestor
604 (defun emerge-setup-with-ancestor (buffer-A file-A buffer-B file-B
605 buffer-ancestor file-ancestor
606 &optional startup-hooks quit-hooks
608 (setq file-A
(expand-file-name file-A
))
609 (setq file-B
(expand-file-name file-B
))
610 (setq file-ancestor
(expand-file-name file-ancestor
))
611 (setq output-file
(and output-file
(expand-file-name output-file
)))
612 (let* ((merge-buffer-name (emerge-unique-buffer-name "*merge" "*"))
613 ;; create the merge buffer from buffer A, so it inherits buffer A's
614 ;; default directory, etc.
615 (merge-buffer (emerge-eval-in-buffer
617 (get-buffer-create merge-buffer-name
))))
618 (emerge-eval-in-buffer
620 (emerge-copy-modes buffer-A
)
621 (setq buffer-read-only nil
)
624 (setq emerge-A-buffer buffer-A
)
625 (setq emerge-B-buffer buffer-B
)
626 (setq emerge-ancestor-buffer buffer-ancestor
)
627 (setq emerge-merge-buffer merge-buffer
)
628 (setq emerge-output-description
630 (concat "Output to file: " output-file
)
631 (concat "Output to buffer: " (buffer-name merge-buffer
))))
632 (insert-buffer emerge-A-buffer
)
634 (setq emerge-difference-list
635 (emerge-make-diff3-list file-A file-B file-ancestor
))
636 (setq emerge-number-of-differences
(length emerge-difference-list
))
637 (setq emerge-current-difference -
1)
638 (setq emerge-quit-hook quit-hooks
)
639 (emerge-remember-buffer-characteristics)
640 (emerge-select-prefer-Bs)
641 (emerge-handle-local-variables))
642 (emerge-setup-windows buffer-A buffer-B merge-buffer t
)
643 (emerge-eval-in-buffer merge-buffer
644 (run-hooks 'startup-hooks
'emerge-startup-hook
)
645 (setq buffer-read-only t
))))
647 ;; Generate the Emerge difference list between two files with an ancestor
648 (defun emerge-make-diff3-list (file-A file-B file-ancestor
)
649 (setq emerge-diff-buffer
(get-buffer-create "*emerge-diff*"))
650 (emerge-eval-in-buffer
654 (format "%s %s %s %s %s"
655 emerge-diff3-program emerge-diff-options
656 (emerge-protect-metachars file-ancestor
)
657 (emerge-protect-metachars file-A
)
658 (emerge-protect-metachars file-B
))
660 (emerge-prepare-error-list emerge-diff3-ok-lines-regexp
)
661 (emerge-convert-diffs-to-markers
662 emerge-A-buffer emerge-B-buffer emerge-merge-buffer
663 (emerge-extract-diffs3 emerge-diff-buffer
)))
665 (defun emerge-extract-diffs3 (diff-buffer)
667 (emerge-eval-in-buffer
669 (while (re-search-forward "^====\\(.?\\)$" nil t
)
670 ;; leave point after matched line
671 (beginning-of-line 2)
672 (let ((agreement (buffer-substring (match-beginning 1) (match-end 1))))
673 ;; if the A and B files are the same, ignore the difference
674 (if (not (string-equal agreement
"1"))
677 (let (group-2 group-3 pos
)
679 (setq group-2
(emerge-get-diff3-group "2"))
681 (setq group-3
(emerge-get-diff3-group "3"))
682 (vector (car group-2
) (car (cdr group-2
))
683 (car group-3
) (car (cdr group-3
))
684 (cond ((string-equal agreement
"2") 'prefer-A
)
685 ((string-equal agreement
"3") 'prefer-B
)
690 (defun emerge-get-diff3-group (file)
691 ;; This save-excursion allows emerge-get-diff3-group to be called for the
692 ;; various groups of lines (1, 2, 3) in any order, and for the lines to
693 ;; appear in any order. The reason this is necessary is that Gnu diff3
694 ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2.
697 (concat "^" file
":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)$"))
698 (beginning-of-line 2)
699 ;; treatment depends on whether it is an "a" group or a "c" group
700 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
702 (if (match-beginning 2)
703 ;; it has two numbers
705 (buffer-substring (match-beginning 1) (match-end 1)))
707 (buffer-substring (match-beginning 3) (match-end 3)))))
709 (let ((x (string-to-int
710 (buffer-substring (match-beginning 1) (match-end 1)))))
712 ;; it is an "a" group
713 (let ((x (1+ (string-to-int
714 (buffer-substring (match-beginning 1) (match-end 1))))))
717 ;;; Functions to start Emerge on files
720 (defun emerge-files (arg file-A file-B file-out
&optional startup-hooks
722 "Run Emerge on two files."
725 (list current-prefix-arg
726 (setq f
(emerge-read-file-name "File A to merge" emerge-last-dir-A
728 (emerge-read-file-name "File B to merge" emerge-last-dir-B nil f
)
729 (and current-prefix-arg
730 (emerge-read-file-name "Output file" emerge-last-dir-output
732 (emerge-files-internal
733 file-A file-B startup-hooks
735 (cons (` (lambda () (emerge-files-exit (, file-out
))))
741 (defun emerge-files-with-ancestor (arg file-A file-B file-ancestor file-out
742 &optional startup-hooks quit-hooks
)
743 "Run Emerge on two files, giving another file as the ancestor."
746 (list current-prefix-arg
747 (setq f
(emerge-read-file-name "File A to merge" emerge-last-dir-A
749 (emerge-read-file-name "File B to merge" emerge-last-dir-B nil f
)
750 (emerge-read-file-name "Ancestor file" emerge-last-dir-ancestor
752 (and current-prefix-arg
753 (emerge-read-file-name "Output file" emerge-last-dir-output
755 (emerge-files-with-ancestor-internal
756 file-A file-B file-ancestor startup-hooks
758 (cons (` (lambda () (emerge-files-exit (, file-out
))))
763 ;; Write the merge buffer out in place of the file the A buffer is visiting.
764 (defun emerge-files-exit (file-out)
765 ;; if merge was successful was given, save to disk
766 (if (not emerge-prefix-argument
)
767 (emerge-write-and-delete file-out
)))
769 ;;; Functions to start Emerge on buffers
772 (defun emerge-buffers (buffer-A buffer-B
&optional startup-hooks quit-hooks
)
773 "Run Emerge on two buffers."
774 (interactive "bBuffer A to merge: \nbBuffer B to merge: ")
775 (let ((emerge-file-A (emerge-make-temp-file "A"))
776 (emerge-file-B (emerge-make-temp-file "B")))
777 (emerge-eval-in-buffer
779 (write-region (point-min) (point-max) emerge-file-A nil
'no-message
))
780 (emerge-eval-in-buffer
782 (write-region (point-min) (point-max) emerge-file-B nil
'no-message
))
783 (emerge-setup (get-buffer buffer-A
) emerge-file-A
784 (get-buffer buffer-B
) emerge-file-B
786 (delete-file (, emerge-file-A
))
787 (delete-file (, emerge-file-B
))))
793 (defun emerge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor
794 &optional startup-hooks
796 "Run Emerge on two buffers, giving another buffer as the ancestor."
798 "bBuffer A to merge: \nbBuffer B to merge: \nbAncestor buffer: ")
799 (let ((emerge-file-A (emerge-make-temp-file "A"))
800 (emerge-file-B (emerge-make-temp-file "B"))
801 (emerge-file-ancestor (emerge-make-temp-file "anc")))
802 (emerge-eval-in-buffer
804 (write-region (point-min) (point-max) emerge-file-A nil
'no-message
))
805 (emerge-eval-in-buffer
807 (write-region (point-min) (point-max) emerge-file-B nil
'no-message
))
808 (emerge-eval-in-buffer
810 (write-region (point-min) (point-max) emerge-file-ancestor nil
812 (emerge-setup-with-ancestor (get-buffer buffer-A
) emerge-file-A
813 (get-buffer buffer-B
) emerge-file-B
814 (get-buffer buffer-ancestor
)
817 (delete-file (, emerge-file-A
))
818 (delete-file (, emerge-file-B
))
820 (, emerge-file-ancestor
))))
825 ;;; Functions to start Emerge from the command line
828 (defun emerge-files-command ()
829 (let ((file-a (nth 0 command-line-args-left
))
830 (file-b (nth 1 command-line-args-left
))
831 (file-out (nth 2 command-line-args-left
)))
832 (setq command-line-args-left
(nthcdr 3 command-line-args-left
))
833 (emerge-files-internal
835 (list (` (lambda () (emerge-command-exit (, file-out
))))))))
838 (defun emerge-files-with-ancestor-command ()
839 (let (file-a file-b file-anc file-out
)
840 ;; check for a -a flag, for filemerge compatibility
841 (if (string= (car command-line-args-left
) "-a")
842 ;; arguments are "-a ancestor file-a file-b file-out"
844 (setq file-a
(nth 2 command-line-args-left
))
845 (setq file-b
(nth 3 command-line-args-left
))
846 (setq file-anc
(nth 1 command-line-args-left
))
847 (setq file-out
(nth 4 command-line-args-left
))
848 (setq command-line-args-left
(nthcdr 5 command-line-args-left
)))
849 ;; arguments are "file-a file-b ancestor file-out"
850 (setq file-a
(nth 0 command-line-args-left
))
851 (setq file-b
(nth 1 command-line-args-left
))
852 (setq file-anc
(nth 2 command-line-args-left
))
853 (setq file-out
(nth 3 command-line-args-left
))
854 (setq command-line-args-left
(nthcdr 4 command-line-args-left
)))
855 (emerge-files-with-ancestor-internal
856 file-a file-b file-anc nil
857 (list (` (lambda () (emerge-command-exit (, file-out
))))))))
859 (defun emerge-command-exit (file-out)
860 (emerge-write-and-delete file-out
)
861 (kill-emacs (if emerge-prefix-argument
1 0)))
863 ;;; Functions to start Emerge via remote request
866 (defun emerge-files-remote (file-a file-b file-out
)
867 (setq emerge-file-out file-out
)
868 (emerge-files-internal
870 (list (` (lambda () (emerge-remote-exit (, file-out
) '(, exit-func
)))))
872 (throw 'client-wait nil
))
875 (defun emerge-files-with-ancestor-remote (file-a file-b file-anc file-out
)
876 (setq emerge-file-out file-out
)
877 (emerge-files-with-ancestor-internal
878 file-a file-b file-anc nil
879 (list (` (lambda () (emerge-remote-exit (, file-out
) '(, exit-func
)))))
881 (throw 'client-wait nil
))
883 (defun emerge-remote-exit (file-out exit-func
)
884 (emerge-write-and-delete file-out
)
885 (kill-buffer emerge-merge-buffer
)
886 (funcall exit-func
(if emerge-prefix-argument
1 0)))
888 ;;; Functions to start Emerge on RCS versions
890 (defun emerge-revisions (arg file revision-A revision-B
891 &optional startup-hooks quit-hooks
)
892 "Emerge two RCS revisions of a file."
894 (list current-prefix-arg
895 (read-file-name "File to merge: " nil nil
'confirm
)
896 (read-string "Revision A to merge: " emerge-last-revision-A
)
897 (read-string "Revision B to merge: " emerge-last-revision-B
)))
898 (setq emerge-last-revision-A revision-A
899 emerge-last-revision-B revision-B
)
900 (emerge-revisions-internal
901 file revision-A revision-B startup-hooks
905 (, (format "%s %s" emerge-rcs-ci-program file
)))))
909 (defun emerge-revisions-with-ancestor (arg file revision-A
912 startup-hooks quit-hooks
)
913 "Emerge two RCS revisions of a file, with another revision as ancestor."
915 (list current-prefix-arg
916 (read-file-name "File to merge: " nil nil
'confirm
)
917 (read-string "Revision A to merge: " emerge-last-revision-A
)
918 (read-string "Revision B to merge: " emerge-last-revision-B
)
919 (read-string "Ancestor: " emerge-last-revision-ancestor
)))
920 (setq emerge-last-revision-A revision-A
921 emerge-last-revision-B revision-B
922 emerge-last-revision-ancestor ancestor
)
923 (emerge-revision-with-ancestor-internal
924 file revision-A revision-B ancestor startup-hooks
929 (, (format "%s %s" emerge-rcs-ci-program file
)))))
933 (defun emerge-revisions-internal (file revision-A revision-B
&optional
934 startup-hooks quit-hooks output-file
)
935 (let ((buffer-A (get-buffer-create (format "%s,%s" file revision-A
)))
936 (buffer-B (get-buffer-create (format "%s,%s" file revision-B
)))
937 (emerge-file-A (emerge-make-temp-file "A"))
938 (emerge-file-B (emerge-make-temp-file "B")))
939 ;; Get the revisions into buffers
940 (emerge-eval-in-buffer
944 (format "%s -q -p%s %s" emerge-rcs-co-program revision-A file
)
946 (write-region (point-min) (point-max) emerge-file-A nil
'no-message
)
947 (set-buffer-modified-p nil
))
948 (emerge-eval-in-buffer
952 (format "%s -q -p%s %s" emerge-rcs-co-program revision-B file
)
954 (write-region (point-min) (point-max) emerge-file-B nil
'no-message
)
955 (set-buffer-modified-p nil
))
957 (emerge-setup buffer-A emerge-file-A
958 buffer-B emerge-file-B
960 (delete-file (, emerge-file-A
))
961 (delete-file (, emerge-file-B
))))
963 (cons (` (lambda () (emerge-files-exit (, file
))))
967 (defun emerge-revision-with-ancestor-internal (file revision-A revision-B
969 &optional startup-hooks
970 quit-hooks output-file
)
971 (let ((buffer-A (get-buffer-create (format "%s,%s" file revision-A
)))
972 (buffer-B (get-buffer-create (format "%s,%s" file revision-B
)))
973 (buffer-ancestor (get-buffer-create (format "%s,%s" file ancestor
)))
974 (emerge-file-A (emerge-make-temp-file "A"))
975 (emerge-file-B (emerge-make-temp-file "B"))
976 (emerge-ancestor (emerge-make-temp-file "ancestor")))
977 ;; Get the revisions into buffers
978 (emerge-eval-in-buffer
982 (format "%s -q -p%s %s" emerge-rcs-co-program
985 (write-region (point-min) (point-max) emerge-file-A nil
'no-message
)
986 (set-buffer-modified-p nil
))
987 (emerge-eval-in-buffer
991 (format "%s -q -p%s %s" emerge-rcs-co-program revision-B file
)
993 (write-region (point-min) (point-max) emerge-file-B nil
'no-message
)
994 (set-buffer-modified-p nil
))
995 (emerge-eval-in-buffer
999 (format "%s -q -p%s %s" emerge-rcs-co-program ancestor file
)
1001 (write-region (point-min) (point-max) emerge-ancestor nil
'no-message
)
1002 (set-buffer-modified-p nil
))
1004 (emerge-setup-with-ancestor
1005 buffer-A emerge-file-A buffer-B emerge-file-B
1006 buffer-ancestor emerge-ancestor
1008 (delete-file (, emerge-file-A
))
1009 (delete-file (, emerge-file-B
))
1010 (delete-file (, emerge-ancestor
))))
1012 (cons (` (lambda () (emerge-files-exit (, file
))))
1016 ;;; Function to start Emerge based on a line in a file
1018 (defun emerge-execute-line ()
1019 "Run Emerge using files named in current text line.
1020 Looks in that line for whitespace-separated entries of these forms:
1025 to specify the files to use in Emerge.
1027 In addition, if only one of `a=file' or `b=file' is present, and `output=file'
1029 If `emerge-execute-line-deletions' is non-nil and `ancestor=file' is present,
1030 it is assumed that the file in question has been deleted, and it is
1031 not copied to the output file.
1032 Otherwise, the A or B file present is copied to the output file."
1034 (let (file-A file-B file-ancestor file-out
1035 (case-fold-search t
))
1036 ;; Stop if at end of buffer (even though we might be in a line, if
1037 ;; the line does not end with newline)
1039 (error "At end of buffer"))
1040 ;; Go to the beginning of the line
1042 ;; Skip any initial whitespace
1043 (if (looking-at "[ \t]*")
1044 (goto-char (match-end 0)))
1045 ;; Process the entire line
1047 ;; Get the next entry
1048 (if (looking-at "\\([a-z]+\\)=\\([^ \t\n]+\\)[ \t]*")
1049 ;; Break apart the tab (before =) and the filename (after =)
1050 (let ((tag (downcase
1051 (buffer-substring (match-beginning 1) (match-end 1))))
1052 (file (buffer-substring (match-beginning 2) (match-end 2))))
1053 ;; Move point after the entry
1054 (goto-char (match-end 0))
1055 ;; Store the filename in the right variable
1057 ((string-equal tag
"a")
1059 (error "This line has two `A' entries"))
1061 ((string-equal tag
"b")
1063 (error "This line has two `B' entries"))
1065 ((or (string-equal tag
"anc") (string-equal tag
"ancestor"))
1067 (error "This line has two `ancestor' entries"))
1068 (setq file-ancestor file
))
1069 ((or (string-equal tag
"out") (string-equal tag
"output"))
1071 (error "This line has two `output' entries"))
1072 (setq file-out file
))
1074 (error "Unrecognized entry"))))
1075 ;; If the match on the entry pattern failed
1076 (error "Unparseable entry")))
1077 ;; Make sure that file-A and file-B are present
1078 (if (not (or (and file-A file-B
) file-out
))
1079 (error "Must have both `A' and `B' entries"))
1080 (if (not (or file-A file-B
))
1081 (error "Must have `A' or `B' entry"))
1082 ;; Go to the beginning of the next line, so next execution will use
1083 ;; next line in buffer.
1084 (beginning-of-line 2)
1085 ;; Execute the correct command
1087 ;; Merge of two files with ancestor
1088 ((and file-A file-B file-ancestor
)
1089 (message "Merging %s and %s..." file-A file-B
)
1090 (emerge-files-with-ancestor (not (not file-out
)) file-A file-B
1091 file-ancestor file-out
1093 ;; When done, return to this buffer.
1096 (switch-to-buffer (, (current-buffer)))
1097 (message "Merge done."))))))
1098 ;; Merge of two files without ancestor
1099 ((and file-A file-B
)
1100 (message "Merging %s and %s..." file-A file-B
)
1101 (emerge-files (not (not file-out
)) file-A file-B file-out
1103 ;; When done, return to this buffer.
1106 (switch-to-buffer (, (current-buffer)))
1107 (message "Merge done."))))))
1108 ;; There is an output file (or there would have been an error above),
1109 ;; but only one input file.
1110 ;; The file appears to have been deleted in one version; do nothing.
1111 ((and file-ancestor emerge-execute-line-deletions
)
1112 (message "No action."))
1113 ;; The file should be copied from the version that contains it
1114 (t (let ((input-file (or file-A file-B
)))
1115 (message "Copying...")
1116 (copy-file input-file file-out
)
1117 (message "%s copied to %s." input-file file-out
))))))
1119 ;;; Sample function for creating information for emerge-execute-line
1121 (defvar emerge-merge-directories-filename-regexp
"[^.]"
1122 "Regexp describing files to be processed by `emerge-merge-directories'.")
1124 (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir
)
1127 (read-file-name "A directory: " nil nil
'confirm
)
1128 (read-file-name "B directory: " nil nil
'confirm
)
1129 (read-file-name "Ancestor directory (null for none): " nil nil
'confirm
)
1130 (read-file-name "Output directory (null for none): " nil nil
'confirm
)))
1131 ;; Check that we're not on a line
1132 (if (not (and (bolp) (eolp)))
1133 (error "There is text on this line"))
1134 ;; Turn null strings into nil to indicate directories not used.
1135 (if (and ancestor-dir
(string-equal ancestor-dir
""))
1136 (setq ancestor-dir nil
))
1137 (if (and output-dir
(string-equal output-dir
""))
1138 (setq output-dir nil
))
1139 ;; Canonicalize the directory names
1140 (setq a-dir
(expand-file-name a-dir
))
1141 (if (not (string-equal (substring a-dir -
1) "/"))
1142 (setq a-dir
(concat a-dir
"/")))
1143 (setq b-dir
(expand-file-name b-dir
))
1144 (if (not (string-equal (substring b-dir -
1) "/"))
1145 (setq b-dir
(concat b-dir
"/")))
1148 (setq ancestor-dir
(expand-file-name ancestor-dir
))
1149 (if (not (string-equal (substring ancestor-dir -
1) "/"))
1150 (setq ancestor-dir
(concat ancestor-dir
"/")))))
1153 (setq output-dir
(expand-file-name output-dir
))
1154 (if (not (string-equal (substring output-dir -
1) "/"))
1155 (setq output-dir
(concat output-dir
"/")))))
1156 ;; Set the mark to where we start
1158 ;; Find out what files are in the directories.
1160 (directory-files a-dir nil emerge-merge-directories-filename-regexp
))
1162 (directory-files b-dir nil emerge-merge-directories-filename-regexp
))
1165 (directory-files ancestor-dir nil
1166 emerge-merge-directories-filename-regexp
)))
1167 (all-files (sort (nconc (copy-sequence a-dir-files
)
1168 (copy-sequence b-dir-files
)
1169 (copy-sequence ancestor-dir-files
))
1170 (function string-lessp
))))
1171 ;; Remove duplicates from all-files.
1172 (let ((p all-files
))
1174 (if (and (cdr p
) (string-equal (car p
) (car (cdr p
))))
1175 (setcdr p
(cdr (cdr p
)))
1177 ;; Generate the control lines for the various files.
1179 (let ((f (car all-files
)))
1180 (setq all-files
(cdr all-files
))
1181 (if (and a-dir-files
(string-equal (car a-dir-files
) f
))
1183 (insert "A=" a-dir f
"\t")
1184 (setq a-dir-files
(cdr a-dir-files
))))
1185 (if (and b-dir-files
(string-equal (car b-dir-files
) f
))
1187 (insert "B=" b-dir f
"\t")
1188 (setq b-dir-files
(cdr b-dir-files
))))
1189 (if (and ancestor-dir-files
(string-equal (car ancestor-dir-files
) f
))
1191 (insert "ancestor=" ancestor-dir f
"\t")
1192 (setq ancestor-dir-files
(cdr ancestor-dir-files
))))
1194 (insert "output=" output-dir f
"\t"))
1195 (backward-delete-char 1)
1198 ;;; Common setup routines
1200 ;; Set up the window configuration. If POS is given, set the points to
1201 ;; the beginnings of the buffers.
1202 (defun emerge-setup-windows (buffer-A buffer-B merge-buffer
&optional pos
)
1203 ;; Make sure we are not in the minibuffer window when we try to delete
1204 ;; all other windows.
1205 (if (eq (selected-window) (minibuffer-window))
1207 (delete-other-windows)
1208 (switch-to-buffer merge-buffer
)
1209 (emerge-refresh-mode-line)
1210 (split-window-vertically)
1211 (split-window-horizontally)
1212 (switch-to-buffer buffer-A
)
1214 (goto-char (point-min)))
1216 (switch-to-buffer buffer-B
)
1218 (goto-char (point-min)))
1221 (goto-char (point-min)))
1222 ;; If diff/diff3 reports errors, display them rather than the merge buffer.
1223 (if (/= 0 (emerge-eval-in-buffer emerge-diff-error-buffer
(buffer-size)))
1226 (message "Errors found in diff/diff3 output. Merge buffer is %s."
1227 (buffer-name emerge-merge-buffer
))
1228 (switch-to-buffer emerge-diff-error-buffer
))))
1230 ;; Set up the keymap in the merge buffer
1231 (defun emerge-set-keys ()
1232 ;; Set up fixed keymaps if necessary
1233 (if (not emerge-basic-keymap
)
1234 (emerge-setup-fixed-keymaps))
1235 ;; Save the old local map
1236 (setq emerge-old-keymap
(current-local-map))
1237 ;; Construct the edit keymap
1238 (setq emerge-edit-keymap
(if emerge-old-keymap
1239 (copy-keymap emerge-old-keymap
)
1240 (make-sparse-keymap)))
1241 ;; Install the Emerge commands
1242 (emerge-force-define-key emerge-edit-keymap emerge-command-prefix
1243 'emerge-basic-keymap
)
1244 ;; Suppress write-file and save-buffer
1245 (substitute-key-definition 'write-file
1246 'emerge-query-write-file
1248 (substitute-key-definition 'save-buffer
1249 'emerge-query-save-buffer
1251 (substitute-key-definition 'write-file
'emerge-query-write-file
1252 emerge-edit-keymap
(current-global-map))
1253 (substitute-key-definition 'save-buffer
'emerge-query-save-buffer
1254 emerge-edit-keymap
(current-global-map))
1255 (use-local-map emerge-fast-keymap
)
1256 (setq emerge-edit-mode nil
)
1257 (setq emerge-fast-mode t
))
1259 (defun emerge-remember-buffer-characteristics ()
1260 "Record certain properties of the buffers being merged.
1261 Must be called in the merge buffer. Remembers read-only, modified,
1262 auto-save, and saves them in buffer local variables. Sets the buffers
1263 read-only and turns off `auto-save-mode'.
1264 These characteristics are restored by `emerge-restore-buffer-characteristics'."
1265 ;; force auto-save, because we will turn off auto-saving in buffers for the
1268 ;; remember and alter buffer characteristics
1269 (setq emerge-A-buffer-values
1270 (emerge-eval-in-buffer
1273 (emerge-save-variables emerge-saved-variables
)
1274 (emerge-restore-variables emerge-saved-variables
1275 emerge-merging-values
))))
1276 (setq emerge-B-buffer-values
1277 (emerge-eval-in-buffer
1280 (emerge-save-variables emerge-saved-variables
)
1281 (emerge-restore-variables emerge-saved-variables
1282 emerge-merging-values
)))))
1284 (defun emerge-restore-buffer-characteristics ()
1285 "Restores characteristics saved by `emerge-remember-buffer-characteristics'."
1286 (let ((A-values emerge-A-buffer-values
)
1287 (B-values emerge-B-buffer-values
))
1288 (emerge-eval-in-buffer emerge-A-buffer
1289 (emerge-restore-variables emerge-saved-variables
1291 (emerge-eval-in-buffer emerge-B-buffer
1292 (emerge-restore-variables emerge-saved-variables
1295 (defun emerge-convert-diffs-to-markers (A-buffer
1300 (A-point-min (emerge-eval-in-buffer A-buffer
(point-min)))
1301 (offset (1- A-point-min
))
1302 (A-hidden-lines (emerge-eval-in-buffer
1306 (count-lines 1 A-point-min
))))
1307 (B-point-min (emerge-eval-in-buffer B-buffer
(point-min)))
1308 (B-hidden-lines (emerge-eval-in-buffer
1312 (count-lines 1 B-point-min
)))))
1314 (let* ((list-element (car lineno-list
))
1321 (a-begin (aref list-element
0))
1322 (a-end (aref list-element
1))
1323 (b-begin (aref list-element
2))
1324 (b-end (aref list-element
3))
1325 (state (aref list-element
4)))
1326 ;; place markers at the appropriate places in the buffers
1327 (emerge-eval-in-buffer
1329 (goto-line (+ a-begin A-hidden-lines
))
1330 (setq a-begin-marker
(point-marker))
1331 (goto-line (+ a-end A-hidden-lines
))
1332 (setq a-end-marker
(point-marker)))
1333 (emerge-eval-in-buffer
1335 (goto-line (+ b-begin B-hidden-lines
))
1336 (setq b-begin-marker
(point-marker))
1337 (goto-line (+ b-end B-hidden-lines
))
1338 (setq b-end-marker
(point-marker)))
1339 (setq merge-begin-marker
(set-marker
1341 (- (marker-position a-begin-marker
)
1344 (setq merge-end-marker
(set-marker
1346 (- (marker-position a-end-marker
)
1349 ;; record all the markers for this difference
1350 (setq marker-list
(cons (vector a-begin-marker a-end-marker
1351 b-begin-marker b-end-marker
1352 merge-begin-marker merge-end-marker
1355 (setq lineno-list
(cdr lineno-list
)))
1356 ;; convert the list of difference information into a vector for
1358 (setq emerge-difference-list
(apply 'vector
(nreverse marker-list
)))))
1360 ;; If we have an ancestor, select all B variants that we prefer
1361 (defun emerge-select-prefer-Bs ()
1363 (while (< n emerge-number-of-differences
)
1364 (if (eq (aref (aref emerge-difference-list n
) 6) 'prefer-B
)
1366 (emerge-unselect-and-select-difference n t
)
1368 (aset (aref emerge-difference-list n
) 6 'prefer-B
)))
1370 (emerge-unselect-and-select-difference -
1))
1372 ;; Process the local-variables list at the end of the merged file, if
1374 (defun emerge-handle-local-variables ()
1375 (if emerge-process-local-variables
1377 (hack-local-variables t
)
1378 (error (message "Local-variables error in merge buffer: %s"
1379 (prin1-to-string err
))))))
1381 ;;; Common exit routines
1383 (defun emerge-write-and-delete (file-out)
1384 ;; clear screen format
1385 (delete-other-windows)
1386 ;; delete A, B, and ancestor buffers, if they haven't been changed
1387 (if (not (buffer-modified-p emerge-A-buffer
))
1388 (kill-buffer emerge-A-buffer
))
1389 (if (not (buffer-modified-p emerge-B-buffer
))
1390 (kill-buffer emerge-B-buffer
))
1391 (if (and emerge-ancestor-buffer
1392 (not (buffer-modified-p emerge-ancestor-buffer
)))
1393 (kill-buffer emerge-ancestor-buffer
))
1394 ;; Write merge buffer to file
1396 (write-file file-out
)))
1400 (defun emerge-recenter (&optional arg
)
1401 "Bring the highlighted region of all three merge buffers into view.
1402 This brings the buffers into view if they are in windows.
1403 With an argument, reestablish the default three-window display."
1405 ;; If there is an argument, rebuild the window structure
1407 (emerge-setup-windows emerge-A-buffer emerge-B-buffer
1408 emerge-merge-buffer
))
1409 ;; Redisplay whatever buffers are showing, if there is a selected difference
1410 (if (and (>= emerge-current-difference
0)
1411 (< emerge-current-difference emerge-number-of-differences
))
1412 (let* ((merge-buffer emerge-merge-buffer
)
1413 (buffer-A emerge-A-buffer
)
1414 (buffer-B emerge-B-buffer
)
1415 (window-A (get-buffer-window buffer-A
))
1416 (window-B (get-buffer-window buffer-B
))
1417 (merge-window (get-buffer-window merge-buffer
))
1419 (aref emerge-difference-list emerge-current-difference
)))
1421 (select-window window-A
)
1422 (emerge-position-region
1423 (- (aref diff-vector
0)
1424 (1- emerge-before-flag-length
))
1425 (+ (aref diff-vector
1)
1426 (1- emerge-after-flag-length
))
1427 (1+ (aref diff-vector
0)))))
1429 (select-window window-B
)
1430 (emerge-position-region
1431 (- (aref diff-vector
2)
1432 (1- emerge-before-flag-length
))
1433 (+ (aref diff-vector
3)
1434 (1- emerge-after-flag-length
))
1435 (1+ (aref diff-vector
2)))))
1436 (if merge-window
(progn
1437 (select-window merge-window
)
1438 (emerge-position-region
1439 (- (aref diff-vector
4)
1440 (1- emerge-before-flag-length
))
1441 (+ (aref diff-vector
5)
1442 (1- emerge-after-flag-length
))
1443 (1+ (aref diff-vector
4))))))))
1445 ;;; Window scrolling operations
1446 ;; These operations are designed to scroll all three windows the same amount,
1447 ;; so as to keep the text in them aligned.
1449 ;; Perform some operation on all three windows (if they are showing).
1450 ;; Catches all errors on the operation in the A and B windows, but not
1451 ;; in the merge window. Usually, errors come from scrolling off the
1452 ;; beginning or end of the buffer, and this gives a nice error message:
1453 ;; End of buffer is reported in the merge buffer, but if the scroll was
1454 ;; possible in the A or B windows, it is performed there before the error
1456 (defun emerge-operate-on-windows (operation arg
)
1457 (let* ((merge-buffer emerge-merge-buffer
)
1458 (buffer-A emerge-A-buffer
)
1459 (buffer-B emerge-B-buffer
)
1460 (window-A (get-buffer-window buffer-A
))
1461 (window-B (get-buffer-window buffer-B
))
1462 (merge-window (get-buffer-window merge-buffer
)))
1464 (select-window window-A
)
1466 (funcall operation arg
)
1469 (select-window window-B
)
1471 (funcall operation arg
)
1473 (if merge-window
(progn
1474 (select-window merge-window
)
1475 (funcall operation arg
)))))
1477 (defun emerge-scroll-up (&optional arg
)
1478 "Scroll up all three merge buffers, if they are in windows.
1479 With argument N, scroll N lines; otherwise scroll by nearly
1480 the height of the merge window.
1481 `C-u -' alone as argument scrolls half the height of the merge window."
1483 (emerge-operate-on-windows
1485 ;; calculate argument to scroll-up
1486 ;; if there is an explicit argument
1487 (if (and arg
(not (equal arg
'-
)))
1489 (prefix-numeric-value arg
)
1490 ;; if not, see if we can determine a default amount (the window height)
1491 (let ((merge-window (get-buffer-window emerge-merge-buffer
)))
1492 (if (null merge-window
)
1493 ;; no window, use nil
1495 (let ((default-amount
1496 (- (window-height merge-window
) 1 next-screen-context-lines
)))
1497 ;; the window was found
1499 ;; C-u as argument means half of default amount
1500 (/ default-amount
2)
1501 ;; no argument means default amount
1502 default-amount
)))))))
1504 (defun emerge-scroll-down (&optional arg
)
1505 "Scroll down all three merge buffers, if they are in windows.
1506 With argument N, scroll N lines; otherwise scroll by nearly
1507 the height of the merge window.
1508 `C-u -' alone as argument scrolls half the height of the merge window."
1510 (emerge-operate-on-windows
1512 ;; calculate argument to scroll-down
1513 ;; if there is an explicit argument
1514 (if (and arg
(not (equal arg
'-
)))
1516 (prefix-numeric-value arg
)
1517 ;; if not, see if we can determine a default amount (the window height)
1518 (let ((merge-window (get-buffer-window emerge-merge-buffer
)))
1519 (if (null merge-window
)
1520 ;; no window, use nil
1522 (let ((default-amount
1523 (- (window-height merge-window
) 1 next-screen-context-lines
)))
1524 ;; the window was found
1526 ;; C-u as argument means half of default amount
1527 (/ default-amount
2)
1528 ;; no argument means default amount
1529 default-amount
)))))))
1531 (defun emerge-scroll-left (&optional arg
)
1532 "Scroll left all three merge buffers, if they are in windows.
1533 If an argument is given, that is how many columns are scrolled, else nearly
1534 the width of the A and B windows. `C-u -' alone as argument scrolls half the
1535 width of the A and B windows."
1537 (emerge-operate-on-windows
1539 ;; calculate argument to scroll-left
1540 ;; if there is an explicit argument
1541 (if (and arg
(not (equal arg
'-
)))
1543 (prefix-numeric-value arg
)
1544 ;; if not, see if we can determine a default amount
1545 ;; (half the window width)
1546 (let ((merge-window (get-buffer-window emerge-merge-buffer
)))
1547 (if (null merge-window
)
1548 ;; no window, use nil
1550 (let ((default-amount
1551 (- (/ (window-width merge-window
) 2) 3)))
1552 ;; the window was found
1554 ;; C-u as argument means half of default amount
1555 (/ default-amount
2)
1556 ;; no argument means default amount
1557 default-amount
)))))))
1559 (defun emerge-scroll-right (&optional arg
)
1560 "Scroll right all three merge buffers, if they are in windows.
1561 If an argument is given, that is how many columns are scrolled, else nearly
1562 the width of the A and B windows. `C-u -' alone as argument scrolls half the
1563 width of the A and B windows."
1565 (emerge-operate-on-windows
1567 ;; calculate argument to scroll-right
1568 ;; if there is an explicit argument
1569 (if (and arg
(not (equal arg
'-
)))
1571 (prefix-numeric-value arg
)
1572 ;; if not, see if we can determine a default amount
1573 ;; (half the window width)
1574 (let ((merge-window (get-buffer-window emerge-merge-buffer
)))
1575 (if (null merge-window
)
1576 ;; no window, use nil
1578 (let ((default-amount
1579 (- (/ (window-width merge-window
) 2) 3)))
1580 ;; the window was found
1582 ;; C-u as argument means half of default amount
1583 (/ default-amount
2)
1584 ;; no argument means default amount
1585 default-amount
)))))))
1587 (defun emerge-scroll-reset ()
1588 "Reset horizontal scrolling in Emerge.
1589 This resets the horizontal scrolling of all three merge buffers
1590 to the left margin, if they are in windows."
1592 (emerge-operate-on-windows
1593 (function (lambda (x) (set-window-hscroll (selected-window) 0)))
1596 ;; Attempt to show the region nicely.
1597 ;; If there are min-lines lines above and below the region, then don't do
1599 ;; If not, recenter the region to make it so.
1600 ;; If that isn't possible, remove context lines balancedly from top and botton
1601 ;; so the entire region shows.
1602 ;; If that isn't possible, show the top of the region.
1603 ;; BEG must be at the beginning of a line.
1604 (defun emerge-position-region (beg end pos
)
1605 ;; First test whether the entire region is visible with
1606 ;; emerge-min-visible-lines above and below it
1607 (if (not (and (<= (progn
1608 (move-to-window-line emerge-min-visible-lines
)
1612 (move-to-window-line
1613 (- (1+ emerge-min-visible-lines
)))
1615 ;; We failed that test, see if it fits at all
1616 ;; Meanwhile positioning it correctly in case it doesn't fit
1618 (set-window-start (selected-window) beg
)
1619 (if (pos-visible-in-window-p end
)
1620 ;; Determine the number of lines that the region occupies
1622 (while (> end
(progn
1623 (move-to-window-line lines
)
1625 (setq lines
(1+ lines
)))
1626 ;; And position the beginning on the right line
1628 (recenter (/ (1+ (- (1- (window-height (selected-window)))
1633 (defun emerge-next-difference ()
1634 "Advance to the next difference."
1636 (if (< emerge-current-difference emerge-number-of-differences
)
1637 (let ((n (1+ emerge-current-difference
)))
1638 (while (and emerge-skip-prefers
1639 (< n emerge-number-of-differences
)
1640 (memq (aref (aref emerge-difference-list n
) 6)
1641 '(prefer-A prefer-B
)))
1643 (let ((buffer-read-only nil
))
1644 (emerge-unselect-and-select-difference n
)))
1647 (defun emerge-previous-difference ()
1648 "Go to the previous difference."
1650 (if (> emerge-current-difference -
1)
1651 (let ((n (1- emerge-current-difference
)))
1652 (while (and emerge-skip-prefers
1654 (memq (aref (aref emerge-difference-list n
) 6)
1655 '(prefer-A prefer-B
)))
1657 (let ((buffer-read-only nil
))
1658 (emerge-unselect-and-select-difference n
)))
1659 (error "At beginning")))
1661 (defun emerge-jump-to-difference (difference-number)
1662 "Go to the N-th difference."
1664 (let ((buffer-read-only nil
))
1665 (setq difference-number
(1- difference-number
))
1666 (if (and (>= difference-number -
1)
1667 (< difference-number
(1+ emerge-number-of-differences
)))
1668 (emerge-unselect-and-select-difference difference-number
)
1669 (error "Bad difference number"))))
1671 (defun emerge-abort ()
1672 "Abort the Emerge session."
1676 (defun emerge-quit (arg)
1677 "Finish the Emerge session and exit Emerge.
1678 Prefix argument means to abort rather than successfully finish.
1679 The difference depends on how the merge was started,
1680 but usually means to not write over one of the original files, or to signal
1681 to some process which invoked Emerge a failure code.
1683 Unselects the selected difference, if any, restores the read-only and modified
1684 flags of the merged file buffers, restores the local keymap of the merge
1685 buffer, and sets off various emerge flags. Using Emerge commands in this
1686 buffer after this will cause serious problems."
1691 "Do you really want to successfully finish this merge? "
1692 "Do you really want to abort this merge? "))
1694 (emerge-really-quit arg
)))
1696 ;; Perform the quit operations.
1697 (defun emerge-really-quit (arg)
1698 (setq buffer-read-only nil
)
1699 (emerge-unselect-and-select-difference -
1)
1700 (emerge-restore-buffer-characteristics)
1701 ;; null out the difference markers so they don't slow down future editing
1703 (mapcar (function (lambda (d)
1704 (set-marker (aref d
0) nil
)
1705 (set-marker (aref d
1) nil
)
1706 (set-marker (aref d
2) nil
)
1707 (set-marker (aref d
3) nil
)
1708 (set-marker (aref d
4) nil
)
1709 (set-marker (aref d
5) nil
)))
1710 emerge-difference-list
)
1711 ;; allow them to be garbage collected
1712 (setq emerge-difference-list nil
)
1713 ;; restore the local map
1714 (use-local-map emerge-old-keymap
)
1715 ;; turn off all the emerge modes
1716 (setq emerge-mode nil
)
1717 (setq emerge-fast-mode nil
)
1718 (setq emerge-edit-mode nil
)
1719 (setq emerge-auto-advance nil
)
1720 (setq emerge-skip-prefers nil
)
1721 ;; restore mode line
1722 (kill-local-variable 'mode-line-buffer-identification
)
1723 (let ((emerge-prefix-argument arg
))
1724 (run-hooks 'emerge-quit-hook
)))
1726 (defun emerge-select-A (&optional force
)
1727 "Select the A variant of this difference.
1728 Refuses to function if this difference has been edited, i.e., if it
1729 is neither the A nor the B variant.
1730 A prefix argument forces the variant to be selected
1731 even if the difference has been edited."
1734 (function (lambda ()
1735 (emerge-select-A-edit merge-begin merge-end A-begin A-end
)
1736 (if emerge-auto-advance
1737 (emerge-next-difference)))))
1739 (function (lambda ()
1740 (if emerge-auto-advance
1741 (emerge-next-difference))))))
1742 (emerge-select-version force operate-no-change operate operate
)))
1744 ;; Actually select the A variant
1745 (defun emerge-select-A-edit (merge-begin merge-end A-begin A-end
)
1746 (emerge-eval-in-buffer
1748 (delete-region merge-begin merge-end
)
1749 (goto-char merge-begin
)
1750 (insert-buffer-substring emerge-A-buffer A-begin A-end
)
1751 (goto-char merge-begin
)
1752 (aset diff-vector
6 'A
)
1753 (emerge-refresh-mode-line)))
1755 (defun emerge-select-B (&optional force
)
1756 "Select the B variant of this difference.
1757 Refuses to function if this difference has been edited, i.e., if it
1758 is neither the A nor the B variant.
1759 A prefix argument forces the variant to be selected
1760 even if the difference has been edited."
1763 (function (lambda ()
1764 (emerge-select-B-edit merge-begin merge-end B-begin B-end
)
1765 (if emerge-auto-advance
1766 (emerge-next-difference)))))
1768 (function (lambda ()
1769 (if emerge-auto-advance
1770 (emerge-next-difference))))))
1771 (emerge-select-version force operate operate-no-change operate
)))
1773 ;; Actually select the B variant
1774 (defun emerge-select-B-edit (merge-begin merge-end B-begin B-end
)
1775 (emerge-eval-in-buffer
1777 (delete-region merge-begin merge-end
)
1778 (goto-char merge-begin
)
1779 (insert-buffer-substring emerge-B-buffer B-begin B-end
)
1780 (goto-char merge-begin
)
1781 (aset diff-vector
6 'B
)
1782 (emerge-refresh-mode-line)))
1784 (defun emerge-default-A ()
1785 "Make the A variant the default from here down.
1786 This selects the A variant for all differences from here down in the buffer
1787 which are still defaulted, i.e., which the user has not selected and for
1788 which there is no preference."
1790 (let ((buffer-read-only nil
))
1791 (let ((selected-difference emerge-current-difference
)
1792 (n (max emerge-current-difference
0)))
1793 (while (< n emerge-number-of-differences
)
1794 (let ((diff-vector (aref emerge-difference-list n
)))
1795 (if (eq (aref diff-vector
6) 'default-B
)
1797 (emerge-unselect-and-select-difference n t
)
1799 (aset diff-vector
6 'default-A
))))
1801 (if (= (* (/ n
10) 10) n
)
1802 (message "Setting default to A...%d" n
)))
1803 (emerge-unselect-and-select-difference selected-difference
)))
1804 (message "Default A set"))
1806 (defun emerge-default-B ()
1807 "Make the B variant the default from here down.
1808 This selects the B variant for all differences from here down in the buffer
1809 which are still defaulted, i.e., which the user has not selected and for
1810 which there is no preference."
1812 (let ((buffer-read-only nil
))
1813 (let ((selected-difference emerge-current-difference
)
1814 (n (max emerge-current-difference
0)))
1815 (while (< n emerge-number-of-differences
)
1816 (let ((diff-vector (aref emerge-difference-list n
)))
1817 (if (eq (aref diff-vector
6) 'default-A
)
1819 (emerge-unselect-and-select-difference n t
)
1821 (aset diff-vector
6 'default-B
))))
1823 (if (= (* (/ n
10) 10) n
)
1824 (message "Setting default to B...%d" n
)))
1825 (emerge-unselect-and-select-difference selected-difference
)))
1826 (message "Default B set"))
1828 (defun emerge-fast-mode ()
1829 "Set fast mode, for Emerge.
1830 In this mode ordinary Emacs commands are disabled, and Emerge commands
1831 need not be prefixed with \\<emerge-fast-keymap>\\[emerge-basic-keymap]."
1833 (setq buffer-read-only t
)
1834 (use-local-map emerge-fast-keymap
)
1835 (setq emerge-mode t
)
1836 (setq emerge-fast-mode t
)
1837 (setq emerge-edit-mode nil
)
1838 (message "Fast mode set")
1839 ;; force mode line redisplay
1840 (set-buffer-modified-p (buffer-modified-p)))
1842 (defun emerge-edit-mode ()
1843 "Set edit mode, for Emerge.
1844 In this mode ordinary Emacs commands are available, and Emerge commands
1845 must be prefixed with \\<emerge-fast-keymap>\\[emerge-basic-keymap]."
1847 (setq buffer-read-only nil
)
1848 (use-local-map emerge-edit-keymap
)
1849 (setq emerge-mode t
)
1850 (setq emerge-fast-mode nil
)
1851 (setq emerge-edit-mode t
)
1852 (message "Edit mode set")
1853 ;; force mode line redisplay
1854 (set-buffer-modified-p (buffer-modified-p)))
1856 (defun emerge-auto-advance (arg)
1857 "Toggle Auto-Advance mode, for Emerge.
1858 This mode causes `emerge-select-A' and `emerge-select-B' to automatically
1859 advance to the next difference.
1860 With a positive argument, turn on Auto-Advance mode.
1861 With a negative argument, turn off Auto-Advance mode."
1863 (setq emerge-auto-advance
(if (null arg
)
1864 (not emerge-auto-advance
)
1865 (> (prefix-numeric-value arg
) 0)))
1866 (message (if emerge-skip-prefers
1868 "Auto-advance cleared"))
1869 ;; force mode line redisplay
1870 (set-buffer-modified-p (buffer-modified-p)))
1872 (defun emerge-skip-prefers (arg)
1873 "Toggle Skip-Prefers mode, for Emerge.
1874 This mode causes `emerge-next-difference' and `emerge-previous-difference'
1875 to automatically skip over differences for which there is a preference.
1876 With a positive argument, turn on Skip-Prefers mode.
1877 With a negative argument, turn off Skip-Prefers mode."
1879 (setq emerge-skip-prefers
(if (null arg
)
1880 (not emerge-skip-prefers
)
1881 (> (prefix-numeric-value arg
) 0)))
1882 (message (if emerge-skip-prefers
1884 "Skip-prefers cleared"))
1885 ;; force mode line redisplay
1886 (set-buffer-modified-p (buffer-modified-p)))
1888 (defun emerge-copy-as-kill-A ()
1889 "Put the A variant of this difference in the kill ring."
1891 (emerge-validate-difference)
1893 (aref emerge-difference-list emerge-current-difference
))
1894 (A-begin (1+ (aref diff-vector
0)))
1895 (A-end (1- (aref diff-vector
1)))
1896 ;; so further kills don't append
1899 (set-buffer emerge-A-buffer
)
1900 (copy-region-as-kill A-begin A-end
))))
1902 (defun emerge-copy-as-kill-B ()
1903 "Put the B variant of this difference in the kill ring."
1905 (emerge-validate-difference)
1907 (aref emerge-difference-list emerge-current-difference
))
1908 (B-begin (1+ (aref diff-vector
2)))
1909 (B-end (1- (aref diff-vector
3)))
1910 ;; so further kills don't append
1913 (set-buffer emerge-B-buffer
)
1914 (copy-region-as-kill B-begin B-end
))))
1916 (defun emerge-insert-A (arg)
1917 "Insert the A variant of this difference at the point.
1918 Leaves point after text, mark before.
1919 With prefix argument, puts point before, mark after."
1921 (emerge-validate-difference)
1923 (aref emerge-difference-list emerge-current-difference
))
1924 (A-begin (1+ (aref diff-vector
0)))
1925 (A-end (1- (aref diff-vector
1)))
1927 (buffer-read-only nil
))
1928 (insert-buffer-substring emerge-A-buffer A-begin A-end
)
1932 (goto-char opoint
))))
1934 (defun emerge-insert-B (arg)
1935 "Insert the B variant of this difference at the point.
1936 Leaves point after text, mark before.
1937 With prefix argument, puts point before, mark after."
1939 (emerge-validate-difference)
1941 (aref emerge-difference-list emerge-current-difference
))
1942 (B-begin (1+ (aref diff-vector
2)))
1943 (B-end (1- (aref diff-vector
3)))
1945 (buffer-read-only nil
))
1946 (insert-buffer-substring emerge-B-buffer B-begin B-end
)
1950 (goto-char opoint
))))
1952 (defun emerge-mark-difference (arg)
1953 "Leaves the point before this difference and the mark after it.
1954 With prefix argument, puts mark before, point after."
1956 (emerge-validate-difference)
1958 (aref emerge-difference-list emerge-current-difference
))
1959 (merge-begin (1+ (aref diff-vector
4)))
1960 (merge-end (1- (aref diff-vector
5))))
1963 (goto-char merge-begin
)
1964 (set-mark merge-end
))
1965 (goto-char merge-end
)
1966 (set-mark merge-begin
))))
1968 (defun emerge-file-names ()
1969 "Show the names of the buffers or files being operated on by Emerge.
1970 Use C-u l to reset the windows afterward."
1972 (delete-other-windows)
1973 (let ((temp-buffer-show-function
1974 (function (lambda (buf)
1975 (split-window-vertically)
1976 (switch-to-buffer buf
)
1977 (other-window 1)))))
1978 (with-output-to-temp-buffer "*Help*"
1979 (emerge-eval-in-buffer emerge-A-buffer
1980 (if buffer-file-name
1982 (princ "File A is: ")
1983 (princ buffer-file-name
))
1985 (princ "Buffer A is: ")
1986 (princ (buffer-name))))
1988 (emerge-eval-in-buffer emerge-B-buffer
1989 (if buffer-file-name
1991 (princ "File B is: ")
1992 (princ buffer-file-name
))
1994 (princ "Buffer B is: ")
1995 (princ (buffer-name))))
1997 (if emerge-ancestor-buffer
1998 (emerge-eval-in-buffer emerge-ancestor-buffer
1999 (if buffer-file-name
2001 (princ "Ancestor file is: ")
2002 (princ buffer-file-name
))
2004 (princ "Ancestor buffer is: ")
2005 (princ (buffer-name))))
2007 (princ emerge-output-description
))))
2009 (defun emerge-join-differences (arg)
2010 "Join the selected difference with the following one.
2011 With a prefix argument, join with the preceeding one."
2013 (let ((n emerge-current-difference
))
2014 ;; adjust n to be first difference to join
2017 ;; n and n+1 are the differences to join
2018 ;; check that they are both differences
2019 (if (or (< n
0) (>= n
(1- emerge-number-of-differences
)))
2020 (error "Incorrect differences to join"))
2022 (emerge-unselect-difference emerge-current-difference
)
2023 ;; decrement total number of differences
2024 (setq emerge-number-of-differences
(1- emerge-number-of-differences
))
2025 ;; build new differences vector
2027 (new-differences (make-vector emerge-number-of-differences nil
)))
2028 (while (< i emerge-number-of-differences
)
2029 (aset new-differences i
2031 ((< i n
) (aref emerge-difference-list i
))
2032 ((> i n
) (aref emerge-difference-list
(1+ i
)))
2033 (t (let ((prev (aref emerge-difference-list i
))
2034 (next (aref emerge-difference-list
(1+ i
))))
2035 (vector (aref prev
0)
2041 (let ((ps (aref prev
6))
2046 ((and (or (eq ps
'B
) (eq ps
'prefer-B
))
2047 (or (eq ns
'B
) (eq ns
'prefer-B
)))
2051 (setq emerge-difference-list new-differences
))
2052 ;; set the current difference correctly
2053 (setq emerge-current-difference n
)
2054 ;; fix the mode line
2055 (emerge-refresh-mode-line)
2056 ;; reinsert the flags
2057 (emerge-select-difference emerge-current-difference
)
2060 (defun emerge-split-difference ()
2061 "Split the current difference where the points are in the three windows."
2063 (let ((n emerge-current-difference
))
2064 ;; check that this is a valid difference
2065 (emerge-validate-difference)
2066 ;; get the point values and old difference
2067 (let ((A-point (emerge-eval-in-buffer emerge-A-buffer
2069 (B-point (emerge-eval-in-buffer emerge-B-buffer
2071 (merge-point (point-marker))
2072 (old-diff (aref emerge-difference-list n
)))
2073 ;; check location of the points, give error if they aren't in the
2075 (if (or (< A-point
(aref old-diff
0))
2076 (> A-point
(aref old-diff
1)))
2077 (error "Point outside of difference in A buffer"))
2078 (if (or (< B-point
(aref old-diff
2))
2079 (> B-point
(aref old-diff
3)))
2080 (error "Point outside of difference in B buffer"))
2081 (if (or (< merge-point
(aref old-diff
4))
2082 (> merge-point
(aref old-diff
5)))
2083 (error "Point outside of difference in merge buffer"))
2085 (emerge-unselect-difference emerge-current-difference
)
2086 ;; increment total number of differences
2087 (setq emerge-number-of-differences
(1+ emerge-number-of-differences
))
2088 ;; build new differences vector
2090 (new-differences (make-vector emerge-number-of-differences nil
)))
2091 (while (< i emerge-number-of-differences
)
2092 (aset new-differences i
2095 (aref emerge-difference-list i
))
2097 (aref emerge-difference-list
(1- i
)))
2099 (vector (aref old-diff
0)
2107 (vector (copy-marker A-point
)
2109 (copy-marker B-point
)
2111 (copy-marker merge-point
)
2113 (aref old-diff
6)))))
2115 (setq emerge-difference-list new-differences
))
2116 ;; set the current difference correctly
2117 (setq emerge-current-difference n
)
2118 ;; fix the mode line
2119 (emerge-refresh-mode-line)
2120 ;; reinsert the flags
2121 (emerge-select-difference emerge-current-difference
)
2122 (emerge-recenter))))
2124 (defun emerge-trim-difference ()
2125 "Trim lines off top and bottom of difference that are the same.
2126 If lines are the same in both the A and the B versions, strip them off.
2127 \(This can happen when the A and B versions have common lines that the
2128 ancestor version does not share.)"
2130 ;; make sure we are in a real difference
2131 (emerge-validate-difference)
2133 (emerge-unselect-difference emerge-current-difference
)
2134 (let* ((diff (aref emerge-difference-list emerge-current-difference
))
2135 (top-a (marker-position (aref diff
0)))
2136 (bottom-a (marker-position (aref diff
1)))
2137 (top-b (marker-position (aref diff
2)))
2138 (bottom-b (marker-position (aref diff
3)))
2139 (top-m (marker-position (aref diff
4)))
2140 (bottom-m (marker-position (aref diff
5)))
2141 size success sa sb sm
)
2142 ;; move down the tops of the difference regions as much as possible
2143 ;; Try advancing comparing 1000 chars at a time.
2144 ;; When that fails, go 500 chars at a time, and so on.
2149 (setq size
(min size
(- bottom-a top-a
) (- bottom-b top-b
)
2150 (- bottom-m top-m
)))
2151 (setq sa
(emerge-eval-in-buffer emerge-A-buffer
2152 (buffer-substring top-a
2154 (setq sb
(emerge-eval-in-buffer emerge-B-buffer
2155 (buffer-substring top-b
2157 (setq sm
(buffer-substring top-m
(+ size top-m
)))
2158 (setq success
(and (> size
0) (equal sa sb
) (equal sb sm
)))
2160 (setq top-a
(+ top-a size
)
2161 top-b
(+ top-b size
)
2162 top-m
(+ top-m size
))))
2163 (setq size
(/ size
2)))
2164 ;; move up the bottoms of the difference regions as much as possible
2165 ;; Try advancing comparing 1000 chars at a time.
2166 ;; When that fails, go 500 chars at a time, and so on.
2171 (setq size
(min size
(- bottom-a top-a
) (- bottom-b top-b
)
2172 (- bottom-m top-m
)))
2173 (setq sa
(emerge-eval-in-buffer emerge-A-buffer
2174 (buffer-substring (- bottom-a size
)
2176 (setq sb
(emerge-eval-in-buffer emerge-B-buffer
2177 (buffer-substring (- bottom-b size
)
2179 (setq sm
(buffer-substring (- bottom-m size
) bottom-m
))
2180 (setq success
(and (> size
0) (equal sa sb
) (equal sb sm
)))
2182 (setq bottom-a
(- bottom-a size
)
2183 bottom-b
(- bottom-b size
)
2184 bottom-m
(- bottom-m size
))))
2185 (setq size
(/ size
2)))
2186 ;; {top,bottom}-{a,b,m} are now set at the new beginnings and ends
2187 ;; of the difference regions. Move them to the beginning of lines, as
2189 (emerge-eval-in-buffer emerge-A-buffer
2192 (aset diff
0 (point-marker))
2193 (goto-char bottom-a
)
2194 (beginning-of-line 2)
2195 (aset diff
1 (point-marker)))
2196 (emerge-eval-in-buffer emerge-B-buffer
2199 (aset diff
2 (point-marker))
2200 (goto-char bottom-b
)
2201 (beginning-of-line 2)
2202 (aset diff
3 (point-marker)))
2205 (aset diff
4 (point-marker))
2206 (goto-char bottom-m
)
2207 (beginning-of-line 2)
2208 (aset diff
5 (point-marker))
2209 ;; put the flags back in, recenter the display
2210 (emerge-select-difference emerge-current-difference
)
2213 (defun emerge-find-difference (arg)
2214 "Find the difference containing the current position of the point.
2215 If there is no containing difference and the prefix argument is positive,
2216 it finds the nearest following difference. A negative prefix argument finds
2217 the nearest previous difference."
2218 (cond ((eq (current-buffer) emerge-A-buffer
)
2219 (emerge-find-difference-A arg
))
2220 ((eq (current-buffer) emerge-B-buffer
)
2221 (emerge-find-difference-B arg
))
2222 (t (emerge-find-difference-merge arg
))))
2224 (defun emerge-find-difference-merge (arg)
2225 "Find the difference containing point, in the merge buffer.
2226 If there is no containing difference and the prefix argument is positive,
2227 it finds the nearest following difference. A negative prefix argument finds
2228 the nearest previous difference."
2230 ;; search for the point in the merge buffer, using the markers
2231 ;; for the beginning and end of the differences in the merge buffer
2232 (emerge-find-difference1 arg
(point) 4 5))
2234 (defun emerge-find-difference-A (arg)
2235 "Find the difference containing point, in the A buffer.
2236 This command must be executed in the merge buffer.
2237 If there is no containing difference and the prefix argument is positive,
2238 it finds the nearest following difference. A negative prefix argument finds
2239 the nearest previous difference."
2241 ;; search for the point in the A buffer, using the markers
2242 ;; for the beginning and end of the differences in the A buffer
2243 (emerge-find-difference1 arg
2244 (emerge-eval-in-buffer emerge-A-buffer
(point))
2247 (defun emerge-find-difference-B (arg)
2248 "Find the difference containing point, in the B buffer.
2249 This command must be executed in the merge buffer.
2250 If there is no containing difference and the prefix argument is positive,
2251 it finds the nearest following difference. A negative prefix argument finds
2252 the nearest previous difference."
2254 ;; search for the point in the B buffer, using the markers
2255 ;; for the beginning and end of the differences in the B buffer
2256 (emerge-find-difference1 arg
2257 (emerge-eval-in-buffer emerge-B-buffer
(point))
2260 (defun emerge-find-difference1 (arg location begin end
)
2262 ;; find first difference containing or after the current position
2265 (while (< n emerge-number-of-differences
)
2266 (let ((diff-vector (aref emerge-difference-list n
)))
2267 (if (<= location
(marker-position (aref diff-vector end
)))
2270 emerge-number-of-differences
))
2272 ;; whether the found difference contains the current position
2273 (and (< index emerge-number-of-differences
)
2274 (<= (marker-position (aref (aref emerge-difference-list index
)
2278 ;; numeric value of prefix argument
2279 (prefix-numeric-value arg
)))
2280 (emerge-unselect-and-select-difference
2282 ;; if the point is in a difference, select it
2284 ;; if the arg is nil and the point is not in a difference, error
2285 ((null arg
) (error "No difference contains point"))
2286 ;; if the arg is positive, select the following difference
2288 (if (< index emerge-number-of-differences
)
2290 (error "No difference contains or follows point")))
2291 ;; if the arg is negative, select the preceeding difference
2295 (error "No difference contains or preceeds point")))))))
2297 (defun emerge-line-numbers ()
2298 "Display the current line numbers.
2299 This function displays the line numbers of the points in the A, B, and
2303 (and (>= emerge-current-difference
0)
2304 (< emerge-current-difference emerge-number-of-differences
)))
2305 (diff (and valid-diff
2306 (aref emerge-difference-list emerge-current-difference
)))
2307 (merge-line (emerge-line-number-in-buf 4 5))
2308 (A-line (emerge-eval-in-buffer emerge-A-buffer
2309 (emerge-line-number-in-buf 0 1)))
2310 (B-line (emerge-eval-in-buffer emerge-B-buffer
2311 (emerge-line-number-in-buf 2 3))))
2312 (message "At lines: merge = %d, A = %d, B = %d"
2313 merge-line A-line B-line
)))
2315 (defun emerge-line-number-in-buf (begin-marker end-marker
)
2317 (setq temp
(save-excursion
2319 (1+ (count-lines 1 (point)))))
2322 (if (> (point) (aref diff begin-marker
))
2323 (setq temp
(- temp emerge-before-flag-lines
)))
2324 (if (> (point) (aref diff end-marker
))
2325 (setq temp
(- temp emerge-after-flag-lines
)))))
2328 (defun emerge-set-combine-versions-template (start end
&optional localize
)
2329 "Copy region into `emerge-combine-versions-template'.
2330 This controls how `emerge-combine-versions' will combine the two versions.
2331 With prefix argument, `emerge-combine-versions' is made local to this
2332 merge buffer. Localization is permanent for any particular merge buffer."
2333 (interactive "r\nP")
2335 (make-local-variable 'emerge-combine-versions-template
))
2336 (setq emerge-combine-versions-template
(buffer-substring start end
))
2338 (if (assq 'emerge-combine-versions-template
(buffer-local-variables))
2339 "emerge-set-combine-versions-template set locally."
2340 "emerge-set-combine-versions-template set.")))
2342 (defun emerge-combine-versions (&optional force
)
2343 "Combine versions using the template in `emerge-combine-versions-template'.
2344 Refuses to function if this difference has been edited, i.e., if it is
2345 neither the A nor the B variant.
2346 An argument forces the variant to be selected even if the difference has
2349 (emerge-combine-versions-internal emerge-combine-versions-template force
))
2351 (defun emerge-combine-versions-register (char &optional force
)
2352 "Combine the two versions using the template in register REG.
2353 See documentation of the variable `emerge-combine-versions-template'
2354 for how the template is interpreted.
2355 Refuses to function if this difference has been edited, i.e., if it is
2356 neither the A nor the B variant.
2357 An argument forces the variant to be selected even if the difference has
2359 (interactive "cRegister containing template: \nP")
2360 (let ((template (get-register char
)))
2361 (if (not (stringp template
))
2362 (error "Register does not contain text"))
2363 (emerge-combine-versions-internal template force
)))
2365 (defun emerge-combine-versions-internal (template force
)
2367 (function (lambda ()
2368 (emerge-combine-versions-edit merge-begin merge-end
2369 A-begin A-end B-begin B-end
)
2370 (if emerge-auto-advance
2371 (emerge-next-difference))))))
2372 (emerge-select-version force operate operate operate
)))
2374 (defun emerge-combine-versions-edit (merge-begin merge-end
2375 A-begin A-end B-begin B-end
)
2376 (emerge-eval-in-buffer
2378 (delete-region merge-begin merge-end
)
2379 (goto-char merge-begin
)
2381 (while (< i
(length template
))
2382 (let ((c (aref template i
)))
2391 (insert-buffer-substring emerge-A-buffer A-begin A-end
))
2393 (insert-buffer-substring emerge-B-buffer B-begin B-end
))
2400 (goto-char merge-begin
)
2401 (aset diff-vector
6 'combined
)
2402 (emerge-refresh-mode-line)))
2404 (defun emerge-set-merge-mode (mode)
2405 "Set the major mode in a merge buffer.
2406 Overrides any change that the mode might make to the mode line or local
2407 keymap. Leaves merge in fast mode."
2409 (list (intern (completing-read "New major mode for merge buffer: "
2410 obarray
'commandp t nil
))))
2412 (emerge-refresh-mode-line)
2413 (if emerge-fast-mode
2415 (emerge-edit-mode)))
2417 (defun emerge-one-line-window ()
2419 (let ((window-min-height 1))
2420 (shrink-window (- (window-height) 2))))
2422 ;;; Support routines
2424 ;; Select a difference by placing the visual flags around the appropriate
2425 ;; group of lines in the A, B, and merge buffers
2426 (defun emerge-select-difference (n)
2427 (let ((emerge-globalized-difference-list emerge-difference-list
)
2428 (emerge-globalized-number-of-differences emerge-number-of-differences
))
2429 (emerge-place-flags-in-buffer emerge-A-buffer n
0 1)
2430 (emerge-place-flags-in-buffer emerge-B-buffer n
2 3)
2431 (emerge-place-flags-in-buffer nil n
4 5))
2432 (run-hooks 'emerge-select-hook
))
2434 (defun emerge-place-flags-in-buffer (buffer difference before-index
2437 (emerge-eval-in-buffer
2439 (emerge-place-flags-in-buffer1 difference before-index after-index
))
2440 (emerge-place-flags-in-buffer1 difference before-index after-index
)))
2442 (defun emerge-place-flags-in-buffer1 (difference before-index after-index
)
2443 (let ((buffer-read-only nil
))
2444 ;; insert the flag before the difference
2445 (let ((before (aref (aref emerge-globalized-difference-list difference
)
2449 ;; insert the flag itself
2450 (insert-before-markers emerge-before-flag
)
2452 ;; Put the marker(s) referring to this position 1 character before the
2453 ;; end of the flag, so it won't be damaged by the user.
2454 ;; This gets a bit tricky, as there could be a number of markers
2455 ;; that have to be moved.
2456 (set-marker before
(1- before
))
2457 (let ((n (1- difference
)) after-marker before-marker diff-list
)
2461 (setq diff-list
(aref emerge-globalized-difference-list n
)
2462 after-marker
(aref diff-list after-index
))
2463 (= after-marker here
)))
2464 (set-marker after-marker
(1- after-marker
))
2465 (setq before-marker
(aref diff-list before-index
))
2466 (if (= before-marker here
)
2467 (setq before-marker
(1- before-marker
)))
2469 ;; insert the flag after the difference
2470 (let* ((after (aref (aref emerge-globalized-difference-list difference
)
2472 (here (marker-position after
)))
2474 ;; insert the flag itself
2475 (insert emerge-after-flag
)
2476 ;; Put the marker(s) referring to this position 1 character after the
2477 ;; beginning of the flag, so it won't be damaged by the user.
2478 ;; This gets a bit tricky, as there could be a number of markers
2479 ;; that have to be moved.
2480 (set-marker after
(1+ after
))
2481 (let ((n (1+ difference
)) before-marker after-marker diff-list
)
2483 (< n emerge-globalized-number-of-differences
)
2485 (setq diff-list
(aref emerge-globalized-difference-list n
)
2486 before-marker
(aref diff-list before-index
))
2487 (= before-marker here
)))
2488 (set-marker before-marker
(1+ before-marker
))
2489 (setq after-marker
(aref diff-list after-index
))
2490 (if (= after-marker here
)
2491 (setq after-marker
(1+ after-marker
)))
2492 (setq n
(1+ n
)))))))
2494 ;; Unselect a difference by removing the visual flags in the buffers.
2495 (defun emerge-unselect-difference (n)
2496 (let ((diff-vector (aref emerge-difference-list n
)))
2497 (emerge-remove-flags-in-buffer emerge-A-buffer
2498 (aref diff-vector
0) (aref diff-vector
1))
2499 (emerge-remove-flags-in-buffer emerge-B-buffer
2500 (aref diff-vector
2) (aref diff-vector
3))
2501 (emerge-remove-flags-in-buffer emerge-merge-buffer
2502 (aref diff-vector
4) (aref diff-vector
5)))
2503 (run-hooks 'emerge-unselect-hook
))
2505 (defun emerge-remove-flags-in-buffer (buffer before after
)
2506 (emerge-eval-in-buffer
2508 (let ((buffer-read-only nil
))
2509 ;; remove the flags, if they're there
2510 (goto-char (- before
(1- emerge-before-flag-length
)))
2511 (if (looking-at emerge-before-flag-match
)
2512 (delete-char emerge-before-flag-length
)
2513 ;; the flag isn't there
2515 (message "Trouble removing flag"))
2516 (goto-char (1- after
))
2517 (if (looking-at emerge-after-flag-match
)
2518 (delete-char emerge-after-flag-length
)
2519 ;; the flag isn't there
2521 (message "Trouble removing flag")))))
2523 ;; Select a difference, removing any flags that exist now.
2524 (defun emerge-unselect-and-select-difference (n &optional suppress-display
)
2525 (if (and (>= emerge-current-difference
0)
2526 (< emerge-current-difference emerge-number-of-differences
))
2527 (emerge-unselect-difference emerge-current-difference
))
2528 (if (and (>= n
0) (< n emerge-number-of-differences
))
2530 (emerge-select-difference n
)
2531 (let* ((diff-vector (aref emerge-difference-list n
))
2532 (selection-type (aref diff-vector
6)))
2533 (if (eq selection-type
'default-A
)
2534 (aset diff-vector
6 'A
)
2535 (if (eq selection-type
'default-B
)
2536 (aset diff-vector
6 'B
))))))
2537 (setq emerge-current-difference n
)
2538 (if (not suppress-display
)
2541 (emerge-refresh-mode-line))))
2543 ;; Perform tests to see whether user should be allowed to select a version
2544 ;; of this difference:
2545 ;; a valid difference has been selected; and
2546 ;; the difference text in the merge buffer is:
2547 ;; the A version (execute a-version), or
2548 ;; the B version (execute b-version), or
2549 ;; empty (execute neither-version), or
2550 ;; argument FORCE is true (execute neither-version)
2551 ;; Otherwise, signal an error.
2552 (defun emerge-select-version (force a-version b-version neither-version
)
2553 (emerge-validate-difference)
2554 (let ((buffer-read-only nil
))
2556 (aref emerge-difference-list emerge-current-difference
))
2557 (A-begin (1+ (aref diff-vector
0)))
2558 (A-end (1- (aref diff-vector
1)))
2559 (B-begin (1+ (aref diff-vector
2)))
2560 (B-end (1- (aref diff-vector
3)))
2561 (merge-begin (1+ (aref diff-vector
4)))
2562 (merge-end (1- (aref diff-vector
5))))
2563 (if (emerge-compare-buffers emerge-A-buffer A-begin A-end
2564 emerge-merge-buffer merge-begin
2567 (if (emerge-compare-buffers emerge-B-buffer B-begin B-end
2568 emerge-merge-buffer merge-begin
2571 (if (or force
(= merge-begin merge-end
))
2572 (funcall neither-version
)
2573 (error "This difference region has been edited")))))))
2575 ;; Read a file name, handling all of the various defaulting rules.
2577 (defun emerge-read-file-name (prompt alternative-default-dir default-file
2579 ;; `prompt' should not have trailing ": ", so that it can be modified
2580 ;; according to context.
2581 ;; If alternative-default-dir is non-nil, it should be used as the default
2582 ;; directory instead if default-directory, if emerge-default-last-directories
2584 ;; If default-file is set, it should be used as the default value.
2585 ;; If A-file is set, and its directory is different from
2586 ;; alternative-default-dir, and if emerge-default-last-directories is set,
2587 ;; the default file should be the last part of A-file in the default
2588 ;; directory. (Overriding default-file.)
2590 ;; If this is not the A-file argument (shown by non-nil A-file), and
2591 ;; if emerge-default-last-directories is set, and
2592 ;; the default directory exists but is not the same as the directory of the
2594 ;; then make the default file have the same name as the A-file, but in
2595 ;; the default directory.
2596 ((and emerge-default-last-directories
2598 alternative-default-dir
2599 (not (string-equal alternative-default-dir
2600 (file-name-directory A-file
))))
2601 (read-file-name (format "%s (default %s): "
2602 prompt
(file-name-nondirectory A-file
))
2603 alternative-default-dir
2604 (concat alternative-default-dir
2605 (file-name-nondirectory A-file
))
2607 ;; If there is a default file, use it.
2609 (read-file-name (format "%s (default %s): " prompt default-file
)
2610 ;; If emerge-default-last-directories is set, use the
2611 ;; directory from the same argument of the last call of
2612 ;; Emerge as the default for this argument.
2613 (and emerge-default-last-directories
2614 alternative-default-dir
)
2615 default-file
'confirm
))
2617 (read-file-name (concat prompt
": ")
2618 ;; If emerge-default-last-directories is set, use the
2619 ;; directory from the same argument of the last call of
2620 ;; Emerge as the default for this argument.
2621 (and emerge-default-last-directories
2622 alternative-default-dir
)
2625 ;; Revise the mode line to display which difference we have selected
2627 (defun emerge-refresh-mode-line ()
2628 (setq mode-line-buffer-identification
2629 (list (format "Emerge: %%b diff %d of %d%s"
2630 (1+ emerge-current-difference
)
2631 emerge-number-of-differences
2632 (if (and (>= emerge-current-difference
0)
2633 (< emerge-current-difference
2634 emerge-number-of-differences
))
2635 (cdr (assq (aref (aref emerge-difference-list
2636 emerge-current-difference
)
2640 (prefer-A .
" - A*")
2641 (prefer-B .
" - B*")
2642 (combined .
" - comb"))))
2644 ;; Force mode-line redisplay
2645 (set-buffer-modified-p (buffer-modified-p)))
2647 ;; compare two regions in two buffers for containing the same text
2648 (defun emerge-compare-buffers (buffer-x x-begin x-end buffer-y y-begin y-end
)
2649 ;; first check that the two regions are the same length
2650 (if (not (and (= (- x-end x-begin
) (- y-end y-begin
))))
2653 (while (< x-begin x-end
)
2654 ;; bite off and compare no more than 1000 characters at a time
2655 (let* ((compare-length (min (- x-end x-begin
) 1000))
2656 (x-string (emerge-eval-in-buffer
2658 (buffer-substring x-begin
2659 (+ x-begin compare-length
))))
2660 (y-string (emerge-eval-in-buffer
2662 (buffer-substring y-begin
2663 (+ y-begin compare-length
)))))
2664 (if (not (string-equal x-string y-string
))
2666 (setq x-begin
(+ x-begin compare-length
))
2667 (setq y-begin
(+ y-begin compare-length
)))))
2670 ;; Construct a unique buffer name.
2671 ;; The first one tried is prefixsuffix, then prefix<2>suffix,
2672 ;; prefix<3>suffix, etc.
2673 (defun emerge-unique-buffer-name (prefix suffix
)
2674 (if (null (get-buffer (concat prefix suffix
)))
2675 (concat prefix suffix
)
2677 (while (get-buffer (format "%s<%d>%s" prefix n suffix
))
2679 (format "%s<%d>%s" prefix n suffix
))))
2681 ;; Verify that we have a difference selected.
2682 (defun emerge-validate-difference ()
2683 (if (not (and (>= emerge-current-difference
0)
2684 (< emerge-current-difference emerge-number-of-differences
)))
2685 (error "No difference selected")))
2687 ;;; Functions for saving and restoring a batch of variables
2689 ;; These functions save (get the values of) and restore (set the values of)
2690 ;; a list of variables. The argument is a list of symbols (the names of
2691 ;; the variables). A list element can also be a list of two functions,
2692 ;; the first of which (when called with no arguments) gets the value, and
2693 ;; the second (when called with a value as an argment) sets the value.
2694 ;; A "function" is anything that funcall can handle as an argument.
2696 (defun emerge-save-variables (vars)
2697 (mapcar (function (lambda (v) (if (symbolp v
)
2699 (funcall (car v
)))))
2702 (defun emerge-restore-variables (vars values
)
2704 (let ((var (car vars
))
2705 (value (car values
)))
2708 (funcall (car (cdr var
)) value
)))
2709 (setq vars
(cdr vars
))
2710 (setq values
(cdr values
))))
2712 ;; Make a temporary file that only we have access to.
2713 ;; PREFIX is appended to emerge-temp-file-prefix to make the filename prefix.
2714 (defun emerge-make-temp-file (prefix)
2715 (let ((f (make-temp-name (concat emerge-temp-file-prefix prefix
))))
2717 (write-region (point-min) (point-min) f nil
'no-message
)
2718 (set-file-modes f emerge-temp-file-mode
)
2721 ;;; Functions that query the user before he can write out the current buffer.
2723 (defun emerge-query-write-file ()
2724 "Ask the user whether to write out an incomplete merge.
2725 If answer is yes, call `write-file' to do so. See `emerge-query-and-call'
2726 for details of the querying process."
2728 (emerge-query-and-call 'write-file
))
2730 (defun emerge-query-save-buffer ()
2731 "Ask the user whether to save an incomplete merge.
2732 If answer is yes, call `save-buffer' to do so. See `emerge-query-and-call'
2733 for details of the querying process."
2735 (emerge-query-and-call 'save-buffer
))
2737 (defun emerge-query-and-call (command)
2738 "Ask the user whether to save or write out the incomplete merge.
2739 If answer is yes, call COMMAND interactively. During the call, the flags
2740 around the current difference are removed."
2741 (if (yes-or-no-p "Do you really write to write out this unfinished merge? ")
2742 ;; He really wants to do it -- unselect the difference for the duration
2744 (if (and (>= emerge-current-difference
0)
2745 (< emerge-current-difference emerge-number-of-differences
))
2746 (emerge-unselect-difference emerge-current-difference
))
2747 ;; call-interactively takes the value of current-prefix-arg as the
2748 ;; prefix argument value to be passed to the command. Thus, we have
2749 ;; to do nothing special to make sure the prefix argument is
2750 ;; transmitted to the command.
2751 (call-interactively command
)
2752 (if (and (>= emerge-current-difference
0)
2753 (< emerge-current-difference emerge-number-of-differences
))
2755 (emerge-select-difference emerge-current-difference
)
2756 (emerge-recenter))))
2757 ;; He's being smart and not doing it
2758 (message "Not written")))
2760 ;; Make sure the current buffer (for a file) has the same contents as the
2761 ;; file on disk, and attempt to remedy the situation if not.
2762 ;; Signal an error if we can't make them the same, or the user doesn't want
2763 ;; to do what is necessary to make them the same.
2764 (defun emerge-verify-file-buffer ()
2765 ;; First check if the file has been modified since the buffer visited it.
2766 (if (verify-visited-file-modtime (current-buffer))
2767 (if (buffer-modified-p)
2768 ;; If buffer is not obsolete and is modified, offer to save
2769 (if (yes-or-no-p (format "Save file %s? " buffer-file-name
))
2771 (error "Buffer out of sync for file %s" buffer-file-name
))
2772 ;; If buffer is not obsolete and is not modified, do nothing
2774 (if (buffer-modified-p)
2775 ;; If buffer is obsolete and is modified, give error
2776 (error "Buffer out of sync for file %s" buffer-file-name
)
2777 ;; If buffer is obsolete and is not modified, offer to revert
2778 (if (yes-or-no-p (format "Revert file %s? " buffer-file-name
))
2780 (error "Buffer out of sync for file %s" buffer-file-name
)))))
2782 ;; Utilities that might have value outside of Emerge.
2784 ;; Set up the mode in the current buffer to duplicate the mode in another
2786 (defun emerge-copy-modes (buffer)
2787 ;; Set the major mode
2788 (funcall (emerge-eval-in-buffer buffer major-mode
)))
2790 ;; Define a key, even if a prefix of it is defined
2791 (defun emerge-force-define-key (keymap key definition
)
2792 "Like `define-key', but forcibly creates prefix characters as needed.
2793 If some prefix of KEY has a non-prefix definition, it is redefined."
2794 ;; Find out if a prefix of key is defined
2795 (let ((v (lookup-key keymap key
)))
2796 ;; If so, undefine it
2798 (define-key keymap
(substring key
0 v
) nil
)))
2799 ;; Now define the key
2800 (define-key keymap key definition
))
2802 ;;;;; Improvements to describe-mode, so that it describes minor modes as well
2803 ;;;;; as the major mode
2804 ;;(defun describe-mode (&optional minor)
2805 ;; "Display documentation of current major mode.
2806 ;;If optional arg MINOR is non-nil (or prefix argument is given if interactive),
2807 ;;display documentation of active minor modes as well.
2808 ;;For this to work correctly for a minor mode, the mode's indicator variable
2809 ;;\(listed in `minor-mode-alist') must also be a function whose documentation
2810 ;;describes the minor mode."
2812 ;; (with-output-to-temp-buffer "*Help*"
2813 ;; (princ mode-name)
2814 ;; (princ " Mode:\n")
2815 ;; (princ (documentation major-mode))
2816 ;; (let ((minor-modes minor-mode-alist)
2817 ;; (locals (buffer-local-variables)))
2818 ;; (while minor-modes
2819 ;; (let* ((minor-mode (car (car minor-modes)))
2820 ;; (indicator (car (cdr (car minor-modes))))
2821 ;; (local-binding (assq minor-mode locals)))
2822 ;; ;; Document a minor mode if it is listed in minor-mode-alist,
2823 ;; ;; bound locally in this buffer, non-nil, and has a function
2825 ;; (if (and local-binding
2826 ;; (cdr local-binding)
2827 ;; (fboundp minor-mode))
2829 ;; (princ (format "\n\n\n%s minor mode (indicator%s):\n"
2830 ;; minor-mode indicator))
2831 ;; (princ (documentation minor-mode)))))
2832 ;; (setq minor-modes (cdr minor-modes))))
2833 ;; (print-help-return-message)))
2835 ;; This goes with the redefinition of describe-mode.
2836 ;;;; Adjust things so that keyboard macro definitions are documented correctly.
2837 ;;(fset 'defining-kbd-macro (symbol-function 'start-kbd-macro))
2839 ;; substitute-key-definition should work now.
2840 ;;;; Function to shadow a definition in a keymap with definitions in another.
2841 ;;(defun emerge-shadow-key-definition (olddef newdef keymap shadowmap)
2842 ;; "Shadow OLDDEF with NEWDEF for any keys in KEYMAP with entries in SHADOWMAP.
2843 ;;In other words, SHADOWMAP will now shadow all definitions of OLDDEF in KEYMAP
2844 ;;with NEWDEF. Does not affect keys that are already defined in SHADOWMAP,
2845 ;;including those whose definition is OLDDEF."
2846 ;; ;; loop through all keymaps accessible from keymap
2847 ;; (let ((maps (accessible-keymaps keymap)))
2849 ;; (let ((prefix (car (car maps)))
2850 ;; (map (cdr (car maps))))
2851 ;; ;; examine a keymap
2854 ;; (let ((len (length map))
2857 ;; (if (eq (aref map i) olddef)
2858 ;; ;; set the shadowing definition
2859 ;; (let ((key (concat prefix (char-to-string i))))
2860 ;; (emerge-define-key-if-possible shadowmap key newdef)))
2861 ;; (setq i (1+ i))))
2864 ;; (if (eq (cdr-safe (car-safe map)) olddef)
2865 ;; ;; set the shadowing definition
2867 ;; (concat prefix (char-to-string (car (car map))))))
2868 ;; (emerge-define-key-if-possible shadowmap key newdef)))
2869 ;; (setq map (cdr map)))))
2870 ;; (setq maps (cdr maps)))))
2872 ;; Define a key if it (or a prefix) is not already defined in the map.
2873 (defun emerge-define-key-if-possible (keymap key definition
)
2874 ;; look up the present definition of the key
2875 (let ((present (lookup-key keymap key
)))
2876 (if (integerp present
)
2877 ;; if it is "too long", look up the valid prefix
2878 (if (not (lookup-key keymap
(substring key
0 present
)))
2879 ;; if the prefix isn't defined, define it
2880 (define-key keymap key definition
))
2881 ;; if there is no present definition, define it
2883 (define-key keymap key definition
)))))
2885 ;; Ordinary substitute-key-definition should do this now.
2886 ;;(defun emerge-recursively-substitute-key-definition (olddef newdef keymap)
2887 ;; "Like `substitute-key-definition', but act recursively on subkeymaps.
2888 ;;Make sure that subordinate keymaps aren't shared with other keymaps!
2889 ;;\(`copy-keymap' will suffice.)"
2890 ;; ;; Loop through all keymaps accessible from keymap
2891 ;; (let ((maps (accessible-keymaps keymap)))
2893 ;; ;; Substitute in this keymap
2894 ;; (substitute-key-definition olddef newdef (cdr (car maps)))
2895 ;; (setq maps (cdr maps)))))
2897 ;; Show the name of the file in the buffer.
2898 (defun emerge-show-file-name ()
2899 "Displays the name of the file loaded into the current buffer.
2900 If the name won't fit on one line, the minibuffer is expanded to hold it,
2901 and the command waits for a keystroke from the user. If the keystroke is
2902 SPC, it is ignored; if it is anything else, it is processed as a command."
2904 (let ((name (buffer-file-name)))
2906 (setq name
"Buffer has no file name."))
2907 (save-window-excursion
2908 (select-window (minibuffer-window))
2911 (if (not (pos-visible-in-window-p))
2912 (let ((echo-keystrokes 0))
2913 (while (and (not (pos-visible-in-window-p))
2914 (> (1- (screen-height)) (window-height)))
2916 (let ((c (read-event)))
2918 (setq unread-command-events
(list c
)))))))))
2920 ;; Improved auto-save file names.
2921 ;; This function fixes many problems with the standard auto-save file names:
2922 ;; Auto-save files for non-file buffers get put in the default directory
2923 ;; for the buffer, whether that makes sense or not.
2924 ;; Auto-save files for file buffers get put in the directory of the file,
2925 ;; regardless of whether we can write into it or not.
2926 ;; Auto-save files for non-file buffers don't use the process id, so if a
2927 ;; user runs more than on Emacs, they can make auto-save files that overwrite
2929 ;; To use this function, do:
2930 ;; (fset 'make-auto-save-file-name
2931 ;; (symbol-function 'emerge-make-auto-save-file-name))
2932 (defun emerge-make-auto-save-file-name ()
2933 "Return file name to use for auto-saves of current buffer.
2934 Does not consider `auto-save-visited-file-name';
2935 that is checked before calling this function.
2936 You can redefine this for customization.
2937 See also `auto-save-file-name-p'."
2938 (if buffer-file-name
2939 ;; if buffer has a file, try the format <file directory>/#<file name>#
2940 (let ((f (concat (file-name-directory buffer-file-name
)
2942 (file-name-nondirectory buffer-file-name
)
2944 (if (file-writable-p f
)
2945 ;; the file is writable, so use it
2947 ;; the file isn't writable, so use the format
2948 ;; ~/#&<file name>&<hash of directory>#
2949 (concat (getenv "HOME")
2951 (file-name-nondirectory buffer-file-name
)
2953 (emerge-hash-string-into-string
2954 (file-name-directory buffer-file-name
))
2956 ;; if buffer has no file, use the format ~/#%<buffer name>%<process id>#
2957 (expand-file-name (concat (getenv "HOME")
2959 ;; quote / into \! and \ into \\
2960 (emerge-unslashify-name (buffer-name))
2965 ;; Hash a string into five characters more-or-less suitable for use in a file
2966 ;; name. (Allowed characters are ! through ~, except /.)
2967 (defun emerge-hash-string-into-string (s)
2968 (let ((bins (vector 0 0 0 0 0))
2970 (while (< i
(length s
))
2971 (aset bins
(% i
5) (%
(+ (* (aref bins
(% i
5)) 35)
2975 (mapconcat (function (lambda (b)
2976 (setq b
(+ (% b
93) ?
!))
2979 (char-to-string b
)))
2982 ;; Quote any /s in a string by replacing them with \!.
2983 ;; Also, replace any \s by \\, to make it one-to-one.
2984 (defun emerge-unslashify-name (s)
2986 (while (string-match "[/\\]" s limit
)
2987 (setq s
(concat (substring s
0 (match-beginning 0))
2988 (if (string= (substring s
(match-beginning 0)
2993 (substring s
(match-end 0))))
2994 (setq limit
(1+ (match-end 0)))))
2997 ;; Metacharacters that have to be protected from the shell when executing
2998 ;; a diff/diff3 command.
2999 (defvar emerge-metachars
"[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
3000 "Characters that must be quoted with \\ when used in a shell command line.
3001 More precisely, a [...] regexp to match any one such character.")
3003 ;; Quote metacharacters (using \) when executing a diff/diff3 command.
3004 (defun emerge-protect-metachars (s)
3006 (while (string-match emerge-metachars s limit
)
3007 (setq s
(concat (substring s
0 (match-beginning 0))
3009 (substring s
(match-beginning 0))))
3010 (setq limit
(1+ (match-end 0)))))
3015 ;;; emerge.el ends here
HCoop / bpt / emacs.git / blob