* progmodes/octave.el (octave-mode-syntax-table): Correct syntax

for \.
(octave-font-lock-keywords): Include [ and {.

Fixes: debbugs:14332

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 695f66c272c69955be56f8205078bc692b042c91..86202e98a335b9792668ca37f3ed8878198a1336 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-05-02  Leo Liu  <sdl.web@gmail.com>
+
+       * progmodes/octave.el (octave-mode-syntax-table): Correct syntax
+       for \.  (bug#14332)
+       (octave-font-lock-keywords): Include [ and {.
+
 2013-05-02  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el (inferior-octave-startup-file): Change default.
@@ -24,7 +30,7 @@
 2013-05-01  Leo Liu  <sdl.web@gmail.com>
 
        * progmodes/octave.el: Compatible with older emacs-24 releases.
-       (inferior-octave-has-built-in-variables): Remove.  Buil-in
+       (inferior-octave-has-built-in-variables): Remove.  Built-in
        variables were removed from Octave in 2007.
        (inferior-octave-startup): Fix uses.
        (comint-line-beginning-position): Remove compatibility code for

diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 56f2805d48eda77932b741516e6ca00b1bbe9526..695ad1c4ffd38d1773765432081fe59f3596d7b2 100644 (file)
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -111,7 +111,7 @@ parenthetical grouping.")
                             (progn
                               (goto-char (match-beginning 0))
                               (backward-up-list)
-                              (unless (eq (char-after) ?\()
+                              (unless (memq (char-after) '(?\( ?\[ ?\{))
                                 font-lock-keyword-face))
                           (error font-lock-keyword-face)))
                       t))
@@ -233,7 +233,7 @@ parenthetical grouping.")
     (modify-syntax-entry ?& "."   table)
     (modify-syntax-entry ?| "."   table)
     (modify-syntax-entry ?! "."   table)
-    (modify-syntax-entry ?\\ "\\" table)
+    (modify-syntax-entry ?\\ "."  table)
     (modify-syntax-entry ?\' "."  table)
     ;; Was "w" for abbrevs, but now that it's not necessary any more,
     (modify-syntax-entry ?\` "."  table)