Commit e5d49589 authored by Glenn Morris's avatar Glenn Morris
Browse files

Rename some shadow.el things.

* lisp/emacs-lisp/shadow.el (lisp-shadow): Change prefix.
(shadows-compare-text-p): Make it an obsolete alias for...
(load-path-shadows-compare-text): ... new name.
(find-emacs-lisp-shadows): Update for above name change.
(load-path-shadows-same-file-or-nonexistent): New name for the old
shadow-same-file-or-nonexistent.
parent 12359245
2010-10-08 Glenn Morris <rgm@gnu.org>
* emacs-lisp/shadow.el (lisp-shadow): Change prefix.
(shadows-compare-text-p): Make it an obsolete alias for...
(load-path-shadows-compare-text): ... new name.
(find-emacs-lisp-shadows): Update for above name change.
(load-path-shadows-same-file-or-nonexistent): New name for the old
shadow-same-file-or-nonexistent.
2010-10-03 Chong Yidong <cyd@stupidchicken.com> 2010-10-03 Chong Yidong <cyd@stupidchicken.com>
* minibuffer.el (completion--some, completion--do-completion) * minibuffer.el (completion--some, completion--do-completion)
......
...@@ -53,10 +53,13 @@ ...@@ -53,10 +53,13 @@
(defgroup lisp-shadow nil (defgroup lisp-shadow nil
"Locate Emacs Lisp file shadowings." "Locate Emacs Lisp file shadowings."
:prefix "shadows-" :prefix "load-path-shadows-"
:group 'lisp) :group 'lisp)
(defcustom shadows-compare-text-p nil (define-obsolete-variable-alias 'shadows-compare-text-p
'load-path-shadows-compare-text "23.3")
(defcustom load-path-shadows-compare-text nil
"If non-nil, then shadowing files are reported only if their text differs. "If non-nil, then shadowing files are reported only if their text differs.
This is slower, but filters out some innocuous shadowing." This is slower, but filters out some innocuous shadowing."
:type 'boolean :type 'boolean
...@@ -124,11 +127,11 @@ See the documentation for `list-load-path-shadows' for further information." ...@@ -124,11 +127,11 @@ See the documentation for `list-load-path-shadows' for further information."
;; Report it unless the files are identical. ;; Report it unless the files are identical.
(let ((base1 (concat (cdr orig-dir) "/" file)) (let ((base1 (concat (cdr orig-dir) "/" file))
(base2 (concat dir "/" file))) (base2 (concat dir "/" file)))
(if (not (and shadows-compare-text-p (if (not (and load-path-shadows-compare-text
(shadow-same-file-or-nonexistent (load-path-shadows-same-file-or-nonexistent
(concat base1 ".el") (concat base2 ".el")) (concat base1 ".el") (concat base2 ".el"))
;; This is a bit strict, but safe. ;; This is a bit strict, but safe.
(shadow-same-file-or-nonexistent (load-path-shadows-same-file-or-nonexistent
(concat base1 ".elc") (concat base2 ".elc")))) (concat base1 ".elc") (concat base2 ".elc"))))
(setq shadows (setq shadows
(append shadows (list base1 base2))))) (append shadows (list base1 base2)))))
...@@ -140,7 +143,7 @@ See the documentation for `list-load-path-shadows' for further information." ...@@ -140,7 +143,7 @@ See the documentation for `list-load-path-shadows' for further information."
;; Return true if neither file exists, or if both exist and have identical ;; Return true if neither file exists, or if both exist and have identical
;; contents. ;; contents.
(defun shadow-same-file-or-nonexistent (f1 f2) (defun load-path-shadows-same-file-or-nonexistent (f1 f2)
(let ((exists1 (file-exists-p f1)) (let ((exists1 (file-exists-p f1))
(exists2 (file-exists-p f2))) (exists2 (file-exists-p f2)))
(or (and (not exists1) (not exists2)) (or (and (not exists1) (not exists2))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment