*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 916c1afa53cfb6ae72305413706568f916f48863..0a9583483568f1240ed40df7a155c0753fc9e3ed 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-12  Stefan  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
+       Don't tell to use \\{...} when it's already done.
+
        * textmodes/bibtex.el (bibtex-generate-url-list): Change format.
        Provide a sample complex default.
        (bibtex-url, bibtex-font-lock-url): Adapt to new format.

diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index cf1743c3490ee519c3144fefe6c756f100d110e5..486f0f38964abe3701c21259bfde305a3bc91141 100644 (file)
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -14327,7 +14327,7 @@
 2002-06-01  Kim F. Storm  <storm@cua.dk>
 
        * simple.el: Reworked previous change.
-       (choose-completion-string1): Merged back into choose-completion-string.
+       (choose-completion-string1): Merge back into choose-completion-string.
        (choose-completion-string): Run choose-completion-string-functions
        after checking for proper minibuffer window.  Added mini-p arg to
        the hook functions.  Insert choice if all hook functions return nil.
@@ -14348,7 +14348,7 @@
 2002-06-01  Kim F. Storm  <storm@cua.dk>
 
        * simple.el (choose-completion-string-functions): New special hook.
-       (choose-completion-string1): Renamed from choose-completion-string.
+       (choose-completion-string1): Rename from choose-completion-string.
        (choose-completion-string): Run choose-completion-string-functions
        until success, and only call choose-completion-string1 if it fails.