twitter submodule + tweaks on the home system

diff --git a/.gitmodules b/.gitmodules
index 5cca1e652dfe68085c2f9ebea09d435b7dac26bb..1d6da9ffa6c2669bb9a3f29ac665ec0995e628f3 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -31,3 +31,6 @@
 [submodule "themes/dream"]
        path = themes/dream
        url = https://github.com/djcb/dream-theme.git
+[submodule "vendor/twittering-mode"]
+       path = vendor/twittering-mode
+       url = git://github.com/hayamiz/twittering-mode.git

diff --git a/emacs/my-twitter.el b/emacs/my-twitter.el
index bbd94956fa2f246afb69a9416cba1bb448d13ce1..632b0cd9868c3c25f29acf605fe9af899aedaf93 100644 (file)
--- a/emacs/my-twitter.el
+++ b/emacs/my-twitter.el
@@ -1,4 +1,4 @@
-(add-to-list 'load-path "~/.emacs.d/emacs/twittering-mode")
+(add-to-list 'load-path "~/.emacs.d/vendor/twittering-mode")
 (require 'twittering-mode)
 
 (add-hook 'twittering-edit-mode-hook (lambda () (ispell-minor-mode) (flyspell-mode)))

diff --git a/emacs/twittering-mode b/emacs/twittering-mode
deleted file mode 160000 (submodule)
index ab64c73..0000000
--- a/emacs/twittering-mode
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ab64c73b393e7ed1a28ca2bf15e13958996a52df

diff --git a/init.el b/init.el
index 10c1ebd01c4ec2ec0142f94704549dd4a80dfe6d..479725a4a8c0297cd6d03d1fbcb182d6a3e80a6d 100644 (file)
--- a/init.el
+++ b/init.el
@@ -375,7 +375,7 @@
 ;; notmuch
 (setq gnus-inhibit-images nil)
 (add-to-list 'load-path "~/.emacs.d/emacs/notmuch")
-(setq notmuch-command "/Users/rkrishnan/bin/remote-notmuch.sh")
+(setq notmuch-command "~/bin/remote-notmuch.sh")
 (require 'notmuch)
 (when (memq window-system '(mac ns))
   (exec-path-from-shell-initialize)
@@ -405,11 +405,9 @@
 (require 'starttls)
 
 ;; sign all emails
-;(add-hook 'message-setup-hook 'mml-secure-message-sign-pgpmime)
+(add-hook 'message-setup-hook 'mml-secure-message-sign-pgpmime)
 
-(setq default-frame-alist
-      '((font . "Menlo-13")
-        (width . 80)))
+(set-default-font "Inconsolata-11")
 
 ;; spell check
 (setq ispell-program-name "aspell"

diff --git a/vendor/twittering-mode b/vendor/twittering-mode
new file mode 160000 (submodule)
index 0000000..a65362d
--- /dev/null
+++ b/vendor/twittering-mode
@@ -0,0 +1 @@
+Subproject commit a65362daf6ae967d907f52ab3f5ffca5001be56f