Remove the multi-line string test, since it seems to be near-impossible to disable...

[nagios-mode.git] / nagios-mode.el

diff --git a/nagios-mode.el b/nagios-mode.el
index 291b0eb0c006f7e89f9134122043d691c2779f9f..6b2d1d12a3ded7159559539603d19aa6021f5cb6 100644 (file)
--- a/nagios-mode.el
+++ b/nagios-mode.el
@@ -292,17 +292,25 @@
   (kill-all-local-variables)
   (make-local-variable 'font-lock-defaults)
   (make-local-variable 'comment-start)
+  (make-local-variable 'comment-start-skip)
   (make-local-variable 'comment-end)
   (make-local-variable 'indent-line-function)
+  (make-local-variable 'syntax-begin-function)
 
   (set-syntax-table nagios-mode-syntax-table)
   
-  (setq mode-name            "nagios"
-       major-mode           'nagios-mode
-       indent-line-function 'nagios-indent-line
-       font-lock-defaults   '(nagios-font-lock-keywords)
-       comment-start        "#"
-       comment-end          ""
+  (setq mode-name             "nagios"
+       major-mode            'nagios-mode
+       indent-line-function  'nagios-indent-line
+       font-lock-defaults    '(nagios-font-lock-keywords)
+       comment-start         "#"
+       comment-start-skip    "#\|; +"
+       comment-end           ""
+       
+       ;; Since comments and strings do not span multiple lines,
+       ;; the syntax parser can safely start parsing at the beginning
+       ;; of any line.
+       syntax-begin-function 'beginning-of-line
        )
 
   ;; Keyboard Mapping