diff options
| author | Juanma Barranquero | 2014-10-20 18:41:19 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-10-20 18:41:19 -0400 |
| commit | 531f56f59b2ae2fc79377662bd041b85b2563268 (patch) | |
| tree | cfa794752eb1843e5408e9e2bb4564f34638c0f6 | |
| parent | 3ac4e4c0eb19cecf7adce4ad6ffe60f70ad8a72d (diff) | |
| download | emacs-531f56f59b2ae2fc79377662bd041b85b2563268.tar.gz emacs-531f56f59b2ae2fc79377662bd041b85b2563268.zip | |
* lisp/skeleton.el (skeleton-autowrap): Mark as obsolete. [Backport]
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/skeleton.el | 7 |
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 @@ | |||
| 1 | 2014-03-20 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * skeleton.el (skeleton-autowrap): Mark as obsolete. Doc fix. | ||
| 4 | |||
| 1 | 2014-10-20 Glenn Morris <rgm@gnu.org> | 5 | 2014-10-20 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * dired.el (dired-read-regexp): Make obsolete. | 7 | * 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'.") | |||
| 55 | When the region is visible (due to `transient-mark-mode' or marking a region | 55 | When the region is visible (due to `transient-mark-mode' or marking a region |
| 56 | with the mouse) and this is non-nil and the function was called without an | 56 | with the mouse) and this is non-nil and the function was called without an |
| 57 | explicit ARG, then the ARG defaults to -1, i.e. wrapping around the visible | 57 | explicit ARG, then the ARG defaults to -1, i.e. wrapping around the visible |
| 58 | region. | 58 | region.") |
| 59 | 59 | (make-obsolete-variable 'skeleton-autowrap nil "24.5") | |
| 60 | We will probably delete this variable in a future Emacs version | ||
| 61 | unless we get a substantial number of complaints about the auto-wrap | ||
| 62 | feature.") | ||
| 63 | 60 | ||
| 64 | (defvar skeleton-end-newline t | 61 | (defvar skeleton-end-newline t |
| 65 | "If non-nil, make sure that the skeleton inserted ends with a newline. | 62 | "If non-nil, make sure that the skeleton inserted ends with a newline. |