Mercurial > emacs
comparison lisp/diff-mode.el @ 64045:30fe6a97264a
Fix brainos.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Mon, 04 Jul 2005 03:11:31 +0000 |
parents | ea880752de3b |
children | 6fb026ad601f |
comparison
equal
deleted
inserted
replaced
64044:56910476003b | 64045:30fe6a97264a |
---|---|
638 (goto-char (point-max)) | 638 (goto-char (point-max)) |
639 (let ((modif nil) last-pt) | 639 (let ((modif nil) last-pt) |
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 (?s (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) |
647 (insert " ")) | 647 (insert " ")) |
648 (delete-char 1) | 648 (delete-char 1) |
663 (if (not (save-excursion (re-search-forward "^+" nil t))) | 663 (if (not (save-excursion (re-search-forward "^+" nil t))) |
664 (delete-region (point) (point-max)) | 664 (delete-region (point) (point-max)) |
665 (let ((modif nil) (delete nil)) | 665 (let ((modif nil) (delete nil)) |
666 (while (not (eobp)) | 666 (while (not (eobp)) |
667 (case (char-after) | 667 (case (char-after) |
668 (? (insert " ") (setq modif nil) (backward-char 1)) | 668 (?\s (insert " ") (setq modif nil) (backward-char 1)) |
669 (?- (setq delete t) (setq modif t)) | 669 (?- (setq delete t) (setq modif t)) |
670 (?+ (if (not modif) | 670 (?+ (if (not modif) |
671 (progn (forward-char 1) | 671 (progn (forward-char 1) |
672 (insert " ")) | 672 (insert " ")) |
673 (delete-char 1) | 673 (delete-char 1) |