[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118062: * lisp/icomplete.el: Move Iswitchb autoload
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] trunk r118062: * lisp/icomplete.el: Move Iswitchb autoload here. Much simpler. |
Date: |
Mon, 06 Oct 2014 14:13:04 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118062
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2014-10-06 10:12:56 -0400
message:
* 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.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-1831
lisp/icomplete.el
icomplete.el-20091113204419-o5vbwnq5f7feedwu-643
lisp/loadup.el loadup.el-20091113204419-o5vbwnq5f7feedwu-49
lisp/obsolete/iswitchb.el
iswitchb.el-20091113204419-o5vbwnq5f7feedwu-1173
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-10-06 07:00:33 +0000
+++ b/lisp/ChangeLog 2014-10-06 14:12:56 +0000
@@ -1,3 +1,15 @@
+2014-10-06 Stefan Monnier <address@hidden>
+
+ * 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 <address@hidden>
* Makefile.in (obsolete-autoloads): Write to a separate file,
=== modified file 'lisp/Makefile.in'
--- a/lisp/Makefile.in 2014-10-06 07:00:33 +0000
+++ b/lisp/Makefile.in 2014-10-06 14:12:56 +0000
@@ -68,7 +68,6 @@
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 @@
--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.
=== modified file 'lisp/icomplete.el'
--- a/lisp/icomplete.el 2014-03-03 03:40:48 +0000
+++ b/lisp/icomplete.el 2014-10-06 14:12:56 +0000
@@ -487,6 +487,19 @@
"}")
(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)
=== modified file 'lisp/loadup.el'
--- a/lisp/loadup.el 2014-10-06 07:00:33 +0000
+++ b/lisp/loadup.el 2014-10-06 14:12:56 +0000
@@ -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.
=== modified file 'lisp/obsolete/iswitchb.el'
--- a/lisp/obsolete/iswitchb.el 2014-03-27 19:00:49 +0000
+++ b/lisp/obsolete/iswitchb.el 2014-10-06 14:12:56 +0000
@@ -1416,7 +1416,7 @@
(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 @@
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118062: * lisp/icomplete.el: Move Iswitchb autoload here. Much simpler.,
Stefan Monnier <=