diff options
| -rw-r--r-- | lisp/diff-mode.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 1fb6aefef5e..8d836894f5d 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> | 5 | ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
| 6 | ;; Keywords: patch diff | 6 | ;; Keywords: patch diff |
| 7 | ;; Revision: $Id: diff-mode.el,v 1.33 2000/10/19 15:42:21 monnier Exp $ | 7 | ;; Revision: $Id: diff-mode.el,v 1.34 2000/11/12 16:59:52 monnier Exp $ |
| 8 | 8 | ||
| 9 | ;; This file is part of GNU Emacs. | 9 | ;; This file is part of GNU Emacs. |
| 10 | 10 | ||
| @@ -274,8 +274,9 @@ when editing big diffs)." | |||
| 274 | 274 | ||
| 275 | (defvar diff-imenu-generic-expression | 275 | (defvar diff-imenu-generic-expression |
| 276 | ;; Prefer second name as first is most likely to be a backup or | 276 | ;; Prefer second name as first is most likely to be a backup or |
| 277 | ;; version-control name. | 277 | ;; version-control name. The [\t\n] at the end of the unidiff pattern |
| 278 | '((nil "\\+\\+\\+\\ \\([^\t\n]+\\)\t" 1) ; unidiffs | 278 | ;; catches Debian source diff files (which lack the trailing date). |
| 279 | '((nil "\\+\\+\\+\\ \\([^\t\n]+\\)[\t\n]" 1) ; unidiffs | ||
| 279 | (nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs | 280 | (nil "^--- \\([^\t\n]+\\)\t.*\n\\*" 1))) ; context diffs |
| 280 | 281 | ||
| 281 | ;;;; | 282 | ;;;; |