Mercurial > emacs
comparison lisp/ediff-mult.el @ 106697:ac408704629c
lisp/*: Fix typos in docstrings and messages.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Sat, 02 Jan 2010 02:05:44 +0100 |
parents | 9fe246ccb486 |
children | 1d1d5d9bd884 |
comparison
equal
deleted
inserted
replaced
106696:9084997e41f6 | 106697:ac408704629c |
---|---|
328 ;; | 328 ;; |
329 ;; Also, session objects A/B/C are turned into lists of the form (obj nil). | 329 ;; Also, session objects A/B/C are turned into lists of the form (obj nil). |
330 ;; This nil is a placeholder for eq-indicator. It is either nil or =. | 330 ;; This nil is a placeholder for eq-indicator. It is either nil or =. |
331 ;; If it is discovered that this file is = to some other | 331 ;; If it is discovered that this file is = to some other |
332 ;; file in the same session, eq-indicator is changed to `='. | 332 ;; file in the same session, eq-indicator is changed to `='. |
333 ;; Curently, the eq-indicator is used only for 2 and 3-file jobs. | 333 ;; Currently, the eq-indicator is used only for 2 and 3-file jobs. |
334 (defun ediff-make-new-meta-list-element (obj1 obj2 obj3) | 334 (defun ediff-make-new-meta-list-element (obj1 obj2 obj3) |
335 (list nil nil (list obj1 nil) (list obj2 nil) (list obj3 nil))) | 335 (list nil nil (list obj1 nil) (list obj2 nil) (list obj3 nil))) |
336 | 336 |
337 ;; Constructs a meta list header. | 337 ;; Constructs a meta list header. |
338 ;; OBJA, OBJB, OBJC are usually directories involved, but can be different for | 338 ;; OBJA, OBJB, OBJC are usually directories involved, but can be different for |
877 :help "Mark session for hiding. With prefix arg, unmark")) | 877 :help "Mark session for hiding. With prefix arg, unmark")) |
878 | 878 |
879 (define-key ediff-meta-buffer-map | 879 (define-key ediff-meta-buffer-map |
880 [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos] | 880 [menu-bar ediff-meta-mode ediff-mark-for-operation-at-pos] |
881 '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos | 881 '(menu-item "Mark for group operation" ediff-mark-for-operation-at-pos |
882 :help "Mark session for a group operation. With prefix arg, unmark.")) | 882 :help "Mark session for a group operation. With prefix arg, unmark")) |
883 | 883 |
884 (define-key ediff-meta-buffer-map | 884 (define-key ediff-meta-buffer-map |
885 [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding] | 885 [menu-bar ediff-meta-mode ediff-unmark-all-for-hiding] |
886 '(menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding | 886 '(menu-item "Unmark all for hiding" ediff-unmark-all-for-hiding |
887 :help "Unmark all sessions marked for hiding")) | 887 :help "Unmark all sessions marked for hiding")) |
1737 (goto-char (point-max)) | 1737 (goto-char (point-max)) |
1738 (insert-buffer-substring tmp-buf) | 1738 (insert-buffer-substring tmp-buf) |
1739 (insert "\n"))) | 1739 (insert "\n"))) |
1740 (t | 1740 (t |
1741 (ediff-kill-buffer-carefully meta-diff-buff) | 1741 (ediff-kill-buffer-carefully meta-diff-buff) |
1742 (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum ))) | 1742 (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum ))) |
1743 )) | 1743 )) |
1744 | 1744 |
1745 (defun ediff-collect-custom-diffs () | 1745 (defun ediff-collect-custom-diffs () |
1746 "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'. | 1746 "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'. |
1747 This operation is defined only for `ediff-directories' and | 1747 This operation is defined only for `ediff-directories' and |
2419 (if (null action) | 2419 (if (null action) |
2420 (setq action (ediff-last-command-char))) | 2420 (setq action (ediff-last-command-char))) |
2421 (let ((list (cdr ediff-meta-list)) | 2421 (let ((list (cdr ediff-meta-list)) |
2422 marked1 marked2 marked3 | 2422 marked1 marked2 marked3 |
2423 fileinfo1 fileinfo2 fileinfo3 elt) | 2423 fileinfo1 fileinfo2 fileinfo3 elt) |
2424 (message "Comparing files ...") | 2424 (message "Comparing files...") |
2425 (while (setq elt (car list)) | 2425 (while (setq elt (car list)) |
2426 (setq fileinfo1 (ediff-get-session-objA elt) | 2426 (setq fileinfo1 (ediff-get-session-objA elt) |
2427 fileinfo2 (ediff-get-session-objB elt) | 2427 fileinfo2 (ediff-get-session-objB elt) |
2428 fileinfo3 (ediff-get-session-objC elt)) | 2428 fileinfo3 (ediff-get-session-objC elt)) |
2429 (ediff-set-file-eqstatus fileinfo1 nil) | 2429 (ediff-set-file-eqstatus fileinfo1 nil) |
2446 (ediff-mark-session-for-hiding elt 'mark)) | 2446 (ediff-mark-session-for-hiding elt 'mark)) |
2447 ((eq action ?m) | 2447 ((eq action ?m) |
2448 (ediff-mark-session-for-operation elt 'mark)) | 2448 (ediff-mark-session-for-operation elt 'mark)) |
2449 )) | 2449 )) |
2450 (setq list (cdr list))) | 2450 (setq list (cdr list))) |
2451 (message "Comparing files ... Done")) | 2451 (message "Comparing files... Done")) |
2452 (setq ediff-recurse-to-subdirectories nil) | 2452 (setq ediff-recurse-to-subdirectories nil) |
2453 (ediff-update-meta-buffer (current-buffer) 'must-redraw)) | 2453 (ediff-update-meta-buffer (current-buffer) 'must-redraw)) |
2454 | 2454 |
2455 ;; mark files 1 and 2 as equal, if they are. | 2455 ;; mark files 1 and 2 as equal, if they are. |
2456 ;; returns t, if something was marked | 2456 ;; returns t, if something was marked |