Move 'make_time' to be next to its inverse 'lisp_time_argument'.

* dired.c (make_time): Move to ...
* editfns.c (make_time): ... here.
* systime.h: Note the move.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b54abe08ddf40ecd3bc6ec7ee6cbb150c3e527f..85100149c92f3cbda6d1f12f6e0284deabdd7f0a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Move 'make_time' to be next to its inverse 'lisp_time_argument'.
+       * dired.c (make_time): Move to ...
+       * editfns.c (make_time): ... here.
+       * systime.h: Note the move.
+
 2011-03-11  Tom Tromey  <tromey@redhat.com>
 
        * buffer.c (syms_of_buffer): Remove obsolete comment.

diff --git a/src/dired.c b/src/dired.c
index 96063680d4def0a95e4b07b23ee451dd4e58c45f..d201418d78b4b1841cf6f9ff668db3b9a4caf75a 100644 (file)
--- a/src/dired.c
+++ b/src/dired.c
@@ -848,13 +848,6 @@ file_name_completion_stat (Lisp_Object dirname, DIRENTRY *dp, struct stat *st_ad
   return value;
 }
 \f
-Lisp_Object
-make_time (time_t time)
-{
-  return Fcons (make_number (time >> 16),
-               Fcons (make_number (time & 0177777), Qnil));
-}
-
 static char *
 stat_uname (struct stat *st)
 {

diff --git a/src/editfns.c b/src/editfns.c
index 28690e7c76d2eabd415737c7591898257b7e2508..ec477f0e0108901aef703a99c79ad7b3471dac0d 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1476,6 +1476,19 @@ on systems that do not provide resolution finer than a second.  */)
 }
 \f
 
+/* Make a Lisp list that represents the time T.  */
+Lisp_Object
+make_time (time_t t)
+{
+  return Fcons (make_number (t >> 16),
+               Fcons (make_number (t & 0177777), Qnil));
+}
+
+/* Decode a Lisp list SPECIFIED_TIME that represents a time.
+   If SPECIFIED_TIME is nil, use the current time.
+   Set *RESULT to seconds since the Epoch.
+   If USEC is not null, set *USEC to the microseconds component.
+   Return nonzero if successful.  */
 int
 lisp_time_argument (Lisp_Object specified_time, time_t *result, int *usec)
 {

diff --git a/src/systime.h b/src/systime.h
index eae302904fad6e1266a9669f41b5ebc0047f611e..cb1ea230f7dbc0ac22d3a8451b9d849d43fcd6af 100644 (file)
--- a/src/systime.h
+++ b/src/systime.h
@@ -144,10 +144,8 @@ extern void set_waiting_for_input (EMACS_TIME *);
    happen when this files is used outside the src directory).
    Use GCPRO1 to determine if lisp.h was included.  */
 #ifdef GCPRO1
-/* defined in dired.c */
-extern Lisp_Object make_time (time_t);
-
 /* defined in editfns.c*/
+extern Lisp_Object make_time (time_t);
 extern int lisp_time_argument (Lisp_Object, time_t *, int *);
 #endif
 
@@ -172,4 +170,3 @@ extern int lisp_time_argument (Lisp_Object, time_t *, int *);
 #define EMACS_TIME_LE(T1, T2) (EMACS_TIME_CMP (T1, T2) <= 0)
 
 #endif /* EMACS_SYSTIME_H */
-