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

[Stefan Monnier]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.7096 emacs/lisp/ChangeLog:1.7097
*** emacs/lisp/ChangeLog:1.7096 Mon Mar 14 17:46:09 2005
--- emacs/lisp/ChangeLog        Mon Mar 14 19:39:17 2005
***************
*** 1,10 ****
  2005-03-14  Lute Kamstra  <address@hidden>
  
        * emacs-lisp/debug.el (debugger-make-xrefs): Docstring fix.
        Ignore a `*' at the beginning of a line.
  
!       * subr.el (macro-declaration-function): Move to
!       emacs-lisp/byte-run.el.
        * emacs-lisp/byte-run.el (macro-declaration-function): Move from
        subr.el.
        (dont-compile, eval-when-compile, eval-and-compile): Use declare
--- 1,13 ----
+ 2005-03-14  Stefan Monnier  <address@hidden>
+ 
+       * pcvs.el (smerge-ediff): Remove bogus autoload.
+ 
  2005-03-14  Lute Kamstra  <address@hidden>
  
        * emacs-lisp/debug.el (debugger-make-xrefs): Docstring fix.
        Ignore a `*' at the beginning of a line.
  
!       * subr.el (macro-declaration-function): Move to emacs-lisp/byte-run.el.
        * emacs-lisp/byte-run.el (macro-declaration-function): Move from
        subr.el.
        (dont-compile, eval-when-compile, eval-and-compile): Use declare