diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-06-09 11:59:12 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-06-09 11:59:12 +0000 |
| commit | eb8c3be94e12644f506b8857e49ffef88046bb0b (patch) | |
| tree | 505c4ea5ae59214e4d6e749047d160c98191c9d2 /lisp/emerge.el | |
| parent | 16a4a21d0117ef5ed346f340f244fe199d3c8a26 (diff) | |
| download | emacs-eb8c3be94e12644f506b8857e49ffef88046bb0b.tar.gz | |
Apply typo patches from Paul Eggert.
Diffstat (limited to 'lisp/emerge.el')
| -rw-r--r-- | lisp/emerge.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/emerge.el b/lisp/emerge.el index 3247c6c6a2e..53749d7c445 100644 --- a/lisp/emerge.el +++ b/lisp/emerge.el @@ -365,9 +365,9 @@ the markers. default-B the merge buffer contains the B variant by default, but this difference hasn't been selected yet, so change-default commands can alter it - prefer-A in a three-file merge, the A variant is the prefered + prefer-A in a three-file merge, the A variant is the preferred choice - prefer-B in a three-file merge, the B variant is the prefered + prefer-B in a three-file merge, the B variant is the preferred choice") (emerge-defvar-local emerge-current-difference -1 "The difference that is currently selected.") @@ -1073,7 +1073,7 @@ Otherwise, the A or B file present is copied to the output file." (t (error "Unrecognized entry")))) ;; If the match on the entry pattern failed - (error "Unparseable entry"))) + (error "Unparsable entry"))) ;; Make sure that file-A and file-B are present (if (not (or (and file-A file-B) file-out)) (error "Must have both `A' and `B' entries")) @@ -2008,7 +2008,7 @@ Use C-u l to reset the windows afterward." (defun emerge-join-differences (arg) "Join the selected difference with the following one. -With a prefix argument, join with the preceeding one." +With a prefix argument, join with the preceding one." (interactive "P") (let ((n emerge-current-difference)) ;; adjust n to be first difference to join @@ -2288,11 +2288,11 @@ the nearest previous difference." (if (< index emerge-number-of-differences) index (error "No difference contains or follows point"))) - ;; if the arg is negative, select the preceeding difference + ;; if the arg is negative, select the preceding difference (t (if (> index 0) (1- index) - (error "No difference contains or preceeds point"))))))) + (error "No difference contains or precedes point"))))))) (defun emerge-line-numbers () "Display the current line numbers. |