Move facemenu to enriched mode

* lisp/menu-bar.el (menu-bar-edit-menu): Move from here...

* lisp/textmodes/enriched.el (enriched-mode): ... to here.

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index ef7235cffa09691bce23987536a6f289712003ca..55744221b81933eb1648c78d47e82110ef5a68ec 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -456,9 +456,6 @@
 (defvar menu-bar-edit-menu
   (let ((menu (make-sparse-keymap "Edit")))
 
-    (bindings--define-key menu [props]
-      '(menu-item "Text Properties" facemenu-menu))
-
     ;; ns-win.el said: Add spell for platform consistency.
     (if (featurep 'ns)
         (bindings--define-key menu [spell]

diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index ba8fac81f2c3b9b4b54bb14bf6a91299ea416195..e68100714c32ae451d9b5ed614572f9926332c8e 100644 (file)
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -38,6 +38,7 @@
 
 ;;; Code:
 
+(require 'facemenu)
 (provide 'enriched)
 
 ;;;
@@ -235,6 +236,9 @@ Commands:
        (t                              ; Turn mode on
          (add-hook 'change-major-mode-hook
                    #'enriched-before-change-major-mode nil 'local)
+         (easy-menu-add-item
+          text-mode-menu nil
+          ["Text Properties" facemenu-menu :help "Change text properties"])
         (add-to-list 'buffer-file-format 'text/enriched)
         ;; Save old variable values before we change them.
         ;; These will be restored if we exit Enriched mode.