[Emacs-diffs] /srv/bzr/emacs/trunk r105712: * facemenu.el: Disable the remove-* commands if the mark isn't active.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105712
fixes bug(s): http://debbugs.gnu.org/9162
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sun 2011-09-11 03:55:09 +0200
message:
  * facemenu.el: Disable the remove-* commands if the mark isn't active.
modified:
  lisp/ChangeLog
  lisp/facemenu.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-10 21:15:28 +0000
+++ b/lisp/ChangeLog    2011-09-11 01:55:09 +0000
@@ -1,3 +1,8 @@
+2011-09-11  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * facemenu.el: Disable the remove-* commands if the mark isn't
+       active (bug#9162).
+
 2011-09-10  Chong Yidong  <address@hidden>
 
        * buff-menu.el (Buffer-menu-switch-other-window): Use second arg

=== modified file 'lisp/facemenu.el'
--- a/lisp/facemenu.el  2011-04-19 13:44:55 +0000
+++ b/lisp/facemenu.el  2011-09-11 01:55:09 +0000
@@ -241,10 +241,12 @@
   (define-key map [df] (cons (purecopy "Display Faces") 'list-faces-display))
   (define-key map [dp] (cons (purecopy "Describe Properties")
                             'describe-text-properties))
-  (define-key map [ra] (cons (purecopy "Remove Text Properties")
-                            'facemenu-remove-all))
-  (define-key map [rm] (cons (purecopy "Remove Face Properties")
-                            'facemenu-remove-face-props))
+  (define-key map [ra] (list 'menu-item (purecopy "Remove Text Properties")
+                            'facemenu-remove-all
+                            :enable 'mark-active))
+  (define-key map [rm] (list 'menu-item (purecopy "Remove Face Properties")
+                            'facemenu-remove-face-props
+                            :enable 'mark-active))
   (define-key map [s1] (list (purecopy "--"))))
 (let ((map facemenu-menu))
   (define-key map [in] (cons (purecopy "Indentation")