summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-09-13 09:23:06 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-09-13 09:23:06 -0700
commitc18e885bdd2607ec1784c3e1585e581459408932 (patch)
treeaeacf95b156f43cd91086bb5152086915893da8d /lisp/emacs-lisp
parentd607d303028dca3d7d6ba21b4013f08dd2b0a1d6 (diff)
downloademacs-c18e885bdd2607ec1784c3e1585e581459408932.tar.gz
emacs-c18e885bdd2607ec1784c3e1585e581459408932.tar.bz2
emacs-c18e885bdd2607ec1784c3e1585e581459408932.zip
Use a more backwards-compatible timer format.
* etc/NEWS: Document it. * lisp/emacs-lisp/timer.el (timer): PSECS is now at the end, rather than being right after USECS, as that better supports old code that inadvisedly looked directly at the timer vector. * src/keyboard.c (decode_timer): Get PSECS from the 8th (origin-0) vector element, not from the 4th, since PSECS is now at the end. (Fcurrent_idle_time): Doc fix. Fixes: debbugs:12430
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/timer.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index a66d5972d82..2248dde8c03 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -28,8 +28,8 @@
;;; Code:
;; Layout of a timer vector:
-;; [triggered-p high-seconds low-seconds usecs psecs repeat-delay
-;; function args idle-delay]
+;; [triggered-p high-seconds low-seconds usecs repeat-delay
+;; function args idle-delay psecs]
;; triggered-p is nil if the timer is active (waiting to be triggered),
;; t if it is inactive ("already triggered", in theory)
@@ -42,7 +42,7 @@
(:type vector)
(:conc-name timer--))
(triggered t)
- high-seconds low-seconds usecs psecs repeat-delay function args idle-delay)
+ high-seconds low-seconds usecs repeat-delay function args idle-delay psecs)
(defun timerp (object)
"Return t if OBJECT is a timer."