From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sun, 12 Sep 2004 20:17:53 +0000 (+0000)
Subject: (checkdoc-this-string-valid-engine):
X-Git-Tag: ttn-vms-21-2-B4~4946
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25d91d947ff58fd69ee08f688d02c854ef04980b;p=emacs.git

(checkdoc-this-string-valid-engine):
Don't tell to use \\{...} when it's already done.
---

diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 2aba3ea254c..cc2be890657 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1561,8 +1561,9 @@ mouse-[0-3]\\)\\)\\>"))
      ;; to describe the most important commands in your major mode, and
      ;; then use `\\{...}' to display the rest of the mode's keymap.
      (save-excursion
-       (if (re-search-forward "\\\\\\\\\\[\\w+" e t
-			      (1+ checkdoc-max-keyref-before-warn))
+       (if (and (re-search-forward "\\\\\\\\\\[\\w+" e t
+				   (1+ checkdoc-max-keyref-before-warn))
+		(not (re-search-forward "\\\\\\\\{\\w+}" e t)))
 	   (checkdoc-create-error
 	    "Too many occurrences of \\[function].  Use \\{keymap} instead"
 	    s (marker-position e))))