[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110909: Minor cleanup for times as lists of four integers.

[Paul Eggert]

------------------------------------------------------------
revno: 110909
committer: Paul Eggert <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-11-17 18:13:19 -0800
message:
  Minor cleanup for times as lists of four integers.
  
  * doc/lispref/os.texi (Time Parsing): Time values can now be four integers.
  * lisp/files.el (dir-locals-directory-cache):
  * lisp/ps-bdf.el (bdf-file-mod-time, bdf-read-font-info):
  Doc fixes.
  * lisp/net/tramp-sh.el (tramp-do-file-attributes-with-ls):
  * lisp/ps-bdf.el (bdf-file-newer-than-time):
  Process four-integers time stamps, not two.  Doc fixes.
modified:
  doc/lispref/ChangeLog
  doc/lispref/os.texi
  lisp/ChangeLog
  lisp/files.el
  lisp/net/tramp-sh.el
  lisp/ps-bdf.el

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2012-11-18 01:38:42 +0000
+++ b/doc/lispref/ChangeLog     2012-11-18 02:13:19 +0000
@@ -1,3 +1,8 @@
+2012-11-18  Paul Eggert  <address@hidden>
+
+       Minor cleanup for times as lists of four integers.
+       * os.texi (Time Parsing): Time values can now be four integers.
+
 2012-11-18  Glenn Morris  <address@hidden>
 
        * loading.texi (How Programs Do Loading): Add eager macro expansion.

=== modified file 'doc/lispref/os.texi'
--- a/doc/lispref/os.texi       2012-10-24 05:12:23 +0000
+++ b/doc/lispref/os.texi       2012-11-18 02:13:19 +0000
@@ -1373,8 +1373,8 @@
 @node Time Parsing
 @section Parsing and Formatting Times
 
-  These functions convert time values (lists of two or three integers)
-to text in a string, and vice versa.
+  These functions convert time values to text in a string, and vice versa.
+Time values are lists of two to four integers (@pxref{Time of Day}).
 
 @defun date-to-time string
 This function parses the time-string @var{string} and returns the

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-18 01:43:32 +0000
+++ b/lisp/ChangeLog    2012-11-18 02:13:19 +0000
@@ -1,3 +1,13 @@
+2012-11-18  Paul Eggert  <address@hidden>
+
+       Minor cleanup for times as lists of four integers.
+       * files.el (dir-locals-directory-cache):
+       * ps-bdf.el (bdf-file-mod-time, bdf-read-font-info):
+       Doc fixes.
+       * net/tramp-sh.el (tramp-do-file-attributes-with-ls):
+       * ps-bdf.el (bdf-file-newer-than-time):
+       Process four-integers time stamps, not two.  Doc fixes.
+
 2012-11-18  Glenn Morris  <address@hidden>
 
        * image.el (insert-image, insert-sliced-image): Doc fix.

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2012-10-29 13:28:41 +0000
+++ b/lisp/files.el     2012-11-18 02:13:19 +0000
@@ -3424,7 +3424,7 @@
 CLASS is the name of a variable class (a symbol).
 MTIME is the recorded modification time of the directory-local
 variables file associated with this entry.  This time is a list
-of two integers (the same format as `file-attributes'), and is
+of integers (the same format as `file-attributes'), and is
 used to test whether the cache entry is still valid.
 Alternatively, MTIME can be nil, which means the entry is always
 considered valid.")

=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el      2012-10-09 12:49:02 +0000
+++ b/lisp/net/tramp-sh.el      2012-11-18 02:13:19 +0000
@@ -1270,12 +1270,11 @@
          res-uid
          ;; 3. File gid.
          res-gid
-         ;; 4. Last access time, as a list of two integers. First
-         ;; integer has high-order 16 bits of time, second has low 16
-         ;; bits.
+         ;; 4. Last access time, as a list of integers in the same format
+         ;; as `current-time'.
          ;; 5. Last modification time, likewise.
          ;; 6. Last status change time, likewise.
-         '(0 0) '(0 0) '(0 0)          ;CCC how to find out?
+         '(0 0 0 0) '(0 0 0 0) '(0 0 0 0)      ;CCC how to find out?
          ;; 7. Size in bytes (-1, if number is out of range).
          res-size
          ;; 8. File modes, as a string of ten letters or dashes as in ls -l.

=== modified file 'lisp/ps-bdf.el'
--- a/lisp/ps-bdf.el    2012-01-19 07:21:25 +0000
+++ b/lisp/ps-bdf.el    2012-11-18 02:13:19 +0000
@@ -70,20 +70,15 @@
 
 (defsubst bdf-file-mod-time (filename)
   "Return modification time of FILENAME.
-The value is a list of two integers, the first integer has high-order
-16 bits, the second has low 16 bits."
+The value is a list of integers in the same format as `current-time'."
   (nth 5 (file-attributes filename)))
 
 (defun bdf-file-newer-than-time (filename mod-time)
   "Return non-nil if and only if FILENAME is newer than MOD-TIME.
-MOD-TIME is a modification time as a list of two integers, the first
-integer has high-order 16 bits, the second has low 16 bits."
-  (let* ((new-mod-time (bdf-file-mod-time filename))
-        (new-time (car new-mod-time))
-        (time (car mod-time)))
-    (or (> new-time time)
-       (and (= new-time time)
-            (> (nth 1 new-mod-time) (nth 1 mod-time))))))
+MOD-TIME is a modification time as a list of integers in the same
+format as `current-time'."
+  (let ((new-mod-time (bdf-file-mod-time filename)))
+    (time-less-p mod-time new-mod-time)))
 
 (defun bdf-find-file (bdfname)
   "Return a buffer visiting a bdf file BDFNAME.
@@ -178,8 +173,8 @@
     (BDFFILE MOD-TIME FONT-BOUNDING-BOX
      RELATIVE-COMPOSE BASELINE-OFFSET CODE-RANGE MAXLEN OFFSET-VECTOR)
 
-MOD-TIME is last modification time as a list of two integers, the
-first integer has high-order 16 bits, the second has low 16 bits.
+MOD-TIME is last modification time as a list of integers in the
+same format as `current-time'.
 
 SIZE is a size of the font on 72 dpi device.  This value is got
 from SIZE record of the font.