aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2012-08-27 19:02:23 +0800
committerLeo Liu2012-08-27 19:02:23 +0800
commit3bb213b9fcf46b0e1f97cf830c1a9e2b62c566e7 (patch)
tree534eee92cdd9bce03c7db44f91d9e26a58da3ac6
parent22ab32ef882fb7aaf1c193d377194ed797e81e20 (diff)
downloademacs-3bb213b9fcf46b0e1f97cf830c1a9e2b62c566e7.tar.gz
emacs-3bb213b9fcf46b0e1f97cf830c1a9e2b62c566e7.zip
* skeleton.el (skeleton-untabify): Change to nil.
Fixes: debbugs:12223
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/skeleton.el2
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 @@
12012-08-27 Leo Liu <sdl.web@gmail.com> 12012-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
52012-08-24 Chong Yidong <cyd@gnu.org> 72012-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