Commit 88a36e60 authored by Daniel Colascione's avatar Daniel Colascione Committed by Chong Yidong
Browse files

Avoid using font-lock properties to indent in sh-get-indent-info.

* progmodes/sh-script.el (sh-get-indent-info): Use syntax-ppss
instead of inspecting font-lock properties (Bug#6916).
parent 38dbc4d8
2010-08-26 Daniel Colascione <dan.colascione@gmail.com>
* progmodes/sh-script.el (sh-get-indent-info): Use syntax-ppss
instead of inspecting font-lock properties (Bug#6916).
2010-08-26 David Reitter <david.reitter@gmail.com>
 
* server.el (server-visit-files): Run pre-command-hook and
......
......@@ -2207,10 +2207,9 @@ STRING This is ignored for the purposes of calculating
;; Note: setting result to t means we are done and will return nil.
;;(This function never returns just t.)
(cond
((or (and (boundp 'font-lock-string-face) (not (bobp))
(eq (get-text-property (1- (point)) 'face)
font-lock-string-face))
((or (nth 3 (syntax-ppss (point)))
(eq (get-text-property (point) 'face) sh-heredoc-face))
;; String continuation -- don't indent
(setq result t)
(setq have-result t))
((looking-at "\\s-*#") ; was (equal this-kw "#")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment