diff options
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 |