[Emacs-diffs] emacs/lisp ChangeLog progmodes/sh-script.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/08/16 14:04:30

Modified files:
        lisp           : ChangeLog 
        lisp/progmodes : sh-script.el 

Log message:
        * progmodes/sh-script.el (sh-maybe-here-document): Avoid inserting
        another heredoc if the user adds another < (Bug#3226).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15943&r2=1.15944
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/progmodes/sh-script.el?cvsroot=emacs&r1=1.223&r2=1.224

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15943
retrieving revision 1.15944
diff -u -b -r1.15943 -r1.15944
--- ChangeLog   16 Aug 2009 05:49:26 -0000      1.15943
+++ ChangeLog   16 Aug 2009 14:04:25 -0000      1.15944
@@ -1,5 +1,8 @@
 2009-08-16  Chong Yidong  <address@hidden>
 
+       * 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).
 

Index: progmodes/sh-script.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/sh-script.el,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -b -r1.223 -r1.224
--- progmodes/sh-script.el      19 Feb 2009 22:18:18 -0000      1.223
+++ progmodes/sh-script.el      16 Aug 2009 14:04:30 -0000      1.224
@@ -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))