From 1b2ac613e3ee291ddf37b16f01d82343906e5d39 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Thu, 3 Jul 2014 11:35:43 +0100
Subject: Emacs: add kill-this-buffer-dwim for server edits

---
 tag-emacs/emacs.d/init.el | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tag-emacs/emacs.d/init.el b/tag-emacs/emacs.d/init.el
index 442c1b2..4305625 100644
--- a/tag-emacs/emacs.d/init.el
+++ b/tag-emacs/emacs.d/init.el
@@ -126,6 +126,12 @@
 
 ;;;; Buffers
 
+(defun kill-this-buffer-dwim ()
+  (interactive)
+  (if server-buffer-clients
+      (server-edit)
+    (kill-this-buffer)))
+
 (req-package ibuffer
   :bind (("C-x C-b" . ibuffer))
   :config (progn
@@ -411,7 +417,7 @@
 (unbind-key "s-n")
 (unbind-key "s-p")
 (unbind-key "s-w")
-(bind-key "s-k" #'kill-this-buffer)
+(bind-key "s-k" #'kill-this-buffer-dwim)
 
 (bind-key "s-x" (define-prefix-command 'super-x-map))
 
-- 
cgit 1.4.1