From: Glenn Morris <rgm@gnu.org>
Date: Fri, 8 Nov 2013 07:36:54 +0000 (-0800)
Subject: * lisp/progmodes/autoconf.el (autoconf-mode): Tweak comment-start-skip.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~904
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b0f4c320e550a921a9804c64423178039034fe3f;p=emacs.git

* lisp/progmodes/autoconf.el (autoconf-mode): Tweak comment-start-skip.
See also http://debbugs.gnu.org/10033

Fixes: debbugs:15822
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6b941c67fce..a3c895c6942 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-08  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/autoconf.el (autoconf-mode):
+	Tweak comment-start-skip.  (Bug#15822)
+
 2013-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* progmodes/sh-script.el (sh-smie--sh-keyword-in-p): Don't inf-loop
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index e6eaea985af..293ae6856e9 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -79,7 +79,8 @@ searching backwards at another AC_... command."
   (setq-local parens-require-spaces nil) ; for M4 arg lists
   (setq-local defun-prompt-regexp "^[ \t]*A[CM]_\\(\\sw\\|\\s_\\)+")
   (setq-local comment-start "dnl ")
-  (setq-local comment-start-skip "\\(?:\\(\\W\\|\\`\\)dnl\\|#\\) +")
+  ;; We want to avoid matching "dnl" in other text.
+  (setq-local comment-start-skip "\\(?:\\(\\W\\|^\\)dnl\\|#\\) +")
   (setq-local syntax-propertize-function
 	      (syntax-propertize-rules ("\\<dnl\\>" (0 "<"))))
   (setq-local font-lock-defaults