Mercurial > emacs
diff lisp/progmodes/sh-script.el @ 91041:bdb3fe0ba9fa
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 866-879)
- Merge multi-tty branch
- Update from CVS
- Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-257
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 11 Oct 2007 16:22:07 +0000 |
parents | 424b655804ca 35543641f89c |
children | 53108e6cea98 |
line wrap: on
line diff
--- a/lisp/progmodes/sh-script.el Thu Oct 11 16:14:00 2007 +0000 +++ b/lisp/progmodes/sh-script.el Thu Oct 11 16:22:07 2007 +0000 @@ -1029,7 +1029,7 @@ (t (error "Internal error in sh-font-lock-quoted-subshell"))) (forward-char 1))) t)) - + (defun sh-is-quoted-p (pos) (and (eq (char-before pos) ?\\) @@ -1192,7 +1192,7 @@ nil means leave it as it is; t means indent it as a normal line, aligning it to previous non-blank non-comment line; -a number means align to that column, e.g. 0 means fist column." +a number means align to that column, e.g. 0 means first column." :type '(choice (const :tag "Leave as is." nil) (const :tag "Indent as a normal line." t) @@ -1906,14 +1906,14 @@ To revert all these variables to the global values, use command `sh-reset-indent-vars-to-global-values'." (interactive) - (mapcar 'make-local-variable sh-var-list) + (mapc 'make-local-variable sh-var-list) (message "Indentation variables are now local.")) (defun sh-reset-indent-vars-to-global-values () "Reset local indentation variables to the global values. Then, if variable `sh-make-vars-local' is non-nil, make them local." (interactive) - (mapcar 'kill-local-variable sh-var-list) + (mapc 'kill-local-variable sh-var-list) (if sh-make-vars-local (mapcar 'make-local-variable sh-var-list)))