diff options
| author | Juanma Barranquero | 2005-07-04 01:55:56 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2005-07-04 01:55:56 +0000 |
| commit | aa753196b93c3b7901f4cb4a0392f9f3940e3091 (patch) | |
| tree | f5320162a9eb915fb20bb37512e8656848a32c78 | |
| parent | 0c5a1b51ed44edfd13c8429c9054dafe7f6e7724 (diff) | |
| download | emacs-aa753196b93c3b7901f4cb4a0392f9f3940e3091.tar.gz emacs-aa753196b93c3b7901f4cb4a0392f9f3940e3091.zip | |
(diff-mode): Finish `defgroup' description with period.
(diff-context->unified, diff-reverse-direction, diff-unified->context):
"?\ " -> "?\s".
| -rw-r--r-- | lisp/diff-mode.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 1cb5111dcfb..20094895660 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -57,7 +57,7 @@ | |||
| 57 | 57 | ||
| 58 | 58 | ||
| 59 | (defgroup diff-mode () | 59 | (defgroup diff-mode () |
| 60 | "Major mode for viewing/editing diffs" | 60 | "Major mode for viewing/editing diffs." |
| 61 | :version "21.1" | 61 | :version "21.1" |
| 62 | :group 'tools | 62 | :group 'tools |
| 63 | :group 'diff) | 63 | :group 'diff) |
| @@ -640,7 +640,7 @@ else cover the whole bufer." | |||
| 640 | (while (progn (setq last-pt (point)) | 640 | (while (progn (setq last-pt (point)) |
| 641 | (= (forward-line -1) 0)) | 641 | (= (forward-line -1) 0)) |
| 642 | (case (char-after) | 642 | (case (char-after) |
| 643 | (? (insert " ") (setq modif nil) (backward-char 1)) | 643 | (?s (insert " ") (setq modif nil) (backward-char 1)) |
| 644 | (?+ (delete-region (point) last-pt) (setq modif t)) | 644 | (?+ (delete-region (point) last-pt) (setq modif t)) |
| 645 | (?- (if (not modif) | 645 | (?- (if (not modif) |
| 646 | (progn (forward-char 1) | 646 | (progn (forward-char 1) |
| @@ -723,7 +723,7 @@ else cover the whole bufer." | |||
| 723 | (while (< (point) pt2) | 723 | (while (< (point) pt2) |
| 724 | (case (char-after) | 724 | (case (char-after) |
| 725 | ((?! ?-) (delete-char 2) (insert "-") (forward-line 1)) | 725 | ((?! ?-) (delete-char 2) (insert "-") (forward-line 1)) |
| 726 | (?\ ;merge with the other half of the chunk | 726 | (?\s ;merge with the other half of the chunk |
| 727 | (let* ((endline2 | 727 | (let* ((endline2 |
| 728 | (save-excursion | 728 | (save-excursion |
| 729 | (goto-char pt2) (forward-line 1) (point))) | 729 | (goto-char pt2) (forward-line 1) (point))) |
| @@ -733,7 +733,7 @@ else cover the whole bufer." | |||
| 733 | (insert "+" | 733 | (insert "+" |
| 734 | (prog1 (buffer-substring (+ pt2 2) endline2) | 734 | (prog1 (buffer-substring (+ pt2 2) endline2) |
| 735 | (delete-region pt2 endline2)))) | 735 | (delete-region pt2 endline2)))) |
| 736 | (?\ ;FIXME: check consistency | 736 | (?\s ;FIXME: check consistency |
| 737 | (delete-region pt2 endline2) | 737 | (delete-region pt2 endline2) |
| 738 | (delete-char 1) | 738 | (delete-char 1) |
| 739 | (forward-line 1)) | 739 | (forward-line 1)) |
| @@ -814,7 +814,7 @@ else cover the whole bufer." | |||
| 814 | (t (when (and first last (< first last)) | 814 | (t (when (and first last (< first last)) |
| 815 | (insert (delete-and-extract-region first last))) | 815 | (insert (delete-and-extract-region first last))) |
| 816 | (setq first nil last nil) | 816 | (setq first nil last nil) |
| 817 | (equal ?\ c))) | 817 | (equal ?\s c))) |
| 818 | (forward-line 1)))))))))) | 818 | (forward-line 1)))))))))) |
| 819 | 819 | ||
| 820 | (defun diff-fixup-modifs (start end) | 820 | (defun diff-fixup-modifs (start end) |