From 6730259fea22fcd4b7d28f3b57fef2d5776a2dad Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Thu, 27 Mar 2014 15:00:49 -0400
Subject: [PATCH] Allow selective autoloading from lisp/obsolete directory

* lisp/Makefile.in (obsolete-autoloads): New rule.
(autoloads): Run obsolete-autoloads.

* lisp/obsolete/iswitchb.el (iswitchb-mode): Use obsolete-autoload.

* lisp/simple.el (iswitchb-mode): Remove hand-written autoloads.
---
 lisp/ChangeLog            |  8 ++++++++
 lisp/Makefile.in          | 11 +++++++++++
 lisp/obsolete/iswitchb.el |  7 ++-----
 lisp/simple.el            | 25 -------------------------
 4 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fc83e157d18..2553fea6a4d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2014-03-27  Glenn Morris  <rgm@gnu.org>
+
+	Allow selective autoloading from obsolete/ directory.
+	* Makefile.in (obsolete-autoloads): New rule.
+	(autoloads): Run obsolete-autoloads.
+	* obsolete/iswitchb.el (iswitchb-mode): Use obsolete-autoload.
+	* simple.el (iswitchb-mode): Remove hand-written autoloads.
+
 2014-03-27  Dmitry Gutov  <dgutov@yandex.ru>
 
 	* progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 6a1bca4c03b..eb86256d186 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -196,6 +196,17 @@ autoloads: $(LOADDEFS) doit
 	    --eval '(setq autoload-builtin-package-versions t)' \
 	    --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
 	    -f batch-update-autoloads $$wins
+	$(MAKE) $(MFLAGS) obsolete-autoloads
+
+# The obsolete/ subdirectory is normally not scanned for autoloads.
+# Sometimes we still want to autoload something from that directory,
+# eg iswitchb.
+.PHONY: obsolete-autoloads
+obsolete-autoloads: ${lisp}/obsolete/*.el
+	$(emacs) -l autoload \
+	    --eval '(setq generate-autoload-cookie ";;;###obsolete-autoload")' \
+	    --eval '(setq generated-autoload-file (expand-file-name (unmsys--file-name "$(srcdir)/loaddefs.el")))' \
+	    -f batch-update-autoloads ${lisp}/obsolete
 
 # This is required by the bootstrap-emacs target in ../src/Makefile, so
 # we know that if we have an emacs executable, we also have a subdirs.el.
diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index c1313b8a00f..dfe1222d550 100644
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -1416,10 +1416,7 @@ 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
+;;;###obsolete-autoload
 (define-minor-mode iswitchb-mode
   "Toggle Iswitchb mode.
 With a prefix argument ARG, enable Iswitchb mode if ARG is
@@ -1433,7 +1430,7 @@ 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
+;;;###obsolete-autoload
 (make-obsolete 'iswitchb-mode
                "use `icomplete-mode' or `ido-mode' instead." "24.4")
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 2ee62310b98..ea9ba8fa9a5 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -7814,31 +7814,6 @@ contains the list of implementations currently supported for this command."
                              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)
 
-- 
2.39.5