X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3f715d17fef56ee78a3df7ebb00d4e8b1aec37de..f019fb210628549b661bf7ebaa40e136df205af4:/lisp/loadhist.el

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 121013dfc1..0b56919993 100644
--- 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-2011 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -116,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
-    redisplay-end-trigger-functions suspend-tty-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
+    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
+    redisplaylay-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
@@ -143,6 +151,19 @@ 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 an antecessor 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.
@@ -222,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)
@@ -266,5 +291,4 @@ something strange, such as redefining an Emacs function."
 
 (provide 'loadhist)
 
-;; arch-tag: 70bb846a-c413-4f01-bf88-78dba4ac0798
 ;;; loadhist.el ends here