diff options
author | David Bremner <bremner@debian.org> | 2013-02-18 20:33:48 -0400 |
---|---|---|
committer | David Bremner <bremner@debian.org> | 2013-02-18 20:33:48 -0400 |
commit | 16aa65ba2575fd504c31d9671d8c5150f8e8adf1 (patch) | |
tree | ac2398df690fa58f584d82044d9273dbfd557b11 /test | |
parent | 2bedb0300544bf0603863b372cb605dca40c6b33 (diff) | |
parent | bcccc2e1fe19003e28b6cd85d3f2b2beda40335f (diff) |
Merge branch 'release'
add in NEWS from 0.15.2
Conflicts:
NEWS
Diffstat (limited to 'test')
-rw-r--r-- | test/test-lib.el | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/test-lib.el b/test/test-lib.el index dece811e..d26b49f7 100644 --- a/test/test-lib.el +++ b/test/test-lib.el @@ -77,12 +77,19 @@ invisible text." (setq start next-pos))) str)) -(defun orphan-watchdog (pid) +(defun orphan-watchdog-check (pid) "Periodically check that the process with id PID is still running, quit if it terminated." (if (not (process-attributes pid)) - (kill-emacs) - (run-at-time "1 min" nil 'orphan-watchdog pid))) + (kill-emacs))) + +(defun orphan-watchdog (pid) + "Initiate orphan watchdog check." + ; If process-attributes returns nil right away, that probably means + ; it is unimplimented. So we delay two minutes before killing emacs. + (if (process-attributes pid) + (run-at-time 60 60 'orphan-watchdog-check pid) + (run-at-time 120 60 'orphan-watchdog-check pid))) (defun hook-counter (hook) "Count how many times a hook is called. Increments |