diff options
| author | Karl Heuer | 1996-07-20 06:12:06 +0000 |
|---|---|---|
| committer | Karl Heuer | 1996-07-20 06:12:06 +0000 |
| commit | c2b7bdc246521c85d97416b60c2e34d9fc88a58e (patch) | |
| tree | 38a98d3ca096bb7652f274e1b9b7d1c552371cd2 | |
| parent | 996e3c6c7b5f17dd2f3b602e157dc0d09df4b22b (diff) | |
| download | emacs-c2b7bdc246521c85d97416b60c2e34d9fc88a58e.tar.gz emacs-c2b7bdc246521c85d97416b60c2e34d9fc88a58e.zip | |
(list-load-path-shadows): Fix ambiguous wording.
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 686fa9851e6..cf87c648451 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el | |||
| @@ -88,7 +88,7 @@ See the documentation for `list-load-path-shadows' for further information." | |||
| 88 | (or noninteractive | 88 | (or noninteractive |
| 89 | (and (car path) | 89 | (and (car path) |
| 90 | (not (string= (car path) ".")) | 90 | (not (string= (car path) ".")) |
| 91 | (message "Ignoring redundant directory '%s'." (car path)))) | 91 | (message "Ignoring redundant directory %s" (car path)))) |
| 92 | 92 | ||
| 93 | (setq true-names (append true-names (list dir))) | 93 | (setq true-names (append true-names (list dir))) |
| 94 | (setq dir (or (car path) ".")) | 94 | (setq dir (or (car path) ".")) |
| @@ -96,7 +96,7 @@ See the documentation for `list-load-path-shadows' for further information." | |||
| 96 | (directory-files dir nil ".\\.elc?$" t))) | 96 | (directory-files dir nil ".\\.elc?$" t))) |
| 97 | (and curr-files | 97 | (and curr-files |
| 98 | (not noninteractive) | 98 | (not noninteractive) |
| 99 | (message "Checking %d files in '%s' ..." (length curr-files) dir)) | 99 | (message "Checking %d files in %s..." (length curr-files) dir)) |
| 100 | 100 | ||
| 101 | (setq files-seen-this-dir nil) | 101 | (setq files-seen-this-dir nil) |
| 102 | 102 | ||
| @@ -176,26 +176,27 @@ buffer called `*Shadows*'. Shadowings are located by calling the | |||
| 176 | (interactive) | 176 | (interactive) |
| 177 | (let* ((shadows (find-emacs-lisp-shadows)) | 177 | (let* ((shadows (find-emacs-lisp-shadows)) |
| 178 | (n (/ (length shadows) 2)) | 178 | (n (/ (length shadows) 2)) |
| 179 | (msg (format "%s Emacs Lisp load-path shadowing%s found." | 179 | (msg (format "%s Emacs Lisp load-path shadowing%s found" |
| 180 | (if (zerop n) "No" (concat "\n" (number-to-string n))) | 180 | (if (zerop n) "No" (concat "\n" (number-to-string n))) |
| 181 | (if (= n 1) " was" "s were")))) | 181 | (if (= n 1) " was" "s were")))) |
| 182 | (if (interactive-p) | 182 | (if (interactive-p) |
| 183 | (save-excursion | 183 | (save-excursion |
| 184 | ;; We are interactive. | 184 | ;; We are interactive. |
| 185 | ;; Create the *Shadows* buffer and display shadowings there. | 185 | ;; Create the *Shadows* buffer and display shadowings there. |
| 186 | (let ((output-buffer (get-buffer-create "*Shadows*"))) | 186 | (let ((output-buffer (get-buffer-create "*Shadows*"))) |
| 187 | (display-buffer output-buffer) | 187 | (display-buffer output-buffer) |
| 188 | (set-buffer output-buffer) | 188 | (set-buffer output-buffer) |
| 189 | (erase-buffer) | 189 | (erase-buffer) |
| 190 | (while shadows | 190 | (while shadows |
| 191 | (insert (format "%s shadows %s\n" (car shadows) (car (cdr shadows)))) | 191 | (insert (format "%s hides %s\n" (car shadows) |
| 192 | (setq shadows (cdr (cdr shadows)))) | 192 | (car (cdr shadows)))) |
| 193 | (insert msg "\n"))) | 193 | (setq shadows (cdr (cdr shadows)))) |
| 194 | ;; We are non-interactive, print shadows via message. | 194 | (insert msg "\n"))) |
| 195 | (while shadows | 195 | ;; We are non-interactive, print shadows via message. |
| 196 | (message "%s shadows %s" (car shadows) (car (cdr shadows))) | 196 | (while shadows |
| 197 | (setq shadows (cdr (cdr shadows)))) | 197 | (message "%s hides %s" (car shadows) (car (cdr shadows))) |
| 198 | (message "%s" msg)))) | 198 | (setq shadows (cdr (cdr shadows)))) |
| 199 | (message "%s" msg)))) | ||
| 199 | 200 | ||
| 200 | (provide 'shadow) | 201 | (provide 'shadow) |
| 201 | 202 | ||