Add new maintainer (deego).

[gnu-emacs] / lisp / emacs-lisp / shadow.el

diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index edaa74e6a3e6abd74993ffdd4da09f7499550c63..3618cdd9ea2ca8ef9528a588d30cd98cd785c63e 100644 (file)
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -1,4 +1,4 @@
-;;; shadow.el --- Locate Emacs Lisp file shadowings.
+;;; shadow.el --- locate Emacs Lisp file shadowings
 
 ;; Copyright (C) 1995 Free Software Foundation, Inc.
 
@@ -53,7 +53,7 @@
 
 ;;; Code:
 \f
-(defgroup shadow nil
+(defgroup lisp-shadow nil
   "Locate Emacs Lisp file shadowings."
   :prefix "shadows-"
   :group 'lisp)
@@ -62,7 +62,7 @@
   "*If non-nil, then shadowing files are reported only if their text differs.
 This is slower, but filters out some innocuous shadowing."
   :type 'boolean
-  :group 'shadow)
+  :group 'lisp-shadow)
 
 (defun find-emacs-lisp-shadows (&optional path)
   "Return a list of Emacs Lisp files that create shadows.
@@ -137,8 +137,8 @@ See the documentation for `list-load-path-shadows' for further information."
                                ;; This is a bit strict, but safe.
                                (shadow-same-file-or-nonexistent
                                 (concat base1 ".elc") (concat base2 ".elc"))))
-               (setq shadows
-                     (append shadows (list base1 base2)))))
+                     (setq shadows
+                           (append shadows (list base1 base2)))))
 
              ;; Not seen before, add it to the list of seen files.
              (setq files (cons (cons file dir) files))))
@@ -214,10 +214,10 @@ buffer called `*Shadows*'.  Shadowings are located by calling the
       (setq tem (cdr tem)))
     (if (> (length toplevs) 1)
        ;; Cut off our copy of load-path right before
-       ;; the second directory which has simple.el in it.
+       ;; the last directory which has simple.el in it.
        ;; This avoids loads of duplications between the source dir
        ;; and the dir where these files were copied by installation.
-       (let ((break (nth (- (length toplevs) 2) toplevs)))
+       (let ((break (car toplevs)))
          (setq tem path)
          (while tem
            (if (eq (nth 1 tem) break)
@@ -249,11 +249,11 @@ buffer called `*Shadows*'.  Shadowings are located by calling the
          (message "This site has duplicate Lisp libraries with the same name.
 If a locally-installed Lisp library overrides a library in the Emacs release,
 that can cause trouble, and you should probably remove the locally-installed
-version unless you know what you are doing.\n"))
-       (while shadows
-         (message "%s hides %s" (car shadows) (car (cdr shadows)))
-         (setq shadows (cdr (cdr shadows))))
-       (message "%s" msg)))))
+version unless you know what you are doing.\n")
+         (while shadows
+           (message "%s hides %s" (car shadows) (car (cdr shadows)))
+           (setq shadows (cdr (cdr shadows))))
+         (message "%s" msg))))))
 
 (provide 'shadow)