diff options
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/Makefile.in | 12 | ||||
| -rw-r--r-- | lisp/icomplete.el | 13 | ||||
| -rw-r--r-- | lisp/loadup.el | 2 | ||||
| -rw-r--r-- | lisp/obsolete/iswitchb.el | 6 |
5 files changed, 26 insertions, 19 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 034651d13c7..5847802f8fd 100644 --- 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 83c76bff3ea..6f87c6da312 100644 --- 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 0c5a2babd86..95a6e1b357c 100644 --- 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 cbd3838d0e0..9c052b284b8 100644 --- 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 dfe1222d550..4a0338af530 100644 --- 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 |