summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs8
-rw-r--r--.emacs-custom.el4
2 files changed, 9 insertions, 3 deletions
diff --git a/.emacs b/.emacs
index b7a9eb4..ab0e3e1 100644
--- a/.emacs
+++ b/.emacs
@@ -7,9 +7,11 @@
;; resets global-page-break-lines-mode to nil. Cue Custom shrugging,
;; "changed outside Customize".
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/"))
-(package-initialize)
+;; NB: starting from Emacs 27, package-initialize is automatically
+;; called before loading the user's init file, unless
+;; package-enable-at-startup is set to nil in the early init file.
+(when (version< emacs-version "27")
+ (package-initialize))
(setq custom-file "~/.emacs-custom.el")
(load custom-file)
diff --git a/.emacs-custom.el b/.emacs-custom.el
index 04494cd..734cdcc 100644
--- a/.emacs-custom.el
+++ b/.emacs-custom.el
@@ -43,6 +43,10 @@
'(markdown-enable-math t)
'(markdown-header-scaling t)
'(menu-bar-mode nil)
+ '(package-archives
+ (quote
+ (("melpa" . "https://melpa.org/packages/")
+ ("gnu" . "http://elpa.gnu.org/packages/"))))
'(package-selected-packages
(quote
(rg delight paradox flycheck magit markdown-mode page-break-lines rust-mode wgrep)))