procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sh-electric-here-document-mode accessible in sh-mode-hook. (Bug#3226)

Browse source 
* lisp/progmodes/sh-script.el (sh-mode-hook): Add
sh-electric-here-document-mode as an option and the default value.
(sh-mode): Mention sh-mode-hook in docstring.
(sh-mode): Remove sh-electric-here-document-mode invocation.
This commit is contained in:
Mark Oteiza 2016-04-16 14:40:17 -04:00
parent 3287f48f5d
commit ac00a92e3d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/progmodes/sh-script.el
View file

@ -1225,9 +1225,10 @@ and command `sh-reset-indent-vars-to-global-values'."
:type 'hook :type 'hook
:group 'sh-script) :group 'sh-script)
(defcustom sh-mode-hook nil (defcustom sh-mode-hook '(sh-electric-here-document-mode)
"Hook run by `sh-mode'." "Hook run by `sh-mode'."
:type 'hook :type 'hook
:options '(sh-electric-here-document-mode)
:group 'sh-script) :group 'sh-script)
(defcustom sh-learn-basic-offset nil (defcustom sh-learn-basic-offset nil
@ -1616,7 +1617,8 @@ buffer indents as it currently is indented.
\\[sh-execute-region] Have optional header and region be executed in a subshell. \\[sh-execute-region] Have optional header and region be executed in a subshell.
`sh-electric-here-document-mode' controls whether insertion of two `sh-electric-here-document-mode' controls whether insertion of two
unquoted < insert a here document. unquoted < insert a here document. You can control this behavior by
modifying `sh-mode-hook'.
If you generally program a shell different from your login shell you can If you generally program a shell different from your login shell you can
set `sh-shell-file' accordingly. If your shell's file name doesn't correctly set `sh-shell-file' accordingly. If your shell's file name doesn't correctly
@ -1653,7 +1655,6 @@ with your script for an edit-interpret-debug cycle."
(setq-local syntax-propertize-function #'sh-syntax-propertize-function) (setq-local syntax-propertize-function #'sh-syntax-propertize-function)
(add-hook 'syntax-propertize-extend-region-functions (add-hook 'syntax-propertize-extend-region-functions
#'syntax-propertize-multiline 'append 'local) #'syntax-propertize-multiline 'append 'local)
(sh-electric-here-document-mode 1)
(setq-local skeleton-pair-alist '((?` _ ?`))) (setq-local skeleton-pair-alist '((?` _ ?`)))
(setq-local skeleton-pair-filter-function 'sh-quoted-p) (setq-local skeleton-pair-filter-function 'sh-quoted-p)
(setq-local skeleton-further-elements (setq-local skeleton-further-elements