diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d31fdfae83..c94fe9d0d57 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2002-05-04  Richard M. Stallman  <rms@gnu.org>
+
+	* toolbar/tool-bar.el (tool-bar-local-item-from-menu):
+	Handle both cases: when the menu item has cached info
+	and when it doesn't.
+
+	* filesets.el (filesets-browse-dir-function): Renamed from ...-fn.
+	(filesets-open-file-function, filesets-save-buffer-function): Likewise.
+	(filesets-tree-max-level): Doc fix.
+	(filesets-commands, filesets-external-viewers) 
+	(filesets-ingroup-patterns): Mark as risky.
+	(filesets-cache-hostname-flag): Doc fix.
+	(filesets-menu-cache-file): Doc fix.  Mark as risky.
+	(filesets-menu-before, filesets-menu-path, filesets-menu-in-menu):
+	Don't defcustom them if running in Emacs.
+
 2002-05-04  Thomas Link <t.link@gmx.at>
 
 	* filesets.el (filesets-ingroup-collect-files):
diff --git a/lisp/toolbar/tool-bar.el b/lisp/toolbar/tool-bar.el
index ab11bc8b450..42adca58a95 100644
--- a/lisp/toolbar/tool-bar.el
+++ b/lisp/toolbar/tool-bar.el
@@ -208,8 +208,13 @@ MAP must contain appropriate binding for `[menu-bar]' which holds a keymap."
 	      (append (cdr defn) (list :image image) props))
 	  (setq defn (cdr defn))
 	  (define-key-after in-map (vector key)
-	    (append `(menu-item ,(car defn) ,(cdr defn))
-		    (list :image image) props)))))))
+	    (let ((rest (cdr defn)))
+	      ;; If the rest of the definition starts
+	      ;; with a list of menu cache info, get rid of that.
+	      (if (and (consp rest) (consp (car rest)))
+		  (setq rest (cdr rest)))
+	      (append `(menu-item ,(car defn) ,rest)
+		      (list :image image) props))))))))
 
 ;;; Set up some global items.  Additions/deletions up for grabs.