aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJim Blandy1991-12-08 07:04:21 +0000
committerJim Blandy1991-12-08 07:04:21 +0000
commitd940e0e442093af6b22d46b4db3675c73add7e11 (patch)
tree3f70505d586d141ec93f280d1475868597a60b57 /src
parentcfa191ff73a9cd107f32cef3f1396616faf48ccd (diff)
downloademacs-d940e0e442093af6b22d46b4db3675c73add7e11.tar.gz
emacs-d940e0e442093af6b22d46b4db3675c73add7e11.zip
*** empty log message ***
Diffstat (limited to 'src')
-rw-r--r--src/editfns.c16
1 files changed, 9 insertions, 7 deletions
diff --git a/src/editfns.c b/src/editfns.c
index 368727619c0..2ea8471fd50 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -503,6 +503,14 @@ DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
503 return Vsystem_name; 503 return Vsystem_name;
504} 504}
505 505
506DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0,
507 "Return the current time, as an integer.")
508 ()
509{
510 return make_number (time(0));
511}
512
513
506DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 0, 0, 514DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 0, 0,
507 "Return the current time, as a human-readable string.\n\ 515 "Return the current time, as a human-readable string.\n\
508Programs can use it too, since the number of columns in each field is fixed.\n\ 516Programs can use it too, since the number of columns in each field is fixed.\n\
@@ -998,13 +1006,6 @@ the argument used by %d or %c must be a number.")
998{ 1006{
999 register Lisp_Object val; 1007 register Lisp_Object val;
1000 1008
1001#ifdef MULTI_SCREEN
1002 extern Lisp_Object Vglobal_minibuffer_screen;
1003
1004 if (XTYPE (Vglobal_minibuffer_screen) == Lisp_Screen)
1005 Fmake_screen_visible (Vglobal_minibuffer_screen);
1006#endif
1007
1008 val = Fformat (nargs, args); 1009 val = Fformat (nargs, args);
1009 message ("%s", XSTRING (val)->data); 1010 message ("%s", XSTRING (val)->data);
1010 return val; 1011 return val;
@@ -1258,6 +1259,7 @@ syms_of_editfns ()
1258 defsubr (&Suser_uid); 1259 defsubr (&Suser_uid);
1259 defsubr (&Suser_real_uid); 1260 defsubr (&Suser_real_uid);
1260 defsubr (&Suser_full_name); 1261 defsubr (&Suser_full_name);
1262 defsubr (&Scurrent_time);
1261 defsubr (&Scurrent_time_string); 1263 defsubr (&Scurrent_time_string);
1262 defsubr (&Ssystem_name); 1264 defsubr (&Ssystem_name);
1263 defsubr (&Sset_default_file_mode); 1265 defsubr (&Sset_default_file_mode);