summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/timer.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-04-09 12:51:06 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-04-09 12:51:06 -0700
commit9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch)
treee10467a42658a374d5cdb7bb25fc94016abdad7a /lisp/emacs-lisp/timer.el
parentb8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff)
parenta130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff)
downloademacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz
Merge from trunk; add Bug#.
Diffstat (limited to 'lisp/emacs-lisp/timer.el')
-rw-r--r--lisp/emacs-lisp/timer.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index b6b7c266263..87b6cceb24b 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -241,7 +241,7 @@ and idle timers such as are scheduled by `run-with-idle-timer'."
"Third-to-last timer that was run.")
(defvar timer-max-repeats 10
- "*Maximum number of times to repeat a timer, if many repeats are delayed.
+ "Maximum number of times to repeat a timer, if many repeats are delayed.
Timer invocations can be delayed because Emacs is suspended or busy,
or because the system's time changes. If such an occurrence makes it
appear that many invocations are overdue, this variable controls