From 5ffa4bb187762068ae330e45befdb49eb4ae43a9 Mon Sep 17 00:00:00 2001 From: Geoff Shannon Date: Sun, 11 May 2014 16:59:28 -0700 Subject: [PATCH] Pull Prelude's custom variables into a new file This is so we can define a custom variable to use in prelude-core --- core/prelude-custom.el | 69 ++++++++++++++++++++++++++++++++++++++++++ core/prelude-editor.el | 32 -------------------- init.el | 1 + 3 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 core/prelude-custom.el diff --git a/core/prelude-custom.el b/core/prelude-custom.el new file mode 100644 index 0000000..095b583 --- /dev/null +++ b/core/prelude-custom.el @@ -0,0 +1,69 @@ +;;; prelude-custom.el --- Emacs Prelude: Prelude's customizable variables. +;; +;; Copyright © 2011-2013 Bozhidar Batsov +;; +;; Author: Bozhidar Batsov +;; URL: https://github.com/bbatsov/prelude +;; Version: 1.0.0 +;; Keywords: convenience + +;; This file is not part of GNU Emacs. + +;;; Commentary: + +;; Refinements of the core editing experience in Emacs. + +;;; License: + +;; This program is free software; you can redistribute it and/or +;; modify it under the terms of the GNU General Public License +;; as published by the Free Software Foundation; either version 3 +;; of the License, or (at your option) any later version. +;; +;; This program is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs; see the file COPYING. If not, write to the +;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +;; Boston, MA 02110-1301, USA. + +;;; Code: + +;; customize +(defgroup prelude nil + "Emacs Prelude configuration." + :prefix "prelude-" + :group 'convenience) + +(defcustom prelude-auto-save t + "Non-nil values enable Prelude's auto save." + :type 'boolean + :group 'prelude) + +(defcustom prelude-guru t + "Non-nil values enable guru-mode." + :type 'boolean + :group 'prelude) + +(defcustom prelude-whitespace t + "Non-nil values enable Prelude's whitespace visualization." + :type 'boolean + :group 'prelude) + +(defcustom prelude-clean-whitespace-on-save t + "Cleanup whitespace from file before it's saved. +Will only occur if prelude-whitespace is also enabled." + :type 'boolean + :group 'prelude) + +(defcustom prelude-flyspell t + "Non-nil values enable Prelude's flyspell support." + :type 'boolean + :group 'prelude) + +(provide 'prelude-custom) + +;;; prelude-custom.el ends here diff --git a/core/prelude-editor.el b/core/prelude-editor.el index 9a31dd7..276a544 100644 --- a/core/prelude-editor.el +++ b/core/prelude-editor.el @@ -32,38 +32,6 @@ ;;; Code: -;; customize -(defgroup prelude nil - "Emacs Prelude configuration." - :prefix "prelude-" - :group 'convenience) - -(defcustom prelude-auto-save t - "Non-nil values enable Prelude's auto save." - :type 'boolean - :group 'prelude) - -(defcustom prelude-guru t - "Non-nil values enable guru-mode." - :type 'boolean - :group 'prelude) - -(defcustom prelude-whitespace t - "Non-nil values enable Prelude's whitespace visualization." - :type 'boolean - :group 'prelude) - -(defcustom prelude-clean-whitespace-on-save t - "Cleanup whitespace from file before it's saved. -Will only occur if prelude-whitespace is also enabled." - :type 'boolean - :group 'prelude) - -(defcustom prelude-flyspell t - "Non-nil values enable Prelude's flyspell support." - :type 'boolean - :group 'prelude) - ;; Death to the tabs! However, tabs historically indent to the next ;; 8-character offset; specifying anything else will cause *mass* ;; confusion, as it will change the appearance of every existing file. diff --git a/init.el b/init.el index 4482efa..af0e492 100644 --- a/init.el +++ b/init.el @@ -100,6 +100,7 @@ by Prelude.") ;; the core stuff (require 'prelude-packages) (require 'prelude-ui) +(require 'prelude-custom) (require 'prelude-core) (require 'prelude-mode) (require 'prelude-editor)