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

[Kim F . Storm]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7679 emacs/lisp/ChangeLog:1.7680
*** emacs/lisp/ChangeLog:1.7679 Mon Jun  6 12:51:38 2005
--- emacs/lisp/ChangeLog        Mon Jun  6 13:18:36 2005
***************
*** 1,3 ****
--- 1,11 ----
+ 2005-06-06  Kim F. Storm  <address@hidden>
+ 
+       * emulation/cua-base.el (cua-rectangle, cua-rectangle-noselect)
+       (cua-global-mark): Remove -face suffix from face names.
+ 
+       * emulation/cua-gmrk.el (cua--init-global-mark): Remove
+       cua-global-mark face setup.
+ 
  2005-06-06  Richard M. Stallman  <address@hidden>
  
        * progmodes/make-mode.el (makefile-dependency-regex): Handle whitespace
***************
*** 22,31 ****
        * emacs-lisp/debug.el (debugger-window): New variable.
        (debug): Use debugger-window if it is set and still alive.
        Record debugger-window for next entry.
!       
        * mail/supercite.el (sc-mail-glom-frame): Mark as risky.
  
! 2005-06-05  Matthias F,Av(Brste  <address@hidden>
  
        * files.el (hack-local-variables-confirm): New arg FLAG-TO-CHECK.
        (hack-one-local-variable, hack-local-variables)
--- 30,39 ----
        * emacs-lisp/debug.el (debugger-window): New variable.
        (debug): Use debugger-window if it is set and still alive.
        Record debugger-window for next entry.
! 
        * mail/supercite.el (sc-mail-glom-frame): Mark as risky.
  
! 2005-06-06  Matthias F,Av(Brste  <address@hidden>
  
        * files.el (hack-local-variables-confirm): New arg FLAG-TO-CHECK.
        (hack-one-local-variable, hack-local-variables)
***************
*** 58,64 ****
        before selecting the desired mode to not spend time fontifying
        old contents.
  
- >>>>>>> 1.7678
  2005-06-06  Juanma Barranquero  <address@hidden>
  
        * isearchb.el (isearchb): Don't pass a spurious second argument to
--- 66,71 ----