diff options
| author | Andreas Schwab | 2005-11-19 16:53:48 +0000 |
|---|---|---|
| committer | Andreas Schwab | 2005-11-19 16:53:48 +0000 |
| commit | da49096f064057ea082a522fd2688048602c4289 (patch) | |
| tree | 054f02733c137e31d5f999db3ca13e95c446ee09 | |
| parent | f0f98146d29521374a6f348b43b7907baad0b7a1 (diff) | |
| download | emacs-da49096f064057ea082a522fd2688048602c4289.tar.gz emacs-da49096f064057ea082a522fd2688048602c4289.zip | |
Handle compressed files.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8f22f75f15c..434e634e826 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2005-11-19 Andreas Schwab <schwab@suse.de> | ||
| 2 | |||
| 3 | * emacs-lisp/shadow.el: Handle compressed files. | ||
| 4 | |||
| 1 | 2005-11-19 Romain Francoise <romain@orebokech.com> | 5 | 2005-11-19 Romain Francoise <romain@orebokech.com> |
| 2 | 6 | ||
| 3 | * net/browse-url.el (browse-url-default-browser): Signal an error | 7 | * net/browse-url.el (browse-url-default-browser): Signal an error |
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." | |||
| 104 | (setq true-names (append true-names (list dir))) | 104 | (setq true-names (append true-names (list dir))) |
| 105 | (setq dir (directory-file-name (or (car path) "."))) | 105 | (setq dir (directory-file-name (or (car path) "."))) |
| 106 | (setq curr-files (if (file-accessible-directory-p dir) | 106 | (setq curr-files (if (file-accessible-directory-p dir) |
| 107 | (directory-files dir nil ".\\.elc?$" t))) | 107 | (directory-files dir nil ".\\.elc?\\(\\.gz\\)?$" t))) |
| 108 | (and curr-files | 108 | (and curr-files |
| 109 | (not noninteractive) | 109 | (not noninteractive) |
| 110 | (message "Checking %d files in %s..." (length curr-files) dir)) | 110 | (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." | |||
| 114 | (while curr-files | 114 | (while curr-files |
| 115 | 115 | ||
| 116 | (setq file (car curr-files)) | 116 | (setq file (car curr-files)) |
| 117 | (if (string-match "\\.gz$" file) | ||
| 118 | (setq file (substring file 0 -3))) | ||
| 117 | (setq file (substring | 119 | (setq file (substring |
| 118 | file 0 (if (string= (substring file -1) "c") -4 -3))) | 120 | file 0 (if (string= (substring file -1) "c") -4 -3))) |
| 119 | 121 | ||
| @@ -209,7 +211,8 @@ buffer called `*Shadows*'. Shadowings are located by calling the | |||
| 209 | toplevs) | 211 | toplevs) |
| 210 | ;; If we can find simple.el in two places, | 212 | ;; If we can find simple.el in two places, |
| 211 | (while tem | 213 | (while tem |
| 212 | (if (file-exists-p (expand-file-name "simple.el" (car tem))) | 214 | (if (or (file-exists-p (expand-file-name "simple.el" (car tem))) |
| 215 | (file-exists-p (expand-file-name "simple.el.gz" (car tem)))) | ||
| 213 | (setq toplevs (cons (car tem) toplevs))) | 216 | (setq toplevs (cons (car tem) toplevs))) |
| 214 | (setq tem (cdr tem))) | 217 | (setq tem (cdr tem))) |
| 215 | (if (> (length toplevs) 1) | 218 | (if (> (length toplevs) 1) |