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

[Richard M . Stallman]

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.6818 emacs/lisp/ChangeLog:1.6819
*** emacs/lisp/ChangeLog:1.6818 Sun Jan  2 22:00:07 2005
--- emacs/lisp/ChangeLog        Sun Jan  2 23:11:26 2005
***************
*** 1,3 ****
--- 1,8 ----
+ 2005-01-02  Richard M. Stallman  <address@hidden>
+ 
+       * electric.el (Electric-pop-up-window): Use fit-window-to-buffer
+       instead of calculating the right size.
+ 
  2005-01-02  Stefan  <address@hidden>
  
        * vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case.
***************
*** 49,54 ****
--- 54,60 ----
  
        * ses.el (copy-region-as-kill): Deactivate mark.
  
+ >>>>>>> 1.6818
  2005-01-01  Richard M. Stallman  <address@hidden>
  
        * replace.el (occur-1): If the output buffer is also an input,