aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2018-01-15 13:53:40 -0800
committerGlenn Morris2018-01-15 13:53:40 -0800
commit400b72cb6e118b86d2e83cbfb45b829b231ec4f9 (patch)
tree6c4f2e559e952c273dd4a21f90e5308aa28b17d1 /lisp
parent8491cbef1afa0e4088729bfd7476d82bc2f09bba (diff)
parent98e5fb9bf3b49bea82a4d3e38be20415bd7f7684 (diff)
downloademacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.tar.gz
emacs-400b72cb6e118b86d2e83cbfb45b829b231ec4f9.zip
Merge from origin/emacs-26
98e5fb9bf3 (origin/emacs-26) Remove incorrect documentation in comint.el 8ba5b85161 An overdue update of src/emacs-icon.h 155b211133 Minor copyedit in ELisp manual
Diffstat (limited to 'lisp')
-rw-r--r--lisp/comint.el14
1 files changed, 3 insertions, 11 deletions
diff --git a/lisp/comint.el b/lisp/comint.el
index 719945a831f..a79e34b36c3 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -2477,9 +2477,7 @@ Sets mark to the value of point when this command is run."
2477 (comint-truncate-buffer))) 2477 (comint-truncate-buffer)))
2478 2478
2479(defun comint-interrupt-subjob () 2479(defun comint-interrupt-subjob ()
2480 "Interrupt the current subjob. 2480 "Interrupt the current subjob."
2481This command also kills the pending input
2482between the process mark and point."
2483 (interactive) 2481 (interactive)
2484 (comint-skip-input) 2482 (comint-skip-input)
2485 (interrupt-process nil comint-ptyp) 2483 (interrupt-process nil comint-ptyp)
@@ -2487,25 +2485,19 @@ between the process mark and point."
2487 ) 2485 )
2488 2486
2489(defun comint-kill-subjob () 2487(defun comint-kill-subjob ()
2490 "Send kill signal to the current subjob. 2488 "Send kill signal to the current subjob."
2491This command also kills the pending input
2492between the process mark and point."
2493 (interactive) 2489 (interactive)
2494 (comint-skip-input) 2490 (comint-skip-input)
2495 (kill-process nil comint-ptyp)) 2491 (kill-process nil comint-ptyp))
2496 2492
2497(defun comint-quit-subjob () 2493(defun comint-quit-subjob ()
2498 "Send quit signal to the current subjob. 2494 "Send quit signal to the current subjob."
2499This command also kills the pending input
2500between the process mark and point."
2501 (interactive) 2495 (interactive)
2502 (comint-skip-input) 2496 (comint-skip-input)
2503 (quit-process nil comint-ptyp)) 2497 (quit-process nil comint-ptyp))
2504 2498
2505(defun comint-stop-subjob () 2499(defun comint-stop-subjob ()
2506 "Stop the current subjob. 2500 "Stop the current subjob.
2507This command also kills the pending input
2508between the process mark and point.
2509 2501
2510WARNING: if there is no current subjob, you can end up suspending 2502WARNING: if there is no current subjob, you can end up suspending
2511the top-level process running in the buffer. If you accidentally do 2503the top-level process running in the buffer. If you accidentally do