summaryrefslogtreecommitdiff
path: root/.emacs.d/custom.el
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 23:01:21 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 23:01:21 -0400
commit6c0a5af3aba9902206a73a62e2be2e4dd67be9da (patch)
treecbc0dbb938716a80cc0248b5aff97dc34f21c756 /.emacs.d/custom.el
parentebc4f813d517d44ddf7440fd8043c5d41adf8932 (diff)
parenta96ee608ce4be813ce381a6a0c195591f633986e (diff)
Merge branch 'hp-dv6426us-par' into identica-mode-1.2hp-dv6426us-par/identica-mode-1.2
Conflicts: .emacs
Diffstat (limited to '.emacs.d/custom.el')
-rw-r--r--.emacs.d/custom.el10
1 files changed, 10 insertions, 0 deletions
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index d8fdce4..9f61215 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -3,4 +3,14 @@
;; 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.
+ '(erc-nick "lukeshu-freenode")
+ '(erc-port 6667)
+ '(erc-server "lukeshu.ath.cx")
+ '(mdmua-maildir "~/Maildir")
'(scroll-bar-mode nil))
+(custom-set-faces
+ ;; custom-set-faces was added by Custom.
+ ;; 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.
+ )