diff options
| author | Leo Liu | 2012-08-27 18:51:17 +0800 |
|---|---|---|
| committer | Leo Liu | 2012-08-27 18:51:17 +0800 |
| commit | 22ab32ef882fb7aaf1c193d377194ed797e81e20 (patch) | |
| tree | 01e15f64d1690ca72c5c9f9ea8dae3d8678edda8 | |
| parent | 19c17fc1475500f2a6fecf1b8ebd08e64635e4ca (diff) | |
| download | emacs-22ab32ef882fb7aaf1c193d377194ed797e81e20.tar.gz emacs-22ab32ef882fb7aaf1c193d377194ed797e81e20.zip | |
Change sh-indent-comment to t
See: http://debbugs.gnu.org/12267
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/sh-script.el | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a29946a5a73..77c6a8d087c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-08-27 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * progmodes/sh-script.el (sh-indent-comment): Change to t (bug#12267). | ||
| 4 | |||
| 1 | 2012-08-24 Chong Yidong <cyd@gnu.org> | 5 | 2012-08-24 Chong Yidong <cyd@gnu.org> |
| 2 | 6 | ||
| 3 | * Version 24.2 released. | 7 | * Version 24.2 released. |
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 7d38df6aff6..90f9ce3a52f 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el | |||
| @@ -1190,7 +1190,7 @@ This value is used for the `+' and `-' symbols in an indentation variable." | |||
| 1190 | :group 'sh-indentation) | 1190 | :group 'sh-indentation) |
| 1191 | (put 'sh-basic-offset 'safe-local-variable 'integerp) | 1191 | (put 'sh-basic-offset 'safe-local-variable 'integerp) |
| 1192 | 1192 | ||
| 1193 | (defcustom sh-indent-comment nil | 1193 | (defcustom sh-indent-comment t |
| 1194 | "How a comment line is to be indented. | 1194 | "How a comment line is to be indented. |
| 1195 | nil means leave it as it is; | 1195 | nil means leave it as it is; |
| 1196 | t means indent it as a normal line, aligning it to previous non-blank | 1196 | t means indent it as a normal line, aligning it to previous non-blank |
| @@ -1201,6 +1201,7 @@ a number means align to that column, e.g. 0 means first column." | |||
| 1201 | (const :tag "Indent as a normal line." t) | 1201 | (const :tag "Indent as a normal line." t) |
| 1202 | (integer :menu-tag "Indent to this col (0 means first col)." | 1202 | (integer :menu-tag "Indent to this col (0 means first col)." |
| 1203 | :tag "Indent to column number.") ) | 1203 | :tag "Indent to column number.") ) |
| 1204 | :version "24.3" | ||
| 1204 | :group 'sh-indentation) | 1205 | :group 'sh-indentation) |
| 1205 | 1206 | ||
| 1206 | 1207 | ||