procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Small codes update for revert-buffer-function no longer being nil by default

Browse source 
* 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.
This commit is contained in:
Glenn Morris 2014-04-02 00:07:11 -07:00
parent 9c8b0aa042
commit 0b908bf2ef
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,5 +1,9 @@
2014-04-02 Glenn Morris <rgm@gnu.org>
* menu-bar.el (menu-bar-file-menu):
* vc/ediff.el (ediff-current-file):
Update for revert-buffer-function no longer being nil by default.
* simple.el (command-execute): Respect nil disabled-command-function.
2014-04-01 Nicolas Richard <theonewiththeevillook@yahoo.fr>

7
lisp/menu-bar.el
View file

@ -149,8 +149,11 @@
:help "Recover edits from a crashed session"))
(bindings--define-key menu [revert-buffer]
'(menu-item "Revert Buffer" revert-buffer
:enable (or revert-buffer-function
revert-buffer-insert-file-contents-function
:enable (or (not (eq revert-buffer-function
'revert-buffer--default))
(not (eq
revert-buffer-insert-file-contents-function
'revert-buffer-insert-file-contents--default-function))
(and buffer-file-number
(or (buffer-modified-p)
(not (verify-visited-file-modtime

6
lisp/vc/ediff.el
View file

@ -367,8 +367,10 @@ deleted."
This command can be used instead of `revert-buffer'. If there is
nothing to revert then this command fails."
(interactive)
(unless (or revert-buffer-function
revert-buffer-insert-file-contents-function
;; This duplicates code from menu-bar.el.
(unless (or (not (eq revert-buffer-function 'revert-buffer--default))
(not (eq revert-buffer-insert-file-contents-function
'revert-buffer-insert-file-contents--default-function))
(and buffer-file-number
(or (buffer-modified-p)
(not (verify-visited-file-modtime