Commit 1abbe4e5 authored by Chong Yidong's avatar Chong Yidong
Browse files

* progmodes/sh-script.el (sh-maybe-here-document): Avoid inserting

another heredoc if the user adds another < (Bug#3226).
parent a0645cdd
2009-08-16 Chong Yidong <cyd@stupidchicken.com> 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 * mwheel.el (mouse-wheel-down-event, mouse-wheel-up-event): Don't
initialize based on window-system (Bug#4124). initialize based on window-system (Bug#4124).
......
...@@ -3749,7 +3749,7 @@ The document is bounded by `sh-here-document-word'." ...@@ -3749,7 +3749,7 @@ The document is bounded by `sh-here-document-word'."
(interactive "*P") (interactive "*P")
(self-insert-command (prefix-numeric-value arg)) (self-insert-command (prefix-numeric-value arg))
(or arg (or arg
(not (eq (char-after (- (point) 2)) last-command-event)) (not (looking-back "[^<]<<"))
(save-excursion (save-excursion
(backward-char 2) (backward-char 2)
(sh-quoted-p)) (sh-quoted-p))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment