2 files changed, 6 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fabbf14038..d3c0ab97ec4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * skeleton.el (skeleton-autowrap): Mark as obsolete.  Doc fix.
+
 2014-10-20  Glenn Morris  <rgm@gnu.org>
 
         * dired.el (dired-read-regexp): Make obsolete.
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index 54dce9e43b7..bb019db502c 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -55,11 +55,8 @@ Typical examples might be `upcase' or `capitalize'.")
 When the region is visible (due to `transient-mark-mode' or marking a region
 with the mouse) and this is non-nil and the function was called without an
 explicit ARG, then the ARG defaults to -1, i.e. wrapping around the visible
-region.
-
-We will probably delete this variable in a future Emacs version
-unless we get a substantial number of complaints about the auto-wrap
-feature.")
+region.")
+(make-obsolete-variable 'skeleton-autowrap nil "24.5")
 
 (defvar skeleton-end-newline t
   "If non-nil, make sure that the skeleton inserted ends with a newline.