Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed documentation and removed unused argument from (emacs-setup-base).

  • Loading branch information...
commit 46231ad81820dd699e28dc4eafdf7cb457a23fd6 1 parent da61645
Brian Zwahr authored
Showing with 9 additions and 61 deletions.
  1. +4 −34 README
  2. +5 −27 emacs-setup.el
View
38 README
@@ -2,11 +2,10 @@ emacs-setup is an emacs package that is meant to help make maintaining your
emacs setup easier. Through the use of M-x customize, the following can be
setup through emacs-setup:
-Directories to be added to the load path.
-Packages to require, and any setup elisp code.
-Keybindings.
-Emacs window/frame session setups (through the use of revive.el)
-and more!
+Add/remove directories to the load path.
+Add/remove directories to the environment PATH.
+Add/remove packages to require, including any accompanying setup elisp code.
+Set/unset and save keybindings.
Installation:
@@ -28,20 +27,6 @@ In your .emacs, load emacs-setup:
(load-file "~/path/to/emacs-setup/emacs-setup.el")
-then run (emacs-setup-base), which takes two optional arguments:
- FRAME - passed to after-make-frame-hook (typically nil)
- THE-CUSTOM-FILE - if you store your file which is used by customize in a
- place other than default (e.g. I keep mine in Dropbox)
- you must specifiy that location here.
-
-(emacs-setup-base)
- - or -
-(emacs-setup-base nil "~/path/to/custom-file.el")
-
-finally, make a call to
-
-(emacs-setup)
-
Once loaded, you can use M-x customize-group emacs-setup to setup your
environment.
@@ -63,8 +48,6 @@ emacs-setup - This is the main part of emacs-setup. You can set your base
run, it runs in this order:
- emacs-setup-pre-sexp
- require pacakges via emacs-setup-require
- - emacs-setup-pre-layout-sexp
- - setup layout - via emacs-setup-layout
- emacs-setup-post-sexp
- bind keys in emacs-setup-keys
@@ -77,19 +60,6 @@ emacs-setup-keys - This part of emacs-setup allows you to have your keybindings
to interactively bind or unbind keys, which are saved to
customize for you.
-emacs-setup-layout - This part fo emacs-setup allows you to manage multiple
- screen layouts or sessions. Basic usage is to get your
- emacs frame(s)/window(s) like you want them, then run
- M-x emacs-setup-save-frame-configuration
- This will save all frame(s)/window(s) to a unique
- layout file recognized by your screen resolution and
- emacs frame size. This allows you have multiple
- layouts which will automatically load on different
- computers with different screen sizes.
- You can also set a default frame size, height, width,
- fullscreen, etc. all via customize.
- It is also possible to save/restore named layouts.
-
emacs-setup-require - This is ths part of emacs-setup where you can tell it
which packages to load, and give setup s-expressions.
You can customize the load-path and env-path, whether or
View
32 emacs-setup.el
@@ -6,11 +6,10 @@
;; emacs setup easier. Through the use of M-x customize, the following can be
;; setup through emacs-setup:
-;; Directories to be added to the load path.
-;; Packages to require, and any setup elisp code.
-;; Keybindings.
-;; Emacs window/frame session setups (through the use of revive.el)
-;; and more!
+;; Add/remove directories to the load path.
+;; Add/remove directories to the environment PATH.
+;; Add/remove packages to require, including any accompanying setup elisp code.
+;; Set/unset and save keybindings.
;; Installation:
@@ -32,20 +31,6 @@
;; (load-file "~/path/to/emacs-setup/emacs-setup.el")
-;; then run (emacs-setup-base), which takes two optional arguments:
-;; FRAME - passed to after-make-frame-hook (typically nil)
-;; THE-CUSTOM-FILE - if you store your file which is used by customize in a
-;; place other than default (e.g. I keep mine in Dropbox)
-;; you must specifiy that location here.
-
-;; (emacs-setup-base)
-;; - or -
-;; (emacs-setup-base nil "~/path/to/custom-file.el")
-
-;; finally, make a call to
-
-;; (emacs-setup)
-
;; Once loaded, you can use M-x customize-group emacs-setup to setup your
;; environment.
@@ -67,8 +52,6 @@
;; run, it runs in this order:
;; - emacs-setup-pre-sexp
;; - require pacakges via emacs-setup-require
-;; - emacs-setup-pre-layout-sexp
-;; - setup layout - via emacs-setup-layout
;; - emacs-setup-post-sexp
;; - bind keys in emacs-setup-keys
@@ -135,20 +118,15 @@
;;; *********
;;; FUNCTIONS
;;; *********
-(defun emacs-setup-base (&optional frame the-custom-file)
+(defun emacs-setup-base (&optional frame)
"Performs initial setup. The frame argument is there for
after-make-frame-hook."
(interactive)
(let ((dir (file-name-directory
(find-lisp-object-file-name 'emacs-setup-base 'function))))
(add-to-list 'load-path dir)
- (message "Path: %s" 'load-path)
(require 'emacs-setup-require)
(require 'emacs-setup-keys))
- (when the-custom-file
- (setq custom-file the-custom-file)
- (load custom-file))
- ;; This must come first for requires to work from here on out!
(emacs-setup-load-recursive-el-directories
emacs-setup-elisp-base-dir
emacs-setup-elisp-ignore-dirs)
Please sign in to comment.
Something went wrong with that request. Please try again.