diff options
author | Kenichi Handa <handa@gnu.org> | 2012-09-30 23:39:46 +0900 |
---|---|---|
committer | Kenichi Handa <handa@gnu.org> | 2012-09-30 23:39:46 +0900 |
commit | c194970e15b6d6efa07697679a25dfab3aa76442 (patch) | |
tree | 49aec8be9d2dcc74ad3c81f562e48308d8e27b75 /lisp/progmodes/sh-script.el | |
parent | 95402d5faa114a311cabfb8c64cf22a93787a066 (diff) | |
parent | dd946752ab8810149a66a3eff469eb128709972d (diff) | |
download | emacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.gz emacs-c194970e15b6d6efa07697679a25dfab3aa76442.tar.bz2 emacs-c194970e15b6d6efa07697679a25dfab3aa76442.zip |
merge trunk
Diffstat (limited to 'lisp/progmodes/sh-script.el')
-rw-r--r-- | lisp/progmodes/sh-script.el | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index b4d550bcee0..e94919ee2a9 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -4079,11 +4079,10 @@ option followed by a colon `:' if the option accepts an argument." (defun sh-maybe-here-document (arg) "Insert self. Without prefix, following unquoted `<' inserts here document. The document is bounded by `sh-here-document-word'." + (declare (obsolete sh-electric-here-document-mode "24.3")) (interactive "*P") (self-insert-command (prefix-numeric-value arg)) (or arg (sh--maybe-here-document))) -(make-obsolete 'sh--maybe-here-document - 'sh-electric-here-document-mode "24.3") (defun sh--maybe-here-document () (or (not (looking-back "[^<]<<")) |