* 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 6b941c67fce025483890bbd50a2248a472540ebe..a3c895c694236414d6edc8ea3d5007b61a5c4ef5 100644 (file)
--- 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 e6eaea985af43f20bb277d01bc2bb731561f8fa4..293ae6856e97999524d5dedd9395f70836c59186 100644 (file)
--- 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