Bump version to 24.0.94

[bpt/emacs.git] / lisp / loadhist.el

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 71e81ae..d747eb1 100644 (file)
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,7 +1,6 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
-;; Copyright (C) 1995, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000-2012 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -9,10 +8,10 @@
 
 ;; 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 <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
@@ -118,19 +115,28 @@ from a file."
 (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
-    comment-indent-function compilation-finish-functions delete-frame-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
+    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
+    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)
+    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 hooklike values whose names don't end in
@@ -138,13 +144,26 @@ These are symbols with hooklike values whose names don't end in
 pertinent symbols.")
 
 (defvar unload-function-defs-list nil
-  "List of defintions in the Lisp library being unloaded.
+  "List of definitions in the Lisp library being unloaded.
 
 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-defs-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.
@@ -224,6 +243,10 @@ something strange, such as redefining an Emacs function."
                     (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-defs-list)
          (when (symbolp elt)
@@ -268,5 +291,4 @@ something strange, such as redefining an Emacs function."
 
 (provide 'loadhist)
 
-;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798
 ;;; loadhist.el ends here