emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r110018: Use a more backwards-compati


From: Paul Eggert
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r110018: Use a more backwards-compatible timer format.
Date: Thu, 13 Sep 2012 09:23:06 -0700
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 110018
fixes bug: http://debbugs.gnu.org/12430
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2012-09-13 09:23:06 -0700
message:
  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.
modified:
  etc/ChangeLog
  etc/NEWS
  lisp/ChangeLog
  lisp/emacs-lisp/timer.el
  src/ChangeLog
  src/keyboard.c
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2012-09-13 06:13:26 +0000
+++ b/etc/ChangeLog     2012-09-13 16:23:06 +0000
@@ -1,3 +1,8 @@
+2012-09-13  Paul Eggert  <address@hidden>
+
+       Use a more backwards-compatible timer format (Bug#12430).
+       * NEWS: Document it, plus fix a typo.
+
 2012-09-13  Jan Djärv  <address@hidden>
 
        * NEWS (--with-x-toolkit): Mention that Gtk+ 3 is now default.

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2012-09-13 06:13:26 +0000
+++ b/etc/NEWS  2012-09-13 16:23:06 +0000
@@ -110,7 +110,7 @@
 Old-format time stamps are still accepted.
 
 ** The format of timers in timer-list and timer-idle-list is now
-[HIGH-SECONDS LOW-SECONDS USECS PSECS REPEAT-DELAY FUNCTION ARGS IDLE-DELAY].
+[TRIGGERED-P HI-SECS LO-SECS USECS REPEAT-DELAY FUNCTION ARGS IDLE-DELAY 
PSECS].
 The PSECS slot is new, and uses picosecond resolution.  It can be
 accessed via the new timer--psecs accessor.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-13 15:21:58 +0000
+++ b/lisp/ChangeLog    2012-09-13 16:23:06 +0000
@@ -1,3 +1,10 @@
+2012-09-13  Paul Eggert  <address@hidden>
+
+       Use a more backwards-compatible timer format (Bug#12430).
+       * 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.
+
 2012-09-13  Kenichi Handa  <address@hidden>
 
        * language/chinese.el ("Chinese-GB", "Chinese-BIG5")

=== modified file 'lisp/emacs-lisp/timer.el'
--- a/lisp/emacs-lisp/timer.el  2012-06-30 15:32:51 +0000
+++ b/lisp/emacs-lisp/timer.el  2012-09-13 16:23:06 +0000
@@ -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."

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-09-13 11:42:18 +0000
+++ b/src/ChangeLog     2012-09-13 16:23:06 +0000
@@ -1,3 +1,10 @@
+2012-09-13  Paul Eggert  <address@hidden>
+
+       Use a more backwards-compatible timer format (Bug#12430).
+       * 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.
+
 2012-09-13  Dmitry Antipov  <address@hidden>
 
        Function to mark objects and remove killed buffers at once.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2012-09-13 02:21:28 +0000
+++ b/src/keyboard.c    2012-09-13 16:23:06 +0000
@@ -4330,7 +4330,7 @@
   if (! NILP (vector[0]))
     return 0;
 
-  return decode_time_components (vector[1], vector[2], vector[3], vector[4],
+  return decode_time_components (vector[1], vector[2], vector[3], vector[8],
                                 result, 0);
 }
 
@@ -4532,7 +4532,7 @@
 
 The value when Emacs is not idle is nil.
 
-NSEC is a multiple of the system clock resolution.  */)
+PSEC is a multiple of the system clock resolution.  */)
   (void)
 {
   if (EMACS_TIME_VALID_P (timer_idleness_start_time))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]