summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander@sulfrian.net>2012-05-07 17:25:25 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2012-05-15 13:32:20 +0200
commit57bdb9166577ec76ef629a3202e295431c4795e9 (patch)
tree5f623157a2cb185c2b57df71285eaa304def183e
parent0bbc51f35bf2397357b7b44f7a54759e70a7f172 (diff)
downloaddotfiles-57bdb9166577ec76ef629a3202e295431c4795e9.tar.gz
dotfiles-57bdb9166577ec76ef629a3202e295431c4795e9.tar.xz
dotfiles-57bdb9166577ec76ef629a3202e295431c4795e9.zip
emacs: added edit-server for the chrome extension
-rw-r--r--emacs14
-rw-r--r--emacs.elcbin10278 -> 10792 bytes
2 files changed, 14 insertions, 0 deletions
diff --git a/emacs b/emacs
index 2ac9501..0533131 100644
--- a/emacs
+++ b/emacs
@@ -405,3 +405,17 @@ If this is set during find-file, flyspell mode gets enabled automaticaly.")
deft-directory "~/.org/deft/"
deft-text-mode 'org-mode)
(global-set-key (kbd "<f9>") 'deft))
+
+;; edit with emacs
+(when (require 'edit-server nil 'noerror)
+ (setq edit-server-new-frame nil)
+ (edit-server-start))
+
+;; fix raise-frame
+(defadvice raise-frame (after make-it-work (&optional frame) activate)
+ "Work around some bug? in raise-frame/Emacs/GTK/Metacity/something.
+ Katsumi Yamaoka <yamaoka@jpl.org> posted this in
+ http://article.gmane.org/gmane.emacs.devel:39702"
+ (call-process
+ "wmctrl" nil nil nil "-i" "-R"
+ (frame-parameter (or frame (selected-frame)) 'outer-window-id)))
diff --git a/emacs.elc b/emacs.elc
index 3f6dbf1..748ff8a 100644
--- a/emacs.elc
+++ b/emacs.elc
Binary files differ