(menu-bar-goto-menu) [next-tag, next-tag-otherw]:

Don't call ring-empty-p unless tags-location-ring is bound.
From Noah Friedman <friedman@splode.com>.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 90c26fcd7105f79f17b66fe819227df2f6796b90..c9595f6ab3de8ec195ed4518bd2fe8c486f30a1d 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -326,12 +326,14 @@ A large number or nil slows down menu responsiveness."
 (define-key menu-bar-goto-menu [next-tag-otherw]
   '(menu-item "Next Tag in Other Window"
              (function (lambda () (find-tag-other-window nil t)))
-             :enable (not (ring-empty-p tags-location-ring))
+             :enable (and (boundp 'tags-location-ring)
+                          (not (ring-empty-p tags-location-ring)))
              :help "Find next function/variable matching last tag name in another window"))
 (define-key menu-bar-goto-menu [next-tag]
   '(menu-item "Find Next Tag"
              (function (lambda () (find-tag nil t)))
-             :enable (not (ring-empty-p tags-location-ring))
+             :enable (and (boundp 'tags-location-ring)
+                          (not (ring-empty-p tags-location-ring)))
              :help "Find next function/variable matching last tag name"))
 (define-key menu-bar-goto-menu [find-tag-otherw]
   '(menu-item "Find Tag in Other Window..." find-tag-other-window