(defun server-edit-or-close (buf)
  "Close the buffer regardless of whether it's a server file or not."
  (interactive "bKill/finish buffer: ")
  (if server-buffer-clients
      (progn
        (switch-to-buffer buf)
        (server-edit))
    (kill-buffer)))