Mercurial > emacs

changeset 104298:75f3a35d516e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* progmodes/sh-script.el (sh-maybe-here-document): Avoid inserting another heredoc if the user adds another < (Bug#3226).
author Chong Yidong <cyd@stupidchicken.com>
date Sun, 16 Aug 2009 14:04:25 +0000
parents f3695109ab95
children 81498fb7b017
files lisp/ChangeLog lisp/progmodes/sh-script.el
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Sun Aug 16 12:23:23 2009 +0000
+++ b/lisp/ChangeLog	Sun Aug 16 14:04:25 2009 +0000
@@ -1,5 +1,8 @@
 2009-08-16  Chong Yidong  <cyd@stupidchicken.com>
 
+	* progmodes/sh-script.el (sh-maybe-here-document): Avoid inserting
+	another heredoc if the user adds another < (Bug#3226).
+
 	* mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Don't
 	initialize based on window-system (Bug#4124).
 
--- a/lisp/progmodes/sh-script.el	Sun Aug 16 12:23:23 2009 +0000
+++ b/lisp/progmodes/sh-script.el	Sun Aug 16 14:04:25 2009 +0000
@@ -3749,7 +3749,7 @@
   (interactive "*P")
   (self-insert-command (prefix-numeric-value arg))
   (or arg
-      (not (eq (char-after (- (point) 2)) last-command-event))
+      (not (looking-back "[^<]<<"))
       (save-excursion
 	(backward-char 2)
 	(sh-quoted-p))