Mercurial > emacs
changeset 59316:f3839cb9f16c
*** empty log message ***
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 02 Jan 2005 23:11:26 +0000 |
| parents | c5ee87e89147 |
| children | d30f6c6ad0b5 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Jan 02 23:11:03 2005 +0000 +++ b/lisp/ChangeLog Sun Jan 02 23:11:26 2005 +0000 @@ -1,3 +1,8 @@ +2005-01-02 Richard M. Stallman <rms@gnu.org> + + * electric.el (Electric-pop-up-window): Use fit-window-to-buffer + instead of calculating the right size. + 2005-01-02 Stefan <monnier@iro.umontreal.ca> * vc-arch.el (vc-arch-workfile-version): Handle the empty-branch case. @@ -49,6 +54,7 @@ * ses.el (copy-region-as-kill): Deactivate mark. +>>>>>>> 1.6818 2005-01-01 Richard M. Stallman <rms@gnu.org> * replace.el (occur-1): If the output buffer is also an input,