emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

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


From: Richard M. Stallman
Subject: [Emacs-diffs] Changes to emacs/lisp/ChangeLog
Date: Tue, 17 Jan 2006 14:32:17 +0000

Index: emacs/lisp/ChangeLog
diff -u emacs/lisp/ChangeLog:1.8983 emacs/lisp/ChangeLog:1.8984
--- emacs/lisp/ChangeLog:1.8983 Tue Jan 17 04:34:20 2006
+++ emacs/lisp/ChangeLog        Tue Jan 17 14:32:16 2006
@@ -1,3 +1,7 @@
+2006-01-13  Richard M. Stallman  <address@hidden>
+
+       * font-lock.el (lisp-font-lock-keywords-1): Minor rearrangement.
+
 2006-01-16  Luc Teirlinck  <address@hidden>
 
        * cus-edit.el (customize-rogue): Minor doc fix.
@@ -50,6 +54,7 @@
        * time.el (display-time-mail-face): Replace :group `faces' with
        `mode-line-faces'.
 
+>>>>>>> 1.8983
 2006-01-16  Kenichi Handa  <address@hidden>
 
        * international/code-pages.el: Add autoload cookies for
@@ -98,6 +103,7 @@
        (Custom-reset-saved): Do not ask for confirmation in single option
        buffers.
 
+>>>>>>> 1.8978
 2006-01-13  Romain Francoise  <address@hidden>
 
        * add-log.el (add-change-log-entry, change-log-merge):




reply via email to

[Prev in Thread] Current Thread [Next in Thread]