Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
91040:14c4a6aac623 | 91041:bdb3fe0ba9fa |
---|---|
1027 (double-quote nil) | 1027 (double-quote nil) |
1028 (t (setq state (pop states))))) | 1028 (t (setq state (pop states))))) |
1029 (t (error "Internal error in sh-font-lock-quoted-subshell"))) | 1029 (t (error "Internal error in sh-font-lock-quoted-subshell"))) |
1030 (forward-char 1))) | 1030 (forward-char 1))) |
1031 t)) | 1031 t)) |
1032 | 1032 |
1033 | 1033 |
1034 (defun sh-is-quoted-p (pos) | 1034 (defun sh-is-quoted-p (pos) |
1035 (and (eq (char-before pos) ?\\) | 1035 (and (eq (char-before pos) ?\\) |
1036 (not (sh-is-quoted-p (1- pos))))) | 1036 (not (sh-is-quoted-p (1- pos))))) |
1037 | 1037 |
1190 (defcustom sh-indent-comment nil | 1190 (defcustom sh-indent-comment nil |
1191 "How a comment line is to be indented. | 1191 "How a comment line is to be indented. |
1192 nil means leave it as it is; | 1192 nil means leave it as it is; |
1193 t means indent it as a normal line, aligning it to previous non-blank | 1193 t means indent it as a normal line, aligning it to previous non-blank |
1194 non-comment line; | 1194 non-comment line; |
1195 a number means align to that column, e.g. 0 means fist column." | 1195 a number means align to that column, e.g. 0 means first column." |
1196 :type '(choice | 1196 :type '(choice |
1197 (const :tag "Leave as is." nil) | 1197 (const :tag "Leave as is." nil) |
1198 (const :tag "Indent as a normal line." t) | 1198 (const :tag "Indent as a normal line." t) |
1199 (integer :menu-tag "Indent to this col (0 means first col)." | 1199 (integer :menu-tag "Indent to this col (0 means first col)." |
1200 :tag "Indent to column number.") ) | 1200 :tag "Indent to column number.") ) |
1904 variable `sh-make-vars-local' has been set to nil. | 1904 variable `sh-make-vars-local' has been set to nil. |
1905 | 1905 |
1906 To revert all these variables to the global values, use | 1906 To revert all these variables to the global values, use |
1907 command `sh-reset-indent-vars-to-global-values'." | 1907 command `sh-reset-indent-vars-to-global-values'." |
1908 (interactive) | 1908 (interactive) |
1909 (mapcar 'make-local-variable sh-var-list) | 1909 (mapc 'make-local-variable sh-var-list) |
1910 (message "Indentation variables are now local.")) | 1910 (message "Indentation variables are now local.")) |
1911 | 1911 |
1912 (defun sh-reset-indent-vars-to-global-values () | 1912 (defun sh-reset-indent-vars-to-global-values () |
1913 "Reset local indentation variables to the global values. | 1913 "Reset local indentation variables to the global values. |
1914 Then, if variable `sh-make-vars-local' is non-nil, make them local." | 1914 Then, if variable `sh-make-vars-local' is non-nil, make them local." |
1915 (interactive) | 1915 (interactive) |
1916 (mapcar 'kill-local-variable sh-var-list) | 1916 (mapc 'kill-local-variable sh-var-list) |
1917 (if sh-make-vars-local | 1917 (if sh-make-vars-local |
1918 (mapcar 'make-local-variable sh-var-list))) | 1918 (mapcar 'make-local-variable sh-var-list))) |
1919 | 1919 |
1920 | 1920 |
1921 ;; Theoretically these are only needed in shell and derived modes. | 1921 ;; Theoretically these are only needed in shell and derived modes. |