aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2015-12-26 13:48:00 +0200
committerEli Zaretskii2015-12-26 13:48:00 +0200
commit293bd4f6329a112e5c14ae863e963dd0eefb1330 (patch)
tree0ba6a7860407a756d69d8820ac50168c1d351e33 /lisp
parent297e558c56d1538106373a5e9b33a07828cc504b (diff)
downloademacs-293bd4f6329a112e5c14ae863e963dd0eefb1330.tar.gz
emacs-293bd4f6329a112e5c14ae863e963dd0eefb1330.zip
Document changes in Shell-script mode
* lisp/progmodes/sh-script.el (sh-mode, sh-set-shell): Document the 'sh-shell' file-local variable. (top level): Add an auto-load form to avoid byte-compiler warning about 'comint-send-string'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/progmodes/sh-script.el10
1 files changed, 8 insertions, 2 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index ac512f607aa..394e9ca48c6 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -204,6 +204,7 @@
204 204
205(autoload 'comint-completion-at-point "comint") 205(autoload 'comint-completion-at-point "comint")
206(autoload 'comint-filename-completion "comint") 206(autoload 'comint-filename-completion "comint")
207(autoload 'comint-send-string "comint")
207(autoload 'shell-command-completion "shell") 208(autoload 'shell-command-completion "shell")
208(autoload 'shell-environment-variable-completion "shell") 209(autoload 'shell-environment-variable-completion "shell")
209 210
@@ -1580,7 +1581,8 @@ assumed. Since filenames rarely give a clue, they are not further analyzed.
1580This mode adapts to the variations between shells (see `sh-set-shell') by 1581This mode adapts to the variations between shells (see `sh-set-shell') by
1581means of an inheritance based feature lookup (see `sh-feature'). This 1582means of an inheritance based feature lookup (see `sh-feature'). This
1582mechanism applies to all variables (including skeletons) that pertain to 1583mechanism applies to all variables (including skeletons) that pertain to
1583shell-specific features. 1584shell-specific features. Shell script files can use the `sh-shell' local
1585variable to indicate the shell variant to be used for the file.
1584 1586
1585The default style of this mode is that of Rosenblatt's Korn shell book. 1587The default style of this mode is that of Rosenblatt's Korn shell book.
1586The syntax of the statements varies with the shell being used. The 1588The syntax of the statements varies with the shell being used. The
@@ -2364,7 +2366,11 @@ argument) controls whether to insert a #!-line and think about making
2364the visited file executable, and NO-QUERY-FLAG (the second argument) 2366the visited file executable, and NO-QUERY-FLAG (the second argument)
2365controls whether to query about making the visited file executable. 2367controls whether to query about making the visited file executable.
2366 2368
2367Calls the value of `sh-set-shell-hook' if set." 2369Calls the value of `sh-set-shell-hook' if set.
2370
2371Shell script files can cause this function be called automatically
2372when the file is visited by having a `sh-shell' file-local variable
2373whose value is the shell name (don't quote it)."
2368 (interactive (list (completing-read 2374 (interactive (list (completing-read
2369 (format "Shell (default %s): " 2375 (format "Shell (default %s): "
2370 sh-shell-file) 2376 sh-shell-file)