[Emacs-diffs] Changes to emacs/lisp/ChangeLog

[Nick Roberts]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7661 emacs/lisp/ChangeLog:1.7662
*** emacs/lisp/ChangeLog:1.7661 Fri Jun  3 10:38:46 2005
--- emacs/lisp/ChangeLog        Fri Jun  3 11:23:08 2005
***************
*** 1,3 ****
--- 1,11 ----
+ 2005-06-03  Matt Hodges  <address@hidden>
+ 
+       * tmm.el (tmm-inactive-face): New face.
+       (tmm-remove-inactive-mouse-face): New function.
+       (tmm-prompt, tmm-add-one-shortcut)
+       (tmm-add-prompt, tmm-get-keymap): Make active menu items visible
+       but not selectable.
+ 
  2005-06-03  Juanma Barranquero  <address@hidden>
  
        * faces.el (face-equal): Improve argument/docstring consistency.
***************
*** 26,31 ****
--- 34,40 ----
  
        * viper.el (viper-non-hook-settings): Fixed the names of defadvices.
  
+ >>>>>>> 1.7661
  2005-06-01  Luc Teirlinck  <address@hidden>
  
        * autorevert.el (auto-revert-buffers): Use save-match-data.