summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs12
-rw-r--r--.emacs.d/.gitignore4
-rw-r--r--.emacs.d/custom.el6
3 files changed, 10 insertions, 12 deletions
diff --git a/.emacs b/.emacs
index cad9b62..55b970b 100644
--- a/.emacs
+++ b/.emacs
@@ -32,12 +32,12 @@
(eval-url "https://github.com/dimitri/el-get/raw/master/el-get-install.el"))
(setq el-get-sources '(
- (:name nxhtml
- :type http
- :url "http://ourcomments.org/Emacs/DL/elisp/nxhtml/zip/nxhtml-2.08-100425.zip"
- :build ("unzip nxhtml-2.08-100425.zip")
- :load "nxhtml/autostart.el")
- ))
+ (:name nxhtml
+ :type http
+ :url "http://ourcomments.org/Emacs/DL/elisp/nxhtml/zip/nxhtml-2.08-100425.zip"
+ :build ("unzip nxhtml-2.08-100425.zip")
+ :load "nxhtml/autostart.el")
+ ))
(setq my-el-get-packages
'(el-get
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
index 675a8be..ef4ec20 100644
--- a/.emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
@@ -1,7 +1,9 @@
auto-save-list/*
el-get/*
-server/*
elmo/*
+elpa/*
image-dired/*
+server/*
session.*
+tramp
url/*
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index d6b4ddf..fad97a8 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -3,14 +3,10 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(background-color "#002b36")
- '(background-mode dark)
- '(cursor-color "#839496")
'(custom-enabled-themes (quote (wombat)))
'(custom-safe-themes (quote ("71b172ea4aad108801421cc5251edb6c792f3adbaecfa1c52e94e3d99634dee7" "fc5fcb6f1f1c1bc01305694c59a1a861b008c534cae8d0e48e4d5e81ad718bc6" default)))
'(erc-nick "lukeshu")
- '(fci-rule-color "#383838")
- '(foreground-color "#839496")
+ '(explicit-shell-file-name "/bin/bash")
'(inhibit-startup-screen t)
'(ruby-deep-arglist nil)
'(ruby-deep-indent-paren nil)