X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/d66d6ac0286658620023697835f526862171368a..f655987d63e181deb5e6fef1f93b409d96184fae:/lisp/loadhist.el diff --git a/lisp/loadhist.el b/lisp/loadhist.el index cd8c8ef099..056a4ef4dc 100644 --- a/lisp/loadhist.el +++ b/lisp/loadhist.el @@ -1,18 +1,17 @@ ;;; loadhist.el --- lisp functions for working with feature groups -;; Copyright (C) 1995, 1998, 2000, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007 Free Software Foundation, Inc. +;; Copyright (C) 1995, 1998, 2000-2015 Free Software Foundation, Inc. ;; Author: Eric S. Raymond -;; Maintainer: FSF +;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 3, or (at your option) -;; any later version. +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,9 +19,7 @@ ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -32,8 +29,6 @@ ;;; Code: -(eval-when-compile (require 'cl)) - (defun feature-symbols (feature) "Return the file and list of definitions associated with FEATURE. The value is actually the element of `load-history' @@ -74,7 +69,7 @@ A library name is equivalent to the file name that `load-library' would load." (let (provides) (dolist (x (file-loadhist-lookup file) provides) (when (eq (car-safe x) 'provide) - (push x provides))))) + (push (cdr x) provides))))) (defun file-requires (file) "Return the list of features required by FILE as it was loaded. @@ -83,7 +78,7 @@ A library name is equivalent to the file name that `load-library' would load." (let (requires) (dolist (x (file-loadhist-lookup file) requires) (when (eq (car-safe x) 'require) - (push x requires))))) + (push (cdr x) requires))))) (defsubst file-set-intersect (p q) "Return the set intersection of two lists." @@ -106,62 +101,87 @@ A library name is equivalent to the file name that `load-library' would load." "Read feature name from the minibuffer, prompting with string PROMPT. If optional second arg LOADED-P is non-nil, the feature must be loaded from a file." - (intern - (completing-read prompt - (cons nil features) - (and loaded-p - #'(lambda (f) - (and f ; ignore nil - (feature-file f)))) - loaded-p))) + (intern (completing-read prompt + features + (and loaded-p #'feature-file) + loaded-p))) (defvaralias 'loadhist-hook-functions 'unload-feature-special-hooks) (defvar unload-feature-special-hooks '(after-change-functions after-insert-file-functions - after-make-frame-functions auto-fill-function before-change-functions - blink-paren-function buffer-access-fontify-functions command-line-functions + after-make-frame-functions auto-coding-functions + auto-fill-function before-change-functions + blink-paren-function buffer-access-fontify-functions + choose-completion-string-functions + comint-output-filter-functions command-line-functions comment-indent-function compilation-finish-functions - disabled-command-function find-file-not-found-functions - font-lock-beginning-of-syntax-function font-lock-fontify-buffer-function - font-lock-fontify-region-function font-lock-mark-block-function - font-lock-syntactic-face-function font-lock-unfontify-buffer-function - font-lock-unfontify-region-function kill-buffer-query-functions - kill-emacs-query-functions lisp-indent-function mouse-position-function - redisplay-end-trigger-functions temp-buffer-show-function - window-scroll-functions window-size-change-functions - write-contents-functions write-file-functions - write-region-annotate-functions) + delete-frame-functions disabled-command-function + fill-nobreak-predicate find-directory-functions + find-file-not-found-functions + font-lock-beginning-of-syntax-function + font-lock-fontify-buffer-function + font-lock-fontify-region-function + font-lock-mark-block-function + font-lock-syntactic-face-function + font-lock-unfontify-buffer-function + font-lock-unfontify-region-function + kill-buffer-query-functions kill-emacs-query-functions + lisp-indent-function mouse-position-function + redisplay-end-trigger-functions suspend-tty-functions + temp-buffer-show-function window-scroll-functions + window-size-change-functions write-contents-functions + write-file-functions write-region-annotate-functions) "A list of special hooks from Info node `(elisp)Standard Hooks'. -These are symbols with hook-type values whose names don't end in -`-hook' or `-hooks', from which `unload-feature' tries to remove +These are symbols with hooklike values whose names don't end in +`-hook' or `-hooks', from which `unload-feature' should try to remove pertinent symbols.") -(defvar unload-function-features-list nil - "List of features of the package being unloaded. +(define-obsolete-variable-alias 'unload-hook-features-list + 'unload-function-defs-list "22.2") +(defvar unload-function-defs-list nil + "List of definitions in the Lisp library being unloaded. -This is meant to be used by FEATURE-unload-function, see the +This is meant to be used by `FEATURE-unload-function'; see the documentation of `unload-feature' for details.") -(define-obsolete-variable-alias 'unload-hook-features-list - 'unload-function-features-list "22.2") + +(defun unload--set-major-mode () + (save-current-buffer + (dolist (buffer (buffer-list)) + (set-buffer buffer) + (let ((proposed major-mode)) + ;; Look for a predecessor mode not defined in the feature we're processing + (while (and proposed (rassq proposed unload-function-defs-list)) + (setq proposed (get proposed 'derived-mode-parent))) + (unless (eq proposed major-mode) + ;; Two cases: either proposed is nil, and we want to switch to fundamental + ;; mode, or proposed is not nil and not major-mode, and so we use it. + (funcall (or proposed 'fundamental-mode))))))) ;;;###autoload (defun unload-feature (feature &optional force) - "Unload the library that provided FEATURE, restoring all its autoloads. + "Unload the library that provided FEATURE. If the feature is required by any other loaded code, and prefix arg FORCE is nil, raise an error. -This function tries to undo any modifications that the package has -made to hook values in Emacs. Normally it does this using heuristics. -The packages may define a hook `FEATURE-unload-hook'; if that exists, -it is called instead of the normal heuristics. +Standard unloading activities include restoring old autoloads for +functions defined by the library, undoing any additions that the +library has made to hook variables or to `auto-mode-alist', undoing +ELP profiling of functions in that library, unproviding any features +provided by the library, and canceling timers held in variables +defined by the library. -Such a hook should undo all the relevant global state changes that may -have been made by loading the package or executing functions in it. -It has access to the package's feature list (before anything is unbound) -in the variable `unload-hook-features-list' and could remove features -from it in the event that the package has done something strange, -such as redefining an Emacs function." +If a function `FEATURE-unload-function' is defined, this function +calls it with no arguments, before doing anything else. That function +can do whatever is appropriate to undo the loading of the library. If +`FEATURE-unload-function' returns non-nil, that suppresses the +standard unloading of the library. Otherwise the standard unloading +proceeds. + +`FEATURE-unload-function' has access to the package's list of +definitions in the variable `unload-function-defs-list' and could +remove symbols from it in the event that the package has done +something strange, such as redefining an Emacs function." (interactive (list (read-feature "Unload feature: " t) @@ -174,8 +194,8 @@ such as redefining an Emacs function." (when dependents (error "Loaded libraries %s depend on %s" (prin1-to-string dependents) file)))) - (let* ((unload-function-features-list (feature-symbols feature)) - (file (pop unload-function-features-list)) + (let* ((unload-function-defs-list (feature-symbols feature)) + (file (pop unload-function-defs-list)) ;; If non-nil, this is a symbol for which we should ;; restore a previous autoload if possible. restore-autoload @@ -184,7 +204,7 @@ such as redefining an Emacs function." (unload-func (intern-soft (concat name "-unload-function")))) ;; If FEATURE-unload-function is defined and returns non-nil, ;; don't try to do anything more; otherwise proceed normally. - (unless (and (bound-and-true-p unload-func) + (unless (and (fboundp unload-func) (funcall unload-func)) ;; Try to avoid losing badly when hooks installed in critical ;; places go away. (Some packages install things on @@ -207,28 +227,32 @@ such as redefining an Emacs function." (or (and (consp (symbol-value x)) ; Random hooks. (string-match "-hooks?\\'" (symbol-name x))) (memq x unload-feature-special-hooks))) ; Known abnormal hooks etc. - (dolist (y unload-function-features-list) + (dolist (y unload-function-defs-list) (when (and (eq (car-safe y) 'defun) (not (get (cdr y) 'autoload))) (remove-hook x (cdr y))))))) ;; Remove any feature-symbols from auto-mode-alist as well. - (dolist (y unload-function-features-list) + (dolist (y unload-function-defs-list) (when (and (eq (car-safe y) 'defun) (not (get (cdr y) 'autoload))) (setq auto-mode-alist (rassq-delete-all (cdr y) auto-mode-alist))))) + + ;; Change major mode in all buffers using one defined in the feature being unloaded. + (unload--set-major-mode) + (when (fboundp 'elp-restore-function) ; remove ELP stuff first - (dolist (elt unload-function-features-list) + (dolist (elt unload-function-defs-list) (when (symbolp elt) (elp-restore-function elt)))) - (dolist (x unload-function-features-list) + (dolist (x unload-function-defs-list) (if (consp x) - (case (car x) + (pcase (car x) ;; Remove any feature names that this file provided. - (provide + (`provide (setq features (delq (cdr x) features))) - ((defun autoload) + ((or `defun `autoload) (let ((fun (cdr x))) (when (fboundp fun) (when (fboundp 'ad-unadvise) @@ -240,9 +264,9 @@ such as redefining an Emacs function." ;; (t . SYMBOL) comes before (defun . SYMBOL) ;; and says we should restore SYMBOL's autoload ;; when we undefine it. - ((t) (setq restore-autoload (cdr x))) - ((require defface) nil) - (t (message "Unexpected element %s in load-history" x))) + (`t (setq restore-autoload (cdr x))) + ((or `require `defface) nil) + (_ (message "Unexpected element %s in load-history" x))) ;; Kill local values as much as possible. (dolist (buf (buffer-list)) (with-current-buffer buf @@ -261,5 +285,4 @@ such as redefining an Emacs function." (provide 'loadhist) -;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798 ;;; loadhist.el ends here