Skip to content

get confirmation before killing a modified buffer #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

get confirmation before killing a modified buffer #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
765ff97
ask user for input when killing edit buffer
Sep 8, 2012
b5494de
refine edit-server-done make abort possible while killing buffer
Sep 8, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions servers/edit-server.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ to `edit-server-default-major-mode'"
;; hooks early on
(run-hooks 'edit-server-start-hook)
(not-modified)
(add-hook 'kill-buffer-hook 'edit-server-abort* nil t)
(add-hook 'kill-buffer-query-functions 'edit-server-kill-query nil t)
(buffer-enable-undo)
(setq edit-server-proc proc
edit-server-frame (edit-server-create-frame buffer))
Expand Down Expand Up @@ -541,11 +541,11 @@ When called interactively, use prefix arg to abort editing."
(dolist (format buffer-file-format)
(format-decode-region (point-min) (point-max) format))
(buffer-enable-undo)))
(when edit-server-frame
(delete-frame edit-server-frame))
;; delete-frame may change the current buffer
(unless nokill
(kill-buffer buffer))
(when edit-server-frame
(delete-frame edit-server-frame))
(edit-server-kill-client proc))))

;;
Expand Down Expand Up @@ -573,11 +573,24 @@ When called interactively, use prefix arg to abort editing."
(interactive)
(edit-server-done t))

(defun edit-server-abort* ()
"Discard editing and send the original text back to the browser,
but don't kill the editing buffer."
(interactive)
(edit-server-done t t))
(defvar edit-server-kill-query-string
(concat
;; prevent using minibuffer-prompt face
(propertize "(" 'face 'default)
(propertize "s" 'face '(:foreground "ForestGreen"))
")ubmit changes ("
(propertize "k" 'face '(:foreground "Firebrick"))
")ill changes?"))

(defun edit-server-kill-query ()
"Ask user what to do when killing edit buffer."
(when (buffer-modified-p (current-buffer))
(case (read-char-choice
edit-server-kill-query-string
(append "sSKk" nil))
((?s ?S) (edit-server-done))
((?k ?K) (edit-server-done t t))))
t)

(provide 'edit-server)

Expand Down