(find-emacs-lisp-shadows): Don't mention `subdirs.el'.
(list-load-path-shadows): When noninteractive, if there are shadows, start with a message explaining what this is a problem.
This commit is contained in:
parent
9c5886e7ee
commit
5017dcaa27
1 changed files with 9 additions and 5 deletions
|
|
@ -106,10 +106,10 @@ See the documentation for `list-load-path-shadows' for further information."
|
||||||
(setq file (substring
|
(setq file (substring
|
||||||
file 0 (if (string= (substring file -1) "c") -4 -3)))
|
file 0 (if (string= (substring file -1) "c") -4 -3)))
|
||||||
|
|
||||||
;; 'file' now contains the current file name, with no suffix.
|
;; FILE now contains the current file name, with no suffix.
|
||||||
(if (member file files-seen-this-dir)
|
(unless (or (member file files-seen-this-dir)
|
||||||
nil
|
;; Ignore these files.
|
||||||
|
(member file '("subdirs")))
|
||||||
;; File has not been seen yet in this directory.
|
;; File has not been seen yet in this directory.
|
||||||
;; This test prevents us declaring that XXX.el shadows
|
;; This test prevents us declaring that XXX.el shadows
|
||||||
;; XXX.elc (or vice-versa) when they are in the same directory.
|
;; XXX.elc (or vice-versa) when they are in the same directory.
|
||||||
|
|
@ -134,7 +134,6 @@ See the documentation for `list-load-path-shadows' for further information."
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(defun list-load-path-shadows ()
|
(defun list-load-path-shadows ()
|
||||||
|
|
||||||
"Display a list of Emacs Lisp files that shadow other files.
|
"Display a list of Emacs Lisp files that shadow other files.
|
||||||
|
|
||||||
This function lists potential load-path problems. Directories in the
|
This function lists potential load-path problems. Directories in the
|
||||||
|
|
@ -193,6 +192,11 @@ buffer called `*Shadows*'. Shadowings are located by calling the
|
||||||
(setq shadows (cdr (cdr shadows))))
|
(setq shadows (cdr (cdr shadows))))
|
||||||
(insert msg "\n")))
|
(insert msg "\n")))
|
||||||
;; We are non-interactive, print shadows via message.
|
;; We are non-interactive, print shadows via message.
|
||||||
|
(when shadows
|
||||||
|
(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
|
(while shadows
|
||||||
(message "%s hides %s" (car shadows) (car (cdr shadows)))
|
(message "%s hides %s" (car shadows) (car (cdr shadows)))
|
||||||
(setq shadows (cdr (cdr shadows))))
|
(setq shadows (cdr (cdr shadows))))
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue