Move the Text Properties menu back to Edit

* lisp/textmodes/enriched.el (enriched-mode): Don't add "Text
Properties" sub-menu to Text mode menu.
* lisp/facemenu.el (menu-bar-edit-menu): Add "Text Properties"
sub-menu back to the Edit menu.

diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 76ac235c2a876e5b2c8728fb39edd62de799266c..29ee4f8bddc81895f23b37f84ee96b03505c8de0 100644 (file)
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -244,6 +244,10 @@ return a string which is inserted.  It may set `facemenu-end-add-face'."
   (define-key map [fc] (cons "Face" 'facemenu-face-menu)))
 (defalias 'facemenu-menu facemenu-menu)
 
+(easy-menu-add-item
+ menu-bar-edit-menu nil
+ ["Text Properties" facemenu-menu])
+
 (defvar facemenu-keymap
   (let ((map (make-sparse-keymap "Set face")))
     (define-key map "o" (cons "Other..." 'facemenu-set-face))

diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index e68100714c32ae451d9b5ed614572f9926332c8e..ba8fac81f2c3b9b4b54bb14bf6a91299ea416195 100644 (file)
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -38,7 +38,6 @@
 
 ;;; Code:
 
-(require 'facemenu)
 (provide 'enriched)
 
 ;;;
@@ -236,9 +235,6 @@ 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.