aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2013-05-03 05:27:16 +0800
committerLeo Liu2013-05-03 05:27:16 +0800
commitb4c8295e81157fa913674140dee1fc201c881642 (patch)
treef124f40b6647133801d74eb2d7d03ee9e9518d8e
parentf12ad6ecd954a8b167796e6f5a9aa11539d63b95 (diff)
downloademacs-b4c8295e81157fa913674140dee1fc201c881642.tar.gz
emacs-b4c8295e81157fa913674140dee1fc201c881642.zip
* progmodes/octave.el (octave-syntax-propertize-function): Include
the case when ' is at line beginning. Fixes: debbugs:14336
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/octave.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5adfea1d07a..79fd3820074 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-05-02 Leo Liu <sdl.web@gmail.com>
2
3 * progmodes/octave.el (octave-syntax-propertize-function): Include
4 the case when ' is at line beginning. (Bug#14336)
5
12013-05-02 Glenn Morris <rgm@gnu.org> 62013-05-02 Glenn Morris <rgm@gnu.org>
2 7
3 * vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone. 8 * vc/vc-dir.el (vc-dir-mode): Don't autoload it for everyone.
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 4b02645e463..3252b16cbad 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -131,7 +131,7 @@ parenthetical grouping.")
131 (octave-syntax-propertize-sqs end) 131 (octave-syntax-propertize-sqs end)
132 (funcall (syntax-propertize-rules 132 (funcall (syntax-propertize-rules
133 ;; Try to distinguish the string-quotes from the transpose-quotes. 133 ;; Try to distinguish the string-quotes from the transpose-quotes.
134 ("[[({,; ]\\('\\)" 134 ("\\(?:^\\|[[({,; ]\\)\\('\\)"
135 (1 (prog1 "\"'" (octave-syntax-propertize-sqs end))))) 135 (1 (prog1 "\"'" (octave-syntax-propertize-sqs end)))))
136 (point) end)) 136 (point) end))
137 137