Mercurial > emacs
changeset 67493:ab8e9c62b630
*** empty log message ***
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Sun, 11 Dec 2005 05:02:28 +0000 |
parents | 359dd650750d |
children | 28fd92314a04 |
files | lisp/ChangeLog lispref/ChangeLog |
diffstat | 2 files changed, 9 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Dec 11 05:01:21 2005 +0000 +++ b/lisp/ChangeLog Sun Dec 11 05:02:28 2005 +0000 @@ -1,3 +1,7 @@ +2005-12-11 Richard M. Stallman <rms@gnu.org> + + * buff-menu.el (Buffer-menu-sort-column): Not a user variable. + 2005-12-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * term/mac-win.el: Create keymap for mac-apple-event-map. @@ -63,6 +67,7 @@ * emacs/octave-mod.el (octave-electric-space): Don't indent comments or strings if octave-auto-indent is nil. +>>>>>>> 1.8782 2005-12-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * term/mac-win.el: Require url when compiling. Call
--- a/lispref/ChangeLog Sun Dec 11 05:01:21 2005 +0000 +++ b/lispref/ChangeLog Sun Dec 11 05:02:28 2005 +0000 @@ -1,3 +1,7 @@ +2005-12-10 Richard M. Stallman <rms@gnu.org> + + * customize.texi (Common Keywords): State caveats for use of :tag. + 2005-12-08 Richard M. Stallman <rms@gnu.org> * minibuf.texi (Intro to Minibuffers): Replace list of local maps