aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/dframe.el
diff options
context:
space:
mode:
authorJoakim Verona2011-12-28 04:12:56 +0100
committerJoakim Verona2011-12-28 04:12:56 +0100
commitbb29f044aa967831cd664c54eba0de0c701436ce (patch)
tree1398cc9780bbae0fdad071a3a3765a571c3f6d7b /lisp/dframe.el
parent3c935a7e996701244d166f684119f0ff97e25496 (diff)
parent5e605a2e528955721fc6f2bd7b9f174c15075fb1 (diff)
downloademacs-bb29f044aa967831cd664c54eba0de0c701436ce.tar.gz
emacs-bb29f044aa967831cd664c54eba0de0c701436ce.zip
upstream i think
Diffstat (limited to 'lisp/dframe.el')
-rw-r--r--lisp/dframe.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/dframe.el b/lisp/dframe.el
index b1eb2d636b9..b4f44e1a308 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -718,7 +718,7 @@ Argument PROMPT is the prompt to use."
718 718
719(defun dframe-set-timer (timeout fn &optional _null-on-error) 719(defun dframe-set-timer (timeout fn &optional _null-on-error)
720 "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil. 720 "Apply a timer with TIMEOUT, to call FN, or remove a timer if TIMEOUT is nil.
721TIMEOUT is the number of seconds until the dframe controled program 721TIMEOUT is the number of seconds until the dframe controlled program
722timer is called again. When TIMEOUT is nil, turn off all timeouts. 722timer is called again. When TIMEOUT is nil, turn off all timeouts.
723This function must be called from the buffer belonging to the program 723This function must be called from the buffer belonging to the program
724who requested the timer. NULL-ON-ERROR is ignored." 724who requested the timer. NULL-ON-ERROR is ignored."