X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/0bb2392728c10748f3376f8cef6d9ca53e29f464..ac0215a325f4226b73fd650318349395a6d88835:/lisp/loadhist.el

diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 0b56919993..620344734b 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,6 +1,6 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
-;; Copyright (C) 1995, 1998, 2000-2011 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1998, 2000-2013 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
@@ -29,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'
@@ -133,7 +131,7 @@ from a file."
     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
+    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)
@@ -143,20 +141,20 @@ 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.")
 
+(define-obsolete-variable-alias 'unload-hook-features-list
+    'unload-function-defs-list "22.2")
 (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 an antecessor mode not defined in the feature we're processing
+        ;; 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)
@@ -254,11 +252,11 @@ something strange, such as redefining an Emacs function."
 
       (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)
@@ -270,9 +268,9 @@ something strange, 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