diff options
| author | Karoly Lorentey <lorentey@elte.hu> | 2005-11-23 01:35:21 +0000 |
|---|---|---|
| committer | Karoly Lorentey <lorentey@elte.hu> | 2005-11-23 01:35:21 +0000 |
| commit | 950bed4bb96d2a580818bdaab64a164c7c9a1c1e (patch) | |
| tree | 131973e52125af75637cd0417215ba3c5b7d1de4 /lisp/emacs-lisp | |
| parent | 59e085e04d44b0331620b55a64eb94bf99cf81b1 (diff) | |
| parent | 5fdd4cf709ffb9c92cb565a60117afbd6fc43aa5 (diff) | |
| download | emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.tar.gz emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.tar.bz2 emacs-950bed4bb96d2a580818bdaab64a164c7c9a1c1e.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 656-658)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-656
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-658
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-444
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 9cea82d7780..9e68fb08967 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -104,7 +104,7 @@ See the documentation for `list-load-path-shadows' for further information." (setq true-names (append true-names (list dir))) (setq dir (directory-file-name (or (car path) "."))) (setq curr-files (if (file-accessible-directory-p dir) - (directory-files dir nil ".\\.elc?$" t))) + (directory-files dir nil ".\\.elc?\\(\\.gz\\)?$" t))) (and curr-files (not noninteractive) (message "Checking %d files in %s..." (length curr-files) dir)) @@ -114,6 +114,8 @@ See the documentation for `list-load-path-shadows' for further information." (while curr-files (setq file (car curr-files)) + (if (string-match "\\.gz$" file) + (setq file (substring file 0 -3))) (setq file (substring file 0 (if (string= (substring file -1) "c") -4 -3))) @@ -209,7 +211,8 @@ buffer called `*Shadows*'. Shadowings are located by calling the toplevs) ;; If we can find simple.el in two places, (while tem - (if (file-exists-p (expand-file-name "simple.el" (car tem))) + (if (or (file-exists-p (expand-file-name "simple.el" (car tem))) + (file-exists-p (expand-file-name "simple.el.gz" (car tem)))) (setq toplevs (cons (car tem) toplevs))) (setq tem (cdr tem))) (if (> (length toplevs) 1) |