[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/editfns.c
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] Changes to emacs/src/editfns.c |
Date: |
Fri, 24 Mar 2006 20:40:25 +0000 |
Index: emacs/src/editfns.c
diff -u emacs/src/editfns.c:1.409 emacs/src/editfns.c:1.410
--- emacs/src/editfns.c:1.409 Tue Feb 7 09:08:53 2006
+++ emacs/src/editfns.c Fri Mar 24 20:40:24 2006
@@ -72,6 +72,8 @@
extern char **environ;
#endif
+#define TM_YEAR_BASE 1900
+
extern size_t emacs_strftimeu P_ ((char *, size_t, const char *,
const struct tm *, int));
static int tm_diff P_ ((struct tm *, struct tm *));
@@ -721,7 +723,7 @@
int orig_point = 0;
int fwd;
Lisp_Object prev_old, prev_new;
-
+
if (NILP (new_pos))
/* Use the current point, and afterwards, set it. */
{
@@ -736,7 +738,7 @@
prev_old = make_number (XFASTINT (old_pos) - 1);
prev_new = make_number (XFASTINT (new_pos) - 1);
-
+
if (NILP (Vinhibit_field_text_motion)
&& !EQ (new_pos, old_pos)
&& (!NILP (Fget_char_property (new_pos, Qfield, Qnil))
@@ -1722,7 +1724,7 @@
XSETFASTINT (list_args[2], decoded_time->tm_hour);
XSETFASTINT (list_args[3], decoded_time->tm_mday);
XSETFASTINT (list_args[4], decoded_time->tm_mon + 1);
- XSETINT (list_args[5], decoded_time->tm_year + 1900);
+ XSETINT (list_args[5], TM_YEAR_BASE + (EMACS_INT) decoded_time->tm_year);
XSETFASTINT (list_args[6], decoded_time->tm_wday);
list_args[7] = (decoded_time->tm_isdst)? Qt : Qnil;
@@ -1778,7 +1780,7 @@
tm.tm_hour = XINT (args[2]);
tm.tm_mday = XINT (args[3]);
tm.tm_mon = XINT (args[4]) - 1;
- tm.tm_year = XINT (args[5]) - 1900;
+ tm.tm_year = XINT (args[5]) - TM_YEAR_BASE;
tm.tm_isdst = -1;
if (CONSP (zone))
@@ -1844,11 +1846,16 @@
{
time_t value;
char buf[30];
+ struct tm *tm;
register char *tem;
if (! lisp_time_argument (specified_time, &value, NULL))
- value = -1;
- tem = (char *) ctime (&value);
+ error ("Invalid time specification");
+ tm = localtime (&value);
+ if (! (tm && -999 - TM_YEAR_BASE <= tm->tm_year
+ && tm->tm_year <= 9999 - TM_YEAR_BASE))
+ error ("Specified time is not representable");
+ tem = asctime (tm);
strncpy (buf, tem, 24);
buf[24] = 0;
@@ -1856,8 +1863,6 @@
return build_string (buf);
}
-#define TM_YEAR_BASE 1900
-
/* Yield A - B, measured in seconds.
This function is copied from the GNU C Library. */
static int
- [Emacs-diffs] Changes to emacs/src/editfns.c,
Paul Eggert <=