diff options
| author | Lute Kamstra | 2005-04-04 08:54:58 +0000 |
|---|---|---|
| committer | Lute Kamstra | 2005-04-04 08:54:58 +0000 |
| commit | cfc802279aef0c3587e289ad442acff08cb93480 (patch) | |
| tree | f0fedcdda54dda705ef003411d85b1b4b177053f /lisp/diff-mode.el | |
| parent | 62631b2cae942a4ff3be165301e8af64a3e197bb (diff) | |
| download | emacs-cfc802279aef0c3587e289ad442acff08cb93480.tar.gz emacs-cfc802279aef0c3587e289ad442acff08cb93480.zip | |
(diff-minor-mode): Specify :group.
Diffstat (limited to 'lisp/diff-mode.el')
| -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 c945a6a7221..d69685ac86f 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ;;; diff-mode.el --- a mode for viewing/editing context diffs | 1 | ;;; diff-mode.el --- a mode for viewing/editing context diffs |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 | 3 | ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
| 4 | ;; Free Software Foundation, Inc. | 4 | ;; Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 6 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 7 | ;; Keywords: convenience patch diff | 7 | ;; Keywords: convenience patch diff |
| @@ -263,7 +263,7 @@ when editing big diffs)." | |||
| 263 | (save-excursion | 263 | (save-excursion |
| 264 | (while (re-search-backward re start t) | 264 | (while (re-search-backward re start t) |
| 265 | (replace-match "" t t))))))) | 265 | (replace-match "" t t))))))) |
| 266 | 266 | ||
| 267 | 267 | ||
| 268 | (defvar diff-font-lock-keywords | 268 | (defvar diff-font-lock-keywords |
| 269 | `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified | 269 | `(("^\\(@@ -[0-9,]+ \\+[0-9,]+ @@\\)\\(.*\\)$" ;unified |
| @@ -484,7 +484,7 @@ If the OLD prefix arg is passed, tell the file NAME of the old file." | |||
| 484 | (let ((fs (diff-hunk-file-names old))) | 484 | (let ((fs (diff-hunk-file-names old))) |
| 485 | (unless fs (error "No file name to look for")) | 485 | (unless fs (error "No file name to look for")) |
| 486 | (push (cons fs name) diff-remembered-files-alist))) | 486 | (push (cons fs name) diff-remembered-files-alist))) |
| 487 | 487 | ||
| 488 | (defun diff-hunk-file-names (&optional old) | 488 | (defun diff-hunk-file-names (&optional old) |
| 489 | "Give the list of file names textually mentioned for the current hunk." | 489 | "Give the list of file names textually mentioned for the current hunk." |
| 490 | (save-excursion | 490 | (save-excursion |
| @@ -952,7 +952,7 @@ a diff with \\[diff-reverse-direction]." | |||
| 952 | (define-minor-mode diff-minor-mode | 952 | (define-minor-mode diff-minor-mode |
| 953 | "Minor mode for viewing/editing context diffs. | 953 | "Minor mode for viewing/editing context diffs. |
| 954 | \\{diff-minor-mode-map}" | 954 | \\{diff-minor-mode-map}" |
| 955 | nil " Diff" nil | 955 | :group 'diff-mode :lighter " Diff" |
| 956 | ;; FIXME: setup font-lock | 956 | ;; FIXME: setup font-lock |
| 957 | ;; setup change hooks | 957 | ;; setup change hooks |
| 958 | (if (not diff-update-on-the-fly) | 958 | (if (not diff-update-on-the-fly) |