branch: externals/ergoemacs-mode
commit b62f0682487dc34c0d1776794837b9d6e10815a0
Author: Walter Landry <wlan...@caltech.edu>
Commit: Walter Landry <wlan...@caltech.edu>
Remove more package stuff
---
ergoemacs-component.el | 1 -
ergoemacs-lib.el | 2 --
ergoemacs-mode.el | 13 +------------
3 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index ad4ef11..3a14469 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -53,7 +53,6 @@
(defvar ergoemacs-theme-version)
(defvar ergoemacs-translate--translation-hash)
(defvar ergoemacs-translation-hash)
-(defvar package--initialized)
(declare-function diminish "diminish")
(declare-function diminish-undo "diminish")
diff --git a/ergoemacs-lib.el b/ergoemacs-lib.el
index 8142aff..c876df2 100644
--- a/ergoemacs-lib.el
+++ b/ergoemacs-lib.el
@@ -45,8 +45,6 @@
(defvar ergoemacs-theme-hash)
(defvar ergoemacs-timing-hash)
-(defvar package-archives)
-
(defvar ergoemacs-dir)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 50fc851..19858d9 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -51,22 +51,13 @@
(require 'undo-tree nil t)
(provide 'ergoemacs-mode)
-(require 'package)
(require 'kmacro)
(require 'printing)
(pr-update-menus)
-(add-to-list 'package-archives '("melpa-stable" .
"http://stable.melpa.org/packages/";))
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/";))
-(add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/";))
-
(defvar ergoemacs--system (replace-regexp-in-string "[^0-9A-Za-z]+" "-"
(concat emacs-version "-" system-configuration)))
-(when (and (string= package-user-dir (locate-user-emacs-file "elpa"))
- (not (file-exists-p (locate-user-emacs-file "elpa"))))
- (setq package-user-dir (locate-user-emacs-file (format "elpa-%s"
ergoemacs--system))))
-
(defvar cl-struct-ergoemacs-component-struct-tags)
(defvar ergoemacs-component-struct--refresh-variables)
(defvar ergoemacs-keyboard-layout)
@@ -75,8 +66,6 @@
(defvar ergoemacs-require)
(defvar pcache-directory)
-(require 'package)
-
(declare-function ergoemacs-key-description--unicode-char
"ergoemacs-key-description")
(declare-function ergoemacs-require "ergoemacs-lib")
@@ -461,7 +450,7 @@ This is structured by valid keyboard layouts for
(defvar ergoemacs--component-file-mod-time-list nil)
(defun ergoemacs--emacs-state ()
"Return MD5 represting current Emacs state."
- (let* ((state (format "%s %s %s %s %s" ergoemacs--system features
package-alist load-path ergoemacs--component-file-mod-time-list))
+ (let* ((state (format "%s %s %s %s" ergoemacs--system features load-path
ergoemacs--component-file-mod-time-list))
(md5 (md5 state)))
;; (message "%s->%s" md5 state)
md5))
