Mercurial > emacs
annotate lisp/loadhist.el @ 83323:61487e73bbc2
Cleanup: Move kboard fields from struct frame and device-specific descriptors to struct display.
* src/termhooks.h (display): New field: kboard.
* src/xterm.h (x_display_info): Remove kboard field.
* src/termchar.h (tty_display_info): Ditto.
* src/frame.h (frame): Ditto.
(FRAME_KBOARD): Update.
* src/dispnew.c (init_display): Don't initialize kboard.
* src/frame.c (make_frame, make_initial_frame, make_terminal_frame): Ditto.
* src/frame.c (make_frame_without_minibuffer, Fdelete_frame): Update kboard access.
* src/keyboard.c (delete_kboard): Ditto.
* src/term.c (term_init): Ditto.
* src/xfns.c (Fx_create_frame, x_create_tip_frame): Ditto.
* src/xselect.c (x_handle_selection_clear): Ditto.
* src/xterm.c (x_term_init): Ditto.
* src/term.c (init_initial_display): Initialize kboard.
* src/xterm.c (x_term_init): Ditto.
* src/term.c (delete_tty): Remove kboard deletion.
(delete_display): Delete kboard as well.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-363
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Mon, 27 Jun 2005 00:56:21 +0000 |
parents | 314c959fa176 |
children | 6fb026ad601f 08185296b491 |
rev | line source |
---|---|
2543 | 1 ;;; loadhist.el --- lisp functions for working with feature groups |
14169 | 2 |
61664
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
3 ;; Copyright (C) 1995, 1998, 2000, 2005 Free Software Foundation, Inc. |
2543 | 4 |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
6 ;; Maintainer: FSF |
2543 | 7 ;; Keywords: internal |
8 | |
11289 | 9 ;; This file is part of GNU Emacs. |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
14169 | 22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
11289 | 25 |
2543 | 26 ;;; Commentary: |
27 | |
28 ;; These functions exploit the load-history system variable. | |
22459
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
29 ;; Entry points include `unload-feature', `symbol-file', and |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
30 ;; `feature-file', documented in the Emacs Lisp manual. |
2543 | 31 |
32 ;;; Code: | |
33 | |
34 (defun feature-symbols (feature) | |
47017
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
35 "Return the file and list of definitions associated with FEATURE. |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
36 The value is actually the element of `load-history' |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
37 for the file that did (provide FEATURE)." |
2543 | 38 (catch 'foundit |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
39 (mapc (lambda (x) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
40 (if (member (cons 'provide feature) (cdr x)) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
41 (throw 'foundit x))) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
42 load-history) |
2543 | 43 nil)) |
44 | |
45 (defun feature-file (feature) | |
46 "Return the file name from which a given FEATURE was loaded. | |
47 Actually, return the load argument, if any; this is sometimes the name of a | |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
48 Lisp file without an extension. If the feature came from an `eval-buffer' on |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
49 a buffer with no associated file, or an `eval-region', return nil." |
2543 | 50 (if (not (featurep feature)) |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
51 (error "%S is not a currently loaded feature" feature) |
2543 | 52 (car (feature-symbols feature)))) |
53 | |
59318
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
54 (defun file-loadhist-lookup (file) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
55 "Return the `load-history' element for FILE." |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
56 ;; First look for FILE as given. |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
57 (let ((symbols (assoc file load-history))) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
58 ;; Try converting a library name to an absolute file name. |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
59 (and (null symbols) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
60 (let ((absname (find-library-name file))) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
61 (if (not (equal absname file)) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
62 (setq symbols (cdr (assoc absname load-history)))))) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
63 ;; Try converting an absolute file name to a library name. |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
64 (and (null symbols) (string-match "[.]el\\'" file) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
65 (let ((libname (file-name-nondirectory file))) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
66 (string-match "[.]el\\'" libname) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
67 (setq libname (substring libname 0 (match-beginning 0))) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
68 (setq symbols (cdr (assoc libname load-history))))) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
69 symbols)) |
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
70 |
2543 | 71 (defun file-provides (file) |
72 "Return the list of features provided by FILE." | |
59318
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
73 (let ((symbols (file-loadhist-lookup file)) |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
74 provides) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
75 (mapc (lambda (x) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
76 (if (and (consp x) (eq (car x) 'provide)) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
77 (setq provides (cons (cdr x) provides)))) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
78 symbols) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
79 provides)) |
2543 | 80 |
81 (defun file-requires (file) | |
82 "Return the list of features required by FILE." | |
59318
55722dde9e0a
(file-loadhist-lookup): New function.
Richard M. Stallman <rms@gnu.org>
parents:
54000
diff
changeset
|
83 (let ((symbols (file-loadhist-lookup file)) |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
84 requires) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
85 (mapc (lambda (x) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
86 (if (and (consp x) (eq (car x) 'require)) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
87 (setq requires (cons (cdr x) requires)))) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
88 symbols) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
89 requires)) |
2543 | 90 |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
91 (defsubst file-set-intersect (p q) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
92 "Return the set intersection of two lists." |
2543 | 93 (let ((ret nil)) |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
94 (dolist (x p ret) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
95 (if (memq x q) (setq ret (cons x ret)))) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
96 ret)) |
2543 | 97 |
98 (defun file-dependents (file) | |
10498
8fb25f247533
(unload-feature): Don't care if FILE is a dependency of itself.
Richard M. Stallman <rms@gnu.org>
parents:
8108
diff
changeset
|
99 "Return the list of loaded libraries that depend on FILE. |
8fb25f247533
(unload-feature): Don't care if FILE is a dependency of itself.
Richard M. Stallman <rms@gnu.org>
parents:
8108
diff
changeset
|
100 This can include FILE itself." |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
101 (let ((provides (file-provides file)) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
102 (dependents nil)) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
103 (dolist (x load-history dependents) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
104 (if (file-set-intersect provides (file-requires (car x))) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
105 (setq dependents (cons (car x) dependents)))) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
106 dependents)) |
2543 | 107 |
16173
9ba176963a26
(read-feature): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
108 (defun read-feature (prompt) |
22459
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
109 "Read a feature name \(string\) from the minibuffer. |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
110 Prompt with PROMPT and completing from `features', and |
16173
9ba176963a26
(read-feature): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
111 return the feature \(symbol\)." |
9ba176963a26
(read-feature): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
112 (intern (completing-read prompt |
29090
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
113 (mapcar (lambda (feature) |
86d462e378ce
(feature-symbols, file-provides, file-requires): Use mapc.
Dave Love <fx@gnu.org>
parents:
23852
diff
changeset
|
114 (list (symbol-name feature))) |
16173
9ba176963a26
(read-feature): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
115 features) |
9ba176963a26
(read-feature): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
116 nil t))) |
9ba176963a26
(read-feature): New function.
Richard M. Stallman <rms@gnu.org>
parents:
14169
diff
changeset
|
117 |
52755
6c7cae7ce71a
(unload-feature-special-hooks):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
118 (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks) |
6c7cae7ce71a
(unload-feature-special-hooks):
Richard M. Stallman <rms@gnu.org>
parents:
52401
diff
changeset
|
119 (defvar unload-feature-special-hooks |
29346
7ac9c66520d4
(loadhist-hook-functions): Remove before-change-function,
Dave Love <fx@gnu.org>
parents:
29241
diff
changeset
|
120 '(after-change-functions |
47017
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
121 after-insert-file-functions auto-fill-function |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
122 before-change-functions blink-paren-function |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
123 buffer-access-fontify-functions command-line-functions |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
124 comment-indent-function kill-buffer-query-functions |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
125 kill-emacs-query-functions lisp-indent-function |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
126 mouse-position-function |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
127 redisplay-end-trigger-functions temp-buffer-show-function |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
128 window-scroll-functions window-size-change-functions |
0ba62d75345e
(unload-feature): Distinguish functions from variables in load-history.
Richard M. Stallman <rms@gnu.org>
parents:
33094
diff
changeset
|
129 write-region-annotate-functions) |
33094
51c874361c84
(unload-feature): Call elp-restore-function,
Dave Love <fx@gnu.org>
parents:
31674
diff
changeset
|
130 "A list of special hooks from Info node `(elisp)Standard Hooks'. |
22459
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
131 |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
132 These are symbols with hook-type values whose names don't end in |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
133 `-hook' or `-hooks', from which `unload-feature' tries to remove |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
134 pertinent symbols.") |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
135 |
54000
8d106818ca97
(unload-hook-features-list): New defvar.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53998
diff
changeset
|
136 (defvar unload-hook-features-list nil |
8d106818ca97
(unload-hook-features-list): New defvar.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53998
diff
changeset
|
137 "List of features of the package being unloaded. |
8d106818ca97
(unload-hook-features-list): New defvar.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53998
diff
changeset
|
138 |
8d106818ca97
(unload-hook-features-list): New defvar.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53998
diff
changeset
|
139 This is meant to be used by FEATURE-unload-hook hooks, see the |
8d106818ca97
(unload-hook-features-list): New defvar.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53998
diff
changeset
|
140 documentation of `unload-feature' for details.") |
8d106818ca97
(unload-hook-features-list): New defvar.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53998
diff
changeset
|
141 |
2543 | 142 ;;;###autoload |
143 (defun unload-feature (feature &optional force) | |
144 "Unload the library that provided FEATURE, restoring all its autoloads. | |
29241
a243b2d9c015
(unload-feature): Fix interactive spec [from
Dave Love <fx@gnu.org>
parents:
29090
diff
changeset
|
145 If the feature is required by any other loaded code, and prefix arg FORCE |
53998
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
146 is nil, raise an error. |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
147 |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
148 This function tries to undo modifications made by the package to |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
149 hooks. Packages may define a hook FEATURE-unload-hook that is called |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
150 instead of the normal heuristics for doing this. Such a hook should |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
151 undo all the relevant global state changes that may have been made by |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
152 loading the package or executing functions in it. It has access to |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
153 the package's feature list (before anything is unbound) in the |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
154 variable `unload-hook-features-list' and could remove features from it |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
155 in the event that the package has done something normally-ill-advised, |
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
156 such as redefining an Emacs function." |
29241
a243b2d9c015
(unload-feature): Fix interactive spec [from
Dave Love <fx@gnu.org>
parents:
29090
diff
changeset
|
157 (interactive (list (read-feature "Feature: ") current-prefix-arg)) |
61664
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
158 (unless (featurep feature) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
159 (error "%s is not a currently loaded feature" (symbol-name feature))) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
160 (unless force |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
161 (let* ((file (feature-file feature)) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
162 (dependents (delete file (copy-sequence (file-dependents file))))) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
163 (when dependents |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
164 (error "Loaded libraries %s depend on %s" |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
165 (prin1-to-string dependents) file)))) |
53998
2e361a295c26
(unload-feature): Doc fix. Rename flist to unload-hook-features-list.
Eli Zaretskii <eliz@is.elta.co.il>
parents:
53599
diff
changeset
|
166 (let* ((unload-hook-features-list (feature-symbols feature)) |
61664
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
167 (file (pop unload-hook-features-list)) |
22459
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
168 (unload-hook (intern-soft (concat (symbol-name feature) |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
169 "-unload-hook")))) |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
170 ;; Try to avoid losing badly when hooks installed in critical |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
171 ;; places go away. (Some packages install things on |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
172 ;; `kill-buffer-hook', `activate-menubar-hook' and the like.) |
53599 | 173 ;; First off, provide a clean way for package FOO to arrange |
174 ;; this by adding hooks on the variable `FOO-unload-hook'. | |
22459
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
175 (if unload-hook |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
176 (run-hooks unload-hook) |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
177 ;; Otherwise, do our best. Look through the obarray for symbols |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
178 ;; which seem to be hook variables or special hook functions and |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
179 ;; remove anything from them which matches the feature-symbols |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
180 ;; about to get zapped. Obviously this won't get anonymous |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
181 ;; functions which the package might just have installed, and |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
182 ;; there might be other important state, but this tactic |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
183 ;; normally works. |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
184 (mapatoms |
bc88a299d2fc
(read-feature): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
16173
diff
changeset
|
185 (lambda (x) |
61664
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
186 (when (and (boundp x) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
187 (or (and (consp (symbol-value x)) ; Random hooks. |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
188 (string-match "-hooks?\\'" (symbol-name x))) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
189 (memq x unload-feature-special-hooks))) ; Known abnormal hooks etc. |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
190 (dolist (y unload-hook-features-list) |
61720
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
191 (when (and (eq (car-safe y) 'defun) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
192 (not (get (cdr y) 'autoload))) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
193 (remove-hook x (cdr y))))))) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
194 ;; Remove any feature-symbols from auto-mode-alist as well. |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
195 (dolist (y unload-hook-features-list) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
196 (when (and (eq (car-safe y) 'defun) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
197 (not (get (cdr y) 'autoload))) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
198 (setq auto-mode-alist |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
199 (rassq-delete-all (cdr y) auto-mode-alist))))) |
61664
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
200 (when (fboundp 'elp-restore-function) ; remove ELP stuff first |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
201 (dolist (elt unload-hook-features-list) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
202 (when (symbolp elt) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
203 (elp-restore-function elt)))) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
204 (dolist (x unload-hook-features-list) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
205 (if (consp x) |
61720
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
206 (cond |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
207 ;; Remove any feature names that this file provided. |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
208 ((eq (car x) 'provide) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
209 (setq features (delq (cdr x) features))) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
210 ((eq (car x) 'defun) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
211 (let ((fun (cdr x))) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
212 (when (fboundp fun) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
213 (when (fboundp 'ad-unadvise) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
214 (ad-unadvise fun)) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
215 (fmakunbound fun) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
216 (let ((aload (get fun 'autoload))) |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
217 (when aload |
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
218 (fset fun (cons 'autoload aload)))))))) |
61664
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
219 ;; Kill local values as much as possible. |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
220 (dolist (buf (buffer-list)) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
221 (with-current-buffer buf |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
222 (kill-local-variable x))) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
223 ;; Get rid of the default binding if we can. |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
224 (unless (local-variable-if-set-p x) |
79b58e05730b
(unload-feature): Update for new format of load-history. Simplify the code.
Lute Kamstra <lute@gnu.org>
parents:
61599
diff
changeset
|
225 (makunbound x)))) |
12751
f442c14a79c4
(unload-feature): Delete the file's load-history element.
Richard M. Stallman <rms@gnu.org>
parents:
11844
diff
changeset
|
226 ;; Delete the load-history element for this file. |
61720
314c959fa176
(unload-feature): Don't remove a function from hooks if it is about to
Lute Kamstra <lute@gnu.org>
parents:
61664
diff
changeset
|
227 (setq load-history (delq (assoc file load-history) load-history)))) |
2543 | 228 |
229 (provide 'loadhist) | |
230 | |
52401 | 231 ;;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798 |
2543 | 232 ;;; loadhist.el ends here |