(menu-bar-edit-menu): Add listp around pending-undo-list to disable

menu item "undo" when pending undo list is empty.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 662d958a75de1df217170a419d0439395ce1e6bf..eba974e2e493b632cf05b206cec9655fbf2da96a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2005-12-09  Juri Linkov  <juri@jurta.org>
+
+       * isearch.el (isearch-highlight): Change main overlay priority
+       from 1 to 1001.  Simplify.
+       (isearch-lazy-highlight-update): Change lazy overlay priority
+       from 0 to 1000.
+
+       * replace.el (replace-highlight): Change overlay priority from
+       1 to 1001.
+
+       * textmodes/ispell.el (ispell-highlight-spelling-error-overlay):
+       Change overlay priority from 1 to 1001.  Reuse existing overlay.
+
+       * compare-w.el (compare-windows-highlight): Change overlay
+       priority from 1 to 1000.
+
+       * menu-bar.el (menu-bar-edit-menu): Add listp around
+       pending-undo-list to disable menu item "undo" when pending
+       undo list is empty.
+
+       * locate.el (locate): Disable undo in *Locate* buffer.
+
 2005-12-09  Kim F. Storm  <storm@cua.dk>
 
        * mail/smtpmail.el (smtpmail-via-smtp): Disable undo in SMTP buffer.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 64dad08988c7be21e08c656a5bbb5f499ee179a0..56745d82cc4f64a1d66c85a8b87868ceddb6db8b 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -481,7 +481,7 @@ A large number or nil slows down menu responsiveness."
              :enable (and (not buffer-read-only)
                           (not (eq t buffer-undo-list))
                           (if (eq last-command 'undo)
-                              pending-undo-list
+                              (listp pending-undo-list)
                             (consp buffer-undo-list)))
              :help "Undo last operation"))