aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoam Postavsky2016-07-07 21:14:48 -0400
committerNoam Postavsky2016-08-06 16:16:02 -0400
commit37cef5fbfef31fdbdaaab48a0ff428a6f0ed60b6 (patch)
treeff4f7b0303b836c45290d3cb4ca012c95ea4e533
parent0095837d90a07535abb7848de47cc3745656620f (diff)
downloademacs-37cef5fbfef31fdbdaaab48a0ff428a6f0ed60b6.tar.gz
emacs-37cef5fbfef31fdbdaaab48a0ff428a6f0ed60b6.zip
Make sh-mode always use p-s-lookup-properties
This lets functions which rely on syntax-propertize for parsing work correctly even before font lock has a chance to run. * lisp/progmodes/sh-script.el (sh-set-shell): Set parse-sexp-lookup-properties unconditionally (Bug #4920).
-rw-r--r--lisp/progmodes/sh-script.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 39e970714c3..7a9e6c7422d 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -2430,8 +2430,8 @@ whose value is the shell name (don't quote it)."
2430 (funcall mksym "rules") 2430 (funcall mksym "rules")
2431 :forward-token (funcall mksym "forward-token") 2431 :forward-token (funcall mksym "forward-token")
2432 :backward-token (funcall mksym "backward-token"))) 2432 :backward-token (funcall mksym "backward-token")))
2433 (setq-local parse-sexp-lookup-properties t)
2433 (unless sh-use-smie 2434 (unless sh-use-smie
2434 (setq-local parse-sexp-lookup-properties t)
2435 (setq-local sh-kw-alist (sh-feature sh-kw)) 2435 (setq-local sh-kw-alist (sh-feature sh-kw))
2436 (let ((regexp (sh-feature sh-kws-for-done))) 2436 (let ((regexp (sh-feature sh-kws-for-done)))
2437 (if regexp 2437 (if regexp