[Emacs-diffs] /srv/bzr/emacs/trunk r105534: * lisp/progmodes/sh-script.el (sh-maybe-here-document): Disable magic in

[Stefan Monnier]

------------------------------------------------------------
revno: 105534
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9333
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2011-08-22 18:10:21 -0400
message:
  * lisp/progmodes/sh-script.el (sh-maybe-here-document): Disable magic in
  strings and comments.
modified:
  lisp/ChangeLog
  lisp/progmodes/sh-script.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-08-22 21:16:46 +0000
+++ b/lisp/ChangeLog    2011-08-22 22:10:21 +0000
@@ -1,5 +1,8 @@
 2011-08-22  Stefan Monnier  <address@hidden>
 
+       * 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).

=== modified file 'lisp/progmodes/sh-script.el'
--- a/lisp/progmodes/sh-script.el       2011-08-04 00:58:07 +0000
+++ b/lisp/progmodes/sh-script.el       2011-08-22 22:10:21 +0000
@@ -460,6 +460,7 @@
     (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 @@
       (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)
                     ""))