diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77c6a8d087c..456eca53a82 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2012-08-27 Leo Liu + * skeleton.el (skeleton-untabify): Change to nil (bug#12223). + * progmodes/sh-script.el (sh-indent-comment): Change to t (bug#12267). 2012-08-24 Chong Yidong 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.") "Function for transforming a skeleton proxy's aliases' variable value.") (defvaralias 'skeleton-filter 'skeleton-filter-function) -(defvar skeleton-untabify t +(defvar skeleton-untabify nil ; bug#12223 "When non-nil untabifies when deleting backwards with element -ARG.") (defvar skeleton-newline-indent-rigidly nil