From 90d0bce3bddd8bcad23ed9c4bb5f296ea8cb501e Mon Sep 17 00:00:00 2001 From: Bozhidar Batsov Date: Thu, 18 Jun 2020 10:45:54 +0300 Subject: [PATCH] Remove some deprecated logic --- init.el | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/init.el b/init.el index 013639b..a0a2f0d 100644 --- a/init.el +++ b/init.el @@ -71,11 +71,6 @@ by Prelude.") "This folder stores all the automatically generated save/history-files.") (defvar prelude-modules-file (expand-file-name "prelude-modules.el" prelude-personal-dir) "This file contains a list of modules that will be loaded by Prelude.") -(defvar prelude-deprecated-modules-file - (expand-file-name "prelude-modules.el" prelude-dir) - (format "This file may contain a list of Prelude modules. - -This is DEPRECATED, use %s instead." prelude-modules-file)) (unless (file-exists-p prelude-savefile-dir) (make-directory prelude-savefile-dir)) @@ -130,18 +125,9 @@ This is DEPRECATED, use %s instead." prelude-modules-file)) ;; the modules (if (file-exists-p prelude-modules-file) - (progn - (load prelude-modules-file) - (if (file-exists-p prelude-deprecated-modules-file) - (message "Loading new modules configuration, ignoring DEPRECATED prelude-module.el"))) - (if (file-exists-p prelude-deprecated-modules-file) - (progn - (load prelude-deprecated-modules-file) - (message (format "The use of %s is DEPRECATED! Use %s instead!" - prelude-deprecated-modules-file - prelude-modules-file))) - (message "Missing modules file %s" prelude-modules-file) - (message "You can get started by copying the bundled example file from sample/prelude-modules.el"))) + (load prelude-modules-file) + (message "Missing modules file %s" prelude-modules-file) + (message "You can get started by copying the bundled example file from sample/prelude-modules.el")) ;; config changes made through the customize UI will be stored here (setq custom-file (expand-file-name "custom.el" prelude-personal-dir))