Mercurial > emacs
diff 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 |
line wrap: on
line diff
--- a/lisp/vc/diff-mode.el Mon Jun 28 22:47:32 2010 +0000 +++ b/lisp/vc/diff-mode.el Tue Jun 29 22:51:37 2010 +0000 @@ -97,6 +97,9 @@ :options '(diff-delete-empty-files diff-make-unified) :group 'diff-mode) +(defvar diff-vc-backend nil + "The VC backend that created the current Diff buffer, if any.") + (defvar diff-outline-regexp "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")