1 files changed, 8 insertions, 1 deletions
diff --git a/emacs b/emacs
index 0f7a18e..5427da1 100644
--- a/emacs
+++ b/emacs
@@ -209,7 +209,14 @@
 (when (require 'server nil 'noerror)
   (if (and (fboundp 'server-running-p)
 	   (not (server-running-p)))
-      (server-start)))
+      (server-start))
+
+  (add-hook 'server-switch-hook
+          (lambda ()
+            (when (current-local-map)
+              (use-local-map (copy-keymap (current-local-map))))
+            (when server-buffer-clients
+              (local-set-key (kbd "C-x k") 'server-edit)))))
 
 ; emacs code browser
 (when (require 'ecb nil 'noerror)