Mercurial > emacs
comparison lisp/emerge.el @ 3591:507f64624555
Apply typo patches from Paul Eggert.
author | Jim Blandy <jimb@redhat.com> |
---|---|
date | Wed, 09 Jun 1993 11:59:12 +0000 |
parents | 8ab8f28b78d1 |
children | 60292a8697bc |
comparison
equal
deleted
inserted
replaced
3590:d5f22061277d | 3591:507f64624555 |
---|---|
363 but this difference hasn't been selected yet, so | 363 but this difference hasn't been selected yet, so |
364 change-default commands can alter it | 364 change-default commands can alter it |
365 default-B the merge buffer contains the B variant by default, | 365 default-B the merge buffer contains the B variant by default, |
366 but this difference hasn't been selected yet, so | 366 but this difference hasn't been selected yet, so |
367 change-default commands can alter it | 367 change-default commands can alter it |
368 prefer-A in a three-file merge, the A variant is the prefered | 368 prefer-A in a three-file merge, the A variant is the preferred |
369 choice | 369 choice |
370 prefer-B in a three-file merge, the B variant is the prefered | 370 prefer-B in a three-file merge, the B variant is the preferred |
371 choice") | 371 choice") |
372 (emerge-defvar-local emerge-current-difference -1 | 372 (emerge-defvar-local emerge-current-difference -1 |
373 "The difference that is currently selected.") | 373 "The difference that is currently selected.") |
374 (emerge-defvar-local emerge-number-of-differences nil | 374 (emerge-defvar-local emerge-number-of-differences nil |
375 "Number of differences found.") | 375 "Number of differences found.") |
1071 (error "This line has two `output' entries")) | 1071 (error "This line has two `output' entries")) |
1072 (setq file-out file)) | 1072 (setq file-out file)) |
1073 (t | 1073 (t |
1074 (error "Unrecognized entry")))) | 1074 (error "Unrecognized entry")))) |
1075 ;; If the match on the entry pattern failed | 1075 ;; If the match on the entry pattern failed |
1076 (error "Unparseable entry"))) | 1076 (error "Unparsable entry"))) |
1077 ;; Make sure that file-A and file-B are present | 1077 ;; Make sure that file-A and file-B are present |
1078 (if (not (or (and file-A file-B) file-out)) | 1078 (if (not (or (and file-A file-B) file-out)) |
1079 (error "Must have both `A' and `B' entries")) | 1079 (error "Must have both `A' and `B' entries")) |
1080 (if (not (or file-A file-B)) | 1080 (if (not (or file-A file-B)) |
1081 (error "Must have `A' or `B' entry")) | 1081 (error "Must have `A' or `B' entry")) |
2006 (princ "\n"))) | 2006 (princ "\n"))) |
2007 (princ emerge-output-description)))) | 2007 (princ emerge-output-description)))) |
2008 | 2008 |
2009 (defun emerge-join-differences (arg) | 2009 (defun emerge-join-differences (arg) |
2010 "Join the selected difference with the following one. | 2010 "Join the selected difference with the following one. |
2011 With a prefix argument, join with the preceeding one." | 2011 With a prefix argument, join with the preceding one." |
2012 (interactive "P") | 2012 (interactive "P") |
2013 (let ((n emerge-current-difference)) | 2013 (let ((n emerge-current-difference)) |
2014 ;; adjust n to be first difference to join | 2014 ;; adjust n to be first difference to join |
2015 (if arg | 2015 (if arg |
2016 (setq n (1- n))) | 2016 (setq n (1- n))) |
2286 ;; if the arg is positive, select the following difference | 2286 ;; if the arg is positive, select the following difference |
2287 ((> arg-value 0) | 2287 ((> arg-value 0) |
2288 (if (< index emerge-number-of-differences) | 2288 (if (< index emerge-number-of-differences) |
2289 index | 2289 index |
2290 (error "No difference contains or follows point"))) | 2290 (error "No difference contains or follows point"))) |
2291 ;; if the arg is negative, select the preceeding difference | 2291 ;; if the arg is negative, select the preceding difference |
2292 (t | 2292 (t |
2293 (if (> index 0) | 2293 (if (> index 0) |
2294 (1- index) | 2294 (1- index) |
2295 (error "No difference contains or preceeds point"))))))) | 2295 (error "No difference contains or precedes point"))))))) |
2296 | 2296 |
2297 (defun emerge-line-numbers () | 2297 (defun emerge-line-numbers () |
2298 "Display the current line numbers. | 2298 "Display the current line numbers. |
2299 This function displays the line numbers of the points in the A, B, and | 2299 This function displays the line numbers of the points in the A, B, and |
2300 merge buffers." | 2300 merge buffers." |