diff options
| author | Glenn Morris | 2014-04-02 00:07:11 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-04-02 00:07:11 -0700 |
| commit | 0b908bf2ef8a755cc61425e181f8272e52bc5aaa (patch) | |
| tree | 264e25a626c91fa878a1d264d9cedf815d476f63 /lisp/vc | |
| parent | 9c8b0aa042be6b3c5955f855d0d08ae6beaffd06 (diff) | |
| download | emacs-0b908bf2ef8a755cc61425e181f8272e52bc5aaa.tar.gz emacs-0b908bf2ef8a755cc61425e181f8272e52bc5aaa.zip | |
Small codes update for revert-buffer-function no longer being nil by default
* lisp/menu-bar.el (menu-bar-file-menu):
* lisp/vc/ediff.el (ediff-current-file):
Update for revert-buffer-function no longer being nil by default.
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/ediff.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el index d8abe89d17b..927a3ba7fb6 100644 --- a/lisp/vc/ediff.el +++ b/lisp/vc/ediff.el | |||
| @@ -367,8 +367,10 @@ deleted." | |||
| 367 | This command can be used instead of `revert-buffer'. If there is | 367 | This command can be used instead of `revert-buffer'. If there is |
| 368 | nothing to revert then this command fails." | 368 | nothing to revert then this command fails." |
| 369 | (interactive) | 369 | (interactive) |
| 370 | (unless (or revert-buffer-function | 370 | ;; This duplicates code from menu-bar.el. |
| 371 | revert-buffer-insert-file-contents-function | 371 | (unless (or (not (eq revert-buffer-function 'revert-buffer--default)) |
| 372 | (not (eq revert-buffer-insert-file-contents-function | ||
| 373 | 'revert-buffer-insert-file-contents--default-function)) | ||
| 372 | (and buffer-file-number | 374 | (and buffer-file-number |
| 373 | (or (buffer-modified-p) | 375 | (or (buffer-modified-p) |
| 374 | (not (verify-visited-file-modtime | 376 | (not (verify-visited-file-modtime |