(filesets-menu-name): Fix type.

(filesets-menu-path, filesets-menu-before): Fix types.
Change defaults to be consistent with recentf.  (Bug#1056)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3ec18dcb27925355a25cfd7caa28448b47db6e79..9df2c8a01a08e80fdf55fdbf179c91a2af063185 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-01  Glenn Morris  <rgm@gnu.org>
+
+       * filesets.el (filesets-menu-name): Fix type.
+       (filesets-menu-path, filesets-menu-before): Fix types.
+       Change defaults to be consistent with recentf.  (Bug#1056)
+
 2008-09-30  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * term/xterm.el (xterm-turn-on-modify-other-keys)

diff --git a/lisp/filesets.el b/lisp/filesets.el
index b3b021d5695c8f3a463db0bb2c83a0ef9ff7d2f5..6395caaa48360fb490c57a38e7598ee7c7ff2c07 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -307,21 +307,25 @@ SYM to VAL and return t.  If INIT-FLAG is non-nil, set with
 (defcustom filesets-menu-name "Filesets"
   "Filesets' menu name."
   :set (function filesets-set-default)
-  :type 'sexp
+  :type 'string
   :group 'filesets)
 
-(defcustom filesets-menu-path nil
+(defcustom filesets-menu-path '("File")        ; cf recentf-menu-path
   "The menu under which the filesets menu should be inserted.
 See `add-submenu' for documentation."
   :set (function filesets-set-default)
-  :type 'sexp
+  :type '(choice (const :tag "Top Level" nil)
+                (sexp :tag "Menu Path"))
+  :version "23.1"                      ; was nil
   :group 'filesets)
 
-(defcustom filesets-menu-before "File"
+(defcustom filesets-menu-before "Open File..." ; cf recentf-menu-before
   "The name of a menu before which this menu should be added.
 See `add-submenu' for documentation."
   :set (function filesets-set-default)
-  :type 'sexp
+  :type '(choice (string :tag "Name")
+                 (const :tag "Last" nil))
+  :version "23.1"                      ; was "File"
   :group 'filesets)
 
 (defcustom filesets-menu-in-menu nil