Move iswitchb.el to obsolete/

Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-11/msg00501.html

* lisp/obsolete/iswitchb.el: Move to obsolete/.

* lisp/simple.el (iswitchb-mode): Add manual autoloads to ease transition,
since obsolete/ is not scanned for autoloads.

* lisp/emacs-lisp/authors.el (authors-valid-file-names):
Add iswitchb.el.

* doc/emacs/ack.texi (Acknowledgments): No longer mention obsolete files.

* doc/misc/viper.texi (File and Buffer Handling): Prefer ido to iswitchb.

* etc/NEWS: Related edits.

9 files changed, 58 insertions, 21 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 4478e4bd72c..11df5923612 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * ack.texi (Acknowledgments): No longer mention obsolete files.
+
 2014-02-02  Glenn Morris  <rgm@gnu.org>
 
         * regs.texi (Registers): Mention previewing.
diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index 8f8e741c910..0ec2cf8624a 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -52,10 +52,6 @@ files.
 Michael Albinus wrote @file{dbus.el}, a package that implements the
 D-Bus message bus protocol; @file{zeroconf.el}, a mode for browsing
 Avahi services;
-@ignore
-@c obsolete
-@file{xesam.el}, a Xesam-based search engine interface;
-@end ignore
 and @file{secrets.el}, an interface to keyring daemons for
 storing confidential data.  He and Kai Großjohann wrote the Tramp package, which
 provides transparent remote file editing using rcp, ssh, ftp, and
@@ -307,8 +303,7 @@ to VC and the calendar.
 
 @item
 Stephen Eglen wrote @file{mspools.el}, which tells you which Procmail
-folders have mail waiting in them; and @file{iswitchb.el}, a feature
-for incremental reading and completion of buffer names.
+folders have mail waiting in them.
 
 @item
 Torbjörn Einarsson wrote @file{f90.el}, a mode for Fortran 90 files.
@@ -820,10 +815,6 @@ Common Lisp code; @file{ebuff-menu.el}, an ``electric'' browser for
 buffer listings; @file{ehelp.el}, bindings for browsing help screens;
 and @file{rfc822.el}, a parser for E-mail addresses in the RFC-822 format,
 used in mail messages and news articles.
-@ignore
-@c Obsolete since 24.4
-; and @file{terminal.el}, a terminal emulator for Emacs subprocesses.
-@end ignore
 
 @item
 Gerd Möllmann was the Emacs maintainer from the beginning of Emacs 21
@@ -1106,12 +1097,6 @@ Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
 Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played
 against Emacs; and @file{mpuz.el}, a multiplication puzzle.
 
-@ignore
-@c Removed in 24.1.
-@item
-Rainer Schöpf contributed to Alpha and OSF1 support.
-@end ignore
-
 @item
 Jan Schormann wrote @file{solitaire.el}, an implementation of the
 Solitaire game.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 7242110ec0f..766286c5fa7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
+2014-02-07  Glenn Morris  <rgm@gnu.org>
+
+        * viper.texi (File and Buffer Handling): Prefer ido to iswitchb.
+
 2014-02-06  Glenn Morris  <rgm@gnu.org>
 
         * epa.texi (Mail-mode integration): Mention epa-mail-aliases.
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 3195bfa807d..5cbf32c9297 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -4064,7 +4064,7 @@ switch in another window.  Buffer completion is supported.
 The variable @var{viper-read-buffer-function} controls which function is
 actually used to read the buffer name. The default is @code{read-buffer},
 but better alternatives are also available in Emacs (e.g.,
-@code{iswitchb-read-buffer}).
+@code{ido-read-buffer}).
 @vindex @var{viper-read-buffer-function}
 @item :B
 Like @kbd{:b}, but the meaning of @var{ex-cycle-other-window} is reversed.
diff --git a/etc/NEWS b/etc/NEWS
index 53aa825fb88..e2dcadb559f 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -906,11 +906,15 @@ are obsolete.  Customize the `woman-*' faces instead.
 
 ** Obsolete packages
 
-*** Iswitchb; use icomplete-mode.
++++
+*** iswitchb.el; use icomplete-mode.
 
 ---
 *** longlines.el; use visual-line-mode.
 
+---
+*** meese.el.
+
 +++
 *** sup-mouse.el.
 
@@ -918,7 +922,7 @@ are obsolete.  Customize the `woman-*' faces instead.
 *** terminal.el; use term.el instead.
 
 ---
