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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 85d108356cc2e416b6069de332ad0174957b5eb5..bba7a2e5d24c99c685bc06af2302843bc6e55996 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+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>
 
        * minibuffer.el (completion--some, completion--do-completion)

diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index a41db864a1b0ade23df4d90776fb1357ca017de8..15cb37b8ff3501b802c8c22ff5ee751430395a78 100644 (file)
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -53,10 +53,13 @@
 \f
 (defgroup lisp-shadow nil
   "Locate Emacs Lisp file shadowings."
-  :prefix "shadows-"
+  :prefix "load-path-shadows-"
   :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.
 This is slower, but filters out some innocuous shadowing."
   :type 'boolean
@@ -124,11 +127,11 @@ See the documentation for `list-load-path-shadows' for further information."
                ;; Report it unless the files are identical.
                (let ((base1 (concat (cdr orig-dir) "/" file))
                      (base2 (concat dir "/" file)))
-                 (if (not (and shadows-compare-text-p
-                               (shadow-same-file-or-nonexistent
+                 (if (not (and load-path-shadows-compare-text
+                               (load-path-shadows-same-file-or-nonexistent
                                 (concat base1 ".el") (concat base2 ".el"))
                                ;; 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"))))
                      (setq shadows
                            (append shadows (list base1 base2)))))
@@ -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
 ;; 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))
        (exists2 (file-exists-p f2)))
     (or (and (not exists1) (not exists2))