From: Leo Liu Date: Thu, 2 May 2013 23:03:00 +0000 (+0800) Subject: * progmodes/octave.el (octave-mode-syntax-table): Correct syntax X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~2026^2~319 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=271350180c103c2db7dbf15f11b9ddf07def8085;p=emacs.git * 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 695f66c272c..86202e98a33 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-05-02 Leo Liu + + * progmodes/octave.el (octave-mode-syntax-table): Correct syntax + for \. (bug#14332) + (octave-font-lock-keywords): Include [ and {. + 2013-05-02 Leo Liu * progmodes/octave.el (inferior-octave-startup-file): Change default. @@ -24,7 +30,7 @@ 2013-05-01 Leo Liu * 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 56f2805d48e..695ad1c4ffd 100644 --- 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)