Commit 773c1fd3 authored by Jim Blandy's avatar Jim Blandy

* editfns.c (Fcurrent_time_zone): Return a list whose elements are

	nil if the time zone information is unavailable, instead of
	signalling an error.
parent 7ee790ac
...@@ -596,7 +596,11 @@ STANDARD is a string giving the name of the time zone when no seasonal\n\ ...@@ -596,7 +596,11 @@ STANDARD is a string giving the name of the time zone when no seasonal\n\
SAVINGS is a string giving the name of the time zone when there is a\n\ SAVINGS is a string giving the name of the time zone when there is a\n\
seasonal time adjustment in effect.\n\ seasonal time adjustment in effect.\n\
If the local area does not use a seasonal time adjustment,\n\ If the local area does not use a seasonal time adjustment,\n\
SAVINGS-FLAG is always nil, and STANDARD and SAVINGS are equal.") SAVINGS-FLAG is always nil, and STANDARD and SAVINGS are equal.\n\
\n\
Some operating systems cannot provide all this information to Emacs;\n\
in this case, current-time-zone will return a list containing nil for\n\
the data it can't find.")
() ()
{ {
#ifdef EMACS_CURRENT_TIME_ZONE #ifdef EMACS_CURRENT_TIME_ZONE
...@@ -612,8 +616,7 @@ SAVINGS-FLAG is always nil, and STANDARD and SAVINGS are equal.") ...@@ -612,8 +616,7 @@ SAVINGS-FLAG is always nil, and STANDARD and SAVINGS are equal.")
Fcons (build_string (savings), Fcons (build_string (savings),
Qnil)))); Qnil))));
#else #else
error return Fmake_list (4, Qnil);
("current-time-zone has not been implemented on this operating system.");
#endif #endif
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment