Commit aa753196 authored by Juanma Barranquero's avatar Juanma Barranquero
Browse files

(diff-mode): Finish `defgroup' description with period.

(diff-context->unified, diff-reverse-direction, diff-unified->context):
"?\ " -> "?\s".
parent 0c5a1b51
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
(defgroup diff-mode () (defgroup diff-mode ()
"Major mode for viewing/editing diffs" "Major mode for viewing/editing diffs."
:version "21.1" :version "21.1"
:group 'tools :group 'tools
:group 'diff) :group 'diff)
...@@ -640,7 +640,7 @@ else cover the whole bufer." ...@@ -640,7 +640,7 @@ else cover the whole bufer."
(while (progn (setq last-pt (point)) (while (progn (setq last-pt (point))
(= (forward-line -1) 0)) (= (forward-line -1) 0))
(case (char-after) (case (char-after)
(? (insert " ") (setq modif nil) (backward-char 1)) (?s (insert " ") (setq modif nil) (backward-char 1))
(?+ (delete-region (point) last-pt) (setq modif t)) (?+ (delete-region (point) last-pt) (setq modif t))
(?- (if (not modif) (?- (if (not modif)
(progn (forward-char 1) (progn (forward-char 1)
...@@ -723,7 +723,7 @@ else cover the whole bufer." ...@@ -723,7 +723,7 @@ else cover the whole bufer."
(while (< (point) pt2) (while (< (point) pt2)
(case (char-after) (case (char-after)
((?! ?-) (delete-char 2) (insert "-") (forward-line 1)) ((?! ?-) (delete-char 2) (insert "-") (forward-line 1))
(?\ ;merge with the other half of the chunk (?\s ;merge with the other half of the chunk
(let* ((endline2 (let* ((endline2
(save-excursion (save-excursion
(goto-char pt2) (forward-line 1) (point))) (goto-char pt2) (forward-line 1) (point)))
...@@ -733,7 +733,7 @@ else cover the whole bufer." ...@@ -733,7 +733,7 @@ else cover the whole bufer."
(insert "+" (insert "+"
(prog1 (buffer-substring (+ pt2 2) endline2) (prog1 (buffer-substring (+ pt2 2) endline2)
(delete-region pt2 endline2)))) (delete-region pt2 endline2))))
(?\ ;FIXME: check consistency (?\s ;FIXME: check consistency
(delete-region pt2 endline2) (delete-region pt2 endline2)
(delete-char 1) (delete-char 1)
(forward-line 1)) (forward-line 1))
...@@ -814,7 +814,7 @@ else cover the whole bufer." ...@@ -814,7 +814,7 @@ else cover the whole bufer."
(t (when (and first last (< first last)) (t (when (and first last (< first last))
(insert (delete-and-extract-region first last))) (insert (delete-and-extract-region first last)))
(setq first nil last nil) (setq first nil last nil)
(equal ?\ c))) (equal ?\s c)))
(forward-line 1)))))))))) (forward-line 1))))))))))
(defun diff-fixup-modifs (start end) (defun diff-fixup-modifs (start end)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment