jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove some deprecated logic

Browse source
This commit is contained in:
Bozhidar Batsov 2020-06-18 10:45:54 +03:00
parent d87a9a8073
commit 90d0bce3bd
1 changed files with 3 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
init.el
View file

@ -71,11 +71,6 @@ by Prelude.")
"This folder stores all the automatically generated save/history-files.") "This folder stores all the automatically generated save/history-files.")
(defvar prelude-modules-file (expand-file-name "prelude-modules.el" prelude-personal-dir) (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.") "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) (unless (file-exists-p prelude-savefile-dir)
(make-directory prelude-savefile-dir)) (make-directory prelude-savefile-dir))
@ -130,18 +125,9 @@ This is DEPRECATED, use %s instead." prelude-modules-file))
;; the modules ;; the modules
(if (file-exists-p prelude-modules-file) (if (file-exists-p prelude-modules-file)
(progn
(load prelude-modules-file) (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 "Missing modules file %s" prelude-modules-file)
(message "You can get started by copying the bundled example file from sample/prelude-modules.el"))) (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 ;; config changes made through the customize UI will be stored here
(setq custom-file (expand-file-name "custom.el" prelude-personal-dir)) (setq custom-file (expand-file-name "custom.el" prelude-personal-dir))