annotate lisp/progmodes/sh-script.el @ 95109:88a6289c23cb

(destructuring-bind): Fix spec.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 19 May 2008 11:58:43 +0000
parents 52b7a8c22af5
children f9d35151b907
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1 ;;; sh-script.el --- shell-script editing commands for Emacs
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14148
diff changeset
2
74547
183eba998a4d Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 73327
diff changeset
3 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
79717
a1342e6e097a Add 2008 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 79662
diff changeset
4 ;; 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
5
23869
8d2bb5d1416a Update comment.
Karl Heuer <kwzh@gnu.org>
parents: 23589
diff changeset
6 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
7 ;; Version: 2.0f
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
8 ;; Maintainer: FSF
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
9 ;; Keywords: languages, unix
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
10
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
12
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94046
diff changeset
13 ;; GNU Emacs is free software: you can redistribute it and/or modify
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94046
diff changeset
15 ;; the Free Software Foundation, either version 3 of the License, or
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94046
diff changeset
16 ;; (at your option) any later version.
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
17
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
21 ;; GNU General Public License for more details.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
22
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
94673
52b7a8c22af5 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94046
diff changeset
24 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
25
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
26 ;;; Commentary:
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
27
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
28 ;; Major mode for editing shell scripts. Bourne, C and rc shells as well
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
29 ;; as various derivatives are supported and easily derived from. Structured
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
30 ;; statements can be inserted with one command or abbrev. Completion is
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
31 ;; available for filenames, variables known from the script, the shell and
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
32 ;; the environment as well as commands.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
33
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
34 ;;; Known Bugs:
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
35
13705
4111cc3136d1 (sh-mode-map): Make the code more legible.
Karl Heuer <kwzh@gnu.org>
parents: 13510
diff changeset
36 ;; - In Bourne the keyword `in' is not anchored to case, for, select ...
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
37 ;; - Variables in `"' strings aren't fontified because there's no way of
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
38 ;; syntactically distinguishing those from `'' strings.
8257
bbf6304598d9 "Comment out" autoload cookies.
Richard M. Stallman <rms@gnu.org>
parents: 8121
diff changeset
39
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
40 ;; Indentation
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
41 ;; ===========
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
42 ;; Indentation for rc and es modes is very limited, but for Bourne shells
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
43 ;; and its derivatives it is quite customizable.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
44 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
45 ;; The following description applies to sh and derived shells (bash,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
46 ;; zsh, ...).
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
47 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
48 ;; There are various customization variables which allow tailoring to
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
49 ;; a wide variety of styles. Most of these variables are named
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
50 ;; sh-indent-for-XXX and sh-indent-after-XXX. For example.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
51 ;; sh-indent-after-if controls the indenting of a line following
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
52 ;; an if statement, and sh-indent-for-fi controls the indentation
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
53 ;; of the line containing the fi.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
54 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
55 ;; You can set each to a numeric value, but it is often more convenient
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
56 ;; to a symbol such as `+' which uses the value of variable `sh-basic-offset'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
57 ;; By changing this one variable you can increase or decrease how much
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
58 ;; indentation there is. Valid symbols:
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
59 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
60 ;; + Indent right by sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
61 ;; - Indent left by sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
62 ;; ++ Indent right twice sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
63 ;; -- Indent left twice sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
64 ;; * Indent right half sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
65 ;; / Indent left half sh-basic-offset.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
66 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
67 ;; There are 4 commands to help set the indentation variables:
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
68 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
69 ;; `sh-show-indent'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
70 ;; This shows what variable controls the indentation of the current
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
71 ;; line and its value.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
72 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
73 ;; `sh-set-indent'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
74 ;; This allows you to set the value of the variable controlling the
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
75 ;; current line's indentation. You can enter a number or one of a
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
76 ;; number of special symbols to denote the value of sh-basic-offset,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
77 ;; or its negative, or half it, or twice it, etc. If you've used
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
78 ;; cc-mode this should be familiar. If you forget which symbols are
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
79 ;; valid simply press C-h at the prompt.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
80 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
81 ;; `sh-learn-line-indent'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
82 ;; Simply make the line look the way you want it, then invoke this
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
83 ;; command. It will set the variable to the value that makes the line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
84 ;; indent like that. If called with a prefix argument then it will set
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
85 ;; the value to one of the symbols if applicable.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
86 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
87 ;; `sh-learn-buffer-indent'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
88 ;; This is the deluxe function! It "learns" the whole buffer (use
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
89 ;; narrowing if you want it to process only part). It outputs to a
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
90 ;; buffer *indent* any conflicts it finds, and all the variables it has
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
91 ;; learned. This buffer is a sort of Occur mode buffer, allowing you to
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
92 ;; easily find where something was set. It is popped to automatically
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
93 ;; if there are any conflicts found or if `sh-popup-occur-buffer' is
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
94 ;; non-nil.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
95 ;; `sh-indent-comment' will be set if all comments follow the same
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
96 ;; pattern; if they don't it will be set to nil.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
97 ;; Whether `sh-basic-offset' is set is determined by variable
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
98 ;; `sh-learn-basic-offset'.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
99 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
100 ;; Unfortunately, `sh-learn-buffer-indent' can take a long time to run
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
101 ;; (e.g. if there are large case statements). Perhaps it does not make
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
102 ;; sense to run it on large buffers: if lots of lines have different
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
103 ;; indentation styles it will produce a lot of diagnostics in the
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
104 ;; *indent* buffer; if there is a consistent style then running
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
105 ;; `sh-learn-buffer-indent' on a small region of the buffer should
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
106 ;; suffice.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
107 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
108 ;; Saving indentation values
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
109 ;; -------------------------
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
110 ;; After you've learned the values in a buffer, how to you remember
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
111 ;; them? Originally I had hoped that `sh-learn-buffer-indent'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
112 ;; would make this unnecessary; simply learn the values when you visit
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
113 ;; the buffer.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
114 ;; You can do this automatically like this:
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
115 ;; (add-hook 'sh-set-shell-hook 'sh-learn-buffer-indent)
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
116 ;;
47264
05606bafb8f5 (sh-indent-for-fi, sh-indent-for-done): Fix spacing.
Juanma Barranquero <lekktu@gmail.com>
parents: 45900
diff changeset
117 ;; However... `sh-learn-buffer-indent' is extremely slow,
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
118 ;; especially on large-ish buffer. Also, if there are conflicts the
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
119 ;; "last one wins" which may not produce the desired setting.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
120 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
121 ;; So...There is a minimal way of being able to save indentation values and
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
122 ;; to reload them in another buffer or at another point in time.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
123 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
124 ;; Use `sh-name-style' to give a name to the indentation settings of
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
125 ;; the current buffer.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
126 ;; Use `sh-load-style' to load indentation settings for the current
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
127 ;; buffer from a specific style.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
128 ;; Use `sh-save-styles-to-buffer' to write all the styles to a buffer
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
129 ;; in lisp code. You can then store it in a file and later use
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
130 ;; `load-file' to load it.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
131 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
132 ;; Indentation variables - buffer local or global?
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
133 ;; ----------------------------------------------
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
134 ;; I think that often having them buffer-local makes sense,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
135 ;; especially if one is using `sh-learn-buffer-indent'. However, if
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
136 ;; a user sets values using customization, these changes won't appear
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
137 ;; to work if the variables are already local!
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
138 ;;
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
139 ;; To get round this, there is a variable `sh-make-vars-local' and 2
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
140 ;; functions: `sh-make-vars-local' and `sh-reset-indent-vars-to-global-values'.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
141 ;;
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
142 ;; If `sh-make-vars-local' is non-nil, then these variables become
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
143 ;; buffer local when the mode is established.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
144 ;; If this is nil, then the variables are global. At any time you
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
145 ;; can make them local with the command `sh-make-vars-local'.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
146 ;; Conversely, to update with the global values you can use the
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
147 ;; command `sh-reset-indent-vars-to-global-values'.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
148 ;;
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
149 ;; This may be awkward, but the intent is to cover all cases.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
150 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
151 ;; Awkward things, pitfalls
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
152 ;; ------------------------
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
153 ;; Indentation for a sh script is complicated for a number of reasons:
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
154 ;;
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
155 ;; 1. You can't format by simply looking at symbols, you need to look
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
156 ;; at keywords. [This is not the case for rc and es shells.]
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
157 ;; 2. The character ")" is used both as a matched pair "(" ... ")" and
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
158 ;; as a stand-alone symbol (in a case alternative). This makes
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
159 ;; things quite tricky!
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
160 ;; 3. Here-documents in a script should be treated "as is", and when
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
161 ;; they terminate we want to revert to the indentation of the line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
162 ;; containing the "<<" symbol.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
163 ;; 4. A line may be continued using the "\".
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
164 ;; 5. The character "#" (outside a string) normally starts a comment,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
165 ;; but it doesn't in the sequence "$#"!
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
166 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
167 ;; To try and address points 2 3 and 5 I used a feature that cperl mode
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
168 ;; uses, that of a text's syntax property. This, however, has 2
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
169 ;; disadvantages:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
170 ;; 1. We need to scan the buffer to find which ")" symbols belong to a
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
171 ;; case alternative, to find any here documents, and handle "$#".
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
172 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
173 ;; Bugs
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
174 ;; ----
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
175 ;; - Indenting many lines is slow. It currently does each line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
176 ;; independently, rather than saving state information.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
177 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
178 ;; - `sh-learn-buffer-indent' is extremely slow.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
179 ;;
78197
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
180 ;; - "case $x in y) echo ;; esac)" the last ) is mis-identified as being
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
181 ;; part of a case-pattern. You need to add a semi-colon after "esac" to
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
182 ;; coerce sh-script into doing the right thing.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
183 ;;
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
184 ;; - "echo $z in ps | head)" the last ) is mis-identified as being part of
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
185 ;; a case-pattern. You need to put the "in" between quotes to coerce
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
186 ;; sh-script into doing the right thing.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
187 ;;
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
188 ;; - A line starting with "}>foo" is not indented like "} >foo".
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
189 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
190 ;; Richard Sharman <rsharman@pobox.com> June 1999.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
191
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
192 ;;; Code:
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
193
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
194 ;; page 1: variables and settings
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
195 ;; page 2: indentation stuff
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
196 ;; page 3: mode-command and utility functions
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
197 ;; page 4: statement syntax-commands for various shells
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
198 ;; page 5: various other commands
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
199
32503
3470d692f2e0 Require skeleton and comint when
Dave Love <fx@gnu.org>
parents: 32480
diff changeset
200 (eval-when-compile
3470d692f2e0 Require skeleton and comint when
Dave Love <fx@gnu.org>
parents: 32480
diff changeset
201 (require 'skeleton)
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
202 (require 'cl)
32503
3470d692f2e0 Require skeleton and comint when
Dave Love <fx@gnu.org>
parents: 32480
diff changeset
203 (require 'comint))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
204 (require 'executable)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
205
65239
a1c74fb41c2b (font-lock-comment-face, font-lock-set-defaults, font-lock-string-face):
Juanma Barranquero <lekktu@gmail.com>
parents: 64971
diff changeset
206 (defvar font-lock-comment-face)
a1c74fb41c2b (font-lock-comment-face, font-lock-set-defaults, font-lock-string-face):
Juanma Barranquero <lekktu@gmail.com>
parents: 64971
diff changeset
207 (defvar font-lock-set-defaults)
a1c74fb41c2b (font-lock-comment-face, font-lock-set-defaults, font-lock-string-face):
Juanma Barranquero <lekktu@gmail.com>
parents: 64971
diff changeset
208 (defvar font-lock-string-face)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
209
17068
d1391b21626f (sh-mode-hook, sh-set-shell-hook): Add defvars.
Karl Heuer <kwzh@gnu.org>
parents: 16839
diff changeset
210
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
211 (defgroup sh nil
64051
d700ccca5bd4 (sh, sh-script): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63885
diff changeset
212 "Shell programming utilities."
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
213 :group 'languages)
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
214
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
215 (defgroup sh-script nil
64051
d700ccca5bd4 (sh, sh-script): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63885
diff changeset
216 "Shell script mode."
66963
a11fdee52c05 Add :link (custom-group-link font-lock-faces) to defgroup.
Juri Linkov <juri@jurta.org>
parents: 66269
diff changeset
217 :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
218 :group 'sh
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
219 :prefix "sh-")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
220
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
221
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
222 (defcustom sh-ancestor-alist
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
223 '((ash . sh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
224 (bash . jsh)
29109
0e45e6e90467 (sh-ancestor-alist): Add `bash2'.
Gerd Moellmann <gerd@gnu.org>
parents: 28923
diff changeset
225 (bash2 . jsh)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
226 (dtksh . ksh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
227 (es . rc)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
228 (itcsh . tcsh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
229 (jcsh . csh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
230 (jsh . sh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
231 (ksh . ksh88)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
232 (ksh88 . jsh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
233 (oash . sh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
234 (pdksh . ksh88)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
235 (posix . sh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
236 (tcsh . csh)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
237 (wksh . ksh88)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
238 (wsh . sh)
23501
f12ae4499ae0 (sh-mode): Handle .spec and .mspec files.
Richard M. Stallman <rms@gnu.org>
parents: 23341
diff changeset
239 (zsh . ksh88)
f12ae4499ae0 (sh-mode): Handle .spec and .mspec files.
Richard M. Stallman <rms@gnu.org>
parents: 23341
diff changeset
240 (rpm . sh))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
241 "Alist showing the direct ancestor of various shells.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
242 This is the basis for `sh-feature'. See also `sh-alias-alist'.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
243 By default we have the following three hierarchies:
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
244
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
245 csh C Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
246 jcsh C Shell with Job Control
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
247 tcsh Turbo C Shell
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
248 itcsh ? Turbo C Shell
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
249 rc Plan 9 Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
250 es Extensible Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
251 sh Bourne Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
252 ash ? Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
253 jsh Bourne Shell with Job Control
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
254 bash GNU Bourne Again Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
255 ksh88 Korn Shell '88
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
256 ksh Korn Shell '93
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
257 dtksh CDE Desktop Korn Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
258 pdksh Public Domain Korn Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
259 wksh Window Korn Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
260 zsh Z Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
261 oash SCO OA (curses) Shell
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
262 posix IEEE 1003.2 Shell Standard
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
263 wsh ? Shell"
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
264 :type '(repeat (cons symbol symbol))
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
265 :group 'sh-script)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
266
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
267
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
268 (defcustom sh-alias-alist
47732
3712c799f805 (sh-alias-alist): Use append instead of nconc.
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47595
diff changeset
269 (append (if (eq system-type 'gnu/linux)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
270 '((csh . tcsh)
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
271 (ksh . pdksh)))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
272 ;; for the time being
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
273 '((ksh . ksh88)
29109
0e45e6e90467 (sh-ancestor-alist): Add `bash2'.
Gerd Moellmann <gerd@gnu.org>
parents: 28923
diff changeset
274 (bash2 . bash)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
275 (sh5 . sh)))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
276 "Alist for transforming shell names to what they really are.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
277 Use this where the name of the executable doesn't correspond to the type of
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
278 shell it really is."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
279 :type '(repeat (cons symbol symbol))
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
280 :group 'sh-script)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
281
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
282
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
283 (defcustom sh-shell-file
16810
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
284 (or
16839
daaa2c5bb40a (sh-shell-file): Downcase and remove extension on shells in NT.
Richard M. Stallman <rms@gnu.org>
parents: 16810
diff changeset
285 ;; On MSDOS and Windows, collapse $SHELL to lower-case and remove
daaa2c5bb40a (sh-shell-file): Downcase and remove extension on shells in NT.
Richard M. Stallman <rms@gnu.org>
parents: 16810
diff changeset
286 ;; the executable extension, so comparisons with the list of
16810
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
287 ;; known shells work.
16839
daaa2c5bb40a (sh-shell-file): Downcase and remove extension on shells in NT.
Richard M. Stallman <rms@gnu.org>
parents: 16810
diff changeset
288 (and (memq system-type '(ms-dos windows-nt))
21925
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
289 (let* ((shell (getenv "SHELL"))
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
290 (shell-base
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
291 (and shell (file-name-nondirectory shell))))
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
292 ;; shell-script mode doesn't support DOS/Windows shells,
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
293 ;; so use the default instead.
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
294 (if (or (null shell)
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
295 (member (downcase shell-base)
21980
e73c0672d7b3 (sh-shell-file): Add cmdproxy to MS shells.
Richard M. Stallman <rms@gnu.org>
parents: 21925
diff changeset
296 '("command.com" "cmd.exe" "4dos.com" "ndos.com"
e73c0672d7b3 (sh-shell-file): Add cmdproxy to MS shells.
Richard M. Stallman <rms@gnu.org>
parents: 21925
diff changeset
297 "cmdproxy.exe")))
21925
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
298 "/bin/sh"
3e498c36ccce (sh-shell-file): If $SHELL evaluates to
Eli Zaretskii <eliz@gnu.org>
parents: 21669
diff changeset
299 (file-name-sans-extension (downcase shell)))))
16810
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
300 (getenv "SHELL")
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
301 "/bin/sh")
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
302 "The executable file name for the shell being programmed."
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
303 :type 'string
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
304 :group 'sh-script)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
305
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
306
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
307 (defcustom sh-shell-arg
14886
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
308 ;; bash does not need any options when run in a shell script,
14876
b39dde411ac8 (sh-shell-arg): Don't add any options for bash, ksh.
Richard M. Stallman <rms@gnu.org>
parents: 14849
diff changeset
309 '((bash)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
310 (csh . "-f")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
311 (pdksh)
14886
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
312 ;; Bill_Mann@praxisint.com says -p with ksh can do harm.
14876
b39dde411ac8 (sh-shell-arg): Don't add any options for bash, ksh.
Richard M. Stallman <rms@gnu.org>
parents: 14849
diff changeset
313 (ksh88)
14886
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
314 ;; -p means don't initialize functions from the environment.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
315 (rc . "-p")
14886
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
316 ;; Someone proposed -motif, but we don't want to encourage
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
317 ;; use of a non-free widget set.
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
318 (wksh)
96423e733197 (sh-shell-arg): Add no options for bash, ksh, or wksh.
Richard M. Stallman <rms@gnu.org>
parents: 14876
diff changeset
319 ;; -f means don't run .zshrc.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
320 (zsh . "-f"))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
321 "Single argument string for the magic number. See `sh-feature'."
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
322 :type '(repeat (cons (symbol :tag "Shell")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
323 (choice (const :tag "No Arguments" nil)
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
324 (string :tag "Arguments")
54158
43e09e943479 (sh-shell-arg, sh-require-final-newline, sh-assignment-regexp, sh-builtins)
Eli Zaretskii <eliz@gnu.org>
parents: 53419
diff changeset
325 (sexp :format "Evaluate: %v"))))
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
326 :group 'sh-script)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
327
20395
2bd6621697d5 (sh-imenu-generic-expression): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20385
diff changeset
328 (defcustom sh-imenu-generic-expression
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
329 `((sh
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
330 . ((nil "^\\s-*\\(function\\s-+\\)?\\([[:alpha:]_][[:alnum:]_]+\\)\\s-*()" 2))))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
331 "Alist of regular expressions for recognizing shell function definitions.
35180
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
332 See `sh-feature' and `imenu-generic-expression'."
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
333 :type '(alist :key-type (symbol :tag "Shell")
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
334 :value-type (alist :key-type (choice :tag "Title"
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
335 string
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
336 (const :tag "None" nil))
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
337 :value-type
f4733aab37df (sh-imenu-generic-expression): Fix doc,
Dave Love <fx@gnu.org>
parents: 33430
diff changeset
338 (repeat :tag "Regexp, index..." sexp)))
21669
9861518505cb *** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents: 20900
diff changeset
339 :group 'sh-script
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
340 :version "20.4")
20395
2bd6621697d5 (sh-imenu-generic-expression): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20385
diff changeset
341
14195
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
342 (defvar sh-shell-variables nil
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
343 "Alist of shell variable names that should be included in completion.
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
344 These are used for completion in addition to all the variables named
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
345 in `process-environment'. Each element looks like (VAR . VAR), where
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
346 the car and cdr are the same symbol.")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
347
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
348 (defvar sh-shell-variables-initialized nil
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
349 "Non-nil if `sh-shell-variables' is initialized.")
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
350
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
351 (defun sh-canonicalize-shell (shell)
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
352 "Convert a shell name SHELL to the one we should handle it as."
23589
660727693bf6 (sh-canonicalize-shell): Fix regexp.
Andreas Schwab <schwab@suse.de>
parents: 23511
diff changeset
353 (if (string-match "\\.exe\\'" shell)
23341
d29b6b51866f (sh-set-shell): Remove .exe suffix from shell name.
Richard M. Stallman <rms@gnu.org>
parents: 22783
diff changeset
354 (setq shell (substring shell 0 (match-beginning 0))))
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
355 (or (symbolp shell)
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
356 (setq shell (intern shell)))
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
357 (or (cdr (assq shell sh-alias-alist))
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
358 shell))
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
359
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
360 (defvar sh-shell (sh-canonicalize-shell (file-name-nondirectory sh-shell-file))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
361 "The shell being programmed. This is set by \\[sh-set-shell].")
70144
60a94b1ec37e (sh-shell): Mark as safe.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 69149
diff changeset
362 ;;;###autoload(put 'sh-shell 'safe-local-variable 'symbolp)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
363
56688
6eee795cb9eb (sh-set-shell): Use sh-mode-abbrev-table.
Richard M. Stallman <rms@gnu.org>
parents: 55119
diff changeset
364 (defvar sh-mode-abbrev-table nil)
6eee795cb9eb (sh-set-shell): Use sh-mode-abbrev-table.
Richard M. Stallman <rms@gnu.org>
parents: 55119
diff changeset
365
6eee795cb9eb (sh-set-shell): Use sh-mode-abbrev-table.
Richard M. Stallman <rms@gnu.org>
parents: 55119
diff changeset
366 (define-abbrev-table 'sh-mode-abbrev-table ())
6eee795cb9eb (sh-set-shell): Use sh-mode-abbrev-table.
Richard M. Stallman <rms@gnu.org>
parents: 55119
diff changeset
367
6eee795cb9eb (sh-set-shell): Use sh-mode-abbrev-table.
Richard M. Stallman <rms@gnu.org>
parents: 55119
diff changeset
368
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
369 ;; I turned off this feature because it doesn't permit typing commands
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
370 ;; in the usual way without help.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
371 ;;(defvar sh-abbrevs
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
372 ;; '((csh sh-abbrevs shell
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
373 ;; "switch" 'sh-case
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
374 ;; "getopts" 'sh-while-getopts)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
375
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
376 ;; (es sh-abbrevs shell
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
377 ;; "function" 'sh-function)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
378
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
379 ;; (ksh88 sh-abbrevs sh
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
380 ;; "select" 'sh-select)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
381
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
382 ;; (rc sh-abbrevs shell
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
383 ;; "case" 'sh-case
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
384 ;; "function" 'sh-function)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
385
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
386 ;; (sh sh-abbrevs shell
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
387 ;; "case" 'sh-case
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
388 ;; "function" 'sh-function
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
389 ;; "until" 'sh-until
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
390 ;; "getopts" 'sh-while-getopts)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
391
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
392 ;; ;; The next entry is only used for defining the others
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
393 ;; (shell "for" sh-for
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
394 ;; "loop" sh-indexed-loop
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
395 ;; "if" sh-if
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
396 ;; "tmpfile" sh-tmp-file
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
397 ;; "while" sh-while)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
398
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
399 ;; (zsh sh-abbrevs ksh88
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
400 ;; "repeat" 'sh-repeat))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
401 ;; "Abbrev-table used in Shell-Script mode. See `sh-feature'.
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
402 ;;;Due to the internal workings of abbrev tables, the shell name symbol is
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
403 ;;;actually defined as the table for the like of \\[edit-abbrevs].")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
404
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
405
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
406
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
407 (defun sh-mode-syntax-table (table &rest list)
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
408 "Copy TABLE and set syntax for successive CHARs according to strings S."
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
409 (setq table (copy-syntax-table table))
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
410 (while list
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
411 (modify-syntax-entry (pop list) (pop list) table))
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
412 table)
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
413
52682
a7331078ec76 (sh-mode-syntax-table): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 52619
diff changeset
414 (defvar sh-mode-syntax-table nil
a7331078ec76 (sh-mode-syntax-table): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 52619
diff changeset
415 "The syntax table to use for Shell-Script mode.
a7331078ec76 (sh-mode-syntax-table): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 52619
diff changeset
416 This is buffer-local in every such buffer.")
a7331078ec76 (sh-mode-syntax-table): Add defvar.
Richard M. Stallman <rms@gnu.org>
parents: 52619
diff changeset
417
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
418 (defvar sh-mode-default-syntax-table
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
419 (sh-mode-syntax-table ()
41349
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
420 ?\# "<"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
421 ?\n ">#"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
422 ?\" "\"\""
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
423 ?\' "\"'"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
424 ?\` "\"`"
62242
cce9501aab6e (sh-mode-default-syntax-table): Set the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 62214
diff changeset
425 ;; ?$ might also have a ". p" syntax. Both "'" and ". p" seem
cce9501aab6e (sh-mode-default-syntax-table): Set the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 62214
diff changeset
426 ;; to work fine. This is needed so that dabbrev-expand
cce9501aab6e (sh-mode-default-syntax-table): Set the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 62214
diff changeset
427 ;; $VARNAME works.
cce9501aab6e (sh-mode-default-syntax-table): Set the
Dan Nicolaescu <dann@ics.uci.edu>
parents: 62214
diff changeset
428 ?$ "'"
41349
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
429 ?! "_"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
430 ?% "_"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
431 ?: "_"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
432 ?. "_"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
433 ?^ "_"
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
434 ?~ "_"
51970
be96dd81138a (sh-mode-syntax-table): Change syntax of ?, to "_".
Andreas Schwab <schwab@suse.de>
parents: 51727
diff changeset
435 ?, "_"
57159
e00b0d40b4bc (sh-mode-default-syntax-table): Set syntax of = to "." (punctuation).
Richard M. Stallman <rms@gnu.org>
parents: 56688
diff changeset
436 ?= "."
41349
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
437 ?< "."
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
438 ?> ".")
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
439 "Default syntax table for shell mode.")
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
440
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
441 (defvar sh-mode-syntax-table-input
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
442 '((sh . nil))
41349
8dd8d78194a1 (sh-mode-syntax-table): Function restored.
Richard M. Stallman <rms@gnu.org>
parents: 41348
diff changeset
443 "Syntax-table used in Shell-Script mode. See `sh-feature'.")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
444
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
445 (defvar sh-mode-map
13705
4111cc3136d1 (sh-mode-map): Make the code more legible.
Karl Heuer <kwzh@gnu.org>
parents: 13510
diff changeset
446 (let ((map (make-sparse-keymap))
93536
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
447 (menu-map (make-sparse-keymap)))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
448 (define-key map "\C-c(" 'sh-function)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
449 (define-key map "\C-c\C-w" 'sh-while)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
450 (define-key map "\C-c\C-u" 'sh-until)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
451 (define-key map "\C-c\C-t" 'sh-tmp-file)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
452 (define-key map "\C-c\C-s" 'sh-select)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
453 (define-key map "\C-c\C-r" 'sh-repeat)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
454 (define-key map "\C-c\C-o" 'sh-while-getopts)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
455 (define-key map "\C-c\C-l" 'sh-indexed-loop)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
456 (define-key map "\C-c\C-i" 'sh-if)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
457 (define-key map "\C-c\C-f" 'sh-for)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
458 (define-key map "\C-c\C-c" 'sh-case)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
459 (define-key map "\C-c?" 'sh-show-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
460 (define-key map "\C-c=" 'sh-set-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
461 (define-key map "\C-c<" 'sh-learn-line-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
462 (define-key map "\C-c>" 'sh-learn-buffer-indent)
59566
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
463 (define-key map "\C-c\C-\\" 'sh-backslash-region)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
464
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
465 (define-key map "=" 'sh-assignment)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
466 (define-key map "\C-c+" 'sh-add)
13469
5bda9e4d85eb (sh-mode-map): Put sh-execute-region on C-M-x.
Richard M. Stallman <rms@gnu.org>
parents: 13391
diff changeset
467 (define-key map "\C-\M-x" 'sh-execute-region)
5bda9e4d85eb (sh-mode-map): Put sh-execute-region on C-M-x.
Richard M. Stallman <rms@gnu.org>
parents: 13391
diff changeset
468 (define-key map "\C-c\C-x" 'executable-interpret)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
469 (define-key map "<" 'sh-maybe-here-document)
12864
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
470 (define-key map "(" 'skeleton-pair-insert-maybe)
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
471 (define-key map "{" 'skeleton-pair-insert-maybe)
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
472 (define-key map "[" 'skeleton-pair-insert-maybe)
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
473 (define-key map "'" 'skeleton-pair-insert-maybe)
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
474 (define-key map "`" 'skeleton-pair-insert-maybe)
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
475 (define-key map "\"" 'skeleton-pair-insert-maybe)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
476
49176
56966d83f3a5 (sh-mode-map): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents: 49132
diff changeset
477 (define-key map [remap complete-tag] 'comint-dynamic-complete)
56966d83f3a5 (sh-mode-map): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents: 49132
diff changeset
478 (define-key map [remap newline-and-indent] 'sh-newline-and-indent)
56966d83f3a5 (sh-mode-map): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents: 49132
diff changeset
479 (define-key map [remap delete-backward-char]
56966d83f3a5 (sh-mode-map): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents: 49132
diff changeset
480 'backward-delete-char-untabify)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
481 (define-key map "\C-c:" 'sh-set-shell)
49176
56966d83f3a5 (sh-mode-map): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents: 49132
diff changeset
482 (define-key map [remap backward-sentence] 'sh-beginning-of-command)
56966d83f3a5 (sh-mode-map): Use command remapping instead of
Andreas Schwab <schwab@suse.de>
parents: 49132
diff changeset
483 (define-key map [remap forward-sentence] 'sh-end-of-command)
93536
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
484 (define-key map [menu-bar sh-script] (cons "Sh-Script" menu-map))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
485 (define-key menu-map [sh-learn-buffer-indent]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
486 '(menu-item "Learn buffer indentation" sh-learn-buffer-indent
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
487 :help "Learn how to indent the buffer the way it currently is."))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
488 (define-key menu-map [sh-learn-line-indent]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
489 '(menu-item "Learn line indentation" sh-learn-line-indent
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
490 :help "Learn how to indent a line as it currently is indented"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
491 (define-key menu-map [sh-show-indent]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
492 '(menu-item "Show indentation" sh-show-indent
94046
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
493 :help "Show the how the current line would be indented"))
93536
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
494 (define-key menu-map [sh-set-indent]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
495 '(menu-item "Set indentation" sh-set-indent
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
496 :help "Set the indentation for the current line"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
497
94046
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
498 (define-key menu-map [sh-pair]
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
499 '(menu-item "Insert braces and quotes in pairs" (lambda () (interactive) (setq skeleton-pair (not skeleton-pair)))
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
500 :button (:toggle . skeleton-pair)
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
501 :help "Inserting a brace or quote automatically inserts the matching pair"))
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
502
93536
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
503 (define-key menu-map [sh-s0] '("--"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
504 ;; Insert
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
505 (define-key menu-map [sh-function]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
506 '(menu-item "Function..." sh-function
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
507 :help "Insert a function definition"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
508 (define-key menu-map [sh-add]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
509 '(menu-item "Addition..." sh-add
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
510 :help "Insert an addition of VAR and prefix DELTA for Bourne (type) shell"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
511 (define-key menu-map [sh-until]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
512 '(menu-item "Until Loop" sh-until
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
513 :help "Insert an until loop"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
514 (define-key menu-map [sh-repeat]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
515 '(menu-item "Repeat Loop" sh-repeat
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
516 :help "Insert a repeat loop definition"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
517 (define-key menu-map [sh-while]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
518 '(menu-item "While Loop" sh-while
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
519 :help "Insert a while loop"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
520 (define-key menu-map [sh-getopts]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
521 '(menu-item "Options Loop" sh-while-getopts
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
522 :help "Insert a while getopts loop."))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
523 (define-key menu-map [sh-indexed-loop]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
524 '(menu-item "Indexed Loop" sh-indexed-loop
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
525 :help "Insert an indexed loop from 1 to n."))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
526 (define-key menu-map [sh-select]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
527 '(menu-item "Select Statement" sh-select
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
528 :help "Insert a select statement "))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
529 (define-key menu-map [sh-if]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
530 '(menu-item "If Statement" sh-if
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
531 :help "Insert an if statement"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
532 (define-key menu-map [sh-for]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
533 '(menu-item "For Loop" sh-for
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
534 :help "Insert a for loop"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
535 (define-key menu-map [sh-case]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
536 '(menu-item "Case Statement" sh-case
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
537 :help "Insert a case/switch statement"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
538 (define-key menu-map [sh-s1] '("--"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
539 (define-key menu-map [sh-exec]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
540 '(menu-item "Execute region" sh-execute-region
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
541 :help "Pass optional header and region to a subshell for noninteractive execution"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
542 (define-key menu-map [sh-exec-interpret]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
543 '(menu-item "Execute script..." executable-interpret
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
544 :help "Run script with user-specified args, and collect output in a buffer"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
545 (define-key menu-map [sh-set-shell]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
546 '(menu-item "Set shell type..." sh-set-shell
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
547 :help "Set this buffer's shell to SHELL (a string)"))
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
548 (define-key menu-map [sh-backslash-region]
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
549 '(menu-item "Backslash region" sh-backslash-region
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
550 :help "Insert, align, or delete end-of-line backslashes on the lines in the region."))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
551 map)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
552 "Keymap used in Shell-Script mode.")
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
553
65384
96998d31413e (sh-skeleton-pair-default-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents: 65239
diff changeset
554 (defvar sh-skeleton-pair-default-alist '((?( _ ?)) (?\))
96998d31413e (sh-skeleton-pair-default-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents: 65239
diff changeset
555 (?[ ?\s _ ?\s ?]) (?\])
96998d31413e (sh-skeleton-pair-default-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents: 65239
diff changeset
556 (?{ _ ?}) (?\}))
96998d31413e (sh-skeleton-pair-default-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents: 65239
diff changeset
557 "Value to use for `skeleton-pair-default-alist' in Shell-Script mode.")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
558
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
559 (defcustom sh-dynamic-complete-functions
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
560 '(shell-dynamic-complete-environment-variable
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
561 shell-dynamic-complete-command
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
562 comint-dynamic-complete-filename)
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
563 "Functions for doing TAB dynamic completion."
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
564 :type '(repeat function)
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
565 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
566
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
567
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
568 (defcustom sh-require-final-newline
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
569 '((csh . t)
59251
84ede35ffeb4 (sh-require-final-newline):
Richard M. Stallman <rms@gnu.org>
parents: 58767
diff changeset
570 (pdksh . t))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
571 "Value of `require-final-newline' in Shell-Script mode buffers.
59251
84ede35ffeb4 (sh-require-final-newline):
Richard M. Stallman <rms@gnu.org>
parents: 58767
diff changeset
572 \(SHELL . t) means use the value of `mode-require-final-newline' for SHELL.
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
573 See `sh-feature'."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
574 :type '(repeat (cons (symbol :tag "Shell")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
575 (choice (const :tag "require" t)
54158
43e09e943479 (sh-shell-arg, sh-require-final-newline, sh-assignment-regexp, sh-builtins)
Eli Zaretskii <eliz@gnu.org>
parents: 53419
diff changeset
576 (sexp :format "Evaluate: %v"))))
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
577 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
578
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
579
17531
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
580 (defcustom sh-assignment-regexp
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
581 '((csh . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*[-+*/%^]?=")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
582 ;; actually spaces are only supported in let/(( ... ))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
583 (ksh88 . "\\<\\([[:alnum:]_]+\\)\\(\\[.+\\]\\)?[ \t]*\\([-+*/%&|~^]\\|<<\\|>>\\)?=")
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
584 (rc . "\\<\\([[:alnum:]_*]+\\)[ \t]*=")
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
585 (sh . "\\<\\([[:alnum:]_]+\\)="))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
586 "Regexp for the variable name and what may follow in an assignment.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
587 First grouping matches the variable name. This is upto and including the `='
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
588 sign. See `sh-feature'."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
589 :type '(repeat (cons (symbol :tag "Shell")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
590 (choice regexp
54158
43e09e943479 (sh-shell-arg, sh-require-final-newline, sh-assignment-regexp, sh-builtins)
Eli Zaretskii <eliz@gnu.org>
parents: 53419
diff changeset
591 (sexp :format "Evaluate: %v"))))
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
592 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
593
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
594
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
595 (defcustom sh-indentation 4
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
596 "The width for further indentation in Shell-Script mode."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
597 :type 'integer
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
598 :group 'sh-script)
79662
f0e20a14ba94 * progmodes/sh-script.el (sh-indentation): Add safe-local-variable property.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78234
diff changeset
599 (put 'sh-indentation 'safe-local-variable 'integerp)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
600
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
601 (defcustom sh-remember-variable-min 3
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
602 "Don't remember variables less than this length for completing reads."
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
603 :type 'integer
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
604 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
605
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
606
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
607 (defvar sh-header-marker nil
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
608 "When non-nil is the end of header for prepending by \\[sh-execute-region].
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
609 That command is also used for setting this variable.")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
610
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
611
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
612 (defcustom sh-beginning-of-command
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
613 "\\([;({`|&]\\|\\`\\|[^\\]\n\\)[ \t]*\\([/~[:alnum:]:]\\)"
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
614 "Regexp to determine the beginning of a shell command.
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
615 The actual command starts at the beginning of the second \\(grouping\\)."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
616 :type 'regexp
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
617 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
618
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
619
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
620 (defcustom sh-end-of-command
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
621 "\\([/~[:alnum:]:]\\)[ \t]*\\([;#)}`|&]\\|$\\)"
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
622 "Regexp to determine the end of a shell command.
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
623 The actual command ends at the end of the first \\(grouping\\)."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
624 :type 'regexp
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
625 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
626
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
627
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
628
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
629 (defcustom sh-here-document-word "EOF"
51265
575ad90ca254 (sh-here-document-word): Document new treatment of leading "-".
Glenn Morris <rgm@gnu.org>
parents: 49743
diff changeset
630 "Word to delimit here documents.
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
631 If the first character of this string is \"-\", this is taken as
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
632 part of the redirection operator, rather than part of the
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
633 word (that is, \"<<-\" instead of \"<<\"). This is a feature
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
634 used by some shells (for example Bash) to indicate that leading
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
635 tabs inside the here document should be ignored. In this case,
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
636 Emacs indents the initial body and end of the here document with
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
637 tabs, to the same level as the start (note that apart from this
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
638 there is no support for indentation of here documents). This
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
639 will only work correctly if `sh-basic-offset' is a multiple of
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
640 `tab-width'.
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
641
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
642 Any quote characters or leading whitespace in the word are
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
643 removed when closing the here document."
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
644 :type 'string
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
645 :group 'sh-script)
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
646
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
647
12863
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
648 (defvar sh-test
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
649 '((sh "[ ]" . 3)
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
650 (ksh88 "[[ ]]" . 4))
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
651 "Initial input in Bourne if, while and until skeletons. See `sh-feature'.")
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
652
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
653
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
654 ;; customized this out of sheer bravado. not for the faint of heart.
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
655 ;; but it *did* have an asterisk in the docstring!
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
656 (defcustom sh-builtins
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
657 '((bash sh-append posix
61316
283f977b41fb (sh-builtins) <bash>: Add `caller'.
Glenn Morris <rgm@gnu.org>
parents: 60917
diff changeset
658 "." "alias" "bg" "bind" "builtin" "caller" "compgen" "complete"
52322
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
659 "declare" "dirs" "disown" "enable" "fc" "fg" "help" "history"
52619
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
660 "jobs" "kill" "let" "local" "popd" "printf" "pushd" "shopt"
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
661 "source" "suspend" "typeset" "unalias")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
662
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
663 ;; The next entry is only used for defining the others
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
664 (bourne sh-append shell
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
665 "eval" "export" "getopts" "newgrp" "pwd" "read" "readonly"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
666 "times" "ulimit")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
667
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
668 (csh sh-append shell
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
669 "alias" "chdir" "glob" "history" "limit" "nice" "nohup" "rehash"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
670 "setenv" "source" "time" "unalias" "unhash")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
671
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
672 (dtksh sh-append wksh)
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
673
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
674 (es "access" "apids" "cd" "echo" "eval" "false" "let" "limit" "local"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
675 "newpgrp" "result" "time" "umask" "var" "vars" "wait" "whatis")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
676
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
677 (jsh sh-append sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
678 "bg" "fg" "jobs" "kill" "stop" "suspend")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
679
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
680 (jcsh sh-append csh
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
681 "bg" "fg" "jobs" "kill" "notify" "stop" "suspend")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
682
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
683 (ksh88 sh-append bourne
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
684 "alias" "bg" "false" "fc" "fg" "jobs" "kill" "let" "print" "time"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
685 "typeset" "unalias" "whence")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
686
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
687 (oash sh-append sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
688 "checkwin" "dateline" "error" "form" "menu" "newwin" "oadeinit"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
689 "oaed" "oahelp" "oainit" "pp" "ppfile" "scan" "scrollok" "wattr"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
690 "wclear" "werase" "win" "wmclose" "wmmessage" "wmopen" "wmove"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
691 "wmtitle" "wrefresh")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
692
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
693 (pdksh sh-append ksh88
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
694 "bind")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
695
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
696 (posix sh-append sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
697 "command")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
698
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
699 (rc "builtin" "cd" "echo" "eval" "limit" "newpgrp" "shift" "umask" "wait"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
700 "whatis")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
701
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
702 (sh sh-append bourne
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
703 "hash" "test" "type")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
704
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
705 ;; The next entry is only used for defining the others
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
706 (shell "cd" "echo" "eval" "set" "shift" "umask" "unset" "wait")
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
707
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
708 (wksh sh-append ksh88
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
709 ;; FIXME: This looks too much like a regexp. --Stef
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
710 "Xt[A-Z][A-Za-z]*")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
711
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
712 (zsh sh-append ksh88
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
713 "autoload" "bindkey" "builtin" "chdir" "compctl" "declare" "dirs"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
714 "disable" "disown" "echotc" "enable" "functions" "getln" "hash"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
715 "history" "integer" "limit" "local" "log" "popd" "pushd" "r"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
716 "readonly" "rehash" "sched" "setopt" "source" "suspend" "true"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
717 "ttyctl" "type" "unfunction" "unhash" "unlimit" "unsetopt" "vared"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
718 "which"))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
719 "List of all shell builtins for completing read and fontification.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
720 Note that on some systems not all builtins are available or some are
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
721 implemented as aliases. See `sh-feature'."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
722 :type '(repeat (cons (symbol :tag "Shell")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
723 (choice (repeat string)
54158
43e09e943479 (sh-shell-arg, sh-require-final-newline, sh-assignment-regexp, sh-builtins)
Eli Zaretskii <eliz@gnu.org>
parents: 53419
diff changeset
724 (sexp :format "Evaluate: %v"))))
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
725 :group 'sh-script)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
726
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
727
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
728
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
729 (defcustom sh-leading-keywords
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
730 '((bash sh-append sh
52322
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
731 "time")
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
732
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
733 (csh "else")
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
734
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
735 (es "true" "unwind-protect" "whatis")
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
736
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
737 (rc "else")
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
738
55119
3a424bb24301 (sh-leading-keywords) <sh>: Add "!".
Andreas Schwab <schwab@suse.de>
parents: 54282
diff changeset
739 (sh "!" "do" "elif" "else" "if" "then" "trap" "type" "until" "while"))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
740 "List of keywords that may be immediately followed by a builtin or keyword.
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
741 Given some confusion between keywords and builtins depending on shell and
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
742 system, the distinction here has been based on whether they influence the
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
743 flow of control or syntax. See `sh-feature'."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
744 :type '(repeat (cons (symbol :tag "Shell")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
745 (choice (repeat string)
54158
43e09e943479 (sh-shell-arg, sh-require-final-newline, sh-assignment-regexp, sh-builtins)
Eli Zaretskii <eliz@gnu.org>
parents: 53419
diff changeset
746 (sexp :format "Evaluate: %v"))))
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
747 :group 'sh-script)
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
748
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
749
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
750 (defcustom sh-other-keywords
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
751 '((bash sh-append bourne
51515
6d06c54cda5d Fix bug in "Options Loop" skeleton for ksh. Add newlines to a few skeletons,
Juanma Barranquero <lekktu@gmail.com>
parents: 51379
diff changeset
752 "bye" "logout" "select")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
753
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
754 ;; The next entry is only used for defining the others
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
755 (bourne sh-append sh
16810
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
756 "function")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
757
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
758 (csh sh-append shell
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
759 "breaksw" "default" "end" "endif" "endsw" "foreach" "goto"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
760 "if" "logout" "onintr" "repeat" "switch" "then" "while")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
761
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
762 (es "break" "catch" "exec" "exit" "fn" "for" "forever" "fork" "if"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
763 "return" "throw" "while")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
764
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
765 (ksh88 sh-append bourne
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
766 "select")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
767
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
768 (rc "break" "case" "exec" "exit" "fn" "for" "if" "in" "return" "switch"
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
769 "while")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
770
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
771 (sh sh-append shell
16810
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
772 "done" "esac" "fi" "for" "in" "return")
20dc495230a0 (sh-shell-file): On MSDOS, collapse $SHELL to lower
Richard M. Stallman <rms@gnu.org>
parents: 16552
diff changeset
773
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
774 ;; The next entry is only used for defining the others
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
775 (shell "break" "case" "continue" "exec" "exit")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
776
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
777 (zsh sh-append bash
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
778 "select"))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
779 "List of keywords not in `sh-leading-keywords'.
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
780 See `sh-feature'."
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
781 :type '(repeat (cons (symbol :tag "Shell")
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
782 (choice (repeat string)
54158
43e09e943479 (sh-shell-arg, sh-require-final-newline, sh-assignment-regexp, sh-builtins)
Eli Zaretskii <eliz@gnu.org>
parents: 53419
diff changeset
783 (sexp :format "Evaluate: %v"))))
17407
ae0ba78d6c07 Add defgroup's; change use defcustom for user vars.
Richard M. Stallman <rms@gnu.org>
parents: 17356
diff changeset
784 :group 'sh-script)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
785
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
786
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
787
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
788 (defvar sh-variables
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
789 '((bash sh-append sh
52322
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
790 "allow_null_glob_expansion" "auto_resume" "BASH" "BASH_ENV"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
791 "BASH_VERSINFO" "BASH_VERSION" "cdable_vars" "COMP_CWORD"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
792 "COMP_LINE" "COMP_POINT" "COMP_WORDS" "COMPREPLY" "DIRSTACK"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
793 "ENV" "EUID" "FCEDIT" "FIGNORE" "FUNCNAME"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
794 "glob_dot_filenames" "GLOBIGNORE" "GROUPS" "histchars"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
795 "HISTCMD" "HISTCONTROL" "HISTFILE" "HISTFILESIZE"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
796 "HISTIGNORE" "history_control" "HISTSIZE"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
797 "hostname_completion_file" "HOSTFILE" "HOSTTYPE" "IGNOREEOF"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
798 "ignoreeof" "INPUTRC" "LINENO" "MACHTYPE" "MAIL_WARNING"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
799 "noclobber" "nolinks" "notify" "no_exit_on_failed_exec"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
800 "NO_PROMPT_VARS" "OLDPWD" "OPTERR" "OSTYPE" "PIPESTATUS"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
801 "PPID" "POSIXLY_CORRECT" "PROMPT_COMMAND" "PS3" "PS4"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
802 "pushd_silent" "PWD" "RANDOM" "REPLY" "SECONDS" "SHELLOPTS"
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
803 "SHLVL" "TIMEFORMAT" "TMOUT" "UID")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
804
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
805 (csh sh-append shell
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
806 "argv" "cdpath" "child" "echo" "histchars" "history" "home"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
807 "ignoreeof" "mail" "noclobber" "noglob" "nonomatch" "path" "prompt"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
808 "shell" "status" "time" "verbose")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
809
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
810 (es sh-append shell
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
811 "apid" "cdpath" "CDPATH" "history" "home" "ifs" "noexport" "path"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
812 "pid" "prompt" "signals")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
813
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
814 (jcsh sh-append csh
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
815 "notify")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
816
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
817 (ksh88 sh-append sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
818 "ENV" "ERRNO" "FCEDIT" "FPATH" "HISTFILE" "HISTSIZE" "LINENO"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
819 "OLDPWD" "PPID" "PS3" "PS4" "PWD" "RANDOM" "REPLY" "SECONDS"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
820 "TMOUT")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
821
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
822 (oash sh-append sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
823 "FIELD" "FIELD_MAX" "LAST_KEY" "OALIB" "PP_ITEM" "PP_NUM")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
824
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
825 (rc sh-append shell
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
826 "apid" "apids" "cdpath" "CDPATH" "history" "home" "ifs" "path" "pid"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
827 "prompt" "status")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
828
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
829 (sh sh-append shell
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
830 "CDPATH" "IFS" "OPTARG" "OPTIND" "PS1" "PS2")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
831
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
832 ;; The next entry is only used for defining the others
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
833 (shell "COLUMNS" "EDITOR" "HOME" "HUSHLOGIN" "LANG" "LC_COLLATE"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
834 "LC_CTYPE" "LC_MESSAGES" "LC_MONETARY" "LC_NUMERIC" "LC_TIME"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
835 "LINES" "LOGNAME" "MAIL" "MAILCHECK" "MAILPATH" "PAGER" "PATH"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
836 "SHELL" "TERM" "TERMCAP" "TERMINFO" "VISUAL")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
837
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
838 (tcsh sh-append csh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
839 "addsuffix" "ampm" "autocorrect" "autoexpand" "autolist"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
840 "autologout" "chase_symlinks" "correct" "dextract" "edit" "el"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
841 "fignore" "gid" "histlit" "HOST" "HOSTTYPE" "HPATH"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
842 "ignore_symlinks" "listjobs" "listlinks" "listmax" "matchbeep"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
843 "nobeep" "NOREBIND" "oid" "printexitvalue" "prompt2" "prompt3"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
844 "pushdsilent" "pushdtohome" "recexact" "recognize_only_executables"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
845 "rmstar" "savehist" "SHLVL" "showdots" "sl" "SYSTYPE" "tcsh" "term"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
846 "tperiod" "tty" "uid" "version" "visiblebell" "watch" "who"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
847 "wordchars")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
848
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
849 (zsh sh-append ksh88
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
850 "BAUD" "bindcmds" "cdpath" "DIRSTACKSIZE" "fignore" "FIGNORE" "fpath"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
851 "HISTCHARS" "hostcmds" "hosts" "HOSTS" "LISTMAX" "LITHISTSIZE"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
852 "LOGCHECK" "mailpath" "manpath" "NULLCMD" "optcmds" "path" "POSTEDIT"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
853 "prompt" "PROMPT" "PROMPT2" "PROMPT3" "PROMPT4" "psvar" "PSVAR"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
854 "READNULLCMD" "REPORTTIME" "RPROMPT" "RPS1" "SAVEHIST" "SPROMPT"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
855 "STTY" "TIMEFMT" "TMOUT" "TMPPREFIX" "varcmds" "watch" "WATCH"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
856 "WATCHFMT" "WORDCHARS" "ZDOTDIR"))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
857 "List of all shell variables available for completing read.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
858 See `sh-feature'.")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
859
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
860
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
861 ;; Font-Lock support
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
862
63455
1589bde025e5 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Miles Bader <miles@gnu.org>
parents: 62772
diff changeset
863 (defface sh-heredoc
61394
31aa9a390538 * mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents: 61316
diff changeset
864 '((((min-colors 88) (class color)
31aa9a390538 * mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents: 61316
diff changeset
865 (background dark))
31aa9a390538 * mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents: 61316
diff changeset
866 (:foreground "yellow1" :weight bold))
31aa9a390538 * mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents: 61316
diff changeset
867 (((class color)
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
868 (background dark))
42456
8a4077ab418c (various face definitions): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents: 42075
diff changeset
869 (:foreground "yellow" :weight bold))
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
870 (((class color)
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
871 (background light))
93536
e42355d302bb (sh-mode-map): Rename the menu. Add :help.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92878
diff changeset
872 (:foreground "tan1" ))
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
873 (t
42456
8a4077ab418c (various face definitions): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents: 42075
diff changeset
874 (:weight bold)))
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
875 "Face to show a here-document"
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
876 :group 'sh-indentation)
71182
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
877
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
878 ;; These colours are probably icky. It's just a placeholder though.
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
879 (defface sh-quoted-exec
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
880 '((((class color) (background dark))
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
881 (:foreground "salmon"))
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
882 (((class color) (background light))
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
883 (:foreground "magenta"))
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
884 (t
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
885 (:weight bold)))
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
886 "Face to show quoted execs like ``"
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
887 :group 'sh-indentation)
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
888
63455
1589bde025e5 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Miles Bader <miles@gnu.org>
parents: 62772
diff changeset
889 ;; backward-compatibility alias
1589bde025e5 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Miles Bader <miles@gnu.org>
parents: 62772
diff changeset
890 (put 'sh-heredoc-face 'face-alias 'sh-heredoc)
1589bde025e5 Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-414
Miles Bader <miles@gnu.org>
parents: 62772
diff changeset
891 (defvar sh-heredoc-face 'sh-heredoc)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
892
61316
283f977b41fb (sh-builtins) <bash>: Add `caller'.
Glenn Morris <rgm@gnu.org>
parents: 60917
diff changeset
893 (defface sh-escaped-newline '((t :inherit font-lock-string-face))
283f977b41fb (sh-builtins) <bash>: Add `caller'.
Glenn Morris <rgm@gnu.org>
parents: 60917
diff changeset
894 "Face used for (non-escaped) backslash at end of a line in Shell-script mode."
283f977b41fb (sh-builtins) <bash>: Add `caller'.
Glenn Morris <rgm@gnu.org>
parents: 60917
diff changeset
895 :group 'sh-script
283f977b41fb (sh-builtins) <bash>: Add `caller'.
Glenn Morris <rgm@gnu.org>
parents: 60917
diff changeset
896 :version "22.1")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
897
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
898 (defvar sh-font-lock-keywords-var
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
899 '((csh sh-append shell
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
900 ("\\${?[#?]?\\([[:alpha:]_][[:alnum:]_]*\\|0\\)" 1
52619
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
901 font-lock-variable-name-face))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
902
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
903 (es sh-append executable-font-lock-keywords
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
904 ("\\$#?\\([[:alpha:]_][[:alnum:]_]*\\|[0-9]+\\)" 1
52619
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
905 font-lock-variable-name-face))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
906
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
907 (rc sh-append es)
71182
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
908 (bash sh-append shell ("\\$(\\(\\sw+\\)" (1 'sh-quoted-exec t) ))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
909 (sh sh-append shell
20900
bab0b53038ee (sh-font-lock-keywords): Fontify sh-style function names in declarations.
Richard M. Stallman <rms@gnu.org>
parents: 20886
diff changeset
910 ;; Variable names.
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
911 ("\\$\\({#?\\)?\\([[:alpha:]_][[:alnum:]_]*\\|[-#?@!]\\)" 2
20900
bab0b53038ee (sh-font-lock-keywords): Fontify sh-style function names in declarations.
Richard M. Stallman <rms@gnu.org>
parents: 20886
diff changeset
912 font-lock-variable-name-face)
bab0b53038ee (sh-font-lock-keywords): Fontify sh-style function names in declarations.
Richard M. Stallman <rms@gnu.org>
parents: 20886
diff changeset
913 ;; Function names.
52619
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
914 ("^\\(\\sw+\\)[ \t]*(" 1 font-lock-function-name-face)
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
915 ("\\<\\(function\\)\\>[ \t]*\\(\\sw+\\)?"
62080
2922c607db05 (sh-font-lock-keywords): Use font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents: 61534
diff changeset
916 (1 font-lock-keyword-face) (2 font-lock-function-name-face nil t))
2922c607db05 (sh-font-lock-keywords): Use font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents: 61534
diff changeset
917 ("\\(?:^\\s *\\|[[();&|]\\s *\\|\\(?:\\s +-[ao]\\|if\\|else\\|then\\|while\\|do\\)\\s +\\)\\(!\\)"
2922c607db05 (sh-font-lock-keywords): Use font-lock-negation-char-face.
Daniel Pfeiffer <occitan@esperanto.org>
parents: 61534
diff changeset
918 1 font-lock-negation-char-face))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
919
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
920 ;; The next entry is only used for defining the others
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
921 (shell
52411
9db479d16349 (sh-font-lock-keywords): Use something other than
Glenn Morris <rgm@gnu.org>
parents: 52401
diff changeset
922 ;; Using font-lock-string-face here confuses sh-get-indent-info.
61316
283f977b41fb (sh-builtins) <bash>: Add `caller'.
Glenn Morris <rgm@gnu.org>
parents: 60917
diff changeset
923 ("\\(^\\|[^\\]\\)\\(\\\\\\\\\\)*\\(\\\\\\)$" 3 'sh-escaped-newline)
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
924 ("\\\\[^[:alnum:]]" 0 font-lock-string-face)
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
925 ("\\${?\\([[:alpha:]_][[:alnum:]_]*\\|[0-9]+\\|[$*_]\\)" 1
23501
f12ae4499ae0 (sh-mode): Handle .spec and .mspec files.
Richard M. Stallman <rms@gnu.org>
parents: 23341
diff changeset
926 font-lock-variable-name-face))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
927 (rpm sh-append rpm2
52619
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
928 ("%{?\\(\\sw+\\)" 1 font-lock-keyword-face))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
929 (rpm2 sh-append shell
52619
50338995d37f (sh-builtins): Add bash `shopt' builtin.
Glenn Morris <rgm@gnu.org>
parents: 52571
diff changeset
930 ("^\\(\\sw+\\):" 1 font-lock-variable-name-face)))
18024
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
931 "Default expressions to highlight in Shell Script modes. See `sh-feature'.")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
932
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
933 (defvar sh-font-lock-keywords-var-1
13705
4111cc3136d1 (sh-mode-map): Make the code more legible.
Karl Heuer <kwzh@gnu.org>
parents: 13510
diff changeset
934 '((sh "[ \t]in\\>"))
18024
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
935 "Subdued level highlighting for Shell Script modes.")
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
936
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
937 (defvar sh-font-lock-keywords-var-2 ()
18024
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
938 "Gaudy level highlighting for Shell Script modes.")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
939
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
940 ;; These are used for the syntax table stuff (derived from cperl-mode).
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
941 ;; Note: parse-sexp-lookup-properties must be set to t for it to work.
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
942 (defconst sh-st-punc (string-to-syntax "."))
36631
d5345decc9a4 (sh-st-symbol): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35180
diff changeset
943 (defconst sh-st-symbol (string-to-syntax "_"))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
944 (defconst sh-here-doc-syntax (string-to-syntax "|")) ;; generic string
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
945
66255
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
946 (defconst sh-escaped-line-re
78197
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
947 ;; Should match until the real end-of-continued-line, but if that is not
66255
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
948 ;; possible (because we bump into EOB or the search bound), then we should
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
949 ;; match until the search bound.
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
950 "\\(?:\\(?:.*[^\\\n]\\)?\\(?:\\\\\\\\\\)*\\\\\n\\)*.*")
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
951
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
952 (defconst sh-here-doc-open-re
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
953 (concat "<<-?\\s-*\\\\?\\(\\(?:['\"][^'\"]+['\"]\\|\\sw\\)+\\)"
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
954 sh-escaped-line-re "\\(\n\\)"))
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
955
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
956 (defvar sh-here-doc-markers nil)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
957 (make-variable-buffer-local 'sh-here-doc-markers)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
958 (defvar sh-here-doc-re sh-here-doc-open-re)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
959 (make-variable-buffer-local 'sh-here-doc-re)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
960
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
961 (defun sh-font-lock-close-heredoc (bol eof indented)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
962 "Determine the syntax of the \\n after an EOF.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
963 If non-nil INDENTED indicates that the EOF was indented."
40336
8f116e4bd2cd (sh-font-lock-close-heredoc): check the args for being non-nil
Sam Steingold <sds@gnu.org>
parents: 40335
diff changeset
964 (let* ((eof-re (if eof (regexp-quote eof) ""))
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
965 ;; A rough regexp that should find the opening <<EOF back.
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
966 (sre (concat "<<\\(-?\\)\\s-*['\"\\]?"
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
967 ;; Use \s| to cheaply check it's an open-heredoc.
66255
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
968 eof-re "['\"]?\\([ \t|;&)<>]"
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
969 sh-escaped-line-re
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
970 "\\)?\\s|"))
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
971 ;; A regexp that will find other EOFs.
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
972 (ere (concat "^" (if indented "[ \t]*") eof-re "\n"))
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
973 (start (save-excursion
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
974 (goto-char bol)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
975 (re-search-backward (concat sre "\\|" ere) nil t))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
976 ;; If subgroup 1 matched, we found an open-heredoc, otherwise we first
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
977 ;; found a close-heredoc which makes the current close-heredoc inoperant.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
978 (cond
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
979 ((when (and start (match-end 1)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
980 (not (and indented (= (match-beginning 1) (match-end 1))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
981 (not (sh-in-comment-or-string (match-beginning 0))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
982 ;; Make sure our `<<' is not the EOF1 of a `cat <<EOF1 <<EOF2'.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
983 (save-excursion
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
984 (goto-char start)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
985 (setq start (line-beginning-position 2))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
986 (while
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
987 (progn
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
988 (re-search-forward "<<") ; Skip ourselves.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
989 (and (re-search-forward sh-here-doc-open-re start 'move)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
990 (goto-char (match-beginning 0))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
991 (sh-in-comment-or-string (point)))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
992 ;; No <<EOF2 found after our <<.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
993 (= (point) start)))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
994 sh-here-doc-syntax)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
995 ((not (or start (save-excursion (re-search-forward sre nil t))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
996 ;; There's no <<EOF either before or after us,
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
997 ;; so we should remove ourselves from font-lock's keywords.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
998 (setq sh-here-doc-markers (delete eof sh-here-doc-markers))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
999 (setq sh-here-doc-re
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1000 (concat sh-here-doc-open-re "\\|^\\([ \t]*\\)"
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1001 (regexp-opt sh-here-doc-markers t) "\\(\n\\)"))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1002 nil))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1003
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1004 (defun sh-font-lock-open-heredoc (start string)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1005 "Determine the syntax of the \\n after a <<EOF.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1006 START is the position of <<.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1007 STRING is the actual word used as delimiter (f.ex. \"EOF\").
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1008 INDENTED is non-nil if the here document's content (and the EOF mark) can
66255
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1009 be indented (i.e. a <<- was used rather than just <<).
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1010 Point is at the beginning of the next line."
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1011 (unless (or (memq (char-before start) '(?< ?>))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1012 (sh-in-comment-or-string start))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1013 ;; We're looking at <<STRING, so we add "^STRING$" to the syntactic
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1014 ;; font-lock keywords to detect the end of this here document.
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1015 (let ((str (replace-regexp-in-string "['\"]" "" string)))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1016 (unless (member str sh-here-doc-markers)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1017 (push str sh-here-doc-markers)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1018 (setq sh-here-doc-re
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1019 (concat sh-here-doc-open-re "\\|^\\([ \t]*\\)"
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1020 (regexp-opt sh-here-doc-markers t) "\\(\n\\)"))))
66255
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1021 (let ((ppss (save-excursion (syntax-ppss (1- (point))))))
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1022 (if (nth 4 ppss)
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1023 ;; The \n not only starts the heredoc but also closes a comment.
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1024 ;; Let's close the comment just before the \n.
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1025 (put-text-property (1- (point)) (point) 'syntax-table '(12))) ;">"
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1026 (if (or (nth 5 ppss) (> (count-lines start (point)) 1))
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1027 ;; If the sh-escaped-line-re part of sh-here-doc-re has matched
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1028 ;; several lines, make sure we refontify them together.
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1029 ;; Furthermore, if (nth 5 ppss) is non-nil (i.e. the \n is
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1030 ;; escaped), it means the right \n is actually further down.
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1031 ;; Don't bother fixing it now, but place a multiline property so
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1032 ;; that when jit-lock-context-* refontifies the rest of the
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1033 ;; buffer, it also refontifies the current line with it.
9cf3996bb877 (sh-escaped-line-re): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66027
diff changeset
1034 (put-text-property start (point) 'font-lock-multiline t)))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1035 sh-here-doc-syntax))
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1036
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1037 (defun sh-font-lock-here-doc (limit)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1038 "Search for a heredoc marker."
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1039 ;; This looks silly, but it's because `sh-here-doc-re' keeps changing.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1040 (re-search-forward sh-here-doc-re limit t))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1041
81909
bf55b9b62e57 (sh-font-lock-quoted-subshell): Skip over the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81462
diff changeset
1042 (defun sh-font-lock-quoted-subshell (limit)
72044
3dc0557bba5f (sh-quoted-subshell): Further fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72015
diff changeset
1043 "Search for a subshell embedded in a string.
3dc0557bba5f (sh-quoted-subshell): Further fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72015
diff changeset
1044 Find all the unescaped \" characters within said subshell, remembering that
3dc0557bba5f (sh-quoted-subshell): Further fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72015
diff changeset
1045 subshells can nest."
71949
e430f5632d15 (sh-quoted-subshell): Don't match escaped `. Use `cond', push', and `dolist'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71182
diff changeset
1046 ;; FIXME: This can (and often does) match multiple lines, yet it makes no
e430f5632d15 (sh-quoted-subshell): Don't match escaped `. Use `cond', push', and `dolist'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71182
diff changeset
1047 ;; effort to handle multiline cases correctly, so it ends up being
e430f5632d15 (sh-quoted-subshell): Don't match escaped `. Use `cond', push', and `dolist'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71182
diff changeset
1048 ;; rather flakey.
72316
cedc7e7f2199 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72044
diff changeset
1049 (when (and (re-search-forward "\"\\(?:\\(?:.\\|\n\\)*?[^\\]\\(?:\\\\\\\\\\)*\\)??\\(\\$(\\|`\\)" limit t)
cedc7e7f2199 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72044
diff changeset
1050 ;; Make sure the " we matched is an opening quote.
cedc7e7f2199 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72044
diff changeset
1051 (eq ?\" (nth 3 (syntax-ppss))))
72044
3dc0557bba5f (sh-quoted-subshell): Further fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72015
diff changeset
1052 ;; bingo we have a $( or a ` inside a ""
3dc0557bba5f (sh-quoted-subshell): Further fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72015
diff changeset
1053 (let ((char (char-after (point)))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1054 ;; `state' can be: double-quote, backquote, code.
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1055 (state (if (eq (char-before) ?`) 'backquote 'code))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1056 ;; Stacked states in the context.
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1057 (states '(double-quote)))
92878
0d903db06886 (sh-font-lock-quoted-subshell): Fix handling of \ and '.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1058 (while (and state (progn (skip-chars-forward "^'\\\\\"`$()" limit)
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1059 (< (point) limit)))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1060 ;; unescape " inside a $( ... ) construct.
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1061 (case (char-after)
92878
0d903db06886 (sh-font-lock-quoted-subshell): Fix handling of \ and '.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 91367
diff changeset
1062 (?\' (forward-char 1) (skip-chars-forward "^'" limit))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1063 (?\\ (forward-char 1))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1064 (?\" (case state
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1065 (double-quote (setq state (pop states)))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1066 (t (push state states) (setq state 'double-quote)))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1067 (if state (put-text-property (point) (1+ (point))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1068 'syntax-table '(1))))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1069 (?\` (case state
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1070 (backquote (setq state (pop states)))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1071 (t (push state states) (setq state 'backquote))))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1072 (?\$ (if (not (eq (char-after (1+ (point))) ?\())
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1073 nil
81909
bf55b9b62e57 (sh-font-lock-quoted-subshell): Skip over the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81462
diff changeset
1074 (forward-char 1)
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1075 (case state
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1076 (t (push state states) (setq state 'code)))))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1077 (?\( (case state
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1078 (double-quote nil)
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1079 (t (push state states) (setq state 'code))))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1080 (?\) (case state
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1081 (double-quote nil)
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1082 (t (setq state (pop states)))))
81909
bf55b9b62e57 (sh-font-lock-quoted-subshell): Skip over the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81462
diff changeset
1083 (t (error "Internal error in sh-font-lock-quoted-subshell")))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1084 (forward-char 1)))
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1085 t))
84921
35543641f89c (sh-make-vars-local, sh-reset-indent-vars-to-global-values):
Juanma Barranquero <lekktu@gmail.com>
parents: 84755
diff changeset
1086
71182
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
1087
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
1088 (defun sh-is-quoted-p (pos)
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
1089 (and (eq (char-before pos) ?\\)
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
1090 (not (sh-is-quoted-p (1- pos)))))
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
1091
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1092 (defun sh-font-lock-paren (start)
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1093 (save-excursion
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1094 (goto-char start)
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1095 ;; Skip through all patterns
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1096 (while
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1097 (progn
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1098 (forward-comment (- (point-max)))
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1099 ;; Skip through one pattern
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1100 (while
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1101 (or (/= 0 (skip-syntax-backward "w_"))
54282
d11df80991d8 (sh-font-lock-paren): Add @ in case patterns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 54158
diff changeset
1102 (/= 0 (skip-chars-backward "?[]*@/\\"))
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
1103 (and (sh-is-quoted-p (1- (point)))
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
1104 (goto-char (- (point) 2)))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1105 (when (memq (char-before) '(?\" ?\'))
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1106 (condition-case nil (progn (backward-sexp 1) t)
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1107 (error nil)))))
67069
962ab95567f0 (sh-font-lock-paren): Handle continued lines in patterns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66963
diff changeset
1108 (while (progn
962ab95567f0 (sh-font-lock-paren): Handle continued lines in patterns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66963
diff changeset
1109 (forward-comment (- (point-max)))
962ab95567f0 (sh-font-lock-paren): Handle continued lines in patterns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66963
diff changeset
1110 ;; Maybe we've bumped into an escaped newline.
962ab95567f0 (sh-font-lock-paren): Handle continued lines in patterns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66963
diff changeset
1111 (sh-is-quoted-p (point)))
962ab95567f0 (sh-font-lock-paren): Handle continued lines in patterns.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66963
diff changeset
1112 (backward-char 1))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1113 (when (eq (char-before) ?|)
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1114 (backward-char 1) t)))
78197
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1115 ;; FIXME: ";; esac )" is a case that looks like a case-pattern but it's
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1116 ;; really just a close paren after a case statement. I.e. if we skipped
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1117 ;; over `esac' just now, we're not looking at a case-pattern.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1118 (when (progn (backward-char 2)
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1119 (if (> start (line-end-position))
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1120 (put-text-property (point) (1+ start)
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1121 'font-lock-multiline t))
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1122 ;; FIXME: The `in' may just be a random argument to
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1123 ;; a normal command rather than the real `in' keyword.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1124 ;; I.e. we should look back to try and find the
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1125 ;; corresponding `case'.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1126 (looking-at ";;\\|in"))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1127 sh-st-punc)))
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1128
78197
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1129 (defun sh-font-lock-backslash-quote ()
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1130 (if (eq (save-excursion (nth 3 (syntax-ppss (match-beginning 0)))) ?\')
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1131 ;; In a '...' the backslash is not escaping.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1132 sh-st-punc
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1133 nil))
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1134
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1135 (defun sh-font-lock-flush-syntax-ppss-cache (limit)
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1136 ;; This should probably be a standard function provided by font-lock.el
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1137 ;; (or syntax.el).
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1138 (syntax-ppss-flush-cache (point))
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1139 (goto-char limit)
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1140 nil)
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1141
18024
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
1142 (defconst sh-font-lock-syntactic-keywords
36631
d5345decc9a4 (sh-st-symbol): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35180
diff changeset
1143 ;; A `#' begins a comment when it is unquoted and at the beginning of a
d5345decc9a4 (sh-st-symbol): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35180
diff changeset
1144 ;; word. In the shell, words are separated by metacharacters.
d5345decc9a4 (sh-st-symbol): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35180
diff changeset
1145 ;; The list of special chars is taken from the single-unix spec
d5345decc9a4 (sh-st-symbol): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35180
diff changeset
1146 ;; of the shell command language (under `quoting') but with `$' removed.
d5345decc9a4 (sh-st-symbol): New symbol.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 35180
diff changeset
1147 `(("[^|&;<>()`\\\"' \t\n]\\(#+\\)" 1 ,sh-st-symbol)
67160
23ef368e1c3d (sh-font-lock-syntactic-keywords): \ doesn't escape single quotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 67069
diff changeset
1148 ;; In a '...' the backslash is not escaping.
78197
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1149 ("\\(\\\\\\)'" (1 (sh-font-lock-backslash-quote)))
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1150 ;; The previous rule uses syntax-ppss, but the subsequent rules may
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1151 ;; change the syntax, so we have to tell syntax-ppss that the states it
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1152 ;; has just computed will need to be recomputed.
f942a5cc0de4 (sh-font-lock-backslash-quote, sh-font-lock-flush-syntax-ppss-cache): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 77593
diff changeset
1153 (sh-font-lock-flush-syntax-ppss-cache)
87311
5459c18c7d1a (sh-font-lock-syntactic-keywords): Fix
Andreas Schwab <schwab@suse.de>
parents: 86283
diff changeset
1154 ;; Make sure $@ and $? are correctly recognized as sexps.
66269
5ab4a52a31ac (sh-font-lock-syntactic-keywords): Make $@ and $? into sexps.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 66255
diff changeset
1155 ("\\$\\([?@]\\)" 1 ,sh-st-symbol)
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1156 ;; Find HEREDOC starters and add a corresponding rule for the ender.
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1157 (sh-font-lock-here-doc
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1158 (2 (sh-font-lock-open-heredoc
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1159 (match-beginning 0) (match-string 1)) nil t)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1160 (5 (sh-font-lock-close-heredoc
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1161 (match-beginning 0) (match-string 4)
40336
8f116e4bd2cd (sh-font-lock-close-heredoc): check the args for being non-nil
Sam Steingold <sds@gnu.org>
parents: 40335
diff changeset
1162 (and (match-beginning 3) (/= (match-beginning 3) (match-end 3))))
8f116e4bd2cd (sh-font-lock-close-heredoc): check the args for being non-nil
Sam Steingold <sds@gnu.org>
parents: 40335
diff changeset
1163 nil t))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1164 ;; Distinguish the special close-paren in `case'.
72316
cedc7e7f2199 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72044
diff changeset
1165 (")" 0 (sh-font-lock-paren (match-beginning 0)))
cedc7e7f2199 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72044
diff changeset
1166 ;; highlight (possibly nested) subshells inside "" quoted regions correctly.
cedc7e7f2199 (sh-quoted-subshell): Make sure we don't mistake a closing " for an opening one.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 72044
diff changeset
1167 ;; This should be at the very end because it uses syntax-ppss.
81909
bf55b9b62e57 (sh-font-lock-quoted-subshell): Skip over the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81462
diff changeset
1168 (sh-font-lock-quoted-subshell)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1169
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
1170 (defun sh-font-lock-syntactic-face-function (state)
71182
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
1171 (let ((q (nth 3 state)))
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
1172 (if q
90428
a8190f7e546e Merge from emacs--devo--0
Miles Bader <miles@gnu.org>
parents: 90385 71182
diff changeset
1173 (if (characterp q)
71182
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
1174 (if (eq q ?\`) 'sh-quoted-exec font-lock-string-face)
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
1175 sh-heredoc-face)
44d77343c9ac (sh-quoted-exec): New face for quoted exec constructs like `foo bar`.
Eli Zaretskii <eliz@gnu.org>
parents: 70829
diff changeset
1176 font-lock-comment-face)))
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
1177
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1178 (defgroup sh-indentation nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1179 "Variables controlling indentation in shell scripts.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1180
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1181 Note: customizing these variables will not affect existing buffers if
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1182 `sh-make-vars-local' is no-nil. See the documentation for
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1183 variable `sh-make-vars-local', command `sh-make-vars-local'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1184 and command `sh-reset-indent-vars-to-global-values'."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1185 :group 'sh-script)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1186
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1187
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1188 (defcustom sh-set-shell-hook nil
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1189 "Hook run by `sh-set-shell'."
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1190 :type 'hook
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1191 :group 'sh-script)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1192
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1193 (defcustom sh-mode-hook nil
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1194 "Hook run by `sh-mode'."
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1195 :type 'hook
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1196 :group 'sh-script)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1197
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1198 (defcustom sh-learn-basic-offset nil
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1199 "When `sh-guess-basic-offset' should learn `sh-basic-offset'.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1200
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1201 nil mean: never.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1202 t means: only if there seems to be an obvious value.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1203 Anything else means: whenever we have a \"good guess\" as to the value."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1204 :type '(choice
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1205 (const :tag "Never" nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1206 (const :tag "Only if sure" t)
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1207 (const :tag "If have a good guess" usually))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1208 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1209
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1210 (defcustom sh-popup-occur-buffer nil
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1211 "Controls when `sh-learn-buffer-indent' pops the `*indent*' buffer.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1212 If t it is always shown. If nil, it is shown only when there
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1213 are conflicts."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1214 :type '(choice
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1215 (const :tag "Only when there are conflicts." nil)
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1216 (const :tag "Always" t))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1217 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1218
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1219 (defcustom sh-blink t
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1220 "If non-nil, `sh-show-indent' shows the line indentation is relative to.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1221 The position on the line is not necessarily meaningful.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1222 In some cases the line will be the matching keyword, but this is not
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1223 always the case."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1224 :type 'boolean
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1225 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1226
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1227 (defcustom sh-first-lines-indent 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1228 "The indentation of the first non-blank non-comment line.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1229 Usually 0 meaning first column.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1230 Can be set to a number, or to nil which means leave it as is."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1231 :type '(choice
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1232 (const :tag "Leave as is" nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1233 (integer :tag "Column number"
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1234 :menu-tag "Indent to this col (0 means first col)" ))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1235 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1236
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1237
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1238 (defcustom sh-basic-offset 4
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1239 "The default indentation increment.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1240 This value is used for the `+' and `-' symbols in an indentation variable."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1241 :type 'integer
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1242 :group 'sh-indentation)
79885
897a4cc5c95d * progmodes/sh-script.el (sh-basic-offset):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79717
diff changeset
1243 (put 'sh-basic-offset 'safe-local-variable 'integerp)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1244
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1245 (defcustom sh-indent-comment nil
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1246 "How a comment line is to be indented.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1247 nil means leave it as it is;
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1248 t means indent it as a normal line, aligning it to previous non-blank
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1249 non-comment line;
84755
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82354
diff changeset
1250 a number means align to that column, e.g. 0 means first column."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1251 :type '(choice
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1252 (const :tag "Leave as is." nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1253 (const :tag "Indent as a normal line." t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1254 (integer :menu-tag "Indent to this col (0 means first col)."
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1255 :tag "Indent to column number.") )
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1256 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1257
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1258
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1259 (defvar sh-debug nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1260 "Enable lots of debug messages - if function `sh-debug' is enabled.")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1261
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1262
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1263 ;; Uncomment this defun and comment the defmacro for debugging.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1264 ;; (defun sh-debug (&rest args)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1265 ;; "For debugging: display message ARGS if variable SH-DEBUG is non-nil."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1266 ;; (if sh-debug
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1267 ;; (apply 'message args)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1268 (defmacro sh-debug (&rest args))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1269
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1270 (defconst sh-symbol-list
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1271 '((const :tag "+ " :value +
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1272 :menu-tag "+ Indent right by sh-basic-offset")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1273 (const :tag "- " :value -
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1274 :menu-tag "- Indent left by sh-basic-offset")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1275 (const :tag "++" :value ++
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1276 :menu-tag "++ Indent right twice sh-basic-offset")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1277 (const :tag "--" :value --
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1278 :menu-tag "-- Indent left twice sh-basic-offset")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1279 (const :tag "* " :value *
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1280 :menu-tag "* Indent right half sh-basic-offset")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1281 (const :tag "/ " :value /
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1282 :menu-tag "/ Indent left half sh-basic-offset")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1283
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1284 (defcustom sh-indent-for-else 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1285 "How much to indent an `else' relative to its `if'. Usually 0."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1286 :type `(choice
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1287 (integer :menu-tag "A number (positive=>indent right)"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1288 :tag "A number")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1289 (const :tag "--") ;; separator!
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1290 ,@ sh-symbol-list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1291 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1292 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1293
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1294 (defconst sh-number-or-symbol-list
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1295 (append '((integer :menu-tag "A number (positive=>indent right)"
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1296 :tag "A number")
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1297 (const :tag "--")) ; separator
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1298 sh-symbol-list))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1299
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1300 (defcustom sh-indent-for-fi 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1301 "How much to indent a `fi' relative to its `if'. Usually 0."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1302 :type `(choice ,@ sh-number-or-symbol-list )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1303 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1304
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1305 (defcustom sh-indent-for-done 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1306 "How much to indent a `done' relative to its matching stmt. Usually 0."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1307 :type `(choice ,@ sh-number-or-symbol-list )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1308 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1309
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1310 (defcustom sh-indent-after-else '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1311 "How much to indent a statement after an `else' statement."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1312 :type `(choice ,@ sh-number-or-symbol-list )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1313 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1314
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1315 (defcustom sh-indent-after-if '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1316 "How much to indent a statement after an `if' statement.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1317 This includes lines after `else' and `elif' statements, too, but
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1318 does not affect the `else', `elif' or `fi' statements themselves."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1319 :type `(choice ,@ sh-number-or-symbol-list )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1320 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1321
58767
d2c6a8b592f2 (sh-indent-for-then): Change default.
Richard M. Stallman <rms@gnu.org>
parents: 57159
diff changeset
1322 (defcustom sh-indent-for-then 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1323 "How much to indent a `then' relative to its `if'."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1324 :type `(choice ,@ sh-number-or-symbol-list )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1325 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1326
62214
e451c7eb2d24 (sh-indent-for-do): Default to 0.
Richard M. Stallman <rms@gnu.org>
parents: 62080
diff changeset
1327 (defcustom sh-indent-for-do 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1328 "How much to indent a `do' statement.
62310
063800c5c224 More doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62309
diff changeset
1329 This is relative to the statement before the `do', typically a
063800c5c224 More doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62309
diff changeset
1330 `while', `until', `for', `repeat' or `select' statement."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1331 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1332 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1333
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1334 (defcustom sh-indent-after-do '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1335 "How much to indent a line after a `do' statement.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1336 This is used when the `do' is the first word of the line.
62310
063800c5c224 More doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62309
diff changeset
1337 This is relative to the statement before the `do', typically a
063800c5c224 More doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62309
diff changeset
1338 `while', `until', `for', `repeat' or `select' statement."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1339 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1340 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1341
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1342 (defcustom sh-indent-after-loop-construct '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1343 "How much to indent a statement after a loop construct.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1344
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1345 This variable is used when the keyword `do' is on the same line as the
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1346 loop statement (e.g., `until', `while' or `for').
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1347 If the `do' is on a line by itself, then `sh-indent-after-do' is used instead."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1348 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1349 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1350
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1351
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1352 (defcustom sh-indent-after-done 0
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1353 "How much to indent a statement after a `done' keyword.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1354 Normally this is 0, which aligns the `done' to the matching
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1355 looping construct line.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1356 Setting it non-zero allows you to have the `do' statement on a line
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1357 by itself and align the done under to do."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1358 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1359 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1360
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1361 (defcustom sh-indent-for-case-label '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1362 "How much to indent a case label statement.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1363 This is relative to the line containing the `case' statement."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1364 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1365 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1366
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1367 (defcustom sh-indent-for-case-alt '++
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1368 "How much to indent statements after the case label.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1369 This is relative to the line containing the `case' statement."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1370 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1371 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1372
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1373
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1374 (defcustom sh-indent-for-continuation '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1375 "How much to indent for a continuation statement."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1376 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1377 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1378
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1379 (defcustom sh-indent-after-open '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1380 "How much to indent after a line with an opening parenthesis or brace.
62309
93889fbf94b2 Many doc usage fixes.
Richard M. Stallman <rms@gnu.org>
parents: 62242
diff changeset
1381 For an open paren after a function, `sh-indent-after-function' is used."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1382 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1383 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1384
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1385 (defcustom sh-indent-after-function '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1386 "How much to indent after a function line."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1387 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1388 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1389
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1390 ;; These 2 are for the rc shell:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1391
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1392 (defcustom sh-indent-after-switch '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1393 "How much to indent a `case' statement relative to the `switch' statement.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1394 This is for the rc shell."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1395 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1396 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1397
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1398 (defcustom sh-indent-after-case '+
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1399 "How much to indent a statement relative to the `case' statement.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1400 This is for the rc shell."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1401 :type `(choice ,@ sh-number-or-symbol-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1402 :group 'sh-indentation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1403
59566
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1404 (defcustom sh-backslash-column 48
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1405 "Column in which `sh-backslash-region' inserts backslashes."
59566
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1406 :type 'integer
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1407 :group 'sh)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1408
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1409 (defcustom sh-backslash-align t
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1410 "If non-nil, `sh-backslash-region' will align backslashes."
59566
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1411 :type 'boolean
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1412 :group 'sh)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
1413
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1414 ;; Internal use - not designed to be changed by the user:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1415
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1416 (defun sh-mkword-regexpr (word)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1417 "Make a regexp which matches WORD as a word.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1418 This specifically excludes an occurrence of WORD followed by
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1419 punctuation characters like '-'."
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
1420 (concat word "\\([^-[:alnum:]_]\\|$\\)"))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1421
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1422 (defconst sh-re-done (sh-mkword-regexpr "done"))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1423
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1424
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1425 (defconst sh-kws-for-done
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1426 '((sh . ( "while" "until" "for" ) )
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1427 (bash . ( "while" "until" "for" "select" ) )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1428 (ksh88 . ( "while" "until" "for" "select" ) )
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1429 (zsh . ( "while" "until" "for" "repeat" "select" ) ) )
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1430 "Which keywords can match the word `done' in this shell.")
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1431
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1432
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1433 (defconst sh-indent-supported
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1434 '((sh . t)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1435 (csh . nil)
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1436 (rc . t))
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1437 "Shell types that shell indenting can do something with.")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1438
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1439 (defvar sh-indent-supported-here nil
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1440 "Non-nil if we support indentation for the current buffer's shell type.")
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1441
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1442 (defconst sh-var-list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1443 '(
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1444 sh-basic-offset sh-first-lines-indent sh-indent-after-case
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1445 sh-indent-after-do sh-indent-after-done
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1446 sh-indent-after-else
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1447 sh-indent-after-if
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1448 sh-indent-after-loop-construct
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1449 sh-indent-after-open
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1450 sh-indent-comment
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1451 sh-indent-for-case-alt
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1452 sh-indent-for-case-label
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1453 sh-indent-for-continuation
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1454 sh-indent-for-do
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1455 sh-indent-for-done
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1456 sh-indent-for-else
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1457 sh-indent-for-fi
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1458 sh-indent-for-then
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1459 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1460 "A list of variables used by script mode to control indentation.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1461 This list is used when switching between buffer-local and global
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1462 values of variables, and for the commands using indentation styles.")
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1463
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1464 (defvar sh-make-vars-local t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1465 "*Controls whether indentation variables are local to the buffer.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1466 If non-nil, indentation variables are made local initially.
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1467 If nil, you can later make the variables local by invoking
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1468 command `sh-make-vars-local'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1469 The default is t because I assume that in one Emacs session one is
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1470 frequently editing existing scripts with different styles.")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1471
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1472
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1473 ;; mode-command and utility functions
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1474
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1475 ;;;###autoload
41348
b46a4ee1a05d (sh-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41233
diff changeset
1476 (defun sh-mode ()
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1477 "Major mode for editing shell scripts.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1478 This mode works for many shells, since they all have roughly the same syntax,
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1479 as far as commands, arguments, variables, pipes, comments etc. are concerned.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1480 Unless the file's magic number indicates the shell, your usual shell is
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1481 assumed. Since filenames rarely give a clue, they are not further analyzed.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1482
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1483 This mode adapts to the variations between shells (see `sh-set-shell') by
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1484 means of an inheritance based feature lookup (see `sh-feature'). This
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1485 mechanism applies to all variables (including skeletons) that pertain to
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1486 shell-specific features.
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1487
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1488 The default style of this mode is that of Rosenblatt's Korn shell book.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1489 The syntax of the statements varies with the shell being used. The
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1490 following commands are available, based on the current shell's syntax:
67647
ccd73c32ce19 * progmodes/sh-script.el (sh-mode): Add keymap to docstring.
Chong Yidong <cyd@stupidchicken.com>
parents: 67160
diff changeset
1491 \\<sh-mode-map>
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1492 \\[sh-case] case statement
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1493 \\[sh-for] for loop
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1494 \\[sh-function] function definition
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1495 \\[sh-if] if statement
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1496 \\[sh-indexed-loop] indexed loop from 1 to n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1497 \\[sh-while-getopts] while getopts loop
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1498 \\[sh-repeat] repeat loop
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1499 \\[sh-select] select loop
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1500 \\[sh-until] until loop
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1501 \\[sh-while] while loop
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1502
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1503 For sh and rc shells indentation commands are:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1504 \\[sh-show-indent] Show the variable controlling this line's indentation.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1505 \\[sh-set-indent] Set then variable controlling this line's indentation.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1506 \\[sh-learn-line-indent] Change the indentation variable so this line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1507 would indent to the way it currently is.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1508 \\[sh-learn-buffer-indent] Set the indentation variables so the
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1509 buffer indents as it currently is indented.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1510
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1511
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1512 \\[backward-delete-char-untabify] Delete backward one position, even if it was a tab.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1513 \\[sh-newline-and-indent] Delete unquoted space and indent new line same as this one.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1514 \\[sh-end-of-command] Go to end of successive commands.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1515 \\[sh-beginning-of-command] Go to beginning of successive commands.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1516 \\[sh-set-shell] Set this buffer's shell, and maybe its magic number.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1517 \\[sh-execute-region] Have optional header and region be executed in a subshell.
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1518
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1519 \\[sh-maybe-here-document] Without prefix, following an unquoted < inserts here document.
40340
5800d6cc4718 sugar: escape a "{" in the first column to pacify font-lock
Sam Steingold <sds@gnu.org>
parents: 40336
diff changeset
1520 \{, (, [, ', \", `
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1521 Unless quoted with \\, insert the pairs {}, (), [], or '', \"\", ``.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1522
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1523 If you generally program a shell different from your login shell you can
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
1524 set `sh-shell-file' accordingly. If your shell's file name doesn't correctly
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1525 indicate what shell it is use `sh-alias-alist' to translate.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1526
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1527 If your shell gives error messages with line numbers, you can use \\[executable-interpret]
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1528 with your script for an edit-interpret-debug cycle."
41348
b46a4ee1a05d (sh-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41233
diff changeset
1529 (interactive)
b46a4ee1a05d (sh-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41233
diff changeset
1530 (kill-all-local-variables)
b46a4ee1a05d (sh-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41233
diff changeset
1531 (setq major-mode 'sh-mode
b46a4ee1a05d (sh-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41233
diff changeset
1532 mode-name "Shell-script")
b46a4ee1a05d (sh-mode): Don't use define-derived-mode.
Richard M. Stallman <rms@gnu.org>
parents: 41233
diff changeset
1533 (use-local-map sh-mode-map)
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1534 (make-local-variable 'skeleton-end-hook)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1535 (make-local-variable 'paragraph-start)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1536 (make-local-variable 'paragraph-separate)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1537 (make-local-variable 'comment-start)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1538 (make-local-variable 'comment-start-skip)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1539 (make-local-variable 'require-final-newline)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1540 (make-local-variable 'sh-header-marker)
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
1541 (make-local-variable 'sh-shell-file)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1542 (make-local-variable 'sh-shell)
12864
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
1543 (make-local-variable 'skeleton-pair-alist)
70829
b9fa14b504d3 (sh-mode): Use skeleton-pair-filter-function.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70828
diff changeset
1544 (make-local-variable 'skeleton-pair-filter-function)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1545 (make-local-variable 'comint-dynamic-complete-functions)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1546 (make-local-variable 'comint-prompt-regexp)
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1547 (make-local-variable 'font-lock-defaults)
70828
bc576a11127e (sh-mode): Use skeleton-filter-function.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70144
diff changeset
1548 (make-local-variable 'skeleton-filter-function)
12887
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
1549 (make-local-variable 'skeleton-newline-indent-rigidly)
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
1550 (make-local-variable 'sh-shell-variables)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
1551 (make-local-variable 'sh-shell-variables-initialized)
20395
2bd6621697d5 (sh-imenu-generic-expression): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 20385
diff changeset
1552 (make-local-variable 'imenu-generic-expression)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1553 (make-local-variable 'sh-indent-supported-here)
65384
96998d31413e (sh-skeleton-pair-default-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents: 65239
diff changeset
1554 (make-local-variable 'skeleton-pair-default-alist)
96998d31413e (sh-skeleton-pair-default-alist): New var.
Richard M. Stallman <rms@gnu.org>
parents: 65239
diff changeset
1555 (setq skeleton-pair-default-alist sh-skeleton-pair-default-alist)
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
1556 (setq skeleton-end-hook (lambda ()
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1557 (or (eolp) (newline) (indent-relative)))
13705
4111cc3136d1 (sh-mode-map): Make the code more legible.
Karl Heuer <kwzh@gnu.org>
parents: 13510
diff changeset
1558 paragraph-start (concat page-delimiter "\\|$")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1559 paragraph-separate paragraph-start
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1560 comment-start "# "
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1561 comment-start-skip "#+[\t ]*"
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1562 local-abbrev-table sh-mode-abbrev-table
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1563 comint-dynamic-complete-functions sh-dynamic-complete-functions
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1564 ;; we can't look if previous line ended with `\'
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1565 comint-prompt-regexp "^[ \t]*"
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1566 imenu-case-fold-search nil
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1567 font-lock-defaults
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
1568 `((sh-font-lock-keywords
18024
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
1569 sh-font-lock-keywords-1 sh-font-lock-keywords-2)
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
1570 nil nil
58afe194f1bd Update for syntax-table text properties.
Simon Marshall <simon@gnu.org>
parents: 17531
diff changeset
1571 ((?/ . "w") (?~ . "w") (?. . "w") (?- . "w") (?_ . "w")) nil
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1572 (font-lock-syntactic-keywords . sh-font-lock-syntactic-keywords)
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
1573 (font-lock-syntactic-face-function
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
1574 . sh-font-lock-syntactic-face-function))
12864
3b9dcd964c66 (sh-mode-map): Use new name skeleton-pair-insert-maybe.
Karl Heuer <kwzh@gnu.org>
parents: 12863
diff changeset
1575 skeleton-pair-alist '((?` _ ?`))
70829
b9fa14b504d3 (sh-mode): Use skeleton-pair-filter-function.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70828
diff changeset
1576 skeleton-pair-filter-function 'sh-quoted-p
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1577 skeleton-further-elements '((< '(- (min sh-indentation
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1578 (current-column)))))
70828
bc576a11127e (sh-mode): Use skeleton-filter-function.
Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
parents: 70144
diff changeset
1579 skeleton-filter-function 'sh-feature
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1580 skeleton-newline-indent-rigidly t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1581 sh-indent-supported-here nil)
86283
dcb8172071f2 (sh-mode): Set defun-prompt-regexp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84921
diff changeset
1582 (set (make-local-variable 'defun-prompt-regexp)
dcb8172071f2 (sh-mode): Set defun-prompt-regexp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 84921
diff changeset
1583 (concat "^\\(function[ \t]\\|[[:alnum:]]+[ \t]+()[ \t]+\\)"))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1584 (set (make-local-variable 'parse-sexp-ignore-comments) t)
16552
fe3d32bca2c5 (sh-set-shell): Pass args no-query-flag
Richard M. Stallman <rms@gnu.org>
parents: 16535
diff changeset
1585 ;; Parse or insert magic number for exec, and set all variables depending
fe3d32bca2c5 (sh-set-shell): Pass args no-query-flag
Richard M. Stallman <rms@gnu.org>
parents: 16535
diff changeset
1586 ;; on the shell thus determined.
69149
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1587 (sh-set-shell
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1588 (cond ((save-excursion
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1589 (goto-char (point-min))
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1590 (looking-at "#![ \t]?\\([^ \t\n]*/bin/env[ \t]\\)?\\([^ \t\n]+\\)"))
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1591 (match-string 2))
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1592 ((not buffer-file-name)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1593 sh-shell-file)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1594 ;; Checks that use `buffer-file-name' follow.
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1595 ((string-match "\\.m?spec\\'" buffer-file-name)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1596 "rpm")
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1597 ((string-match "[.]sh\\>" buffer-file-name)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1598 "sh")
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1599 ((string-match "[.]bash\\>" buffer-file-name)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1600 "bash")
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1601 ((string-match "[.]ksh\\>" buffer-file-name)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1602 "ksh")
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1603 ((string-match "[.]csh\\>" buffer-file-name)
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1604 "csh")
77593
dac1de8103f2 (sh-mode): Recognize .profile as sh style.
Richard M. Stallman <rms@gnu.org>
parents: 75347
diff changeset
1605 ((equal (file-name-nondirectory buffer-file-name) ".profile")
dac1de8103f2 (sh-mode): Recognize .profile as sh style.
Richard M. Stallman <rms@gnu.org>
parents: 75347
diff changeset
1606 "sh")
69149
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1607 (t
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1608 sh-shell-file))
b5043066337b (sh-mode): Fix bug: Arrange to use
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 69083
diff changeset
1609 nil nil)
62772
f2892faa87d4 * progmodes/ada-mode.el (ada-mode):
Lute Kamstra <lute@gnu.org>
parents: 62550
diff changeset
1610 (run-mode-hooks 'sh-mode-hook))
33430
d2648645aa9b (sh-mode-syntax-table) <defvar>:
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32728
diff changeset
1611
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1612 ;;;###autoload
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1613 (defalias 'shell-script-mode 'sh-mode)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1614
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1615
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1616 (defun sh-font-lock-keywords (&optional keywords)
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1617 "Function to get simple fontification based on `sh-font-lock-keywords'.
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1618 This adds rules for comments and assignments."
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1619 (sh-feature sh-font-lock-keywords-var
23511
8b4cdcbaf071 (sh-font-lock-keywords): Don't crash for an unrecognized shell.
Richard M. Stallman <rms@gnu.org>
parents: 23501
diff changeset
1620 (when (stringp (sh-feature sh-assignment-regexp))
8b4cdcbaf071 (sh-font-lock-keywords): Don't crash for an unrecognized shell.
Richard M. Stallman <rms@gnu.org>
parents: 23501
diff changeset
1621 (lambda (list)
8b4cdcbaf071 (sh-font-lock-keywords): Don't crash for an unrecognized shell.
Richard M. Stallman <rms@gnu.org>
parents: 23501
diff changeset
1622 `((,(sh-feature sh-assignment-regexp)
8b4cdcbaf071 (sh-font-lock-keywords): Don't crash for an unrecognized shell.
Richard M. Stallman <rms@gnu.org>
parents: 23501
diff changeset
1623 1 font-lock-variable-name-face)
8b4cdcbaf071 (sh-font-lock-keywords): Don't crash for an unrecognized shell.
Richard M. Stallman <rms@gnu.org>
parents: 23501
diff changeset
1624 ,@keywords
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1625 ,@list
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1626 ,@executable-font-lock-keywords)))))
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1627
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1628 (defun sh-font-lock-keywords-1 (&optional builtins)
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1629 "Function to get better fontification including keywords."
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1630 (let ((keywords (concat "\\([;(){}`|&]\\|^\\)[ \t]*\\(\\("
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1631 (regexp-opt (sh-feature sh-leading-keywords) t)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1632 "[ \t]+\\)?"
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1633 (regexp-opt (append (sh-feature sh-leading-keywords)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1634 (sh-feature sh-other-keywords))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1635 t))))
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1636 (sh-font-lock-keywords
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1637 `(,@(if builtins
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1638 `((,(concat keywords "[ \t]+\\)?"
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1639 (regexp-opt (sh-feature sh-builtins) t)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1640 "\\>")
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1641 (2 font-lock-keyword-face nil t)
72006
f483b68fd89b (sh-font-lock-keywords-1): Revert inadvertently installed patch hunk.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 71949
diff changeset
1642 (6 font-lock-builtin-face))
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1643 ,@(sh-feature sh-font-lock-keywords-var-2)))
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1644 (,(concat keywords "\\)\\>")
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1645 2 font-lock-keyword-face)
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1646 ,@(sh-feature sh-font-lock-keywords-var-1)))))
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1647
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1648 (defun sh-font-lock-keywords-2 ()
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1649 "Function to get better fontification including keywords and builtins."
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1650 (sh-font-lock-keywords-1 t))
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
1651
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1652
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1653 (defvar sh-regexp-for-done nil
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1654 "A buffer-local regexp to match opening keyword for done.")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1655
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1656 (defvar sh-kw-alist nil
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1657 "A buffer-local, since it is shell-type dependent, list of keywords.")
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1658
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1659 ;; ( key-word first-on-this on-prev-line )
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1660 ;; This is used to set `sh-kw-alist' which is a list of sublists each
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1661 ;; having 3 elements:
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1662 ;; a keyword
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1663 ;; a rule to check when the keyword appears on "this" line
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1664 ;; a rule to check when the keyword appears on "the previous" line
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1665 ;; The keyword is usually a string and is the first word on a line.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1666 ;; If this keyword appears on the line whose indentation is to be
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1667 ;; calculated, the rule in element 2 is called. If this returns
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1668 ;; non-zero, the resulting point (which may be changed by the rule)
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1669 ;; is used as the default indentation.
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1670 ;; If it returned false or the keyword was not found in the table,
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1671 ;; then the keyword from the previous line is looked up and the rule
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1672 ;; in element 3 is called. In this case, however,
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1673 ;; `sh-get-indent-info' does not stop but may keep going and test
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1674 ;; other keywords against rules in element 3. This is because the
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1675 ;; preceding line could have, for example, an opening "if" and an
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1676 ;; opening "while" keyword and we need to add the indentation offsets
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1677 ;; for both.
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1678 ;;
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1679 (defconst sh-kw
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1680 '((sh
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1681 ("if" nil sh-handle-prev-if)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1682 ("elif" sh-handle-this-else sh-handle-prev-else)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1683 ("else" sh-handle-this-else sh-handle-prev-else)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1684 ("fi" sh-handle-this-fi sh-handle-prev-fi)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1685 ("then" sh-handle-this-then sh-handle-prev-then)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1686 ("(" nil sh-handle-prev-open)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1687 ("{" nil sh-handle-prev-open)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1688 ("[" nil sh-handle-prev-open)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1689 ("}" sh-handle-this-close nil)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1690 (")" sh-handle-this-close nil)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1691 ("]" sh-handle-this-close nil)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1692 ("case" nil sh-handle-prev-case)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1693 ("esac" sh-handle-this-esac sh-handle-prev-esac)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1694 (case-label nil sh-handle-after-case-label) ;; ???
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1695 (";;" nil sh-handle-prev-case-alt-end) ;; ???
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1696 ("done" sh-handle-this-done sh-handle-prev-done)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1697 ("do" sh-handle-this-do sh-handle-prev-do))
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1698
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1699 ;; Note: we don't need specific stuff for bash and zsh shells;
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1700 ;; the regexp `sh-regexp-for-done' handles the extra keywords
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1701 ;; these shells use.
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1702 (rc
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1703 ("{" nil sh-handle-prev-open)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1704 ("}" sh-handle-this-close nil)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1705 ("case" sh-handle-this-rc-case sh-handle-prev-rc-case))))
29422
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1706
be5a54fc840d (sh-symbol-list, sh-number-or-symbol-list)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29109
diff changeset
1707
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1708
14148
fa30f7528502 (sh-mode): Don't move point.
Richard M. Stallman <rms@gnu.org>
parents: 14119
diff changeset
1709 (defun sh-set-shell (shell &optional no-query-flag insert-flag)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1710 "Set this buffer's shell to SHELL (a string).
42909
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1711 When used interactively, insert the proper starting #!-line,
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1712 and make the visited file executable via `executable-set-magic',
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1713 perhaps querying depending on the value of `executable-query'.
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1714
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1715 When this function is called noninteractively, INSERT-FLAG (the third
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1716 argument) controls whether to insert a #!-line and think about making
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1717 the visited file executable, and NO-QUERY-FLAG (the second argument)
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1718 controls whether to query about making the visited file executable.
af3eb1ed8032 (sh-set-shell): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 42456
diff changeset
1719
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1720 Calls the value of `sh-set-shell-hook' if set."
49132
99f9777a831b (sh-set-shell): Make sh-shell-file the default shell.
Juanma Barranquero <lekktu@gmail.com>
parents: 48032
diff changeset
1721 (interactive (list (completing-read (format "Shell \(default %s\): "
99f9777a831b (sh-set-shell): Make sh-shell-file the default shell.
Juanma Barranquero <lekktu@gmail.com>
parents: 48032
diff changeset
1722 sh-shell-file)
99f9777a831b (sh-set-shell): Make sh-shell-file the default shell.
Juanma Barranquero <lekktu@gmail.com>
parents: 48032
diff changeset
1723 interpreter-mode-alist
99f9777a831b (sh-set-shell): Make sh-shell-file the default shell.
Juanma Barranquero <lekktu@gmail.com>
parents: 48032
diff changeset
1724 (lambda (x) (eq (cdr x) 'sh-mode))
99f9777a831b (sh-set-shell): Make sh-shell-file the default shell.
Juanma Barranquero <lekktu@gmail.com>
parents: 48032
diff changeset
1725 nil nil nil sh-shell-file)
14148
fa30f7528502 (sh-mode): Don't move point.
Richard M. Stallman <rms@gnu.org>
parents: 14119
diff changeset
1726 (eq executable-query 'function)
fa30f7528502 (sh-mode): Don't move point.
Richard M. Stallman <rms@gnu.org>
parents: 14119
diff changeset
1727 t))
23589
660727693bf6 (sh-canonicalize-shell): Fix regexp.
Andreas Schwab <schwab@suse.de>
parents: 23511
diff changeset
1728 (if (string-match "\\.exe\\'" shell)
23341
d29b6b51866f (sh-set-shell): Remove .exe suffix from shell name.
Richard M. Stallman <rms@gnu.org>
parents: 22783
diff changeset
1729 (setq shell (substring shell 0 (match-beginning 0))))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1730 (setq sh-shell (intern (file-name-nondirectory shell))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1731 sh-shell (or (cdr (assq sh-shell sh-alias-alist))
14148
fa30f7528502 (sh-mode): Don't move point.
Richard M. Stallman <rms@gnu.org>
parents: 14119
diff changeset
1732 sh-shell))
16552
fe3d32bca2c5 (sh-set-shell): Pass args no-query-flag
Richard M. Stallman <rms@gnu.org>
parents: 16535
diff changeset
1733 (if insert-flag
fe3d32bca2c5 (sh-set-shell): Pass args no-query-flag
Richard M. Stallman <rms@gnu.org>
parents: 16535
diff changeset
1734 (setq sh-shell-file
fe3d32bca2c5 (sh-set-shell): Pass args no-query-flag
Richard M. Stallman <rms@gnu.org>
parents: 16535
diff changeset
1735 (executable-set-magic shell (sh-feature sh-shell-arg)
fe3d32bca2c5 (sh-set-shell): Pass args no-query-flag
Richard M. Stallman <rms@gnu.org>
parents: 16535
diff changeset
1736 no-query-flag insert-flag)))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1737 (let ((tem (sh-feature sh-require-final-newline)))
59251
84ede35ffeb4 (sh-require-final-newline):
Richard M. Stallman <rms@gnu.org>
parents: 58767
diff changeset
1738 (if (eq tem t)
84ede35ffeb4 (sh-require-final-newline):
Richard M. Stallman <rms@gnu.org>
parents: 58767
diff changeset
1739 (setq require-final-newline mode-require-final-newline)))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1740 (setq
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1741 mode-line-process (format "[%s]" sh-shell)
14195
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1742 sh-shell-variables nil
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
1743 sh-shell-variables-initialized nil
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1744 imenu-generic-expression (sh-feature sh-imenu-generic-expression))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1745 (make-local-variable 'sh-mode-syntax-table)
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1746 (let ((tem (sh-feature sh-mode-syntax-table-input)))
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1747 (setq sh-mode-syntax-table
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1748 (if tem (apply 'sh-mode-syntax-table tem)
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1749 sh-mode-default-syntax-table)))
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1750 (set-syntax-table sh-mode-syntax-table)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1751 (dolist (var (sh-feature sh-variables))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1752 (sh-remember-variable var))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1753 (make-local-variable 'indent-line-function)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1754 (if (setq sh-indent-supported-here (sh-feature sh-indent-supported))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1755 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1756 (message "Setting up indent for shell type %s" sh-shell)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1757 (set (make-local-variable 'parse-sexp-lookup-properties) t)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1758 (set (make-local-variable 'sh-kw-alist) (sh-feature sh-kw))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1759 (let ((regexp (sh-feature sh-kws-for-done)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1760 (if regexp
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1761 (set (make-local-variable 'sh-regexp-for-done)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1762 (sh-mkword-regexpr (regexp-opt regexp t)))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1763 (message "setting up indent stuff")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1764 ;; sh-mode has already made indent-line-function local
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1765 ;; but do it in case this is called before that.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1766 (setq indent-line-function 'sh-indent-line)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1767 (if sh-make-vars-local
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1768 (sh-make-vars-local))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1769 (message "Indentation setup for shell type %s" sh-shell))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1770 (message "No indentation for this shell type.")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1771 (setq indent-line-function 'sh-basic-indent-line))
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1772 (when font-lock-mode
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1773 (setq font-lock-set-defaults nil)
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1774 (font-lock-set-defaults)
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1775 (font-lock-fontify-buffer))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1776 (run-hooks 'sh-set-shell-hook))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1777
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1778
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1779 (defun sh-feature (alist &optional function)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1780 "Index ALIST by the current shell.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1781 If ALIST isn't a list where every element is a cons, it is returned as is.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1782 Else indexing follows an inheritance logic which works in two ways:
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1783
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1784 - Fall back on successive ancestors (see `sh-ancestor-alist') as long as
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1785 the alist contains no value for the current shell.
24906
01882044b37a (sh-feature): If nothing is known about the given shell, use the
Richard M. Stallman <rms@gnu.org>
parents: 24899
diff changeset
1786 The ultimate default is always `sh'.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1787
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1788 - If the value thus looked up is a list starting with `sh-append',
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1789 we call the function `sh-append' with the rest of the list as
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1790 arguments, and use the value. However, the next element of the
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1791 list is not used as-is; instead, we look it up recursively
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1792 in ALIST to allow the function called to define the value for
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1793 one shell to be derived from another shell.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1794 The value thus determined is physically replaced into the alist.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1795
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1796 If FUNCTION is non-nil, it is called with one argument,
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1797 the value thus obtained, and the result is used instead."
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1798 (or (if (consp alist)
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1799 ;; Check for something that isn't a valid alist.
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1800 (let ((l alist))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1801 (while (and l (consp (car l)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1802 (setq l (cdr l)))
52571
6de55a10c444 (sh-mode-default-syntax-table): Renamed from sh-mode-syntax-table.
Richard M. Stallman <rms@gnu.org>
parents: 52549
diff changeset
1803 (if l alist)))
64971
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1804
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1805 (let ((orig-sh-shell sh-shell))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1806 (let ((sh-shell sh-shell)
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1807 elt val)
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1808 (while (and sh-shell
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1809 (not (setq elt (assq sh-shell alist))))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1810 (setq sh-shell (cdr (assq sh-shell sh-ancestor-alist))))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1811 ;; If the shell is not known, treat it as sh.
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1812 (unless elt
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1813 (setq elt (assq 'sh alist)))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1814 (setq val (cdr elt))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1815 (if (and (consp val)
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1816 (memq (car val) '(sh-append sh-modify)))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1817 (setq val
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1818 (apply (car val)
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1819 ;; Refer to the value for a different shell,
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1820 ;; as a kind of inheritance.
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1821 (let ((sh-shell (car (cdr val))))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1822 (sh-feature alist))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1823 (cddr val))))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1824 (if function
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1825 (setq sh-shell orig-sh-shell
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1826 val (funcall function val)))
7fb2b79e33d0 (sh-font-lock-keywords-var): Variable renamed from sh-font-lock-keywords.
Richard M. Stallman <rms@gnu.org>
parents: 64266
diff changeset
1827 val))))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1828
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1829
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1830
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1831 ;; I commented this out because nobody calls it -- rms.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1832 ;;(defun sh-abbrevs (ancestor &rest list)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1833 ;; "Iff it isn't, define the current shell as abbrev table and fill that.
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1834 ;;Abbrev table will inherit all abbrevs from ANCESTOR, which is either an abbrev
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1835 ;;table or a list of (NAME1 EXPANSION1 ...). In addition it will define abbrevs
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1836 ;;according to the remaining arguments NAMEi EXPANSIONi ...
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1837 ;;EXPANSION may be either a string or a skeleton command."
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1838 ;; (or (if (boundp sh-shell)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1839 ;; (symbol-value sh-shell))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1840 ;; (progn
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1841 ;; (if (listp ancestor)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1842 ;; (nconc list ancestor))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1843 ;; (define-abbrev-table sh-shell ())
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1844 ;; (if (vectorp ancestor)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1845 ;; (mapatoms (lambda (atom)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1846 ;; (or (eq atom 0)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1847 ;; (define-abbrev (symbol-value sh-shell)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1848 ;; (symbol-name atom)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1849 ;; (symbol-value atom)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1850 ;; (symbol-function atom))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1851 ;; ancestor))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1852 ;; (while list
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1853 ;; (define-abbrev (symbol-value sh-shell)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1854 ;; (car list)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1855 ;; (if (stringp (car (cdr list)))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1856 ;; (car (cdr list))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1857 ;; "")
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1858 ;; (if (symbolp (car (cdr list)))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1859 ;; (car (cdr list))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1860 ;; (setq list (cdr (cdr list)))))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1861 ;; (symbol-value sh-shell)))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1862
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1863
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1864 (defun sh-append (ancestor &rest list)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1865 "Return list composed of first argument (a list) physically appended to rest."
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1866 (nconc list ancestor))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1867
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1868
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1869 (defun sh-modify (skeleton &rest list)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1870 "Modify a copy of SKELETON by replacing I1 with REPL1, I2 with REPL2 ..."
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1871 (setq skeleton (copy-sequence skeleton))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1872 (while list
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1873 (setcar (or (nthcdr (car list) skeleton)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1874 (error "Index %d out of bounds" (car list)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1875 (car (cdr list)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1876 (setq list (nthcdr 2 list)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1877 skeleton)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1878
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1879
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1880 (defun sh-basic-indent-line ()
19480
7f11f103a0ca (sh-indent-line): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents: 18382
diff changeset
1881 "Indent a line for Sh mode (shell script mode).
7f11f103a0ca (sh-indent-line): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents: 18382
diff changeset
1882 Indent as far as preceding non-empty line, then by steps of `sh-indentation'.
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1883 Lines containing only comments are considered empty."
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1884 (interactive)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1885 (let ((previous (save-excursion
19480
7f11f103a0ca (sh-indent-line): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents: 18382
diff changeset
1886 (while (and (progn (beginning-of-line)
7f11f103a0ca (sh-indent-line): Avoid infinite loop
Richard M. Stallman <rms@gnu.org>
parents: 18382
diff changeset
1887 (not (bobp)))
14211
949aa01aca87 (sh-indent-line): Cope if no previous noncomment line.
Richard M. Stallman <rms@gnu.org>
parents: 14195
diff changeset
1888 (progn
949aa01aca87 (sh-indent-line): Cope if no previous noncomment line.
Richard M. Stallman <rms@gnu.org>
parents: 14195
diff changeset
1889 (forward-line -1)
949aa01aca87 (sh-indent-line): Cope if no previous noncomment line.
Richard M. Stallman <rms@gnu.org>
parents: 14195
diff changeset
1890 (back-to-indentation)
949aa01aca87 (sh-indent-line): Cope if no previous noncomment line.
Richard M. Stallman <rms@gnu.org>
parents: 14195
diff changeset
1891 (or (eolp)
949aa01aca87 (sh-indent-line): Cope if no previous noncomment line.
Richard M. Stallman <rms@gnu.org>
parents: 14195
diff changeset
1892 (eq (following-char) ?#)))))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1893 (current-column)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1894 current)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1895 (save-excursion
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1896 (indent-to (if (eq this-command 'newline-and-indent)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1897 previous
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1898 (if (< (current-column)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1899 (setq current (progn (back-to-indentation)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1900 (current-column))))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1901 (if (eolp) previous 0)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1902 (delete-region (point)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1903 (progn (beginning-of-line) (point)))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1904 (if (eolp)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1905 (max previous (* (1+ (/ current sh-indentation))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1906 sh-indentation))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1907 (* (1+ (/ current sh-indentation)) sh-indentation))))))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1908 (if (< (current-column) (current-indentation))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1909 (skip-chars-forward " \t"))))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1910
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1911
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1912 (defun sh-execute-region (start end &optional flag)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1913 "Pass optional header and region to a subshell for noninteractive execution.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1914 The working directory is that of the buffer, and only environment variables
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1915 are already set which is why you can mark a header within the script.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1916
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1917 With a positive prefix ARG, instead of sending region, define header from
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1918 beginning of buffer to point. With a negative prefix ARG, instead of sending
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1919 region, clear header."
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1920 (interactive "r\nP")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1921 (if flag
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1922 (setq sh-header-marker (if (> (prefix-numeric-value flag) 0)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1923 (point-marker)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1924 (if sh-header-marker
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1925 (save-excursion
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1926 (let (buffer-undo-list)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1927 (goto-char sh-header-marker)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1928 (append-to-buffer (current-buffer) start end)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1929 (shell-command-on-region (point-min)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1930 (setq end (+ sh-header-marker
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1931 (- end start)))
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
1932 sh-shell-file)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1933 (delete-region sh-header-marker end)))
14119
2a05fc406f3a (sh-alias-alist): Don't map sh to bash.
Karl Heuer <kwzh@gnu.org>
parents: 14026
diff changeset
1934 (shell-command-on-region start end (concat sh-shell-file " -")))))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1935
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1936
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1937 (defun sh-remember-variable (var)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1938 "Make VARIABLE available for future completing reads in this buffer."
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1939 (or (< (length var) sh-remember-variable-min)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1940 (getenv var)
14195
df3c52ae5b14 (sh-shell-variables): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14169
diff changeset
1941 (assoc var sh-shell-variables)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1942 (push (cons var var) sh-shell-variables))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1943 var)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1944
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1945
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1946
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1947 (defun sh-quoted-p ()
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1948 "Is point preceded by an odd number of backslashes?"
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
1949 (eq -1 (% (save-excursion (skip-chars-backward "\\\\")) 2)))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
1950
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1951 ;; Indentation stuff.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1952 (defun sh-must-support-indent ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1953 "*Signal an error if the shell type for this buffer is not supported.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1954 Also, the buffer must be in Shell-script mode."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1955 (unless sh-indent-supported-here
40927
d8cd2ee4b10c (sh-must-be-shell-mode): Allow modes derived from sh-mode.
Richard M. Stallman <rms@gnu.org>
parents: 40340
diff changeset
1956 (error "This buffer's shell does not support indentation through Emacs")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1957
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1958 (defun sh-make-vars-local ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1959 "Make the indentation variables local to this buffer.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1960 Normally they already are local. This command is provided in case
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1961 variable `sh-make-vars-local' has been set to nil.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1962
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1963 To revert all these variables to the global values, use
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1964 command `sh-reset-indent-vars-to-global-values'."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1965 (interactive)
84921
35543641f89c (sh-make-vars-local, sh-reset-indent-vars-to-global-values):
Juanma Barranquero <lekktu@gmail.com>
parents: 84755
diff changeset
1966 (mapc 'make-local-variable sh-var-list)
74829
55f1722d93af (sh-make-vars-local): Fix a typo in message string.
Eli Zaretskii <eliz@gnu.org>
parents: 74547
diff changeset
1967 (message "Indentation variables are now local."))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1968
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1969 (defun sh-reset-indent-vars-to-global-values ()
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1970 "Reset local indentation variables to the global values.
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1971 Then, if variable `sh-make-vars-local' is non-nil, make them local."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1972 (interactive)
84921
35543641f89c (sh-make-vars-local, sh-reset-indent-vars-to-global-values):
Juanma Barranquero <lekktu@gmail.com>
parents: 84755
diff changeset
1973 (mapc 'kill-local-variable sh-var-list)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1974 (if sh-make-vars-local
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1975 (mapcar 'make-local-variable sh-var-list)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1976
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1977
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1978 ;; Theoretically these are only needed in shell and derived modes.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1979 ;; However, the routines which use them are only called in those modes.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1980 (defconst sh-special-keywords "then\\|do")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1981
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1982 (defun sh-help-string-for-variable (var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1983 "Construct a string for `sh-read-variable' when changing variable VAR ."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1984 (let ((msg (documentation-property var 'variable-documentation))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1985 (msg2 ""))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
1986 (unless (memq var '(sh-first-lines-indent sh-indent-comment))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1987 (setq msg2
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1988 (format "\n
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1989 You can enter a number (positive to increase indentation,
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1990 negative to decrease indentation, zero for no change to indentation).
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1991
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
1992 Or, you can enter one of the following symbols which are relative to
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1993 the value of variable `sh-basic-offset'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1994 which in this buffer is currently %s.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1995
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1996 \t%s."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
1997 sh-basic-offset
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1998 (mapconcat (lambda (x)
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
1999 (nth (1- (length x)) x))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
2000 sh-symbol-list "\n\t"))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2001 (concat
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2002 ;; The following shows the global not the local value!
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2003 ;; (format "Current value of %s is %s\n\n" var (symbol-value var))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2004 msg msg2)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2005
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2006 (defun sh-read-variable (var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2007 "Read a new value for indentation variable VAR."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2008 (interactive "*variable? ") ;; to test
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2009 (let ((minibuffer-help-form `(sh-help-string-for-variable
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2010 (quote ,var)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2011 val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2012 (setq val (read-from-minibuffer
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2013 (format "New value for %s (press %s for help): "
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2014 var (single-key-description help-char))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2015 (format "%s" (symbol-value var))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2016 nil t))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2017 val))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2018
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2019
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2020
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2021 (defun sh-in-comment-or-string (start)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2022 "Return non-nil if START is in a comment or string."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2023 (save-excursion
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
2024 (let ((state (syntax-ppss start)))
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
2025 (or (nth 3 state) (nth 4 state)))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2026
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2027 (defun sh-goto-matching-if ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2028 "Go to the matching if for a fi.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2029 This handles nested if..fi pairs."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2030 (let ((found (sh-find-prev-matching "\\bif\\b" "\\bfi\\b" 1)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2031 (if found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2032 (goto-char found))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2033
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2034
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2035 ;; Functions named sh-handle-this-XXX are called when the keyword on the
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2036 ;; line whose indentation is being handled contain XXX;
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2037 ;; those named sh-handle-prev-XXX are when XXX appears on the previous line.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2038
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2039 (defun sh-handle-prev-if ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2040 (list '(+ sh-indent-after-if)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2041
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2042 (defun sh-handle-this-else ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2043 (if (sh-goto-matching-if)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2044 ;; (list "aligned to if")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2045 (list "aligned to if" '(+ sh-indent-for-else))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2046 nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2047 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2048
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2049 (defun sh-handle-prev-else ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2050 (if (sh-goto-matching-if)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2051 (list '(+ sh-indent-after-if))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2052 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2053
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2054 (defun sh-handle-this-fi ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2055 (if (sh-goto-matching-if)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2056 (list "aligned to if" '(+ sh-indent-for-fi))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2057 nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2058 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2059
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2060 (defun sh-handle-prev-fi ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2061 ;; Why do we have this rule? Because we must go back to the if
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2062 ;; to get its indent. We may continue back from there.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2063 ;; We return nil because we don't have anything to add to result,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2064 ;; the side affect of setting align-point is all that matters.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2065 ;; we could return a comment (a string) but I can't think of a good one...
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2066 (sh-goto-matching-if)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2067 nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2068
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2069 (defun sh-handle-this-then ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2070 (let ((p (sh-goto-matching-if)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2071 (if p
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2072 (list '(+ sh-indent-for-then))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2073 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2074
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2075 (defun sh-handle-prev-then ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2076 (let ((p (sh-goto-matching-if)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2077 (if p
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2078 (list '(+ sh-indent-after-if))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2079 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2080
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2081 (defun sh-handle-prev-open ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2082 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2083 (let ((x (sh-prev-stmt)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2084 (if (and x
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2085 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2086 (goto-char x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2087 (or
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2088 (looking-at "function\\b")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2089 (looking-at "\\s-*\\S-+\\s-*()")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2090 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2091 (list '(+ sh-indent-after-function))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2092 (list '(+ sh-indent-after-open)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2093 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2094
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2095 (defun sh-handle-this-close ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2096 (forward-char 1) ;; move over ")"
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2097 (if (sh-safe-forward-sexp -1)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2098 (list "aligned to opening paren")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2099
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2100 (defun sh-goto-matching-case ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2101 (let ((found (sh-find-prev-matching "\\bcase\\b" "\\besac\\b" 1)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2102 (if found (goto-char found))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2103
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2104 (defun sh-handle-prev-case ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2105 ;; This is typically called when point is on same line as a case
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2106 ;; we shouldn't -- and can't find prev-case
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2107 (if (looking-at ".*\\<case\\>")
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2108 (list '(+ sh-indent-for-case-label))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2109 (error "We don't seem to be on a line with a case"))) ;; debug
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2110
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2111 (defun sh-handle-this-esac ()
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2112 (if (sh-goto-matching-case)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2113 (list "aligned to matching case")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2114
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2115 (defun sh-handle-prev-esac ()
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2116 (if (sh-goto-matching-case)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2117 (list "matching case")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2118
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2119 (defun sh-handle-after-case-label ()
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2120 (if (sh-goto-matching-case)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2121 (list '(+ sh-indent-for-case-alt))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2122
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2123 (defun sh-handle-prev-case-alt-end ()
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2124 (if (sh-goto-matching-case)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2125 (list '(+ sh-indent-for-case-label))))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2126
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2127 (defun sh-safe-forward-sexp (&optional arg)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2128 "Try and do a `forward-sexp', but do not error.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2129 Return new point if successful, nil if an error occurred."
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2130 (condition-case nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2131 (progn
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2132 (forward-sexp (or arg 1))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2133 (point)) ;; return point if successful
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2134 (error
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2135 (sh-debug "oops!(1) %d" (point))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2136 nil))) ;; return nil if fail
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2137
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2138 (defun sh-goto-match-for-done ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2139 (let ((found (sh-find-prev-matching sh-regexp-for-done sh-re-done 1)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2140 (if found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2141 (goto-char found))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2142
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2143 (defun sh-handle-this-done ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2144 (if (sh-goto-match-for-done)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2145 (list "aligned to do stmt" '(+ sh-indent-for-done))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2146
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2147 (defun sh-handle-prev-done ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2148 (if (sh-goto-match-for-done)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2149 (list "previous done")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2150
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2151 (defun sh-handle-this-do ()
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2152 (if (sh-goto-match-for-done)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2153 (list '(+ sh-indent-for-do))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2154
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2155 (defun sh-handle-prev-do ()
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2156 (cond
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2157 ((save-restriction
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2158 (narrow-to-region
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2159 (point)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2160 (save-excursion
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2161 (beginning-of-line)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2162 (point)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2163 (sh-goto-match-for-done))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2164 (sh-debug "match for done found on THIS line")
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2165 (list '(+ sh-indent-after-loop-construct)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2166 ((sh-goto-match-for-done)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2167 (sh-debug "match for done found on PREV line")
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2168 (list '(+ sh-indent-after-do)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2169 (t
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2170 (message "match for done NOT found")
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2171 nil)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2172
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2173 ;; for rc:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2174 (defun sh-find-prev-switch ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2175 "Find the line for the switch keyword matching this line's case keyword."
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2176 (re-search-backward "\\<switch\\>" nil t))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2177
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2178 (defun sh-handle-this-rc-case ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2179 (if (sh-find-prev-switch)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2180 (list '(+ sh-indent-after-switch))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2181 ;; (list '(+ sh-indent-for-case-label))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2182 nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2183
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2184 (defun sh-handle-prev-rc-case ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2185 (list '(+ sh-indent-after-case)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2186
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2187 (defun sh-check-rule (n thing)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2188 (let ((rule (nth n (assoc thing sh-kw-alist)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2189 (val nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2190 (if rule
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2191 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2192 (setq val (funcall rule))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2193 (sh-debug "rule (%d) for %s at %d is %s\n-> returned %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2194 n thing (point) rule val)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2195 val))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2196
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2197
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2198 (defun sh-get-indent-info ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2199 "Return indent-info for this line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2200 This is a list. nil means the line is to be left as is.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2201 Otherwise it contains one or more of the following sublists:
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2202 \(t NUMBER\) NUMBER is the base location in the buffer that indentation is
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2203 relative to. If present, this is always the first of the
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2204 sublists. The indentation of the line in question is
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2205 derived from the indentation of this point, possibly
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2206 modified by subsequent sublists.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2207 \(+ VAR\)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2208 \(- VAR\) Get the value of variable VAR and add to or subtract from
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2209 the indentation calculated so far.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2210 \(= VAR\) Get the value of variable VAR and *replace* the
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2211 indentation with its value. This only occurs for
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2212 special variables such as `sh-indent-comment'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2213 STRING This is ignored for the purposes of calculating
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2214 indentation, it is printed in certain cases to help show
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2215 what the indentation is based on."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2216 ;; See comments before `sh-kw'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2217 (save-excursion
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
2218 (let ((have-result nil)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2219 this-kw
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2220 start
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
2221 val
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2222 (result nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2223 (align-point nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2224 prev-line-end x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2225 (beginning-of-line)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2226 ;; Note: setting result to t means we are done and will return nil.
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2227 ;;(This function never returns just t.)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2228 (cond
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
2229 ((or (and (boundp 'font-lock-string-face) (not (bobp))
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
2230 (eq (get-text-property (1- (point)) 'face)
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
2231 font-lock-string-face))
37542
51f2e2a0c455 (sh-prev-line): Look for sh-heredoc-face
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37528
diff changeset
2232 (eq (get-text-property (point) 'face) sh-heredoc-face))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2233 (setq result t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2234 (setq have-result t))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2235 ((looking-at "\\s-*#") ; was (equal this-kw "#")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2236 (if (bobp)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2237 (setq result t) ;; return nil if 1st line!
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2238 (setq result (list '(= sh-indent-comment)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2239 ;; we still need to get previous line in case
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2240 ;; sh-indent-comment is t (indent as normal)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2241 (setq align-point (sh-prev-line nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2242 (setq have-result nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2243 ))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2244 ) ;; cond
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2245
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2246 (unless have-result
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2247 ;; Continuation lines are handled specially
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2248 (if (sh-this-is-a-continuation)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2249 (progn
64266
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2250 (setq result
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2251 (if (save-excursion
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2252 (beginning-of-line)
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2253 (not (memq (char-before (- (point) 2)) '(?\s ?\t))))
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2254 ;; By convention, if the continuation \ is not
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2255 ;; preceded by a SPC or a TAB it means that the line
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2256 ;; is cut at a place where spaces cannot be freely
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2257 ;; added/removed. I.e. do not indent the line.
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2258 (list '(= nil))
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2259 ;; We assume the line being continued is already
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2260 ;; properly indented...
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2261 ;; (setq prev-line-end (sh-prev-line))
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2262 (setq align-point (sh-prev-line nil))
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2263 (list '(+ sh-indent-for-continuation))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2264 (setq have-result t))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2265 (beginning-of-line)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2266 (skip-chars-forward " \t")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2267 (setq this-kw (sh-get-kw)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2268
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2269 ;; Handle "this" keyword: first word on the line we're
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2270 ;; calculating indentation info for.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2271 (if this-kw
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2272 (if (setq val (sh-check-rule 1 this-kw))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2273 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2274 (setq align-point (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2275 (sh-debug
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2276 "this - setting align-point to %d" align-point)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2277 (setq result (append result val))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2278 (setq have-result t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2279 ;; set prev-line to continue processing remainder
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2280 ;; of this line as a previous line
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2281 (setq prev-line-end (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2282 ))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2283
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2284 (unless have-result
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2285 (setq prev-line-end (sh-prev-line 'end)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2286
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2287 (if prev-line-end
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2288 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2289 ;; We start off at beginning of this line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2290 ;; Scan previous statements while this is <=
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2291 ;; start of previous line.
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2292 (setq start (point)) ;; for debug only
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2293 (goto-char prev-line-end)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2294 (setq x t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2295 (while (and x (setq x (sh-prev-thing)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2296 (sh-debug "at %d x is: %s result is: %s" (point) x result)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2297 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2298 ((and (equal x ")")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2299 (equal (get-text-property (1- (point)) 'syntax-table)
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2300 sh-st-punc))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2301 (sh-debug "Case label) here")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2302 (setq x 'case-label)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2303 (if (setq val (sh-check-rule 2 x))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2304 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2305 (setq result (append result val))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2306 (setq align-point (point))))
53419
7864e9172d4e (sh-get-indent-info):
Richard M. Stallman <rms@gnu.org>
parents: 52758
diff changeset
2307 (or (bobp)
7864e9172d4e (sh-get-indent-info):
Richard M. Stallman <rms@gnu.org>
parents: 52758
diff changeset
2308 (forward-char -1))
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
2309 ;; FIXME: This charset looks too much like a regexp. --Stef
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2310 (skip-chars-forward "[a-z0-9]*?")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2311 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2312 ((string-match "[])}]" x)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2313 (setq x (sh-safe-forward-sexp -1))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2314 (if x
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2315 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2316 (setq align-point (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2317 (setq result (append result
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2318 (list "aligned to opening paren")))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2319 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2320 ((string-match "[[({]" x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2321 (sh-debug "Checking special thing: %s" x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2322 (if (setq val (sh-check-rule 2 x))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2323 (setq result (append result val)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2324 (forward-char -1)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2325 (setq align-point (point)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2326 ((string-match "[\"'`]" x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2327 (sh-debug "Skipping back for %s" x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2328 ;; this was oops-2
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2329 (setq x (sh-safe-forward-sexp -1)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2330 ((stringp x)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2331 (sh-debug "Checking string %s at %s" x (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2332 (if (setq val (sh-check-rule 2 x))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2333 ;; (or (eq t (car val))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2334 ;; (eq t (car (car val))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2335 (setq result (append result val)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2336 ;; not sure about this test Wed Jan 27 23:48:35 1999
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2337 (setq align-point (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2338 (unless (bolp)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2339 (forward-char -1)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2340 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2341 (error "Don't know what to do with %s" x))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2342 )
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2343 ) ;; while
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2344 (sh-debug "result is %s" result)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2345 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2346 (sh-debug "No prev line!")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2347 (sh-debug "result: %s align-point: %s" result align-point)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2348 )
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2349
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2350 (if align-point
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2351 ;; was: (setq result (append result (list (list t align-point))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2352 (setq result (append (list (list t align-point)) result))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2353 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2354 (sh-debug "result is now: %s" result)
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2355
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2356 (or result
64266
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2357 (setq result (list (if prev-line-end
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2358 (list t prev-line-end)
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2359 (list '= 'sh-first-lines-indent)))))
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2360
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2361 (if (eq result t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2362 (setq result nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2363 (sh-debug "result is: %s" result)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2364 result
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2365 ) ;; let
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2366 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2367
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2368
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2369 (defun sh-get-indent-var-for-line (&optional info)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2370 "Return the variable controlling indentation for this line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2371 If there is not [just] one such variable, return a string
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2372 indicating the problem.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2373 If INFO is supplied it is used, else it is calculated."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2374 (let ((var nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2375 (result nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2376 (reason nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2377 sym elt)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2378 (or info
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2379 (setq info (sh-get-indent-info)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2380 (if (null info)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2381 (setq result "this line to be left as is")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2382 (while (and info (null result))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2383 (setq elt (car info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2384 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2385 ((stringp elt)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2386 (setq reason elt)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2387 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2388 ((not (listp elt))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2389 (error "sh-get-indent-var-for-line invalid elt: %s" elt))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2390 ;; so it is a list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2391 ((eq t (car elt))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2392 ) ;; nothing
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2393 ((symbolp (setq sym (nth 1 elt)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2394 ;; A bit of a kludge - when we see the sh-indent-comment
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2395 ;; ignore other variables. Otherwise it is tricky to
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2396 ;; "learn" the comment indentation.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2397 (if (eq var 'sh-indent-comment)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2398 (setq result var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2399 (if var
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2400 (setq result
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2401 "this line is controlled by more than 1 variable.")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2402 (setq var sym))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2403 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2404 (error "sh-get-indent-var-for-line invalid list elt: %s" elt)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2405 (setq info (cdr info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2406 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2407 (or result
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2408 (setq result var))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2409 (or result
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2410 (setq result reason))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2411 (if (null result)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2412 ;; e.g. just had (t POS)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2413 (setq result "line has default indentation"))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2414 result))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2415
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2416
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2417
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2418 ;; Finding the previous line isn't trivial.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2419 ;; We must *always* go back one more and see if that is a continuation
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2420 ;; line -- it is the PREVIOUS line which is continued, not the one
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2421 ;; we are going to!
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2422 ;; Also, we want to treat a whole "here document" as one big line,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2423 ;; because we may want to a align to the beginning of it.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2424 ;;
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2425 ;; What we do:
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2426 ;; - go back to previous non-empty line
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2427 ;; - if this is in a here-document, go to the beginning of it
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2428 ;; - while previous line is continued, go back one line
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2429 (defun sh-prev-line (&optional end)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2430 "Back to end of previous non-comment non-empty line.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2431 Go to beginning of logical line unless END is non-nil, in which case
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2432 we go to the end of the previous line and do not check for continuations."
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2433 (save-excursion
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2434 (beginning-of-line)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2435 (forward-comment (- (point-max)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2436 (unless end (beginning-of-line))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2437 (when (and (not (bobp))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2438 (equal (get-text-property (1- (point)) 'face)
37542
51f2e2a0c455 (sh-prev-line): Look for sh-heredoc-face
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37528
diff changeset
2439 sh-heredoc-face))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2440 (let ((p1 (previous-single-property-change (1- (point)) 'face)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2441 (when p1
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2442 (goto-char p1)
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2443 (if end
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2444 (end-of-line)
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2445 (beginning-of-line)))))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2446 (unless end
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2447 ;; we must check previous lines to see if they are continuation lines
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2448 ;; if so, we must return position of first of them
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2449 (while (and (sh-this-is-a-continuation)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2450 (>= 0 (forward-line -1))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2451 (beginning-of-line)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2452 (skip-chars-forward " \t"))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2453 (point)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2454
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2455
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2456 (defun sh-prev-stmt ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2457 "Return the address of the previous stmt or nil."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2458 ;; This is used when we are trying to find a matching keyword.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2459 ;; Searching backward for the keyword would certainly be quicker, but
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2460 ;; it is hard to remove "false matches" -- such as if the keyword
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2461 ;; appears in a string or quote. This way is slower, but (I think) safer.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2462 (interactive)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2463 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2464 (let ((going t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2465 (start (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2466 (found nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2467 (prev nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2468 (skip-chars-backward " \t;|&({[")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2469 (while (and (not found)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2470 (not (bobp))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2471 going)
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2472 ;; Do a backward-sexp if possible, else backup bit by bit...
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2473 (if (sh-safe-forward-sexp -1)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2474 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2475 (if (looking-at sh-special-keywords)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2476 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2477 (setq found prev))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2478 (setq prev (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2479 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2480 ;; backward-sexp failed
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2481 (if (zerop (skip-chars-backward " \t()[\]{};`'"))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2482 (forward-char -1))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2483 (if (bolp)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2484 (let ((back (sh-prev-line nil)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2485 (if back
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2486 (goto-char back)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2487 (setq going nil)))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2488 (unless found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2489 (skip-chars-backward " \t")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2490 (if (or (and (bolp) (not (sh-this-is-a-continuation)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2491 (eq (char-before) ?\;)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2492 (looking-at "\\s-*[|&]"))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2493 (setq found (point)))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2494 (if found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2495 (goto-char found))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2496 (if found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2497 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2498 (skip-chars-forward " \t|&({[")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2499 (setq found (point))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2500 (if (>= (point) start)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2501 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2502 (debug "We didn't move!")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2503 (setq found nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2504 (or found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2505 (sh-debug "Did not find prev stmt.")))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2506 found)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2507
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2508
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2509 (defun sh-get-word ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2510 "Get a shell word skipping whitespace from point."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2511 (interactive)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2512 (skip-chars-forward "\t ")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2513 (let ((start (point)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2514 (while
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2515 (if (looking-at "[\"'`]")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2516 (sh-safe-forward-sexp)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2517 ;; (> (skip-chars-forward "^ \t\n\"'`") 0)
81380
db32b7ba9c76 Remove unneeded * from docstrings. Use [:alpha:] & [:alnum:] where applicable.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81313
diff changeset
2518 (> (skip-chars-forward "-_$[:alnum:]") 0)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2519 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2520 (buffer-substring start (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2521 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2522
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2523 (defun sh-prev-thing ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2524 "Return the previous thing this logical line."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2525 ;; This is called when `sh-get-indent-info' is working backwards on
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2526 ;; the previous line(s) finding what keywords may be relevant for
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2527 ;; indenting. It moves over sexps if possible, and will stop
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2528 ;; on a ; and at the beginning of a line if it is not a continuation
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2529 ;; line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2530 ;;
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2531 ;; Added a kludge for ";;"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2532 ;; Possible return values:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2533 ;; nil - nothing
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2534 ;; a string - possibly a keyword
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2535 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2536 (if (bolp)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2537 nil
73239
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2538 (let ((start (point))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2539 (min-point (if (sh-this-is-a-continuation)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2540 (sh-prev-line nil)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2541 (line-beginning-position))))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2542 (skip-chars-backward " \t;" min-point)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2543 (if (looking-at "\\s-*;;")
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2544 ;; (message "Found ;; !")
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2545 ";;"
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2546 (skip-chars-backward "^)}];\"'`({[" min-point)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2547 (let ((c (if (> (point) min-point) (char-before))))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2548 (sh-debug "stopping at %d c is %s start=%d min-point=%d"
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2549 (point) c start min-point)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2550 (if (not (memq c '(?\n nil ?\;)))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2551 ;; c -- return a string
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2552 (char-to-string c)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2553 ;; Return the leading keyword of the "command" we supposedly
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2554 ;; skipped over. Maybe we skipped too far (e.g. past a `do' or
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2555 ;; `then' that precedes the actual command), so check whether
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2556 ;; we're looking at such a keyword and if so, move back forward.
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2557 (let ((boundary (point))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2558 kwd next)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2559 (while
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2560 (progn
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2561 ;; Skip forward over white space newline and \ at eol.
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2562 (skip-chars-forward " \t\n\\\\" start)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2563 (if (>= (point) start)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2564 (progn
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2565 (sh-debug "point: %d >= start: %d" (point) start)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2566 nil)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2567 (if next (setq boundary next))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2568 (sh-debug "Now at %d start=%d" (point) start)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2569 (setq kwd (sh-get-word))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2570 (if (member kwd (sh-feature sh-leading-keywords))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2571 (progn
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2572 (setq next (point))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2573 t)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2574 nil))))
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2575 (goto-char boundary)
b6db8e4b9bbe (sh-prev-thing): Massage to untangle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73216
diff changeset
2576 kwd)))))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2577
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2578
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2579 (defun sh-this-is-a-continuation ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2580 "Return non-nil if current line is a continuation of previous line."
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2581 (save-excursion
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2582 (and (zerop (forward-line -1))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2583 (looking-at ".*\\\\$")
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2584 (not (nth 4 (parse-partial-sexp (match-beginning 0) (match-end 0)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2585 nil nil nil t))))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2586
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2587 (defun sh-get-kw (&optional where and-move)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2588 "Return first word of line from WHERE.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2589 If AND-MOVE is non-nil then move to end of word."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2590 (let ((start (point)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2591 (if where
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2592 (goto-char where))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2593 (prog1
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2594 (buffer-substring (point)
73327
5e9926b80061 (sh-get-kw): | is not among the allowed chars for a keyword.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 73241
diff changeset
2595 (progn (skip-chars-forward "^ \t\n;&|()")(point)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2596 (unless and-move
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
2597 (goto-char start)))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2598
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2599 (defun sh-find-prev-matching (open close &optional depth)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2600 "Find a matching token for a set of opening and closing keywords.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2601 This takes into account that there may be nested open..close pairings.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2602 OPEN and CLOSE are regexps denoting the tokens to be matched.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2603 Optional parameter DEPTH (usually 1) says how many to look for."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2604 (let ((parse-sexp-ignore-comments t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2605 prev)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2606 (setq depth (or depth 1))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2607 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2608 (condition-case nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2609 (while (and
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2610 (/= 0 depth)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2611 (not (bobp))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2612 (setq prev (sh-prev-stmt)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2613 (goto-char prev)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2614 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2615 (if (looking-at "\\\\\n")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2616 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2617 (forward-char 2)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2618 (skip-chars-forward " \t")))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2619 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2620 ((looking-at open)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2621 (setq depth (1- depth))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2622 (sh-debug "found open at %d - depth = %d" (point) depth))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2623 ((looking-at close)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2624 (setq depth (1+ depth))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2625 (sh-debug "found close - depth = %d" depth))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2626 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2627 ))))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2628 (error nil))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2629 (if (eq depth 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2630 prev ;; (point)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2631 nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2632 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2633
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2634
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2635 (defun sh-var-value (var &optional ignore-error)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2636 "Return the value of variable VAR, interpreting symbols.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2637 It can also return t or nil.
60917
87f9bb9d3718 * progmodes/ebnf-abn.el, progmodes/ebnf-bnf.el,
Werner LEMBERG <wl@gnu.org>
parents: 59622
diff changeset
2638 If an invalid value is found, throw an error unless Optional argument
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2639 IGNORE-ERROR is non-nil."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2640 (let ((val (symbol-value var)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2641 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2642 ((numberp val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2643 val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2644 ((eq val t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2645 val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2646 ((null val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2647 val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2648 ((eq val '+)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2649 sh-basic-offset)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2650 ((eq val '-)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2651 (- sh-basic-offset))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2652 ((eq val '++)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2653 (* 2 sh-basic-offset))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2654 ((eq val '--)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2655 (* 2 (- sh-basic-offset)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2656 ((eq val '*)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2657 (/ sh-basic-offset 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2658 ((eq val '/)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2659 (/ (- sh-basic-offset) 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2660 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2661 (if ignore-error
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2662 (progn
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2663 (message "Don't know how to handle %s's value of %s" var val)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2664 0)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2665 (error "Don't know how to handle %s's value of %s" var val))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2666 ))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2667
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2668 (defun sh-set-var-value (var value &optional no-symbol)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2669 "Set variable VAR to VALUE.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2670 Unless optional argument NO-SYMBOL is non-nil, then if VALUE is
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2671 can be represented by a symbol then do so."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2672 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2673 (no-symbol
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2674 (set var value))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2675 ((= value sh-basic-offset)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2676 (set var '+))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2677 ((= value (- sh-basic-offset))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2678 (set var '-))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2679 ((eq value (* 2 sh-basic-offset))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2680 (set var '++))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2681 ((eq value (* 2 (- sh-basic-offset)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2682 (set var '--))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2683 ((eq value (/ sh-basic-offset 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2684 (set var '*))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2685 ((eq value (/ (- sh-basic-offset) 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2686 (set var '/))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2687 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2688 (set var value)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2689 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2690
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2691
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2692 (defun sh-calculate-indent (&optional info)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2693 "Return the indentation for the current line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2694 If INFO is supplied it is used, else it is calculated from current line."
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2695 (let ((ofs 0)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2696 (base-value 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2697 elt a b var val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2698 (or info
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2699 (setq info (sh-get-indent-info)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2700 (when info
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2701 (while info
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2702 (sh-debug "info: %s ofs=%s" info ofs)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2703 (setq elt (car info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2704 (cond
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2705 ((stringp elt)) ;; do nothing?
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2706 ((listp elt)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2707 (setq a (car (car info)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2708 (setq b (nth 1 (car info)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2709 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2710 ((eq a t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2711 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2712 (goto-char b)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2713 (setq val (current-indentation)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2714 (setq base-value val))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2715 ((symbolp b)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2716 (setq val (sh-var-value b))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2717 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2718 ((eq a '=)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2719 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2720 ((null val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2721 ;; no indentation
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2722 ;; set info to nil so we stop immediately
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2723 (setq base-value nil ofs nil info nil))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2724 ((eq val t) (setq ofs 0)) ;; indent as normal line
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2725 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2726 ;; The following assume the (t POS) come first!
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2727 (setq ofs val base-value 0)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2728 (setq info nil)))) ;; ? stop now
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2729 ((eq a '+) (setq ofs (+ ofs val)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2730 ((eq a '-) (setq ofs (- ofs val)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2731 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2732 (error "sh-calculate-indent invalid a a=%s b=%s" a b))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2733 (t
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2734 (error "sh-calculate-indent invalid elt: a=%s b=%s" a b))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2735 (t
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2736 (error "sh-calculate-indent invalid elt %s" elt)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2737 (sh-debug "a=%s b=%s val=%s base-value=%s ofs=%s"
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2738 a b val base-value ofs)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2739 (setq info (cdr info)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2740 ;; return value:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2741 (sh-debug "at end: base-value: %s ofs: %s" base-value ofs)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2742
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2743 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2744 ((or (null base-value)(null ofs))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2745 nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2746 ((and (numberp base-value)(numberp ofs))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2747 (sh-debug "base (%d) + ofs (%d) = %d"
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2748 base-value ofs (+ base-value ofs))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2749 (+ base-value ofs)) ;; return value
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2750 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2751 (error "sh-calculate-indent: Help. base-value=%s ofs=%s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2752 base-value ofs)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2753 nil)))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2754
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2755
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
2756 (defun sh-indent-line ()
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2757 "Indent the current line."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2758 (interactive)
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
2759 (let ((indent (sh-calculate-indent))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2760 (pos (- (point-max) (point))))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2761 (when indent
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2762 (beginning-of-line)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2763 (skip-chars-forward " \t")
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
2764 (indent-line-to indent)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2765 ;; If initial point was within line's indentation,
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2766 ;; position after the indentation. Else stay at same point in text.
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2767 (if (> (- (point-max) pos) (point))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2768 (goto-char (- (point-max) pos))))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2769
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2770
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2771 (defun sh-blink (blinkpos &optional msg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2772 "Move cursor momentarily to BLINKPOS and display MSG."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2773 ;; We can get here without it being a number on first line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2774 (if (numberp blinkpos)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2775 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2776 (goto-char blinkpos)
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65384
diff changeset
2777 (if msg (message "%s" msg) (message nil))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2778 (sit-for blink-matching-delay))
65610
5c0acc1c2a2c (sh-blink): Fix spurious reference to variable `message'.
Juanma Barranquero <lekktu@gmail.com>
parents: 65584
diff changeset
2779 (if msg (message "%s" msg) (message nil))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2780
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2781 (defun sh-show-indent (arg)
94046
8208c3bf9e0d (sh-show-indent): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93805
diff changeset
2782 "Show the how the current line would be indented.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2783 This tells you which variable, if any, controls the indentation of
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2784 this line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2785 If optional arg ARG is non-null (called interactively with a prefix),
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2786 a pop up window describes this variable.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2787 If variable `sh-blink' is non-nil then momentarily go to the line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2788 we are indenting relative to, if applicable."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2789 (interactive "P")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2790 (sh-must-support-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2791 (let* ((info (sh-get-indent-info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2792 (var (sh-get-indent-var-for-line info))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2793 (curr-indent (current-indentation))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2794 val msg)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2795 (if (stringp var)
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65384
diff changeset
2796 (message "%s" (setq msg var))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2797 (setq val (sh-calculate-indent info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2798
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2799 (if (eq curr-indent val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2800 (setq msg (format "%s is %s" var (symbol-value var)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2801 (setq msg
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2802 (if val
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2803 (format "%s (%s) would change indent from %d to: %d"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2804 var (symbol-value var) curr-indent val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2805 (format "%s (%s) would leave line as is"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2806 var (symbol-value var)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2807 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2808 (if (and arg var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2809 (describe-variable var)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2810 (if sh-blink
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2811 (let ((info (sh-get-indent-info)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2812 (if (and info (listp (car info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2813 (eq (car (car info)) t))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2814 (sh-blink (nth 1 (car info)) msg)
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65384
diff changeset
2815 (message "%s" msg)))
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65384
diff changeset
2816 (message "%s" msg))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2817 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2818
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2819 (defun sh-set-indent ()
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2820 "Set the indentation for the current line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2821 If the current line is controlled by an indentation variable, prompt
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2822 for a new value for it."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2823 (interactive)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2824 (sh-must-support-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2825 (let* ((info (sh-get-indent-info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2826 (var (sh-get-indent-var-for-line info))
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
2827 val old-val indent-val)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2828 (if (stringp var)
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65384
diff changeset
2829 (message "Cannot set indent - %s" var)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2830 (setq old-val (symbol-value var))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2831 (setq val (sh-read-variable var))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2832 (condition-case nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2833 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2834 (set var val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2835 (setq indent-val (sh-calculate-indent info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2836 (if indent-val
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2837 (message "Variable: %s Value: %s would indent to: %d"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2838 var (symbol-value var) indent-val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2839 (message "Variable: %s Value: %s would leave line as is."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2840 var (symbol-value var)))
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2841 ;; I'm not sure about this, indenting it now?
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2842 ;; No. Because it would give the impression that an undo would
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2843 ;; restore thing, but the value has been altered.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2844 ;; (sh-indent-line)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2845 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2846 (error
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2847 (set var old-val)
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2848 (message "Bad value for %s, restoring to previous value %s"
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2849 var old-val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2850 (sit-for 1)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2851 nil))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2852 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2853
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2854
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2855 (defun sh-learn-line-indent (arg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2856 "Learn how to indent a line as it currently is indented.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2857
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2858 If there is an indentation variable which controls this line's indentation,
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2859 then set it to a value which would indent the line the way it
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2860 presently is.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2861
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2862 If the value can be represented by one of the symbols then do so
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2863 unless optional argument ARG (the prefix when interactive) is non-nil."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2864 (interactive "*P")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2865 (sh-must-support-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2866 ;; I'm not sure if we show allow learning on an empty line.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2867 ;; Though it might occasionally be useful I think it usually
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2868 ;; would just be confusing.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2869 (if (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2870 (beginning-of-line)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2871 (looking-at "\\s-*$"))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2872 (message "sh-learn-line-indent ignores empty lines.")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2873 (let* ((info (sh-get-indent-info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2874 (var (sh-get-indent-var-for-line info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2875 ival sval diff new-val
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2876 (no-symbol arg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2877 (curr-indent (current-indentation)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2878 (cond
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2879 ((stringp var)
65584
6dbba0bd58df Message format fixes, commit no. 3
Deepak Goel <deego@gnufans.org>
parents: 65384
diff changeset
2880 (message "Cannot learn line - %s" var))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2881 ((eq var 'sh-indent-comment)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2882 ;; This is arbitrary...
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2883 ;; - if curr-indent is 0, set to curr-indent
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2884 ;; - else if it has the indentation of a "normal" line,
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2885 ;; then set to t
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2886 ;; - else set to curr-indent.
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2887 (setq sh-indent-comment
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2888 (if (= curr-indent 0)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2889 0
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2890 (let* ((sh-indent-comment t)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2891 (val2 (sh-calculate-indent info)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2892 (if (= val2 curr-indent)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2893 t
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2894 curr-indent))))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2895 (message "%s set to %s" var (symbol-value var))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2896 )
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2897 ((numberp (setq sval (sh-var-value var)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2898 (setq ival (sh-calculate-indent info))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2899 (setq diff (- curr-indent ival))
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2900
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2901 (sh-debug "curr-indent: %d ival: %d diff: %d var:%s sval %s"
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2902 curr-indent ival diff var sval)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2903 (setq new-val (+ sval diff))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2904 ;;; I commented out this because someone might want to replace
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2905 ;;; a value of `+' with the current value of sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2906 ;;; or vice-versa.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2907 ;;; (if (= 0 diff)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2908 ;;; (message "No change needed!")
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2909 (sh-set-var-value var new-val no-symbol)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2910 (message "%s set to %s" var (symbol-value var))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2911 )
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2912 (t
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2913 (debug)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2914 (message "Cannot change %s" var))))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2915
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2916
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2917
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2918 (defun sh-mark-init (buffer)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2919 "Initialize a BUFFER to be used by `sh-mark-line'."
64266
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2920 (with-current-buffer (get-buffer-create buffer)
47595
64e6b86fa461 (sh-mark-init): Don't set `occur-buffer'.
Juanma Barranquero <lekktu@gmail.com>
parents: 47264
diff changeset
2921 (erase-buffer)
64266
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
2922 (occur-mode)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2923
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2924
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2925 (defun sh-mark-line (message point buffer &optional add-linenum occur-point)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2926 "Insert MESSAGE referring to location POINT in current buffer into BUFFER.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2927 Buffer BUFFER is in `occur-mode'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2928 If ADD-LINENUM is non-nil the message is preceded by the line number.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2929 If OCCUR-POINT is non-nil then the line is marked as a new occurrence
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2930 so that `occur-next' and `occur-prev' will work."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2931 (let ((m1 (make-marker))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2932 start
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2933 (line ""))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2934 (when point
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2935 (set-marker m1 point (current-buffer))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2936 (if add-linenum
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
2937 (setq line (format "%d: " (1+ (count-lines 1 point))))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2938 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2939 (if (get-buffer buffer)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2940 (set-buffer (get-buffer buffer))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2941 (set-buffer (get-buffer-create buffer))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2942 (occur-mode)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2943 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2944 (goto-char (point-max))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2945 (setq start (point))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2946 (insert line)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2947 (if occur-point
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2948 (setq occur-point (point)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2949 (insert message)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2950 (if point
38079
7563c3b44130 (sh-mark-line): Add help-echo to mouse-highlighted text.
Eli Zaretskii <eliz@gnu.org>
parents: 37542
diff changeset
2951 (add-text-properties
7563c3b44130 (sh-mark-line): Add help-echo to mouse-highlighted text.
Eli Zaretskii <eliz@gnu.org>
parents: 37542
diff changeset
2952 start (point)
7563c3b44130 (sh-mark-line): Add help-echo to mouse-highlighted text.
Eli Zaretskii <eliz@gnu.org>
parents: 37542
diff changeset
2953 '(mouse-face highlight
7563c3b44130 (sh-mark-line): Add help-echo to mouse-highlighted text.
Eli Zaretskii <eliz@gnu.org>
parents: 37542
diff changeset
2954 help-echo "mouse-2: go to the line where I learned this")))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2955 (insert "\n")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2956 (if point
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2957 (progn
47595
64e6b86fa461 (sh-mark-init): Don't set `occur-buffer'.
Juanma Barranquero <lekktu@gmail.com>
parents: 47264
diff changeset
2958 (put-text-property start (point) 'occur-target m1)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2959 (if occur-point
47595
64e6b86fa461 (sh-mark-init): Don't set `occur-buffer'.
Juanma Barranquero <lekktu@gmail.com>
parents: 47264
diff changeset
2960 (put-text-property start occur-point
64e6b86fa461 (sh-mark-init): Don't set `occur-buffer'.
Juanma Barranquero <lekktu@gmail.com>
parents: 47264
diff changeset
2961 'occur-match t))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2962 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2963 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2964
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2965
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2966
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2967 ;; Is this really worth having?
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2968 (defvar sh-learned-buffer-hook nil
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2969 "*An abnormal hook, called with an alist of learned variables.")
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
2970 ;; Example of how to use sh-learned-buffer-hook
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2971 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2972 ;; (defun what-i-learned (list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2973 ;; (let ((p list))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2974 ;; (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2975 ;; (set-buffer "*scratch*")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2976 ;; (goto-char (point-max))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2977 ;; (insert "(setq\n")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2978 ;; (while p
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2979 ;; (insert (format " %s %s \n"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2980 ;; (nth 0 (car p)) (nth 1 (car p))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2981 ;; (setq p (cdr p)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2982 ;; (insert ")\n")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2983 ;; )))
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
2984 ;;
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2985 ;; (add-hook 'sh-learned-buffer-hook 'what-i-learned)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2987
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2988 ;; Originally this was sh-learn-region-indent (beg end)
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2989 ;; However, in practice this was awkward so I changed it to
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2990 ;; use the whole buffer. Use narrowing if needbe.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2991 (defun sh-learn-buffer-indent (&optional arg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2992 "Learn how to indent the buffer the way it currently is.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2993
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
2994 Output in buffer \"*indent*\" shows any lines which have conflicting
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2995 values of a variable, and the final value of all variables learned.
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2996 This buffer is popped to automatically if there are any discrepancies.
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2997
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2998 If no prefix ARG is given, then variables are set to numbers.
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
2999 If a prefix arg is given, then variables are set to symbols when
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3000 applicable -- e.g. to symbol `+' if the value is that of the
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3001 basic indent.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3002 If a positive numerical prefix is given, then `sh-basic-offset'
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3003 is set to the prefix's numerical value.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3004 Otherwise, sh-basic-offset may or may not be changed, according
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3005 to the value of variable `sh-learn-basic-offset'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3006
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3007 Abnormal hook `sh-learned-buffer-hook' if non-nil is called when the
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3008 function completes. The function is abnormal because it is called
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3009 with an alist of variables learned. This feature may be changed or
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3010 removed in the future.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3011
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3012 This command can often take a long time to run."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3013 (interactive "P")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3014 (sh-must-support-indent)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3015 (save-excursion
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3016 (goto-char (point-min))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3017 (let ((learned-var-list nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3018 (out-buffer "*indent*")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3019 (num-diffs 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3020 previous-set-info
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3021 (max 17)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3022 vec
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3023 msg
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3024 (comment-col nil) ;; number if all same, t if seen diff values
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3025 (comments-always-default t) ;; nil if we see one not default
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3026 initial-msg
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3027 (specified-basic-offset (and arg (numberp arg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3028 (> arg 0)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3029 (linenum 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3030 suggested)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3031 (setq vec (make-vector max 0))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3032 (sh-mark-init out-buffer)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3033
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3034 (if specified-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3035 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3036 (setq sh-basic-offset arg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3037 (setq initial-msg
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3038 (format "Using specified sh-basic-offset of %d"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3039 sh-basic-offset)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3040 (setq initial-msg
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3041 (format "Initial value of sh-basic-offset: %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3042 sh-basic-offset)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3043
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3044 (while (< (point) (point-max))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3045 (setq linenum (1+ linenum))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3046 ;; (if (zerop (% linenum 10))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3047 (message "line %d" linenum)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3048 ;; )
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3049 (unless (looking-at "\\s-*$") ;; ignore empty lines!
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3050 (let* ((sh-indent-comment t) ;; info must return default indent
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3051 (info (sh-get-indent-info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3052 (var (sh-get-indent-var-for-line info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3053 sval ival diff new-val
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3054 (curr-indent (current-indentation)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3055 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3056 ((null var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3057 nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3058 ((stringp var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3059 nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3060 ((numberp (setq sval (sh-var-value var 'no-error)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3061 ;; the numberp excludes comments since sval will be t.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3062 (setq ival (sh-calculate-indent))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3063 (setq diff (- curr-indent ival))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3064 (setq new-val (+ sval diff))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3065 (sh-set-var-value var new-val 'no-symbol)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3066 (unless (looking-at "\\s-*#") ;; don't learn from comments
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3067 (if (setq previous-set-info (assoc var learned-var-list))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3068 (progn
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3069 ;; it was already there, is it same value ?
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3070 (unless (eq (symbol-value var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3071 (nth 1 previous-set-info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3072 (sh-mark-line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3073 (format "Variable %s was set to %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3074 var (symbol-value var))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3075 (point) out-buffer t t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3076 (sh-mark-line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3077 (format " but was previously set to %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3078 (nth 1 previous-set-info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3079 (nth 2 previous-set-info) out-buffer t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3080 (setq num-diffs (1+ num-diffs))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3081 ;; (delete previous-set-info learned-var-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3082 (setcdr previous-set-info
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3083 (list (symbol-value var) (point)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3084 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3085 )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3086 (setq learned-var-list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3087 (append (list (list var (symbol-value var)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3088 (point)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3089 learned-var-list)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3090 (if (numberp new-val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3091 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3092 (sh-debug
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3093 "This line's indent value: %d" new-val)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3094 (if (< new-val 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3095 (setq new-val (- new-val)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3096 (if (< new-val max)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3097 (aset vec new-val (1+ (aref vec new-val))))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3098 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3099 ((eq var 'sh-indent-comment)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3100 (unless (= curr-indent (sh-calculate-indent info))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3101 ;; this is not the default indentation
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3102 (setq comments-always-default nil)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3103 (if comment-col ;; then we have see one before
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3104 (or (eq comment-col curr-indent)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3105 (setq comment-col t)) ;; seen a different one
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3106 (setq comment-col curr-indent))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3107 ))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3108 (t
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3109 (sh-debug "Cannot learn this line!!!")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3110 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3111 (sh-debug
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3112 "at %s learned-var-list is %s" (point) learned-var-list)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3113 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3114 (forward-line 1)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3115 ) ;; while
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3116 (if sh-debug
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3117 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3118 (setq msg (format
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3119 "comment-col = %s comments-always-default = %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3120 comment-col comments-always-default))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3121 ;; (message msg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3122 (sh-mark-line msg nil out-buffer)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3123 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3124 ((eq comment-col 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3125 (setq msg "\nComments are all in 1st column.\n"))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3126 (comments-always-default
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3127 (setq msg "\nComments follow default indentation.\n")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3128 (setq comment-col t))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3129 ((numberp comment-col)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3130 (setq msg (format "\nComments are in col %d." comment-col)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3131 (t
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3132 (setq msg "\nComments seem to be mixed, leaving them as is.\n")
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3133 (setq comment-col nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3134 ))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3135 (sh-debug msg)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3136 (sh-mark-line msg nil out-buffer)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3137
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3138 (sh-mark-line initial-msg nil out-buffer t t)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3139
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3140 (setq suggested (sh-guess-basic-offset vec))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3141
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3142 (if (and suggested (not specified-basic-offset))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3143 (let ((new-value
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3144 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3145 ;; t => set it if we have a single value as a number
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3146 ((and (eq sh-learn-basic-offset t) (numberp suggested))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3147 suggested)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3148 ;; other non-nil => set it if only one value was found
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3149 (sh-learn-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3150 (if (numberp suggested)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3151 suggested
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3152 (if (= (length suggested) 1)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3153 (car suggested))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3154 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3155 nil))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3156 (if new-value
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3157 (progn
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3158 (setq learned-var-list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3159 (append (list (list 'sh-basic-offset
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3160 (setq sh-basic-offset new-value)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3161 (point-max)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3162 learned-var-list))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3163 ;; Not sure if we need to put this line in, since
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3164 ;; it will appear in the "Learned variable settings".
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3165 (sh-mark-line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3166 (format "Changed sh-basic-offset to: %d" sh-basic-offset)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3167 nil out-buffer))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3168 (sh-mark-line
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3169 (if (listp suggested)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3170 (format "Possible value(s) for sh-basic-offset: %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3171 (mapconcat 'int-to-string suggested " "))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3172 (format "Suggested sh-basic-offset: %d" suggested))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3173 nil out-buffer))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3174
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3175
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3176 (setq learned-var-list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3177 (append (list (list 'sh-indent-comment comment-col (point-max)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3178 learned-var-list))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3179 (setq sh-indent-comment comment-col)
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
3180 (let ((name (buffer-name)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3181 (sh-mark-line "\nLearned variable settings:" nil out-buffer)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3182 (if arg
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3183 ;; Set learned variables to symbolic rather than numeric
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3184 ;; values where possible.
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3185 (dolist (learned-var (reverse learned-var-list))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3186 (let ((var (car learned-var))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3187 (val (nth 1 learned-var)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3188 (when (and (not (eq var 'sh-basic-offset))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3189 (numberp val))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3190 (sh-set-var-value var val)))))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3191 (dolist (learned-var (reverse learned-var-list))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3192 (let ((var (car learned-var)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3193 (sh-mark-line (format " %s %s" var (symbol-value var))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3194 (nth 2 learned-var) out-buffer)))
64266
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
3195 (with-current-buffer out-buffer
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3196 (goto-char (point-min))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3197 (insert
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3198 (format "Indentation values for buffer %s.\n" name)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3199 (format "%d indentation variable%s different values%s\n\n"
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3200 num-diffs
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3201 (if (= num-diffs 1)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3202 " has" "s have")
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3203 (if (zerop num-diffs)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3204 "." ":"))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3205 )))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3206 ;; Are abnormal hooks considered bad form?
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3207 (run-hook-with-args 'sh-learned-buffer-hook learned-var-list)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3208 (if (or sh-popup-occur-buffer (> num-diffs 0))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3209 (pop-to-buffer out-buffer))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3210 )))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3211
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3212 (defun sh-guess-basic-offset (vec)
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3213 "See if we can determine a reasonable value for `sh-basic-offset'.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3214 This is experimental, heuristic and arbitrary!
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3215 Argument VEC is a vector of information collected by
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3216 `sh-learn-buffer-indent'.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3217 Return values:
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3218 number - there appears to be a good single value
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3219 list of numbers - no obvious one, here is a list of one or more
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3220 reasonable choices
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3221 nil - we couldn't find a reasonable one."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3222 (let* ((max (1- (length vec)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3223 (i 1)
51379
f61b3dac769b (sh-is-quoted-p): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51265
diff changeset
3224 (totals (make-vector max 0)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3225 (while (< i max)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3226 (aset totals i (+ (aref totals i) (* 4 (aref vec i))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3227 (if (zerop (% i 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3228 (aset totals i (+ (aref totals i) (aref vec (/ i 2)))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3229 (if (< (* i 2) max)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3230 (aset totals i (+ (aref totals i) (aref vec (* i 2)))))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3231 (setq i (1+ i)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3232
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3233 (let ((x nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3234 (result nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3235 tot sum p)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3236 (setq i 1)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3237 (while (< i max)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3238 (if (/= (aref totals i) 0)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3239 (setq x (append x (list (cons i (aref totals i))))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3240 (setq i (1+ i)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3241
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3242 (setq x (sort x (lambda (a b) (> (cdr a) (cdr b)))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3243 (setq tot (apply '+ (append totals nil)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3244 (sh-debug (format "vec: %s\ntotals: %s\ntot: %d"
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3245 vec totals tot))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3246 (cond
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3247 ((zerop (length x))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3248 (message "no values!")) ;; we return nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3249 ((= (length x) 1)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3250 (message "only value is %d" (car (car x)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3251 (setq result (car (car x)))) ;; return single value
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3252 ((> (cdr (car x)) (/ tot 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3253 ;; 1st is > 50%
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3254 (message "basic-offset is probably %d" (car (car x)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3255 (setq result (car (car x)))) ;; again, return a single value
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3256 ((>= (cdr (car x)) (* 2 (cdr (car (cdr x)))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3257 ;; 1st is >= 2 * 2nd
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3258 (message "basic-offset could be %d" (car (car x)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3259 (setq result (car (car x))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3260 ((>= (+ (cdr (car x))(cdr (car (cdr x)))) (/ tot 2))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3261 ;; 1st & 2nd together >= 50% - return a list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3262 (setq p x sum 0 result nil)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3263 (while (and p
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3264 (<= (setq sum (+ sum (cdr (car p)))) (/ tot 2)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3265 (setq result (append result (list (car (car p)))))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3266 (setq p (cdr p)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3267 (message "Possible choices for sh-basic-offset: %s"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3268 (mapconcat 'int-to-string result " ")))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3269 (t
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3270 (message "No obvious value for sh-basic-offset. Perhaps %d"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3271 (car (car x)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3272 ;; result is nil here
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3273 ))
32728
6fe525e8880c (sh-mode-map): Remove bindings for
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32503
diff changeset
3274 result)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3275
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3276 ;; ========================================================================
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3277
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3278 ;; Styles -- a quick and dirty way of saving the indentation settings.
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3279
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3280 (defvar sh-styles-alist nil
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3281 "A list of all known shell indentation styles.")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3282
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3283 (defun sh-name-style (name &optional confirm-overwrite)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3284 "Name the current indentation settings as a style called NAME.
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3285 If this name exists, the command will prompt whether it should be
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3286 overwritten if
30956
4c05432300f8 Big bag of typos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 29844
diff changeset
3287 - - it was called interactively with a prefix argument, or
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3288 - - called non-interactively with optional CONFIRM-OVERWRITE non-nil."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3289 ;; (interactive "sName for this style: ")
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3290 (interactive
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3291 (list
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3292 (read-from-minibuffer "Name for this style? " )
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3293 (not current-prefix-arg)))
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3294 (let ((slist (cons name
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3295 (mapcar (lambda (var) (cons var (symbol-value var)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3296 sh-var-list)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3297 (style (assoc name sh-styles-alist)))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3298 (if style
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3299 (if (and confirm-overwrite
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3300 (not (y-or-n-p "This style exists. Overwrite it? ")))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3301 (message "Not changing style %s" name)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3302 (message "Updating style %s" name)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3303 (setcdr style (cdr slist)))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3304 (message "Creating new style %s" name)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3305 (push slist sh-styles-alist))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3306
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3307 (defun sh-load-style (name)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3308 "Set shell indentation values for this buffer from those in style NAME."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3309 (interactive (list (completing-read
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3310 "Which style to use for this buffer? "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3311 sh-styles-alist nil t)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3312 (let ((sl (assoc name sh-styles-alist)))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3313 (if (null sl)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3314 (error "sh-load-style - style %s not known" name)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3315 (dolist (var (cdr sl))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3316 (set (car var) (cdr var))))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3317
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3318 (defun sh-save-styles-to-buffer (buff)
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3319 "Save all current styles in elisp to buffer BUFF.
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3320 This is always added to the end of the buffer."
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3321 (interactive (list
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3322 (read-from-minibuffer "Buffer to save styles in? " "*scratch*")))
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3323 (with-current-buffer (get-buffer-create buff)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3324 (goto-char (point-max))
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3325 (insert "\n")
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3326 (pp `(setq sh-styles-alist ',sh-styles-alist) (current-buffer))))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3327
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3328
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3329
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3330 ;; statement syntax-commands for various shells
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3331
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3332 ;; You are welcome to add the syntax or even completely new statements as
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3333 ;; appropriate for your favorite shell.
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3334
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3335 (defconst sh-non-closing-paren
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3336 ;; If we leave it rear-sticky, calling `newline' ends up inserting a \n
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3337 ;; that inherits this property, which then confuses the indentation.
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3338 (propertize ")" 'syntax-table sh-st-punc 'rear-nonsticky t))
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3339
17531
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
3340 (define-skeleton sh-case
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
3341 "Insert a case/switch statement. See `sh-feature'."
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3342 (csh "expression: "
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3343 "switch( " str " )" \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3344 > "case " (read-string "pattern: ") ?: \n
17531
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
3345 > _ \n
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3346 "breaksw" \n
17531
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
3347 ( "other pattern, %s: "
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3348 < "case " str ?: \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3349 > _ \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3350 "breaksw" \n)
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3351 < "default:" \n
17531
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
3352 > _ \n
b891e41b4011 (sh-case): Make this a simple define-skeleton
Richard M. Stallman <rms@gnu.org>
parents: 17501
diff changeset
3353 resume:
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3354 < < "endsw" \n)
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3355 (es)
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3356 (rc "expression: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3357 > "switch( " str " ) {" \n
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3358 > "case " (read-string "pattern: ") \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3359 > _ \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3360 ( "other pattern, %s: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3361 "case " str > \n
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3362 > _ \n)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3363 "case *" > \n
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3364 > _ \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3365 resume:
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3366 ?\} > \n)
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3367 (sh "expression: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3368 > "case " str " in" \n
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3369 ( "pattern, %s: "
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3370 > str sh-non-closing-paren \n
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3371 > _ \n
51594
ad56e8962943 (sh-while-getopts, sh-if, sh-case): Revert part of previous change.
Juanma Barranquero <lekktu@gmail.com>
parents: 51515
diff changeset
3372 ";;" \n)
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3373 > "*" sh-non-closing-paren \n
20771
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3374 > _ \n
c6d9f48bd2f8 (sh-case): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents: 20459
diff changeset
3375 resume:
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3376 "esac" > \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3377
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3378 (define-skeleton sh-for
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3379 "Insert a for loop. See `sh-feature'."
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3380 (csh sh-modify sh
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3381 1 ""
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3382 2 "foreach "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3383 4 " ( "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3384 6 " )"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3385 15 '<
37542
51f2e2a0c455 (sh-prev-line): Look for sh-heredoc-face
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37528
diff changeset
3386 16 "end")
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3387 (es sh-modify rc
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3388 4 " = ")
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3389 (rc sh-modify sh
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3390 2 "for( "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3391 6 " ) {"
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3392 15 ?\} )
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3393 (sh "Index variable: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3394 > "for " str " in " _ "; do" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3395 > _ | ?$ & (sh-remember-variable str) \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3396 "done" > \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3397
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3398
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3399
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3400 (define-skeleton sh-indexed-loop
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3401 "Insert an indexed loop from 1 to n. See `sh-feature'."
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3402 (bash sh-modify posix)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3403 (csh "Index variable: "
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3404 "@ " str " = 1" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3405 "while( $" str " <= " (read-string "upper limit: ") " )" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3406 > _ ?$ str \n
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3407 "@ " str "++" \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3408 < "end" \n)
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3409 (es sh-modify rc
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3410 4 " =")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3411 (ksh88 "Index variable: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3412 > "integer " str "=0" \n
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3413 > "while (( ( " str " += 1 ) <= "
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3414 (read-string "upper limit: ")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3415 " )); do" \n
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3416 > _ ?$ (sh-remember-variable str) > \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3417 "done" > \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3418 (posix "Index variable: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3419 > str "=1" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3420 "while [ $" str " -le "
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3421 (read-string "upper limit: ")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3422 " ]; do" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3423 > _ ?$ str \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3424 str ?= (sh-add (sh-remember-variable str) 1) \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3425 "done" > \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3426 (rc "Index variable: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3427 > "for( " str " in" " `{awk 'BEGIN { for( i=1; i<="
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3428 (read-string "upper limit: ")
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3429 "; i++ ) print i }'`}) {" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3430 > _ ?$ (sh-remember-variable str) \n
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3431 ?\} > \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3432 (sh "Index variable: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3433 > "for " str " in `awk 'BEGIN { for( i=1; i<="
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3434 (read-string "upper limit: ")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3435 "; i++ ) print i }'`; do" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3436 > _ ?$ (sh-remember-variable str) \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3437 "done" > \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3438
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3439
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3440 (defun sh-shell-initialize-variables ()
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3441 "Scan the buffer for variable assignments.
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3442 Add these variables to `sh-shell-variables'."
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3443 (message "Scanning buffer `%s' for variable assignments..." (buffer-name))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3444 (save-excursion
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3445 (goto-char (point-min))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3446 (setq sh-shell-variables-initialized t)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3447 (while (search-forward "=" nil t)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3448 (sh-assignment 0)))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3449 (message "Scanning buffer `%s' for variable assignments...done"
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3450 (buffer-name)))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3451
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3452 (defvar sh-add-buffer)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3453
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3454 (defun sh-add-completer (string predicate code)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3455 "Do completion using `sh-shell-variables', but initialize it first.
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3456 This function is designed for use as the \"completion table\",
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3457 so it takes three arguments:
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3458 STRING, the current buffer contents;
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3459 PREDICATE, the predicate for filtering possible matches;
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3460 CODE, which says what kind of things to do.
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3461 CODE can be nil, t or `lambda'.
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3462 nil means to return the best completion of STRING, or nil if there is none.
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3463 t means to return a list of all possible completions of STRING.
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3464 `lambda' means to return t if STRING is a valid completion as it stands."
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3465 (let ((sh-shell-variables
64266
a634aa374675 (sh-get-indent-info): Only indent a continuation line if SPC or TAB precedes \.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 64085
diff changeset
3466 (with-current-buffer sh-add-buffer
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3467 (or sh-shell-variables-initialized
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3468 (sh-shell-initialize-variables))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3469 (nconc (mapcar (lambda (var)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3470 (let ((name
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3471 (substring var 0 (string-match "=" var))))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3472 (cons name name)))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3473 process-environment)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3474 sh-shell-variables))))
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3475 (case code
52322
e9922af67382 (sh-builtins): Add some bash builtins.
Glenn Morris <rgm@gnu.org>
parents: 52099
diff changeset
3476 ((nil) (try-completion string sh-shell-variables predicate))
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3477 (lambda (test-completion string sh-shell-variables predicate))
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3478 (t (all-completions string sh-shell-variables predicate)))))
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3479
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3480 (defun sh-add (var delta)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3481 "Insert an addition of VAR and prefix DELTA for Bourne (type) shell."
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3482 (interactive
14418
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3483 (let ((sh-add-buffer (current-buffer)))
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3484 (list (completing-read "Variable: " 'sh-add-completer)
7f58ca0014ef (sh-shell-variables-initialized): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 14221
diff changeset
3485 (prefix-numeric-value current-prefix-arg))))
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3486 (insert (sh-feature '((bash . "$(( ")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3487 (ksh88 . "$(( ")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3488 (posix . "$(( ")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3489 (rc . "`{expr $")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3490 (sh . "`expr $")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3491 (zsh . "$[ ")))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3492 (sh-remember-variable var)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3493 (if (< delta 0) " - " " + ")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3494 (number-to-string (abs delta))
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3495 (sh-feature '((bash . " ))")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3496 (ksh88 . " ))")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3497 (posix . " ))")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3498 (rc . "}")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3499 (sh . "`")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3500 (zsh . " ]")))))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3501
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3502
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3503
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3504 (define-skeleton sh-function
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3505 "Insert a function definition. See `sh-feature'."
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3506 (bash sh-modify ksh88
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3507 3 "() {")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3508 (ksh88 "name: "
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3509 "function " str " {" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3510 > _ \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3511 < "}" \n)
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3512 (rc sh-modify ksh88
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3513 1 "fn ")
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3514 (sh ()
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3515 "() {" \n
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3516 > _ \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3517 < "}" \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3518
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3519
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3520
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3521 (define-skeleton sh-if
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3522 "Insert an if statement. See `sh-feature'."
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3523 (csh "condition: "
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3524 "if( " str " ) then" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3525 > _ \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3526 ( "other condition, %s: "
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3527 < "else if( " str " ) then" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3528 > _ \n)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3529 < "else" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3530 > _ \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3531 resume:
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3532 < "endif" \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3533 (es "condition: "
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3534 > "if { " str " } {" \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3535 > _ \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3536 ( "other condition, %s: "
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3537 "} { " str " } {" > \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3538 > _ \n)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3539 "} {" > \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3540 > _ \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3541 resume:
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3542 ?\} > \n)
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3543 (rc "condition: "
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3544 > "if( " str " ) {" \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3545 > _ \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3546 ( "other condition, %s: "
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3547 "} else if( " str " ) {" > \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3548 > _ \n)
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3549 "} else {" > \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3550 > _ \n
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3551 resume:
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3552 ?\} > \n)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3553 (sh "condition: "
12863
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3554 '(setq input (sh-feature sh-test))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3555 > "if " str "; then" \n
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3556 > _ \n
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3557 ( "other condition, %s: "
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3558 > "elif " str "; then" > \n
51594
ad56e8962943 (sh-while-getopts, sh-if, sh-case): Revert part of previous change.
Juanma Barranquero <lekktu@gmail.com>
parents: 51515
diff changeset
3559 > \n)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3560 "else" > \n
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3561 > \n
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3562 resume:
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3563 "fi" > \n))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3564
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3565
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3566
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3567 (define-skeleton sh-repeat
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3568 "Insert a repeat loop definition. See `sh-feature'."
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3569 (es nil
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3570 > "forever {" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3571 > _ \n
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3572 ?\} > \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3573 (zsh "factor: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3574 > "repeat " str "; do" > \n
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3575 > \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3576 "done" > \n))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3577
17501
478f9bb8575c Remove all menu-enable properties except for sh-case.
Richard M. Stallman <rms@gnu.org>
parents: 17480
diff changeset
3578 ;;;(put 'sh-repeat 'menu-enable '(sh-feature sh-repeat))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3579
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3580
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3581
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3582 (define-skeleton sh-select
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3583 "Insert a select statement. See `sh-feature'."
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3584 (ksh88 "Index variable: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3585 > "select " str " in " _ "; do" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3586 > ?$ str \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3587 "done" > \n)
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3588 (bash sh-append ksh88))
17501
478f9bb8575c Remove all menu-enable properties except for sh-case.
Richard M. Stallman <rms@gnu.org>
parents: 17480
diff changeset
3589 ;;;(put 'sh-select 'menu-enable '(sh-feature sh-select))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3590
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3591
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3592
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3593 (define-skeleton sh-tmp-file
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3594 "Insert code to setup temporary file handling. See `sh-feature'."
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3595 (bash sh-append ksh88)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3596 (csh (file-name-nondirectory (buffer-file-name))
66027
61174c5e6da6 (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells.
Richard M. Stallman <rms@gnu.org>
parents: 65996
diff changeset
3597 "set tmp = `mktemp -t " str ".XXXXXX`" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3598 "onintr exit" \n _
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3599 (and (goto-char (point-max))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3600 (not (bolp))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3601 ?\n)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3602 "exit:\n"
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3603 "rm $tmp* >&/dev/null" > \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3604 (es (file-name-nondirectory (buffer-file-name))
66027
61174c5e6da6 (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells.
Richard M. Stallman <rms@gnu.org>
parents: 65996
diff changeset
3605 > "local( signals = $signals sighup sigint;" \n
61174c5e6da6 (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells.
Richard M. Stallman <rms@gnu.org>
parents: 65996
diff changeset
3606 > "tmp = `{ mktemp -t " str ".XXXXXX } ) {" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3607 > "catch @ e {" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3608 > "rm $tmp^* >[2]/dev/null" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3609 "throw $e" \n
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3610 "} {" > \n
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3611 _ \n
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3612 ?\} > \n
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3613 ?\} > \n)
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3614 (ksh88 sh-modify sh
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3615 7 "EXIT")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3616 (rc (file-name-nondirectory (buffer-file-name))
66027
61174c5e6da6 (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells.
Richard M. Stallman <rms@gnu.org>
parents: 65996
diff changeset
3617 > "tmp = `{ mktemp -t " str ".XXXXXX }" \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3618 "fn sigexit { rm $tmp^* >[2]/dev/null }" \n)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3619 (sh (file-name-nondirectory (buffer-file-name))
66027
61174c5e6da6 (sh-tmp-file): Use mktemp -t. Finish support for es and rc shells.
Richard M. Stallman <rms@gnu.org>
parents: 65996
diff changeset
3620 > "TMP=`mktemp -t " str ".XXXXXX`" \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3621 "trap \"rm $TMP* 2>/dev/null\" " ?0 \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3622
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3623
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3624
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3625 (define-skeleton sh-until
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3626 "Insert an until loop. See `sh-feature'."
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3627 (sh "condition: "
12863
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3628 '(setq input (sh-feature sh-test))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3629 > "until " str "; do" \n
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3630 > _ \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3631 "done" > \n))
17501
478f9bb8575c Remove all menu-enable properties except for sh-case.
Richard M. Stallman <rms@gnu.org>
parents: 17480
diff changeset
3632 ;;;(put 'sh-until 'menu-enable '(sh-feature sh-until))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3633
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3634
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3635
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3636 (define-skeleton sh-while
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3637 "Insert a while loop. See `sh-feature'."
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3638 (csh sh-modify sh
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3639 2 ""
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3640 3 "while( "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3641 5 " )"
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3642 10 '<
37542
51f2e2a0c455 (sh-prev-line): Look for sh-heredoc-face
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37528
diff changeset
3643 11 "end")
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3644 (es sh-modify sh
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3645 3 "while { "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3646 5 " } {"
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3647 10 ?\} )
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3648 (rc sh-modify sh
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3649 3 "while( "
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3650 5 " ) {"
40335
96186171af6d no functional changes - a preparation for the next patch
Sam Steingold <sds@gnu.org>
parents: 39890
diff changeset
3651 10 ?\} )
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3652 (sh "condition: "
12863
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3653 '(setq input (sh-feature sh-test))
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3654 > "while " str "; do" \n
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3655 > _ \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3656 "done" > \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3657
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3658
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3659
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3660 (define-skeleton sh-while-getopts
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3661 "Insert a while getopts loop. See `sh-feature'.
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3662 Prompts for an options string which consists of letters for each recognized
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3663 option followed by a colon `:' if the option accepts an argument."
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3664 (bash sh-modify sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3665 18 "${0##*/}")
12863
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3666 (csh nil
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3667 "while( 1 )" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3668 > "switch( \"$1\" )" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3669 '(setq input '("- x" . 2))
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3670 > >
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3671 ( "option, %s: "
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3672 < "case " '(eval str)
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3673 '(if (string-match " +" str)
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3674 (setq v1 (substring str (match-end 0))
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3675 str (substring str 0 (match-beginning 0)))
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3676 (setq v1 nil))
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3677 str ?: \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3678 > "set " v1 & " = $2" | -4 & _ \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3679 (if v1 "shift") & \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3680 "breaksw" \n)
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3681 < "case --:" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3682 > "shift" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3683 < "default:" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3684 > "break" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3685 resume:
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3686 < < "endsw" \n
bcf5d042f057 (sh-test): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12812
diff changeset
3687 "shift" \n
39890
bc9296467c86 (sh-font-lock-syntactic-keywords): Handle here-docs differently.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38079
diff changeset
3688 < "end" \n)
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3689 (ksh88 sh-modify sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3690 16 "print"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3691 18 "${0##*/}"
51515
6d06c54cda5d Fix bug in "Options Loop" skeleton for ksh. Add newlines to a few skeletons,
Juanma Barranquero <lekktu@gmail.com>
parents: 51379
diff changeset
3692 37 "OPTIND-1")
52758
aaeb60b0150f (sh-feature): Handle sh-modify like sh-append.
Richard M. Stallman <rms@gnu.org>
parents: 52682
diff changeset
3693 (posix sh-modify sh
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3694 18 "$(basename $0)")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3695 (sh "optstring: "
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3696 > "while getopts :" str " OPT; do" \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3697 > "case $OPT in" \n
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3698 '(setq v1 (append (vconcat str) nil))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3699 ( (prog1 (if v1 (char-to-string (car v1)))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3700 (if (eq (nth 1 v1) ?:)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3701 (setq v1 (nthcdr 2 v1)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3702 v2 "\"$OPTARG\"")
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3703 (setq v1 (cdr v1)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3704 v2 nil)))
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3705 > str "|+" str sh-non-closing-paren \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3706 > _ v2 \n
51594
ad56e8962943 (sh-while-getopts, sh-if, sh-case): Revert part of previous change.
Juanma Barranquero <lekktu@gmail.com>
parents: 51515
diff changeset
3707 > ";;" \n)
49306
ed0ec7e165de (sh-indent-line): Use indent-line-to.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 49176
diff changeset
3708 > "*" sh-non-closing-paren \n
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3709 > "echo" " \"usage: " "`basename $0`"
15027
30c4f64f3579 (sh-while-getopts): Punctuate help message better.
Richard M. Stallman <rms@gnu.org>
parents: 14892
diff changeset
3710 " [+-" '(setq v1 (point)) str
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3711 '(save-excursion
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3712 (while (search-backward ":" v1 t)
15027
30c4f64f3579 (sh-while-getopts): Punctuate help message better.
Richard M. Stallman <rms@gnu.org>
parents: 14892
diff changeset
3713 (replace-match " ARG] [+-" t t)))
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3714 (if (eq (preceding-char) ?-) -5)
29844
093c79809c9e (sh-while-getopts): Fix handling of
Gerd Moellmann <gerd@gnu.org>
parents: 29422
diff changeset
3715 (if (and (sequencep v1) (length v1)) "] " "} ")
28923
dcafe3c9cd6c (sh-while-getopts) <sh>: Handle case that
Gerd Moellmann <gerd@gnu.org>
parents: 26967
diff changeset
3716 "[--] ARGS...\"" \n
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3717 "exit 2" > \n
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3718 "esac" >
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3719 \n "done"
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3720 > \n
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3721 "shift " (sh-add "OPTIND" -1) \n
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3722 "OPTIND=1" \n))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3723
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3724
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3725
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3726 (defun sh-assignment (arg)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3727 "Remember preceding identifier for future completion and do self-insert."
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3728 (interactive "p")
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3729 (self-insert-command arg)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3730 (if (<= arg 1)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3731 (sh-remember-variable
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3732 (save-excursion
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3733 (if (re-search-forward (sh-feature sh-assignment-regexp)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3734 (prog1 (point)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3735 (beginning-of-line 1))
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3736 t)
13391
550ecb2269b0 (sh-shells): Eliminated variable redundant with
Karl Heuer <kwzh@gnu.org>
parents: 13389
diff changeset
3737 (match-string 1))))))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3738
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3739
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3740 (defun sh-maybe-here-document (arg)
32480
261dcd5e9f0a (sh-imenu-generic-expression): Fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31731
diff changeset
3741 "Insert self. Without prefix, following unquoted `<' inserts here document.
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3742 The document is bounded by `sh-here-document-word'."
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3743 (interactive "*P")
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3744 (self-insert-command (prefix-numeric-value arg))
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3745 (or arg
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3746 (not (eq (char-after (- (point) 2)) last-command-char))
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3747 (save-excursion
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3748 (backward-char 2)
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3749 (sh-quoted-p))
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3750 (let ((tabs (if (string-match "\\`-" sh-here-document-word)
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3751 (make-string (/ (current-indentation) tab-width) ?\t)
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3752 ""))
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3753 (delim (replace-regexp-in-string "['\"]" ""
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3754 sh-here-document-word)))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3755 (insert sh-here-document-word)
64051
d700ccca5bd4 (sh, sh-script): Finish `defgroup' description with period.
Juanma Barranquero <lekktu@gmail.com>
parents: 63885
diff changeset
3756 (or (eolp) (looking-at "[ \t]") (insert ?\s))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3757 (end-of-line 1)
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3758 (while
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3759 (sh-quoted-p)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3760 (end-of-line 2))
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3761 (insert ?\n tabs)
51265
575ad90ca254 (sh-here-document-word): Document new treatment of leading "-".
Glenn Morris <rgm@gnu.org>
parents: 49743
diff changeset
3762 (save-excursion
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3763 (insert ?\n tabs (replace-regexp-in-string
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3764 "\\`-?[ \t]*" "" delim))))))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3765
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3766
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3767 ;; various other commands
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3768
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3769 (autoload 'comint-dynamic-complete "comint"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3770 "Dynamically perform completion at point." t)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3771
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3772 (autoload 'shell-dynamic-complete-command "shell"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3773 "Dynamically complete the command at point." t)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3774
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3775 (autoload 'comint-dynamic-complete-filename "comint"
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3776 "Dynamically complete the filename at point." t)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3777
12505
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3778 (autoload 'shell-dynamic-complete-environment-variable "shell"
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3779 "Dynamically complete the environment variable at point." t)
0f970ed476cb restructured, largely rewritten without the bugs and
Karl Heuer <kwzh@gnu.org>
parents: 12034
diff changeset
3780
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3781
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3782
12887
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3783 (defun sh-newline-and-indent ()
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3784 "Strip unquoted whitespace, insert newline, and indent like current line."
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3785 (interactive "*")
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3786 (indent-to (prog1 (current-indentation)
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3787 (delete-region (point)
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3788 (progn
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3789 (or (zerop (skip-chars-backward " \t"))
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3790 (if (sh-quoted-p)
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3791 (forward-char)))
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3792 (point)))
cbed067bf52d (sh-newline-and-indent): Don't interpret prefix arg
Karl Heuer <kwzh@gnu.org>
parents: 12864
diff changeset
3793 (newline))))
6463
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3794
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3795 (defun sh-beginning-of-command ()
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3796 "Move point to successive beginnings of commands."
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3797 (interactive)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3798 (if (re-search-backward sh-beginning-of-command nil t)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3799 (goto-char (match-beginning 2))))
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3800
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3801 (defun sh-end-of-command ()
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3802 "Move point to successive ends of commands."
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3803 (interactive)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3804 (if (re-search-forward sh-end-of-command nil t)
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3805 (goto-char (match-end 1))))
380e8fcde9a2 entered into RCS
Richard M. Stallman <rms@gnu.org>
parents:
diff changeset
3806
59566
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3807 ;; Backslashification. Stolen from make-mode.el.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3808
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3809 (defun sh-backslash-region (from to delete-flag)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3810 "Insert, align, or delete end-of-line backslashes on the lines in the region.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3811 With no argument, inserts backslashes and aligns existing backslashes.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3812 With an argument, deletes the backslashes.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3813
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3814 This function does not modify the last line of the region if the region ends
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3815 right at the start of the following line; it does not modify blank lines
61534
3d7c70a6a91e (sh-here-document-word): Make it a defcustom. Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 61394
diff changeset
3816 at the start of the region. So you can put the region around an entire
59566
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3817 shell command and conveniently use this command."
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3818 (interactive "r\nP")
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3819 (save-excursion
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3820 (goto-char from)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3821 (let ((column sh-backslash-column)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3822 (endmark (make-marker)))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3823 (move-marker endmark to)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3824 ;; Compute the smallest column number past the ends of all the lines.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3825 (if sh-backslash-align
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3826 (progn
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3827 (if (not delete-flag)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3828 (while (< (point) to)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3829 (end-of-line)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3830 (if (= (preceding-char) ?\\)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3831 (progn (forward-char -1)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3832 (skip-chars-backward " \t")))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3833 (setq column (max column (1+ (current-column))))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3834 (forward-line 1)))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3835 ;; Adjust upward to a tab column, if that doesn't push
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3836 ;; past the margin.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3837 (if (> (% column tab-width) 0)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3838 (let ((adjusted (* (/ (+ column tab-width -1) tab-width)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3839 tab-width)))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3840 (if (< adjusted (window-width))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3841 (setq column adjusted))))))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3842 ;; Don't modify blank lines at start of region.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3843 (goto-char from)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3844 (while (and (< (point) endmark) (eolp))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3845 (forward-line 1))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3846 ;; Add or remove backslashes on all the lines.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3847 (while (and (< (point) endmark)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3848 ;; Don't backslashify the last line
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3849 ;; if the region ends right at the start of the next line.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3850 (save-excursion
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3851 (forward-line 1)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3852 (< (point) endmark)))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3853 (if (not delete-flag)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3854 (sh-append-backslash column)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3855 (sh-delete-backslash))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3856 (forward-line 1))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3857 (move-marker endmark nil))))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3858
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3859 (defun sh-append-backslash (column)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3860 (end-of-line)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3861 ;; Note that "\\\\" is needed to get one backslash.
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3862 (if (= (preceding-char) ?\\)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3863 (progn (forward-char -1)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3864 (delete-horizontal-space)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3865 (indent-to column (if sh-backslash-align nil 1)))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3866 (indent-to column (if sh-backslash-align nil 1))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3867 (insert "\\")))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3868
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3869 (defun sh-delete-backslash ()
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3870 (end-of-line)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3871 (or (bolp)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3872 (progn
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3873 (forward-char -1)
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3874 (if (looking-at "\\\\")
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3875 (delete-region (1+ (point))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3876 (progn (skip-chars-backward " \t") (point)))))))
7b97d6104891 (sh-mode-map): Bind C-c C-\.
Richard M. Stallman <rms@gnu.org>
parents: 59251
diff changeset
3877
13707
9356c7d7dcd6 Provide sh-script.
Karl Heuer <kwzh@gnu.org>
parents: 13705
diff changeset
3878 (provide 'sh-script)
18382
0e4943a370e2 Whitespace change.
Richard M. Stallman <rms@gnu.org>
parents: 18024
diff changeset
3879
59622
5ec981fa30e5 (sh-here-doc-open-re): Don't allow `|' or other
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 59566
diff changeset
3880 ;; arch-tag: eccd8b72-f337-4fc2-ae86-18155a69d937
25986
29aeb35781cd Added support for indenting existing scripts.
Gerd Moellmann <gerd@gnu.org>
parents: 25554
diff changeset
3881 ;;; sh-script.el ends here