# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1095020300 0
# Node ID e8acd9183eb4ea552ffbff261f7ba3e3a65f2676
# Parent  9dd4195f1c060d45709687a8e70a509f3f0d198d
*** empty log message ***

diff -r 9dd4195f1c06 -r e8acd9183eb4 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Sep 12 20:17:53 2004 +0000
+++ b/lisp/ChangeLog	Sun Sep 12 20:18:20 2004 +0000
@@ -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 -r 9dd4195f1c06 -r e8acd9183eb4 lisp/ChangeLog.10
--- a/lisp/ChangeLog.10	Sun Sep 12 20:17:53 2004 +0000
+++ b/lisp/ChangeLog.10	Sun Sep 12 20:18:20 2004 +0000
@@ -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.