procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* progmodes/octave.el (octave-kill-process): Don't ask twice

Browse source 
Fixes: debbugs:10564
This commit is contained in:
Leo Liu 2013-11-22 17:50:41 +08:00
parent 8c09f64b76
commit 2cc18f9382
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lisp/ChangeLog
View file

@ -5,6 +5,7 @@
(octave-help-mode): Adapt to change to help-mode-finish to use
derived-mode-p on 2013-09-17.
(inferior-octave-prompt): Also match octave-gui.
(octave-kill-process): Don't ask twice. (Bug#10564)
2013-11-22 Leo Liu <sdl.web@gmail.com>

14
lisp/progmodes/octave.el
View file

@ -1445,12 +1445,14 @@ entered without parens)."
(defun octave-kill-process ()
"Kill inferior Octave process and its buffer."
(interactive)
(or (yes-or-no-p "Kill the inferior Octave process and its buffer? ")
(user-error "Aborted"))
(when (inferior-octave-process-live-p)
(process-send-string inferior-octave-process "quit;\n")
(accept-process-output inferior-octave-process))
(when inferior-octave-buffer
(when (and (buffer-live-p (get-buffer inferior-octave-buffer))
(or (yes-or-no-p (format "Kill %S and its buffer? "
inferior-octave-process))
(user-error "Aborted")))
(when (inferior-octave-process-live-p)
(set-process-query-on-exit-flag inferior-octave-process nil)
(process-send-string inferior-octave-process "quit;\n")
(accept-process-output inferior-octave-process))
(kill-buffer inferior-octave-buffer)))
(defun octave-show-process-buffer ()