Mercurial > emacs
changeset 59622:5ec981fa30e5
(sh-here-doc-open-re): Don't allow `|' or other
funny chars in the end-of-here-doc marker.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 18 Jan 2005 18:21:58 +0000 |
| parents | 3cc63cc58421 |
| children | 23a9f70c492b |
| files | lisp/ChangeLog lisp/progmodes/sh-script.el |
| diffstat | 2 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 18 12:46:04 2005 +0000 +++ b/lisp/ChangeLog Tue Jan 18 18:21:58 2005 +0000 @@ -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.
--- a/lisp/progmodes/sh-script.el Tue Jan 18 12:46:04 2005 +0000 +++ b/lisp/progmodes/sh-script.el Tue Jan 18 18:21:58 2005 +0000 @@ -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 @@ (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 @@ (provide 'sh-script) -;;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937 +;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937 ;;; sh-script.el ends here