diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/skeleton.el | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77c6a8d087c..456eca53a82 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2012-08-27 Leo Liu <sdl.web@gmail.com> | 1 | 2012-08-27 Leo Liu <sdl.web@gmail.com> |
| 2 | 2 | ||
| 3 | * skeleton.el (skeleton-untabify): Change to nil (bug#12223). | ||
| 4 | |||
| 3 | * progmodes/sh-script.el (sh-indent-comment): Change to t (bug#12267). | 5 | * progmodes/sh-script.el (sh-indent-comment): Change to t (bug#12267). |
| 4 | 6 | ||
| 5 | 2012-08-24 Chong Yidong <cyd@gnu.org> | 7 | 2012-08-24 Chong Yidong <cyd@gnu.org> |
diff --git a/lisp/skeleton.el b/lisp/skeleton.el index 0f28d32293b..efc0a2da84d 100644 --- a/lisp/skeleton.el +++ b/lisp/skeleton.el | |||
| @@ -77,7 +77,7 @@ The variables `v1' and `v2' are still set when calling this.") | |||
| 77 | "Function for transforming a skeleton proxy's aliases' variable value.") | 77 | "Function for transforming a skeleton proxy's aliases' variable value.") |
| 78 | (defvaralias 'skeleton-filter 'skeleton-filter-function) | 78 | (defvaralias 'skeleton-filter 'skeleton-filter-function) |
| 79 | 79 | ||
| 80 | (defvar skeleton-untabify t | 80 | (defvar skeleton-untabify nil ; bug#12223 |
| 81 | "When non-nil untabifies when deleting backwards with element -ARG.") | 81 | "When non-nil untabifies when deleting backwards with element -ARG.") |
| 82 | 82 | ||
| 83 | (defvar skeleton-newline-indent-rigidly nil | 83 | (defvar skeleton-newline-indent-rigidly nil |