From 8f4c7223a1a049b2833a7c2018b156f3797f6b42 Mon Sep 17 00:00:00 2001 From: John Doty Date: Mon, 26 Mar 2018 06:48:21 -0700 Subject: [PATCH] Use MELPA not MELPA stable (I guess) --- .emacs.d/core.el | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.emacs.d/core.el b/.emacs.d/core.el index 75c4d66..ece0a36 100644 --- a/.emacs.d/core.el +++ b/.emacs.d/core.el @@ -85,14 +85,16 @@ ;; ================================================================= ;; Packages ;; ================================================================= -(setq package-archives - '(("gnu" . "http://elpa.gnu.org/packages/") - ("org" . "http://orgmode.org/elpa/") - ("melpa" . "http://stable.melpa.org/packages/") - )) -(when (< emacs-major-version 24) - ;; For important compatibility libraries like cl-lib - (add-to-list 'package-archives '("gnu" . "http://elpa.gnu.org/packages/"))) +(let* ((no-ssl (and (memq system-type '(windows-nt ms-dos)) + (not (gnutls-available-p)))) + (proto (if no-ssl "http" "https"))) + (setq package-archives + '(("gnu" . "http://elpa.gnu.org/packages/") + ("org" . "http://orgmode.org/elpa/") + )) + + (add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t) + ) (package-initialize) (unless package-archive-contents