diff options
| author | Juanma Barranquero | 2003-02-04 11:26:42 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2003-02-04 11:26:42 +0000 |
| commit | 71296446d3cec5bb2a27bc5ad6da574df38d0ec8 (patch) | |
| tree | 0204c3c252547a44e2404959409034406f7680cd /lisp/diff-mode.el | |
| parent | 693ff6134cb2ec65c7d188696f012662edadfbf0 (diff) | |
| download | emacs-71296446d3cec5bb2a27bc5ad6da574df38d0ec8.tar.gz emacs-71296446d3cec5bb2a27bc5ad6da574df38d0ec8.zip | |
Trailing whitespace deleted.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 7899da63eed..30b9467c727 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -417,7 +417,7 @@ If the prefix ARG is given, restrict the view to the current file instead." | |||
| 417 | (number-to-string newstart2) ",1 @@\n") | 417 | (number-to-string newstart2) ",1 @@\n") |
| 418 | ;; Fix the original hunk-header. | 418 | ;; Fix the original hunk-header. |
| 419 | (diff-fixup-modifs start pos)))) | 419 | (diff-fixup-modifs start pos)))) |
| 420 | 420 | ||
| 421 | 421 | ||
| 422 | ;;;; | 422 | ;;;; |
| 423 | ;;;; jump to other buffers | 423 | ;;;; jump to other buffers |
| @@ -519,9 +519,9 @@ Non-nil OLD means that we want the old file." | |||
| 519 | (ediff-patch-file nil (current-buffer)) | 519 | (ediff-patch-file nil (current-buffer)) |
| 520 | (wrong-number-of-arguments (ediff-patch-file)))) | 520 | (wrong-number-of-arguments (ediff-patch-file)))) |
| 521 | 521 | ||
| 522 | ;;;; | 522 | ;;;; |
| 523 | ;;;; Conversion functions | 523 | ;;;; Conversion functions |
| 524 | ;;;; | 524 | ;;;; |
| 525 | 525 | ||
| 526 | ;;(defvar diff-inhibit-after-change nil | 526 | ;;(defvar diff-inhibit-after-change nil |
| 527 | ;; "Non-nil means inhibit `diff-mode's after-change functions.") | 527 | ;; "Non-nil means inhibit `diff-mode's after-change functions.") |
| @@ -791,9 +791,9 @@ else cover the whole bufer." | |||
| 791 | (unless (string= new old) (replace-match new t t nil 2)))))) | 791 | (unless (string= new old) (replace-match new t t nil 2)))))) |
| 792 | (setq space 0 plus 0 minus 0 bang 0))))))) | 792 | (setq space 0 plus 0 minus 0 bang 0))))))) |
| 793 | 793 | ||
| 794 | ;;;; | 794 | ;;;; |
| 795 | ;;;; Hooks | 795 | ;;;; Hooks |
| 796 | ;;;; | 796 | ;;;; |
| 797 | 797 | ||
| 798 | (defun diff-write-contents-hooks () | 798 | (defun diff-write-contents-hooks () |
| 799 | "Fixup hunk headers if necessary." | 799 | "Fixup hunk headers if necessary." |
| @@ -847,9 +847,9 @@ See `after-change-functions' for the meaning of BEG, END and LEN." | |||
| 847 | (diff-fixup-modifs (point) (cdr diff-unhandled-changes))))) | 847 | (diff-fixup-modifs (point) (cdr diff-unhandled-changes))))) |
| 848 | (setq diff-unhandled-changes nil))) | 848 | (setq diff-unhandled-changes nil))) |
| 849 | 849 | ||
| 850 | ;;;; | 850 | ;;;; |
| 851 | ;;;; The main function | 851 | ;;;; The main function |
| 852 | ;;;; | 852 | ;;;; |
| 853 | 853 | ||
| 854 | ;;;###autoload | 854 | ;;;###autoload |
| 855 | (define-derived-mode diff-mode fundamental-mode "Diff" | 855 | (define-derived-mode diff-mode fundamental-mode "Diff" |