Mercurial > emacs
comparison lisp/vc/diff-mode.el @ 109420:c166807ffc89
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 29 Jun 2010 22:51:37 +0000 |
| parents | c77749185234 c70ff40ac4ce |
| children | 7d18e1db65fe |
comparison
equal
deleted
inserted
replaced
| 109419:4caffbf18f4c | 109420:c166807ffc89 |
|---|---|
| 94 (defcustom diff-mode-hook nil | 94 (defcustom diff-mode-hook nil |
| 95 "Run after setting up the `diff-mode' major mode." | 95 "Run after setting up the `diff-mode' major mode." |
| 96 :type 'hook | 96 :type 'hook |
| 97 :options '(diff-delete-empty-files diff-make-unified) | 97 :options '(diff-delete-empty-files diff-make-unified) |
| 98 :group 'diff-mode) | 98 :group 'diff-mode) |
| 99 | |
| 100 (defvar diff-vc-backend nil | |
| 101 "The VC backend that created the current Diff buffer, if any.") | |
| 99 | 102 |
| 100 (defvar diff-outline-regexp | 103 (defvar diff-outline-regexp |
| 101 "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)") | 104 "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)") |
| 102 | 105 |
| 103 ;;;; | 106 ;;;; |