(sh-here-doc-open-re): Don't allow `|' or other

funny chars in the end-of-here-doc marker.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4553732d4ec7a29c821259327d3236ba3d13ee13..330d448d0b1a616f8fc1daf10b8c442b4ce9a271 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/sh-script.el (sh-here-doc-open-re): Don't allow | or other
+       funny chars in the end-of-here-doc marker.
+
 2005-01-19  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gdb-ui.el (gdb-put-string): Copy/create strings so
@@ -5,9 +10,9 @@
        fringe and on ttys.
        (gdb-put-breakpoint-icon, gdb-info-breakpoints-custom):
        Add breakpoint information as text properties.
-       (gdb-mouse-toggle-breakpoint): 
+       (gdb-mouse-toggle-breakpoint):
        Rename to gdb-mouse-set-clear-breakpoint.
-       (gdb-mouse-toggle-breakpoint): New function. Enable/disable
+       (gdb-mouse-toggle-breakpoint): New function.  Enable/disable
        breakpoints in the margin.
        (gdb-remove-strings): Simplify.
 

diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 019a19ed007ea35d37a13feda1bc943c3cc5c1fd..1e21d10cdc12b2d4b094f6b9262f35bd46c918a0 100644 (file)
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,6 +1,6 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
 
-;; Copyright (C) 1993, 94, 95, 96, 97, 1999, 2001, 03, 2004
+;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2003, 2004, 2005
 ;;  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
@@ -838,7 +838,7 @@ See `sh-feature'.")
 (defconst sh-st-symbol (string-to-syntax "_"))
 (defconst sh-here-doc-syntax (string-to-syntax "|")) ;; generic string
 
-(defconst sh-here-doc-open-re "<<-?\\s-*\\\\?\\(\\(?:['\"][^'\"]+['\"]\\|\\sw\\|\\s_\\)+\\).*\\(\n\\)")
+(defconst sh-here-doc-open-re "<<-?\\s-*\\\\?\\(\\(?:['\"][^'\"]+['\"]\\|\\sw\\)+\\).*\\(\n\\)")
 
 (defvar sh-here-doc-markers nil)
 (make-variable-buffer-local 'sh-here-doc-markers)
@@ -3631,5 +3631,5 @@ shell command and conveniently use this command."
 
 (provide 'sh-script)
 
-;;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937
+;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937
 ;;; sh-script.el ends here