Make compat alias add-submenu obsolete

* lisp/emacs-lisp/easymenu.el (add-submenu): Make compat alias
obsolete.
* lisp/filesets.el (filesets-build-menu-now): Don't use above
obsolete alias.
(filesets-menu-path, filesets-menu-before)
(filesets-menu-in-menu): Doc fix.

diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 73dabef3fa5cce0b4f753f41af081149384d42fe..b0198dbf8d5f49d4f774e1e42669afffb7781325 100644 (file)
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -514,6 +514,7 @@ completely and menu filter functions can be expected to work.
 If BEFORE is non-nil, add before the item named BEFORE.
 If IN-MENU is non-nil, follow MENU-PATH in IN-MENU.
 This is a compatibility function; use `easy-menu-add-item'."
+  (declare (obsolete easy-menu-add-item "28.1"))
   (easy-menu-add-item (or in-menu (current-global-map))
                      (cons "menu-bar" menu-path)
                      submenu before))

diff --git a/lisp/filesets.el b/lisp/filesets.el
index 2cad2023b850db93ce132872a8622c141069c008..dc81366147086914e66c08455038a310c0cda3e8 100644 (file)
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -308,7 +308,7 @@ SYM to VAL and return t.  If INIT-FLAG is non-nil, set with
 
 (defcustom filesets-menu-path '("File")        ; cf recentf-menu-path
   "The menu under which the filesets menu should be inserted.
-See `add-submenu' for documentation."
+See `easy-menu-add-item' for documentation."
   :set (function filesets-set-default)
   :type '(choice (const :tag "Top Level" nil)
                 (sexp :tag "Menu Path"))
@@ -317,7 +317,7 @@ See `add-submenu' for documentation."
 
 (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."
+See `easy-menu-add-item' for documentation."
   :set (function filesets-set-default)
   :type '(choice (string :tag "Name")
                  (const :tag "Last" nil))
@@ -326,7 +326,7 @@ See `add-submenu' for documentation."
 
 (defcustom filesets-menu-in-menu nil
   "Use that instead of `current-menubar' as the menu to change.
-See `add-submenu' for documentation."
+See `easy-menu-add-item' for documentation."
   :set (function filesets-set-default)
   :type 'sexp
   :group 'filesets)
@@ -2349,21 +2349,20 @@ bottom up, set `filesets-submenus' to nil, first.)"
       (filesets-menu-cache-file-save-maybe)))
   (let ((cb (current-buffer)))
     (when (not (member cb filesets-updated-buffers))
-      (add-submenu
-       filesets-menu-path
-       `(,filesets-menu-name
-        ("# Filesets"
-         ["Edit Filesets"   filesets-edit]
-         ["Save Filesets"   filesets-save-config]
-         ["Save Menu Cache" filesets-menu-cache-file-save]
-         ["Rebuild Menu"    filesets-build-menu]
-         ["Customize"       filesets-customize]
-         ["About"           filesets-info])
-        ,(filesets-get-cmd-menu)
-        "---"
-        ,@filesets-menu-cache)
-       filesets-menu-before
-       filesets-menu-in-menu)
+      (easy-menu-add-item (or filesets-menu-in-menu (current-global-map))
+                          (cons "menu-bar" filesets-menu-path)
+                          `(,filesets-menu-name
+                            ("# Filesets"
+                             ["Edit Filesets"   filesets-edit]
+                             ["Save Filesets"   filesets-save-config]
+                             ["Save Menu Cache" filesets-menu-cache-file-save]
+                             ["Rebuild Menu"    filesets-build-menu]
+                             ["Customize"       filesets-customize]
+                             ["About"           filesets-info])
+                            ,(filesets-get-cmd-menu)
+                            "---"
+                            ,@filesets-menu-cache)
+                          filesets-menu-before)
       (setq filesets-updated-buffers
            (cons cb filesets-updated-buffers))
       ;; This wipes out other messages in the echo area.