aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2000-07-27 14:25:35 +0000
committerEli Zaretskii2000-07-27 14:25:35 +0000
commitc0261b5e260eeaddf29a4178dc6e1adb65d15215 (patch)
treec69a0b751a35fb4135984409dfedfd39b99ccc08 /src
parentb548072f27ec8d7c68e4cdc56ac9e52e780ba29e (diff)
downloademacs-c0261b5e260eeaddf29a4178dc6e1adb65d15215.tar.gz
emacs-c0261b5e260eeaddf29a4178dc6e1adb65d15215.zip
(lisp_time_argument): Fix last change.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/editfns.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index ecfe6bee27a..6daf32dea45 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12000-07-27 Eli Zaretskii <eliz@is.elta.co.il>
2
3 * editfns.c (lisp_time_argument): Fix last change.
4
12000-07-27 Gerd Moellmann <gerd@gnu.org> 52000-07-27 Gerd Moellmann <gerd@gnu.org>
2 6
3 * fns.c (Qkey_or_value, Qkey_and_value): New variables. 7 * fns.c (Qkey_or_value, Qkey_and_value): New variables.
diff --git a/src/editfns.c b/src/editfns.c
index a8e5b5594ed..10a52ca2ee6 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1202,8 +1202,7 @@ lisp_time_argument (specified_time, result, usec)
1202 { 1202 {
1203 EMACS_TIME t; 1203 EMACS_TIME t;
1204 1204
1205 if (-1 == EMACS_GET_TIME (t)) 1205 EMACS_GET_TIME (t);
1206 return 0;
1207 *usec = EMACS_USECS (t); 1206 *usec = EMACS_USECS (t);
1208 *result = EMACS_SECS (t); 1207 *result = EMACS_SECS (t);
1209 return 1; 1208 return 1;