* skeleton.el (skeleton-untabify): Change to nil.

Fixes: debbugs:12223

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 77c6a8d087c4961c5d26b422b79c3e8cce97e3d0..456eca53a820ca23424fbfb30b63a6b68eea8294 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-08-27  Leo Liu  <sdl.web@gmail.com>
 
 2012-08-27  Leo Liu  <sdl.web@gmail.com>
 

+       * 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  <cyd@gnu.org>
        * progmodes/sh-script.el (sh-indent-comment): Change to t (bug#12267).
 
 2012-08-24  Chong Yidong  <cyd@gnu.org>

diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 0f28d32293b55460a16dc204bba78c1ec6699937..efc0a2da84d0df9c9734b8c78718707f692908d3 100644 (file)
--- 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)
 
   "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
   "When non-nil untabifies when deleting backwards with element -ARG.")
 
 (defvar skeleton-newline-indent-rigidly nil