;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(defvar sh-mode-map
(let ((map (make-sparse-keymap))
- (menu-map (make-sparse-keymap "Insert")))
+ (menu-map (make-sparse-keymap)))
(define-key map "\C-c(" 'sh-function)
(define-key map "\C-c\C-w" 'sh-while)
(define-key map "\C-c\C-u" 'sh-until)
(define-key map "\C-c:" 'sh-set-shell)
(define-key map [remap backward-sentence] 'sh-beginning-of-command)
(define-key map [remap forward-sentence] 'sh-end-of-command)
- (define-key map [menu-bar insert] (cons "Insert" menu-map))
- (define-key menu-map [sh-while] '("While Loop" . sh-while))
- (define-key menu-map [sh-until] '("Until Loop" . sh-until))
- (define-key menu-map [sh-tmp-file] '("Temporary File" . sh-tmp-file))
- (define-key menu-map [sh-select] '("Select Statement" . sh-select))
- (define-key menu-map [sh-repeat] '("Repeat Loop" . sh-repeat))
- (define-key menu-map [sh-getopts] '("Options Loop" . sh-while-getopts))
- (define-key menu-map [sh-indexed-loop] '("Indexed Loop" . sh-indexed-loop))
- (define-key menu-map [sh-if] '("If Statement" . sh-if))
- (define-key menu-map [sh-for] '("For Loop" . sh-for))
- (define-key menu-map [sh-case] '("Case Statement" . sh-case))
+ (define-key map [menu-bar sh-script] (cons "Sh-Script" menu-map))
+ (define-key menu-map [sh-learn-buffer-indent]
+ '(menu-item "Learn buffer indentation" sh-learn-buffer-indent
+ :help "Learn how to indent the buffer the way it currently is."))
+ (define-key menu-map [sh-learn-line-indent]
+ '(menu-item "Learn line indentation" sh-learn-line-indent
+ :help "Learn how to indent a line as it currently is indented"))
+ (define-key menu-map [sh-show-indent]
+ '(menu-item "Show indentation" sh-show-indent
+ :help "Show the how the current line would be indented"))
+ (define-key menu-map [sh-set-indent]
+ '(menu-item "Set indentation" sh-set-indent
+ :help "Set the indentation for the current line"))
+
+ (define-key menu-map [sh-pair]
+ '(menu-item "Insert braces and quotes in pairs" (lambda () (interactive) (setq skeleton-pair (not skeleton-pair)))
+ :button (:toggle . skeleton-pair)
+ :help "Inserting a brace or quote automatically inserts the matching pair"))
+
+ (define-key menu-map [sh-s0] '("--"))
+ ;; Insert
+ (define-key menu-map [sh-function]
+ '(menu-item "Function..." sh-function
+ :help "Insert a function definition"))
+ (define-key menu-map [sh-add]
+ '(menu-item "Addition..." sh-add
+ :help "Insert an addition of VAR and prefix DELTA for Bourne (type) shell"))
+ (define-key menu-map [sh-until]
+ '(menu-item "Until Loop" sh-until
+ :help "Insert an until loop"))
+ (define-key menu-map [sh-repeat]
+ '(menu-item "Repeat Loop" sh-repeat
+ :help "Insert a repeat loop definition"))
+ (define-key menu-map [sh-while]
+ '(menu-item "While Loop" sh-while
+ :help "Insert a while loop"))
+ (define-key menu-map [sh-getopts]
+ '(menu-item "Options Loop" sh-while-getopts
+ :help "Insert a while getopts loop."))
+ (define-key menu-map [sh-indexed-loop]
+ '(menu-item "Indexed Loop" sh-indexed-loop
+ :help "Insert an indexed loop from 1 to n."))
+ (define-key menu-map [sh-select]
+ '(menu-item "Select Statement" sh-select
+ :help "Insert a select statement "))
+ (define-key menu-map [sh-if]
+ '(menu-item "If Statement" sh-if
+ :help "Insert an if statement"))
+ (define-key menu-map [sh-for]
+ '(menu-item "For Loop" sh-for
+ :help "Insert a for loop"))
+ (define-key menu-map [sh-case]
+ '(menu-item "Case Statement" sh-case
+ :help "Insert a case/switch statement"))
+ (define-key menu-map [sh-s1] '("--"))
+ (define-key menu-map [sh-exec]
+ '(menu-item "Execute region" sh-execute-region
+ :help "Pass optional header and region to a subshell for noninteractive execution"))
+ (define-key menu-map [sh-exec-interpret]
+ '(menu-item "Execute script..." executable-interpret
+ :help "Run script with user-specified args, and collect output in a buffer"))
+ (define-key menu-map [sh-set-shell]
+ '(menu-item "Set shell type..." sh-set-shell
+ :help "Set this buffer's shell to SHELL (a string)"))
+ (define-key menu-map [sh-backslash-region]
+ '(menu-item "Backslash region" sh-backslash-region
+ :help "Insert, align, or delete end-of-line backslashes on the lines in the region."))
map)
"Keymap used in Shell-Script mode.")
(:foreground "yellow" :weight bold))
(((class color)
(background light))
- (:foreground "tan" ))
+ (:foreground "tan1" ))
(t
(:weight bold)))
"Face to show a here-document"
:group 'sh-indentation)
-;; These colours are probably icky. It's just a placeholder though.
+;; These colors are probably icky. It's just a placeholder though.
(defface sh-quoted-exec
'((((class color) (background dark))
(:foreground "salmon"))
(state (if (eq (char-before) ?`) 'backquote 'code))
;; Stacked states in the context.
(states '(double-quote)))
- (while (and state (progn (skip-chars-forward "^'\\\"`$()" limit)
+ (while (and state (progn (skip-chars-forward "^'\\\\\"`$()" limit)
(< (point) limit)))
;; unescape " inside a $( ... ) construct.
(case (char-after)
- (?\' (skip-chars-forward "^'" limit))
+ (?\' (forward-char 1) (skip-chars-forward "^'" limit))
(?\\ (forward-char 1))
(?\" (case state
(double-quote (setq state (pop states)))
This value is used for the `+' and `-' symbols in an indentation variable."
:type 'integer
:group 'sh-indentation)
+(put 'sh-basic-offset 'safe-local-variable 'integerp)
(defcustom sh-indent-comment nil
"How a comment line is to be indented.
(if msg (message "%s" msg) (message nil))))
(defun sh-show-indent (arg)
- "Show the how the currently line would be indented.
+ "Show the how the current line would be indented.
This tells you which variable, if any, controls the indentation of
this line.
If optional arg ARG is non-null (called interactively with a prefix),