[elpa] externals/ergoemacs-mode 7851e51 031/325: Remove more package stuff

[Stefan Monnier]

branch: externals/ergoemacs-mode
commit 7851e51d2f5a47a702120945febd8012bf858988
Author: Walter Landry <wlandry@caltech.edu>
Commit: Walter Landry <wlandry@caltech.edu>

    Remove more package stuff
---
 ergoemacs-component.el      | 2 --
 ergoemacs-lib.el            | 4 +---
 ergoemacs-map-properties.el | 6 +-----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index 3a14469..c289457 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -92,8 +92,6 @@
 (declare-function ergoemacs-key-description--keymap 
"ergoemacs-key-description")
 (declare-function ergoemacs-key-description--unicode-char 
"ergoemacs-key-description")
 
-(declare-function package-installed-p "package")
-
 (declare-function ergoemacs-layout--regexp "ergoemacs-layouts")
 (declare-function ergoemacs-layouts--list "ergoemacs-layouts")
 
diff --git a/ergoemacs-lib.el b/ergoemacs-lib.el
index c876df2..7050c9a 100644
--- a/ergoemacs-lib.el
+++ b/ergoemacs-lib.el
@@ -396,9 +396,7 @@ All other modes are assumed to be minor modes or 
unimportant.
       (push `(,(intern current-letter) menu-item ,current-letter
               (keymap ,@cur-lst)) ret))
     ;; Now create nested menu.
-    `(keymap ,@ret
-             (separator1 menu-item "--")
-             (package menu-item  "Manage Packages" list-packages))))
+    `(keymap ,@ret)))
 
 (defun ergoemacs-menu--filter-key-shortcut (cmd &optional keymap)
   "Figures out ergoemacs-mode menu's preferred key-binding for CMD."
diff --git a/ergoemacs-map-properties.el b/ergoemacs-map-properties.el
index 6793600..eada251 100644
--- a/ergoemacs-map-properties.el
+++ b/ergoemacs-map-properties.el
@@ -35,8 +35,6 @@
 (eval-when-compile
   (require 'ergoemacs-macros))
 
-(require 'package)
-
 (defvar ergoemacs-translate--parent-map)
 (defvar ergoemacs-translate--modal-parent-map)
 (defvar ergoemacs--gzip)
@@ -594,9 +592,7 @@ These keymaps are saved in 
`ergoemacs-map-properties--hook-map-hash'."
   "Hash Table of defined/undefined keys.")
 
 (defvar ergoemacs-map-properties--deferred-hooks-directory-regexp
-  (concat "\\`" (regexp-opt (append package-directory-list
-                                    (list package-user-dir)
-                                    (list (file-name-directory (locate-library 
"abbrev")))
+  (concat "\\`" (regexp-opt (append (list (file-name-directory (locate-library 
"abbrev")))
                                     
ergoemacs-directories-where-keys-from-hook-are-deferred) t))
   "Regular experssion of libraries where maps are deferred.")