* lisp/icomplete.el: Move Iswitchb autoload here. Much simpler.

* lisp/Makefile.in (obsolete-autoloads): Remove.
(AUTOGENEL): Remove obsolete/loaddefs.el.
* lisp/loadup.el: Don't load obsolete/loaddefs.el.
* lisp/obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.
Remove redundant obsolescence thingy.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 034651d13c7639e56558f2a24f4097d3d0bb392d..5847802f8fd0d1bcd5970640ec69b13e807e6150 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2014-10-06  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * obsolete/iswitchb.el (iswitchb-mode): Use normal autoload cookie.
+       Remove redundant obsolescence thingy.
+
+       * loadup.el: Don't load obsolete/loaddefs.el.
+
+       * icomplete.el: Move Iswitchb autoload here.  Much simpler.
+
+       * Makefile.in (obsolete-autoloads): Remove.
+       (AUTOGENEL): Remove obsolete/loaddefs.el.
+
 2014-10-06  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (obsolete-autoloads): Write to a separate file,

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index 83c76bff3eaf69db7e9a7d9b08c321b2bd26f385..6f87c6da31210943f8fbca1d19528418f19732a2 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -68,7 +68,6 @@ AUTOGENEL = loaddefs.el \
        cedet/semantic/loaddefs.el \
        cedet/ede/loaddefs.el \
        cedet/srecode/loaddefs.el \
-       obsolete/loaddefs.el \
        org/org-loaddefs.el
 
 # Value of max-lisp-eval-depth when compiling initially.
@@ -186,17 +185,6 @@ autoloads: $(LOADDEFS)
            --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) 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)/obsolete/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/icomplete.el b/lisp/icomplete.el
index 0c5a2babd8623bd6426555a631f599ecd263f23c..95a6e1b357c9774a544afa6a86565cb232da6003 100644 (file)
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -487,6 +487,19 @@ matches exist."
                    "}")
          (concat determ " [Matched]"))))))
 
+;;; Iswitchb compatibility
+
+;; We moved Iswitchb to `obsolete' in 24.4, but autoloads in files in
+;; `obsolete' aren't obeyed (since that would encourage people to keep using
+;; those packages, oblivious to their obsolescence).  Given the fact that
+;; Iswitchb was very popular, we decided to keep its autoload for a bit longer,
+;; so we moved it here.
+
+;;;###autoload(when (locate-library "obsolete/iswitchb")
+;;;###autoload  (autoload 'iswitchb-mode "iswitchb" "Toggle Iswitchb mode." t)
+;;;###autoload  (make-obsolete 'iswitchb-mode
+;;;###autoload    "use `icomplete-mode' or `ido-mode' instead." "24.4"))
+
 ;;;_* Provide
 (provide 'icomplete)
 

diff --git a/lisp/loadup.el b/lisp/loadup.el
index cbd3838d0e00dc752d4f69c6fd4621208b265cb6..9c052b284b8cc1fe706e4eed00349d1e394ed6ab 100644 (file)
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -144,8 +144,6 @@
   ;; In case loaddefs hasn't been generated yet.
   (file-error (load "ldefs-boot.el")))
 
-(load "obsolete/loaddefs.el" t)
-
 (load "emacs-lisp/nadvice")
 (load "minibuffer")
 (load "abbrev")         ;lisp-mode.el and simple.el use define-abbrev-table.

diff --git a/lisp/obsolete/iswitchb.el b/lisp/obsolete/iswitchb.el
index dfe1222d550d69fdd626e7594cf07fcac711f1f3..4a0338af5304be3c3fabe1e5e2ea22a237262fa1 100644 (file)
--- a/lisp/obsolete/iswitchb.el
+++ b/lisp/obsolete/iswitchb.el
@@ -1416,7 +1416,7 @@ See the variable `iswitchb-case' for details."
          (isearch-no-upper-case-p iswitchb-text)
        (isearch-no-upper-case-p iswitchb-text t))))
 
-;;;###obsolete-autoload
+;;;###autoload
 (define-minor-mode iswitchb-mode
   "Toggle Iswitchb mode.
 With a prefix argument ARG, enable Iswitchb mode if ARG is
@@ -1430,10 +1430,6 @@ between buffers using substrings.  See `iswitchb' for details."
       (add-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)
     (remove-hook 'minibuffer-setup-hook 'iswitchb-minibuffer-setup)))
 
-;;;###obsolete-autoload
-(make-obsolete 'iswitchb-mode
-               "use `icomplete-mode' or `ido-mode' instead." "24.4")
-
 (provide 'iswitchb)
 
 ;;; iswitchb.el ends here