* lisp/skeleton.el (skeleton-autowrap): Mark as obsolete. [Backport]

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fabbf14038e6b81a99efdaff155f61ffbd71208..d3c0ab97ec4e1f807a3b8e4f7f626f2b87c27a8e 100644 (file)
--- 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 54dce9e43b7ad39a735a0e92ce396f4cdb950aa5..bb019db502c3655398b88b04a652d513d4de9f29 100644 (file)
--- 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.