* s-region.el: Move to obsolete.

diff --git a/etc/NEWS b/etc/NEWS
index 01ea6b09fc66ce7ef414fe9a19b4d06430c49cfc..317f5cedf24f9b8af8e26d480471963b718514ae 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -78,6 +78,9 @@ For example, adding "(diff-mode . ((mode . whitespace)))" to your
 .dir-locals.el file, will turn on `whitespace-mode' for *vc-diff*
 buffers.
 
+** s-region.el is now declared obsolete, superceded by shift-select-mode
+enabled by default in 23.1.
+
 \f
 * New Modes and Packages in Emacs 24.1
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ab4834ef0c7a972db1012938db8fa0ca91ccbaaa..b5dd5e0f0c4791d7f44771237bf3d1222ad7e2d0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-20  Juri Linkov  <juri@jurta.org>
+
+       * s-region.el:
+       * obsolete/s-region.el: Move to obsolete.
+
 2010-03-19  Juanma Barranquero  <lekktu@gmail.com>
 
        * vc-dispatcher.el (vc-do-command): Remove reference to `vc-path'.

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index ddec46405a634b41134478ff113bef0e5132fc3b..babb5cff8da2688cd090089d3d753bd751ff7bb2 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1091,6 +1091,7 @@ ELCFILES = \
        $(lisp)/obsolete/rnewspost.elc \
        $(lisp)/obsolete/sc.elc \
        $(lisp)/obsolete/scribe.elc \
+       $(lisp)/obsolete/s-region.elc \
        $(lisp)/obsolete/swedish.elc \
        $(lisp)/obsolete/sym-comp.elc \
        $(lisp)/obsolete/vc-mcvs.elc \
@@ -1294,7 +1295,6 @@ ELCFILES = \
        $(lisp)/rfn-eshadow.elc \
        $(lisp)/rot13.elc \
        $(lisp)/ruler-mode.elc \
-       $(lisp)/s-region.elc \
        $(lisp)/savehist.elc \
        $(lisp)/saveplace.elc \
        $(lisp)/sb-image.elc \

diff --git a/lisp/s-region.el b/lisp/obsolete/s-region.el
similarity index 99%
rename from lisp/s-region.el
rename to lisp/obsolete/s-region.el
index 3bef30c2fe598eb8a0bf54d10be71088cda2ac5b..a88d1f37ee7e92b57d53fda1a6ed7f07f499ea53 100644 (file)
--- a/lisp/s-region.el
+++ b/lisp/obsolete/s-region.el
@@ -6,6 +6,7 @@
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: terminals
 ;; Favourite-brand-of-beer: None, I hate beer.
+;; Obsolete-since: 24.1
 
 ;; This file is part of GNU Emacs.