diff options
| author | Glenn Morris | 2010-10-08 17:44:53 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-10-08 17:44:53 -0700 |
| commit | d15f9a2b499f937d1e962c5dfcebb2024f82de86 (patch) | |
| tree | 7b0f9bccda3813ba0cd632134573a1c04bb441a9 | |
| parent | c7d6d8a1ee9eaadb7d3ad40862fe602e95c4d839 (diff) | |
| download | emacs-d15f9a2b499f937d1e962c5dfcebb2024f82de86.tar.gz emacs-d15f9a2b499f937d1e962c5dfcebb2024f82de86.zip | |
Rename another shadow.el function.
* lisp/emacs-lisp/shadow.el (find-emacs-lisp-shadows): Rename it...
(load-path-shadows-find): ... to this.
(list-load-path-shadows): Update for above change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0b10e2f3cc5..cf32b040c44 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2010-10-09 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-09 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * emacs-lisp/shadow.el (find-emacs-lisp-shadows): Rename it... | ||
| 4 | (load-path-shadows-find): ... to this. | ||
| 5 | (list-load-path-shadows): Update for above change. | ||
| 6 | |||
| 3 | * mail/mail-utils.el (mail-mbox-from): Also try return-path. | 7 | * mail/mail-utils.el (mail-mbox-from): Also try return-path. |
| 4 | 8 | ||
| 5 | 2010-10-08 Glenn Morris <rgm@gnu.org> | 9 | 2010-10-08 Glenn Morris <rgm@gnu.org> |
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 15cb37b8ff3..fe32a302045 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | 24 | ||
| 25 | ;;; Commentary: | 25 | ;;; Commentary: |
| 26 | 26 | ||
| 27 | ;; The functions in this file detect (`find-emacs-lisp-shadows') | 27 | ;; The functions in this file detect (`load-path-shadows-find') |
| 28 | ;; and display (`list-load-path-shadows') potential load-path | 28 | ;; and display (`list-load-path-shadows') potential load-path |
| 29 | ;; problems that arise when Emacs Lisp files "shadow" each other. | 29 | ;; problems that arise when Emacs Lisp files "shadow" each other. |
| 30 | ;; | 30 | ;; |
| @@ -65,7 +65,7 @@ This is slower, but filters out some innocuous shadowing." | |||
| 65 | :type 'boolean | 65 | :type 'boolean |
| 66 | :group 'lisp-shadow) | 66 | :group 'lisp-shadow) |
| 67 | 67 | ||
| 68 | (defun find-emacs-lisp-shadows (&optional path) | 68 | (defun load-path-shadows-find (&optional path) |
| 69 | "Return a list of Emacs Lisp files that create shadows. | 69 | "Return a list of Emacs Lisp files that create shadows. |
| 70 | This function does the work for `list-load-path-shadows'. | 70 | This function does the work for `list-load-path-shadows'. |
| 71 | 71 | ||
| @@ -141,6 +141,9 @@ See the documentation for `list-load-path-shadows' for further information." | |||
| 141 | ;; Return the list of shadowings. | 141 | ;; Return the list of shadowings. |
| 142 | shadows)) | 142 | shadows)) |
| 143 | 143 | ||
| 144 | (define-obsolete-function-alias 'find-emacs-lisp-shadows | ||
| 145 | 'load-path-shadows-find "23.3") | ||
| 146 | |||
| 144 | ;; Return true if neither file exists, or if both exist and have identical | 147 | ;; Return true if neither file exists, or if both exist and have identical |
| 145 | ;; contents. | 148 | ;; contents. |
| 146 | (defun load-path-shadows-same-file-or-nonexistent (f1 f2) | 149 | (defun load-path-shadows-same-file-or-nonexistent (f1 f2) |
| @@ -196,7 +199,7 @@ XXX.elc in an early directory \(that does not contain XXX.el\) is | |||
| 196 | considered to shadow a later file XXX.el, and vice-versa. | 199 | considered to shadow a later file XXX.el, and vice-versa. |
| 197 | 200 | ||
| 198 | Shadowings are located by calling the (non-interactive) companion | 201 | Shadowings are located by calling the (non-interactive) companion |
| 199 | function, `find-emacs-lisp-shadows'." | 202 | function, `load-path-shadows-find'." |
| 200 | (interactive) | 203 | (interactive) |
| 201 | (let* ((path (copy-sequence load-path)) | 204 | (let* ((path (copy-sequence load-path)) |
| 202 | (tem path) | 205 | (tem path) |
| @@ -220,7 +223,7 @@ function, `find-emacs-lisp-shadows'." | |||
| 220 | (setq tem nil))) | 223 | (setq tem nil))) |
| 221 | (setq tem (cdr tem))))) | 224 | (setq tem (cdr tem))))) |
| 222 | 225 | ||
| 223 | (let* ((shadows (find-emacs-lisp-shadows path)) | 226 | (let* ((shadows (load-path-shadows-find path)) |
| 224 | (n (/ (length shadows) 2)) | 227 | (n (/ (length shadows) 2)) |
| 225 | (msg (format "%s Emacs Lisp load-path shadowing%s found" | 228 | (msg (format "%s Emacs Lisp load-path shadowing%s found" |
| 226 | (if (zerop n) "No" (concat "\n" (number-to-string n))) | 229 | (if (zerop n) "No" (concat "\n" (number-to-string n))) |