*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 377f2ce0fc239ebc897f9c4972a518f6913a09d7..6c506d82283bf6c86eead9c882c8517a8e5eabdc 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index a1e236c3314dc995c9c8d1c1b7181cd063326cbd..815dc3483834085a11522054b4075b67e446d11d 100644 (file)
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -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