diff options
| author | Juanma Barranquero | 2011-04-22 20:44:26 +0200 |
|---|---|---|
| committer | Juanma Barranquero | 2011-04-22 20:44:26 +0200 |
| commit | e02f48d76bfd57f014ffbe3ba56b62f2d5ccc794 (patch) | |
| tree | d27a2d9fd6838d6e619c824deb12a568ceac54f6 /lisp/progmodes/sh-script.el | |
| parent | 7ede3b6577ae99a3e7ac45baa7cace439bf5070c (diff) | |
| download | emacs-e02f48d76bfd57f014ffbe3ba56b62f2d5ccc794.tar.gz emacs-e02f48d76bfd57f014ffbe3ba56b62f2d5ccc794.zip | |
lisp/progmodes/*.el: Lexical-binding cleanup.
Diffstat (limited to 'lisp/progmodes/sh-script.el')
| -rw-r--r-- | lisp/progmodes/sh-script.el | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 7b84cc89d08..258f9be9237 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -987,8 +987,7 @@ subshells can nest." | |||
| 987 | ;; rather flakey. | 987 | ;; rather flakey. |
| 988 | (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote. | 988 | (when (eq ?\" (nth 3 (syntax-ppss))) ; Check we matched an opening quote. |
| 989 | ;; bingo we have a $( or a ` inside a "" | 989 | ;; bingo we have a $( or a ` inside a "" |
| 990 | (let ((char (char-after (point))) | 990 | (let (;; `state' can be: double-quote, backquote, code. |
| 991 | ;; `state' can be: double-quote, backquote, code. | ||
| 992 | (state (if (eq (char-before) ?`) 'backquote 'code)) | 991 | (state (if (eq (char-before) ?`) 'backquote 'code)) |
| 993 | ;; Stacked states in the context. | 992 | ;; Stacked states in the context. |
| 994 | (states '(double-quote))) | 993 | (states '(double-quote))) |
| @@ -1212,7 +1211,7 @@ a number means align to that column, e.g. 0 means first column." | |||
| 1212 | ;; "For debugging: display message ARGS if variable SH-DEBUG is non-nil." | 1211 | ;; "For debugging: display message ARGS if variable SH-DEBUG is non-nil." |
| 1213 | ;; (if sh-debug | 1212 | ;; (if sh-debug |
| 1214 | ;; (apply 'message args))) | 1213 | ;; (apply 'message args))) |
| 1215 | (defmacro sh-debug (&rest args)) | 1214 | (defmacro sh-debug (&rest _args)) |
| 1216 | 1215 | ||
| 1217 | (defconst sh-symbol-list | 1216 | (defconst sh-symbol-list |
| 1218 | '((const :tag "+ " :value + | 1217 | '((const :tag "+ " :value + |
| @@ -2138,7 +2137,6 @@ STRING This is ignored for the purposes of calculating | |||
| 2138 | (save-excursion | 2137 | (save-excursion |
| 2139 | (let ((have-result nil) | 2138 | (let ((have-result nil) |
| 2140 | this-kw | 2139 | this-kw |
| 2141 | start | ||
| 2142 | val | 2140 | val |
| 2143 | (result nil) | 2141 | (result nil) |
| 2144 | (align-point nil) | 2142 | (align-point nil) |
| @@ -2209,7 +2207,6 @@ STRING This is ignored for the purposes of calculating | |||
| 2209 | ;; We start off at beginning of this line. | 2207 | ;; We start off at beginning of this line. |
| 2210 | ;; Scan previous statements while this is <= | 2208 | ;; Scan previous statements while this is <= |
| 2211 | ;; start of previous line. | 2209 | ;; start of previous line. |
| 2212 | (setq start (point)) ;; for debug only | ||
| 2213 | (goto-char prev-line-end) | 2210 | (goto-char prev-line-end) |
| 2214 | (setq x t) | 2211 | (setq x t) |
| 2215 | (while (and x (setq x (sh-prev-thing))) | 2212 | (while (and x (setq x (sh-prev-thing))) |
| @@ -2614,7 +2611,7 @@ can be represented by a symbol then do so." | |||
| 2614 | If INFO is supplied it is used, else it is calculated from current line." | 2611 | If INFO is supplied it is used, else it is calculated from current line." |
| 2615 | (let ((ofs 0) | 2612 | (let ((ofs 0) |
| 2616 | (base-value 0) | 2613 | (base-value 0) |
| 2617 | elt a b var val) | 2614 | elt a b val) |
| 2618 | (or info | 2615 | (or info |
| 2619 | (setq info (sh-get-indent-info))) | 2616 | (setq info (sh-get-indent-info))) |
| 2620 | (when info | 2617 | (when info |