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).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78e5c32beb08b7454ddc79d7b4cb9c8bcf08d458..dd96803195fc256a67bd926f86cb21de348207e1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 5f4028af89aeb562ea44fbe760832e0ebf75bc58..9041bd502593ce536b147b6a77d75323da62c6e7 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -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 "#")