master aa14424 1/2: Move facemenu to enriched mode

[Lars Ingebrigtsen]

branch: master
commit aa14424b6be72bb8b55a996dabc9e66580bc57b2
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Move facemenu to enriched mode
    
    * lisp/menu-bar.el (menu-bar-edit-menu): Move from here...
    
    * lisp/textmodes/enriched.el (enriched-mode): ... to here.
---
 lisp/menu-bar.el           | 3 ---
 lisp/textmodes/enriched.el | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index ef7235c..5574422 100644
--- 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 ba8fac8..e681007 100644
--- 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.