*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 90800e49a0a6e2f4ffca93e7e5c042f50cb3dc1b..845d0befa0d07b2973aa3898ad349d48f7984f09 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -27,8 +27,8 @@
 
 2008-03-16  Kenichi Handa  <handa@m17n.org>
 
-       * international/mule.el (auto-coding-alist): Use
-       no-conversion-multibyte for archive files.
+       * international/mule.el (auto-coding-alist):
+       Use no-conversion-multibyte for archive files.
 
 2008-03-16  Glenn Morris  <rgm@gnu.org>
 
@@ -79,8 +79,8 @@
        (diary-list-entries-1, diary-list-entries): Use diary-list-entries-2.
        (print-diary-entries): Use unless.
        (diary-mark-entries-1): Change argument order, make all but
-       markfunc optional.  Handle the standard (Gregorian) case.  Use
-       match-string-no-properties.  Handle marks.
+       markfunc optional.  Handle the standard (Gregorian) case.
+       Use match-string-no-properties.  Handle marks.
        (mark-diary-entries): Use diary-mark-entries-1.
        (diary-font-lock-keywords-1): New macro.
        (diary-font-lock-keywords): Use diary-font-lock-keywords-1.
@@ -206,8 +206,8 @@
        (mark-sexp-diary-entries, list-sexp-diary-entries): Use when.
        (mark-calendar-month): Use dotimes.
 
-       * calendar/holidays.el (displayed-month, displayed-year): Move
-       declarations where needed.
+       * calendar/holidays.el (displayed-month, displayed-year):
+       Move declarations where needed.
        (calendar-list-holidays): Doc fix.
 
        * calendar/parse-time.el (parse-time-string): Simplify.
@@ -224,8 +224,8 @@
        (timeclock-mean, timeclock-generate-report): Use dolist.
 
        * calendar/todo-mode.el (todo-add-category): Simplify.
-       (todo-more-important-p, todo-delete-item, todo-file-item): Use unless,
-       when.
+       (todo-more-important-p, todo-delete-item, todo-file-item):
+       Use unless, when.
        (todo-top-priorities): Use zerop.
 
 2008-03-14  Nick Roberts  <nickrob@snap.net.nz>
@@ -468,7 +468,7 @@
 
        * textmodes/org-mouse.el: Version number change.
 
-       * textmodes/org-publish.el: (org-publish-expand-components):
+       * textmodes/org-publish.el (org-publish-expand-components):
        Remove null projects from the list of components.
        (org-publish-attachment): Bugfix: handle mandatory argument pub-dir.
        Remove unused retrieval of the :publishing-directory property.
@@ -1480,7 +1480,6 @@
        * progmodes/cc-langs.el (c-before-font-lock-function): Fix bug in
        doc-string, "c-old-LEN" -> "c-old-END".
 
->>>>>>> 1.13100
 2008-03-04  Jason Rumney  <jasonr@gnu.org>
 
        * nxml/rng-nxml.el (rng-preferred-prefix-alist): Add dublin core
@@ -5503,7 +5502,7 @@
 2008-02-01  Kenichi Handa  <handa@etl.go.jp>
 
        * international/mule-util.el (detect-coding-with-priority):
-       Fix the place of using `,' marker in backguote form.
+       Fix the place of using `,' marker in backquote form.
 
 2008-02-01  Dave Love  <fx@gnu.org>