diff options
| author | Stefan Monnier <[email protected]> | 2005-01-18 18:21:58 +0000 |
|---|---|---|
| committer | Stefan Monnier <[email protected]> | 2005-01-18 18:21:58 +0000 |
| commit | 67b9b71fc8a51f37dba1bc7adf0d47e8e929c86a (patch) | |
| tree | 0a1992f4ba675e26daa31c6014986cf9b4b87dda /lisp | |
| parent | 87954aeb75e8da1b263d5b0bc69f1e710c3ddec3 (diff) | |
(sh-here-doc-open-re): Don't allow `|' or other
funny chars in the end-of-here-doc marker.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4553732d4e..330d448d0b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-01-18 Stefan Monnier <[email protected]> + + * 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 <[email protected]> * 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 019a19ed00..1e21d10cdc 100644 --- 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 <[email protected]> @@ -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 |