-*** the old version of todo-mode.el (now renamed to otodo-mode.el).
+*** the old version of todo-mode.el (renamed to otodo-mode.el).
 
 ---
 *** xesam.el (owing to the cancellation of the XESAM project).
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e77adedb23f..18587c06e31 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2014-02-07  Glenn Morris  <rgm@gnu.org>
 
+        * obsolete/iswitchb.el: Move to obsolete/.
+        * simple.el (iswitchb-mode): Add manual autoloads to ease transition,
+        since obsolete/ is not scanned for autoloads.
+        * emacs-lisp/authors.el (authors-valid-file-names):
+        Add iswitchb.el.
+
         * obsolete/meese.el: Restore as obsolete (deleted 2014-01-11).
         Disable now non-functional find-file-hook.
 
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index 166e2134cb9..dfc60512c61 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -626,7 +626,7 @@ Changes to files in this list are not listed.")
     "erc-hecomplete.el"
     "eshell/esh-maint.el"
     "language/persian.el"
-    "meese.el"
+    "meese.el" "iswitchb.el"
     "mh-exec.el" "mh-init.el" "mh-customize.el"
     "net/zone-mode.el" "xesam.el"
     "term/mac-win.el" "sup-mouse.el"
diff --git a/lisp/iswitchb.el b/lisp/obsolete/iswitchb.el
index 5690d9c4e3f..c1313b8a00f 100644
--- a/lisp/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -5,6 +5,7 @@
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
 ;; Keywords: completion convenience
+;; Obsolete-since: 24.4
 
 ;; This file is part of GNU Emacs.
 
@@ -23,6 +24,8 @@
 
 ;;; Commentary:
 
+;; This file is obsolete - use icomplete-mode or ido-mode instead.
+
 ;; Installation:
 ;; To get the functions in this package bound to keys, use
 ;; M-x iswitchb-mode or customize the option `iswitchb-mode'.
@@ -1413,6 +1416,9 @@ See the variable `iswitchb-case' for details."
           (isearch-no-upper-case-p iswitchb-text)
         (isearch-no-upper-case-p iswitchb-text t))))
 
+;; NB obsolete/ is not scanned for autoloads.
+;; If you change any of the following doc, copy the changes to simple.el.
+
 ;;;###autoload
 (define-minor-mode iswitchb-mode
   "Toggle Iswitchb mode.
@@ -1427,8 +1433,9 @@ between buffers using substrings.  See `iswitchb' for details."
       (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
     (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)))
 
+;;;###autoload
 (make-obsolete 'iswitchb-mode
-               "use icomplete-mode or ido-mode instead" "24.4")
+               "use `icomplete-mode' or `ido-mode' instead." "24.4")
 
 (provide 'iswitchb)
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 2e924c857da..f1955b58500 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7766,6 +7766,33 @@ contains the list of implementations currently supported for this command."
            (message ,(format "No implementation selected for command `%s'"
                              command-name)))))))
 
+
+;; This is here because files in obsolete/ are not scanned for autoloads.
+
+(defvar iswitchb-mode nil "\
+Non-nil if Iswitchb mode is enabled.
+See the command `iswitchb-mode' for a description of this minor mode.
+Setting this variable directly does not take effect;
+either customize it (see the info node `Easy Customization')
+or call the function `iswitchb-mode'.")
+
+(custom-autoload 'iswitchb-mode "iswitchb" nil)
+
+(autoload 'iswitchb-mode "iswitchb" "\
+Toggle Iswitchb mode.
+With a prefix argument ARG, enable Iswitchb mode if ARG is
+positive, and disable it otherwise.  If called from Lisp, enable
+the mode if ARG is omitted or nil.
+
+Iswitchb mode is a global minor mode that enables switching
+between buffers using substrings.  See `iswitchb' for details.
+
+\(fn &optional ARG)" t nil)
+
+(make-obsolete 'iswitchb-mode
+               "use `icomplete-mode' or `ido-mode' instead." "24.4")
+
+
 (provide 'simple)
 
 ;;; simple.el ends here