summaryrefslogtreecommitdiff
path: root/.emacs
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2011-04-13 23:40:39 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2011-04-13 23:40:39 -0400
commit89f80eac82e1305a3bf4bb4abd805df8345845f5 (patch)
tree3dd0c9662f7520d0a375d4e54d62b9ce629ec79e /.emacs
parentf7464fdd2e33e5dc6c159a4adc8f53902e6d4511 (diff)
Merge .emacs with the one on my desktop, add identica-mode to emacs, remove '*~' files
Diffstat (limited to '.emacs')
-rw-r--r--.emacs9
1 files changed, 9 insertions, 0 deletions
diff --git a/.emacs b/.emacs
index 7c919a8..cac63f7 100644
--- a/.emacs
+++ b/.emacs
@@ -10,6 +10,15 @@
(require 'color-theme-solarized)
(color-theme-solarized-dark)
+(when (require 'netrc nil t)
+ (autoload 'identica-mode "identica-mode" nil t)
+ (let
+ ((identica (netrc-machine (netrc-parse "~/.netrc") "identi.ca" t)))
+ (setq identica-password (netrc-get identica "password"))
+ (setq identica-username (netrc-get identica "login"))
+ )
+)
+
(load "whitespace")
(global-set-key "\C-cw" 'global-whitespace-mode)
;(setq whitespace-style '(