From 56af96e54ee2402a07105fe60a5d6c34d697229d Mon Sep 17 00:00:00 2001 From: Artur Malabarba Date: Fri, 29 May 2015 21:41:53 +0100 Subject: [PATCH] * lisp/emacs-lisp/package.el: Don't load from parent dir (package-load-all-descriptors): Don't load descriptors from directories above the package directories. --- lisp/emacs-lisp/package.el | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 97e6bd63da9..6fecd9a837d 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -587,9 +587,10 @@ updates `package-alist'." (dolist (dir (cons package-user-dir package-directory-list)) (when (file-directory-p dir) (dolist (subdir (directory-files dir)) - (let ((pkg-dir (expand-file-name subdir dir))) - (when (file-directory-p pkg-dir) - (package-load-descriptor pkg-dir))))))) + (unless (equal subdir "..") + (let ((pkg-dir (expand-file-name subdir dir))) + (when (file-directory-p pkg-dir) + (package-load-descriptor pkg-dir)))))))) (defun define-package (_name-string _version-string &optional _docstring _requirements -- 2.11.4.GIT