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

[Richard M. Stallman]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Richard M. Stallman <rms>       06/12/04 00:33:19

Index: ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.10392
retrieving revision 1.10393
diff -u -b -r1.10392 -r1.10393
--- ChangeLog   3 Dec 2006 22:26:52 -0000       1.10392
+++ ChangeLog   4 Dec 2006 00:33:19 -0000       1.10393
@@ -1,3 +1,22 @@
+2006-12-04  Richard Stallman  <address@hidden>
+
+       * progmodes/python.el (python-indent): Add safe-local-variable prop.
+
+       * dired.el (dired-revert): Turn off dired-after-readin-hook
+       around call to dired-readin.
+
+       * menu-bar.el (menu-bar-make-toggle): Add "globally"
+       to echo area messages.
+       <indicate-empty-lines, case-fold-search>:
+       Add "globally" to Help string.
+       <case-fold-search>: MESSAGE arg need not say "globally".
+       (menu-bar-edit-menu <paste-from-menu>): Renamed from select-and-paste.
+
+2006-12-03  Liam Healy  <address@hidden>  (tiny change)
+
+       * outline.el (outline-end-of-subtree): Don't leave an empty
+       line hidden as we would a real next heading.
+
 2006-12-03  Ken Manheimer  <address@hidden>
 
        * allout.el (allout-ascend): Add an optional argument to preserve
@@ -76,7 +95,12 @@
 
        * descr-text.el (describe-char-unicodedata-file): Fix typo in docstring.
 
+<<<<<<< ChangeLog
+>>>>>>> 1.10388
+2006-12-01  Vinicius Jose Latorre  <address@hidden>
+=======
 2006-12-01  Ben North  <address@hidden>
+>>>>>>> 1.10392
 
        * paren.el: Fix the highlight overlay extension when the user types a
        sequence of char very fast just before the open parenthesis.