[Emacs-diffs] malabarba/package.el-reload-files-on-upgrade 634cc69 3/4: (package-list-loaded-files) A couple of symbol refactorings

[Artur Malabarba]

branch: malabarba/package.el-reload-files-on-upgrade
commit 634cc69519d0da332ed41c1ee2380db5df942b0d
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    (package-list-loaded-files) A couple of symbol refactorings
    
    Rename path to file and package-list-loaded-files to
    package--list-loaded-files
---
 lisp/emacs-lisp/package.el |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index c84679c..b34eacb 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -553,7 +553,7 @@ Return the max version (as a string) if the package is held 
at a lower version."
     ;; Don't return nil.
     t))
 
-(defun package-list-loaded-files (dir)
+(defun package--list-loaded-files (dir)
   "List all files in DIR which correspond to loaded features.
 Returns the `file-name-base' of each file, sorted by most recently
 loaded last."
@@ -564,12 +564,12 @@ loaded last."
         (list-of-conflicts
          (remove
           nil
-          (mapcar (lambda (x) (let* ((path (file-name-sans-extension
+          (mapcar (lambda (x) (let* ((file (file-name-sans-extension
                                        (file-truename
                                         (find-library-name (file-name-base 
x)))))
-                                (pos (when path (member path history))))
+                                (pos (when file (member file history))))
                            ;; Return (FILENAME . HISTORY-POSITION)
-                           (when pos (cons path (length pos)))))
+                           (when pos (cons file (length pos)))))
            (directory-files "./" nil "^[^\\.].*\\.el\\'" 'nosort)))))
     ;; Turn the list of (FILENAME . POS) back into a list of features.
     (mapcar (lambda (x) (file-name-base (car x)))