diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2010-10-12 01:57:49 +0200 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2010-10-12 01:57:49 +0200 |
commit | 4c14013dbec3a2f130a38e61e885f1e8cc6c325b (patch) | |
tree | b74121c8de587c217f0d146752e8893d0874aae7 /lisp/emacs-lisp/shadow.el | |
parent | f0b7f5a884806112b6a938b9c31607ea005431d3 (diff) | |
parent | a2e35ef5d52031e0fa184d1863fe7cb7043ef637 (diff) | |
download | emacs-4c14013dbec3a2f130a38e61e885f1e8cc6c325b.tar.gz |
Merge changes from emacs-23 branch.
Diffstat (limited to 'lisp/emacs-lisp/shadow.el')
-rw-r--r-- | lisp/emacs-lisp/shadow.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index 850c1e89682..e690cbaa1bc 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -24,7 +24,7 @@ ;;; Commentary: -;; The functions in this file detect (`find-emacs-lisp-shadows') +;; The functions in this file detect (`load-path-shadows-find') ;; and display (`list-load-path-shadows') potential load-path ;; problems that arise when Emacs Lisp files "shadow" each other. ;; @@ -65,7 +65,7 @@ This is slower, but filters out some innocuous shadowing." :type 'boolean :group 'lisp-shadow) -(defun find-emacs-lisp-shadows (&optional path) +(defun load-path-shadows-find (&optional path) "Return a list of Emacs Lisp files that create shadows. This function does the work for `list-load-path-shadows'. @@ -141,6 +141,9 @@ See the documentation for `list-load-path-shadows' for further information." ;; Return the list of shadowings. shadows)) +(define-obsolete-function-alias 'find-emacs-lisp-shadows + 'load-path-shadows-find "23.3") + ;; Return true if neither file exists, or if both exist and have identical ;; contents. (defun load-path-shadows-same-file-or-nonexistent (f1 f2) @@ -224,7 +227,7 @@ XXX.elc in an early directory \(that does not contain XXX.el\) is considered to shadow a later file XXX.el, and vice-versa. Shadowings are located by calling the (non-interactive) companion -function, `find-emacs-lisp-shadows'." +function, `load-path-shadows-find'." (interactive) (let* ((path (copy-sequence load-path)) (tem path) @@ -248,7 +251,7 @@ function, `find-emacs-lisp-shadows'." (setq tem nil))) (setq tem (cdr tem))))) - (let* ((shadows (find-emacs-lisp-shadows path)) + (let* ((shadows (load-path-shadows-find path)) (n (/ (length shadows) 2)) (msg (format "%s Emacs Lisp load-path shadowing%s found" (if (zerop n) "No" (concat "\n" (number-to-string n))) |