aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2002-07-16 06:43:19 +0000
committerJuanma Barranquero2002-07-16 06:43:19 +0000
commit301085d403de6fbc609f704965305fdf3e1a7db6 (patch)
treecde0ed3d4e6f6a44870f2215f85bacbac9b603cc
parent740fd9d81928cce9870eee64fd8faaee41d21f8c (diff)
downloademacs-301085d403de6fbc609f704965305fdf3e1a7db6.tar.gz
emacs-301085d403de6fbc609f704965305fdf3e1a7db6.zip
(timer-set-time, timer-set-time-with-usecs): Fix docstring.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/timer.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 16a0ced76e3..7051435191e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12002-07-16 Juanma Barranquero <lektu@terra.es>
2
3 * timer.el (timer-set-time, timer-set-time-with-usecs): Fix docstring.
4
12002-07-15 Juanma Barranquero <lektu@terra.es> 52002-07-15 Juanma Barranquero <lektu@terra.es>
2 6
3 * help-fns.el (describe-variable): Show documentation for aliased 7 * help-fns.el (describe-variable): Show documentation for aliased
diff --git a/lisp/timer.el b/lisp/timer.el
index c98d160d57f..b93ec446652 100644
--- a/lisp/timer.el
+++ b/lisp/timer.el
@@ -45,7 +45,7 @@
45(defun timer-set-time (timer time &optional delta) 45(defun timer-set-time (timer time &optional delta)
46 "Set the trigger time of TIMER to TIME. 46 "Set the trigger time of TIMER to TIME.
47TIME must be in the internal format returned by, e.g., `current-time'. 47TIME must be in the internal format returned by, e.g., `current-time'.
48If optional third argument DELTA is a non-zero integer, make the timer 48If optional third argument DELTA is a positive number, make the timer
49fire repeatedly that many seconds apart." 49fire repeatedly that many seconds apart."
50 (or (timerp timer) 50 (or (timerp timer)
51 (error "Invalid timer")) 51 (error "Invalid timer"))
@@ -140,7 +140,7 @@ SECS may be a fraction."
140 "Set the trigger time of TIMER to TIME plus USECS. 140 "Set the trigger time of TIMER to TIME plus USECS.
141TIME must be in the internal format returned by, e.g., `current-time'. 141TIME must be in the internal format returned by, e.g., `current-time'.
142The microsecond count from TIME is ignored, and USECS is used instead. 142The microsecond count from TIME is ignored, and USECS is used instead.
143If optional fourth argument DELTA is a non-zero integer, make the timer 143If optional fourth argument DELTA is a positive number, make the timer
144fire repeatedly that many seconds apart." 144fire repeatedly that many seconds apart."
145 (or (timerp timer) 145 (or (timerp timer)
146 (error "Invalid timer")) 146 (error "Invalid timer"))