procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Have time-add etc. respect CURRENT_TIME_LIST too

Browse source 
* src/timefns.c (time_arith) [!CURRENT_TIME_LIST]:
Don’t generate a list, since CURRENT_TIME_LIST is false.
This commit is contained in:
Paul Eggert 2019-08-17 02:21:25 -07:00
parent 37257d6aca
commit 743cc86a05
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/timefns.c
View file

@ -1090,11 +1090,14 @@ time_arith (Lisp_Object a, Lisp_Object b, bool subtract)
}
/* Return an integer if the timestamp resolution is 1,
otherwise the (TICKS . HZ) form if either argument is that way,
otherwise the (HI LO US PS) form for backward compatibility. */
otherwise the (TICKS . HZ) form if !CURRENT_TIME_LIST or if
either input form supports timestamps that cannot be expressed
exactly in (HI LO US PS) form, otherwise the (HI LO US PS) form
for backward compatibility. */
return (EQ (hz, make_fixnum (1))
? ticks
: timeform_sub_ps_p (aform) || timeform_sub_ps_p (bform)
: (!CURRENT_TIME_LIST
|| timeform_sub_ps_p (aform) || timeform_sub_ps_p (bform))
? Fcons (ticks, hz)
: ticks_hz_list4 (ticks, hz));
}