diff options
| author | Eli Zaretskii | 2010-03-13 04:02:01 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2010-03-13 04:02:01 -0500 |
| commit | 9565d1e6f3d09d5cd5afebd1b30a7571a27199cc (patch) | |
| tree | 2a9b626a132c400e4305163d14a940fa7c3ac7a1 /lisp/diff-mode.el | |
| parent | f866d742007347ca7a6002cea3be13bdf582c5e7 (diff) | |
| parent | a96f6398e13a611aa825ee6e09566d2f0c5fce35 (diff) | |
| download | emacs-9565d1e6f3d09d5cd5afebd1b30a7571a27199cc.tar.gz emacs-9565d1e6f3d09d5cd5afebd1b30a7571a27199cc.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/diff-mode.el')
| -rw-r--r-- | lisp/diff-mode.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el index 27f8318f91c..75ea98ba911 100644 --- a/lisp/diff-mode.el +++ b/lisp/diff-mode.el | |||
| @@ -1287,7 +1287,9 @@ a diff with \\[diff-reverse-direction]. | |||
| 1287 | (set (make-local-variable 'add-log-current-defun-function) | 1287 | (set (make-local-variable 'add-log-current-defun-function) |
| 1288 | 'diff-current-defun) | 1288 | 'diff-current-defun) |
| 1289 | (set (make-local-variable 'add-log-buffer-file-name-function) | 1289 | (set (make-local-variable 'add-log-buffer-file-name-function) |
| 1290 | (lambda () (diff-find-file-name nil 'noprompt)))) | 1290 | (lambda () (diff-find-file-name nil 'noprompt))) |
| 1291 | (unless (buffer-file-name) | ||
| 1292 | (hack-dir-local-variables-non-file-buffer))) | ||
| 1291 | 1293 | ||
| 1292 | ;;;###autoload | 1294 | ;;;###autoload |
| 1293 | (define-minor-mode diff-minor-mode | 1295 | (define-minor-mode diff-minor-mode |