[Emacs-diffs] emacs-24 r116893: Small codes update for revert-buffer-function no longer being nil by default

[Glenn Morris]

------------------------------------------------------------
revno: 116893
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Wed 2014-04-02 00:07:11 -0700
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546
  lisp/vc/ediff.el               ediff.el-20091113204419-o5vbwnq5f7feedwu-769

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-04-02 06:53:10 +0000
+++ b/lisp/ChangeLog    2014-04-02 07:07:11 +0000
@@ -1,5 +1,9 @@
 2014-04-02  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2014-02-10 01:34:22 +0000
+++ b/lisp/menu-bar.el  2014-04-02 07:07:11 +0000
@@ -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

=== modified file 'lisp/vc/ediff.el'
--- a/lisp/vc/ediff.el  2014-01-01 07:43:34 +0000
+++ b/lisp/vc/ediff.el  2014-04-02 07:07:11 +0000
@@ -367,8 +367,10 @@
 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