diff options
| author | Stefan Monnier <[email protected]> | 2011-08-22 18:10:21 -0400 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2011-08-22 18:10:21 -0400 |
| commit | 867cab7493ffdaa9de2b06db573a5f6290a2042f (patch) | |
| tree | f77a42b1df380b2335629bbe7456f6726f547d55 | |
| parent | 4eb613489b98093e31f2a81765a4b644fdb90fb2 (diff) | |
* lisp/progmodes/sh-script.el (sh-maybe-here-document): Disable magic in
strings and comments.
Fixes: debbugs:9333
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4efa1de8e4..82d67fe476 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2011-08-22 Stefan Monnier <[email protected]> + * progmodes/sh-script.el (sh-maybe-here-document): Disable magic in + strings and comments (bug#9333). + * emacs-lisp/debug.el (debug-arglist): New function. (debug-convert-byte-code): Use it. Handle lexical byte-codes. (debug-on-entry-1): Handle interpreted closures (bug#9120). diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 31a4fbaef4..7b949134c6 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -460,6 +460,7 @@ This is buffer-local in every such buffer.") (define-key map "\C-c+" 'sh-add) (define-key map "\C-\M-x" 'sh-execute-region) (define-key map "\C-c\C-x" 'executable-interpret) + ;; FIXME: Use post-self-insert-hook. (define-key map "<" 'sh-maybe-here-document) (define-key map "(" 'skeleton-pair-insert-maybe) (define-key map "{" 'skeleton-pair-insert-maybe) @@ -3659,6 +3660,7 @@ The document is bounded by `sh-here-document-word'." (save-excursion (backward-char 2) (sh-quoted-p)) + (nth 8 (syntax-ppss)) (let ((tabs (if (string-match "\\`-" sh-here-document-word) (make-string (/ (current-indentation) tab-width) ?\t) "")) |