diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/sh-script.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 5f4028af89a..9041bd50259 100644 --- 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 | |||
| 2207 | ;; Note: setting result to t means we are done and will return nil. | 2207 | ;; Note: setting result to t means we are done and will return nil. |
| 2208 | ;;(This function never returns just t.) | 2208 | ;;(This function never returns just t.) |
| 2209 | (cond | 2209 | (cond |
| 2210 | ((or (and (boundp 'font-lock-string-face) (not (bobp)) | 2210 | ((or (nth 3 (syntax-ppss (point))) |
| 2211 | (eq (get-text-property (1- (point)) 'face) | ||
| 2212 | font-lock-string-face)) | ||
| 2213 | (eq (get-text-property (point) 'face) sh-heredoc-face)) | 2211 | (eq (get-text-property (point) 'face) sh-heredoc-face)) |
| 2212 | ;; String continuation -- don't indent | ||
| 2214 | (setq result t) | 2213 | (setq result t) |
| 2215 | (setq have-result t)) | 2214 | (setq have-result t)) |
| 2216 | ((looking-at "\\s-*#") ; was (equal this-kw "#") | 2215 | ((looking-at "\\s-*#") ; was (equal this-kw "#") |