#endif /* not CANNOT_DUMP */
pw = (struct passwd *) getpwuid (getuid ());
+#ifdef MSDOS
+ /* We let the real user name default to "root" because that's quite
+ accurate on MSDOG and because it lets Emacs find the init file.
+ (The DVX libraries override the Djgpp libraries here.) */
+ Vuser_real_name = build_string (pw ? pw->pw_name : "root");
+#else
Vuser_real_name = build_string (pw ? pw->pw_name : "unknown");
+#endif
/* Get the effective user name, by consulting environment variables,
or the effective uid if those are unset. */
p = XSTRING (str);
if (p->size)
- XFASTINT (val) = ((unsigned char *) p->data)[0];
+ XSETFASTINT (val, ((unsigned char *) p->data)[0]);
else
- XFASTINT (val) = 0;
+ XSETFASTINT (val, 0);
return val;
}
\f
()
{
Lisp_Object temp;
- XFASTINT (temp) = point;
+ XSETFASTINT (temp, point);
return temp;
}
()
{
Lisp_Object temp;
- XFASTINT (temp) = Z - BEG;
+ XSETFASTINT (temp, Z - BEG);
return temp;
}
()
{
Lisp_Object temp;
- XFASTINT (temp) = BEGV;
+ XSETFASTINT (temp, BEGV);
return temp;
}
()
{
Lisp_Object temp;
- XFASTINT (temp) = ZV;
+ XSETFASTINT (temp, ZV);
return temp;
}
{
Lisp_Object temp;
if (point >= ZV)
- XFASTINT (temp) = 0;
+ XSETFASTINT (temp, 0);
else
- XFASTINT (temp) = FETCH_CHAR (point);
+ XSETFASTINT (temp, FETCH_CHAR (point));
return temp;
}
{
Lisp_Object temp;
if (point <= BEGV)
- XFASTINT (temp) = 0;
+ XSETFASTINT (temp, 0);
else
- XFASTINT (temp) = FETCH_CHAR (point - 1);
+ XSETFASTINT (temp, FETCH_CHAR (point - 1));
return temp;
}
n = XINT (pos);
if (n < BEGV || n >= ZV) return Qnil;
- XFASTINT (val) = FETCH_CHAR (n);
+ XSETFASTINT (val, FETCH_CHAR (n));
return val;
}
\f
-DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 0, 0,
+DEFUN ("user-login-name", Fuser_login_name, Suser_login_name, 0, 1, 0,
"Return the name under which the user logged in, as a string.\n\
This is based on the effective uid, not the real uid.\n\
Also, if the environment variable LOGNAME or USER is set,\n\
-that determines the value of this function.")
- ()
+that determines the value of this function.\n\n\
+If optional argument UID is an integer, return the login name of the user\n\
+with that uid, or nil if there is no such user.")
+ (uid)
+ Lisp_Object uid;
{
- return Vuser_name;
+ struct passwd *pw;
+
+ /* Set up the user name info if we didn't do it before.
+ (That can happen if Emacs is dumpable
+ but you decide to run `temacs -l loadup' and not dump. */
+ if (INTEGERP (Vuser_name))
+ init_editfns ();
+
+ if (NILP (uid))
+ return Vuser_name;
+
+ CHECK_NUMBER (uid, 0);
+ pw = (struct passwd *) getpwuid (XINT (uid));
+ return (pw ? build_string (pw->pw_name) : Qnil);
}
DEFUN ("user-real-login-name", Fuser_real_login_name, Suser_real_login_name,
`user-login-name' when running under `su'.")
()
{
+ /* Set up the user name info if we didn't do it before.
+ (That can happen if Emacs is dumpable
+ but you decide to run `temacs -l loadup' and not dump. */
+ if (INTEGERP (Vuser_name))
+ init_editfns ();
return Vuser_real_name;
}
Lisp_Object result[3];
EMACS_GET_TIME (t);
- XSET (result[0], Lisp_Int, (EMACS_SECS (t) >> 16) & 0xffff);
- XSET (result[1], Lisp_Int, (EMACS_SECS (t) >> 0) & 0xffff);
- XSET (result[2], Lisp_Int, EMACS_USECS (t));
+ XSETINT (result[0], (EMACS_SECS (t) >> 16) & 0xffff);
+ XSETINT (result[1], (EMACS_SECS (t) >> 0) & 0xffff);
+ XSETINT (result[2], EMACS_USECS (t));
return Flist (3, result);
}
high = Fcar (specified_time);
CHECK_NUMBER (high, 0);
low = Fcdr (specified_time);
- if (XTYPE (low) == Lisp_Cons)
+ if (CONSP (low))
low = Fcar (low);
CHECK_NUMBER (low, 0);
*result = (XINT (high) << 16) + (XINT (low) & 0xffff);
}
}
+DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 2, 2, 0,
+ "Use FORMAT-STRING to format the time TIME.\n\
+TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as from\n\
+`current-time' and `file-attributes'.\n\
+FORMAT-STRING may contain %-sequences to substitute parts of the time.\n\
+%a is replaced by the abbreviated name of the day of week.\n\
+%A is replaced by the full name of the day of week.\n\
+%b is replaced by the abbreviated name of the month.\n\
+%B is replaced by the full name of the month.\n\
+%c is a synonym for \"%x %X\".\n\
+%C is a locale-specific synonym, which defaults to \"%A, %B %e, %Y\" in the C locale.\n\
+%d is replaced by the day of month, zero-padded.\n\
+%D is a synonym for \"%m/%d/%y\".\n\
+%e is replaced by the day of month, blank-padded.\n\
+%h is a synonym for \"%b\".\n\
+%H is replaced by the hour (00-23).\n\
+%I is replaced by the hour (00-12).\n\
+%j is replaced by the day of the year (001-366).\n\
+%k is replaced by the hour (0-23), blank padded.\n\
+%l is replaced by the hour (1-12), blank padded.\n\
+%m is replaced by the month (01-12).\n\
+%M is replaced by the minut (00-59).\n\
+%n is a synonym for \"\\n\".\n\
+%p is replaced by AM or PM, as appropriate.\n\
+%r is a synonym for \"%I:%M:%S %p\".\n\
+%R is a synonym for \"%H:%M\".\n\
+%S is replaced by the seconds (00-60).\n\
+%t is a synonym for \"\\t\".\n\
+%T is a synonym for \"%H:%M:%S\".\n\
+%U is replaced by the week of the year (01-52), first day of week is Sunday.\n\
+%w is replaced by the day of week (0-6), Sunday is day 0.\n\
+%W is replaced by the week of the year (01-52), first day of week is Monday.\n\
+%x is a locale-specific synonym, which defaults to \"%D\" in the C locale.\n\
+%X is a locale-specific synonym, which defaults to \"%T\" in the C locale.\n\
+%y is replaced by the year without century (00-99).\n\
+%Y is replaced by the year with century.\n\
+%Z is replaced by the time zone abbreviation.\n\
+\n\
+The number of options reflects the strftime(3) function.")
+ (format_string, time)
+ Lisp_Object format_string, time;
+{
+ time_t value;
+ int size;
+
+ CHECK_STRING (format_string, 1);
+
+ if (! lisp_time_argument (time, &value))
+ error ("Invalid time specification");
+
+ /* This is probably enough. */
+ size = XSTRING (format_string)->size * 6 + 50;
+
+ while (1)
+ {
+ char *buf = (char *) alloca (size);
+ if (strftime (buf, size, XSTRING (format_string)->data,
+ localtime (&value)))
+ return build_string (buf);
+ /* If buffer was too small, make it bigger. */
+ size *= 2;
+ }
+}
+
DEFUN ("current-time-string", Fcurrent_time_string, Scurrent_time_string, 0, 1, 0,
"Return the current time, as a human-readable string.\n\
Programs can use this function to decode a time,\n\
{
tem = args[argnum];
retry:
- if (XTYPE (tem) == Lisp_Int)
+ if (INTEGERP (tem))
{
str[0] = XINT (tem);
insert (str, 1);
}
- else if (XTYPE (tem) == Lisp_String)
+ else if (STRINGP (tem))
{
insert_from_string (tem, 0, XSTRING (tem)->size, 0);
}
{
tem = args[argnum];
retry:
- if (XTYPE (tem) == Lisp_Int)
+ if (INTEGERP (tem))
{
str[0] = XINT (tem);
insert_and_inherit (str, 1);
}
- else if (XTYPE (tem) == Lisp_String)
+ else if (STRINGP (tem))
{
insert_from_string (tem, 0, XSTRING (tem)->size, 1);
}
{
tem = args[argnum];
retry:
- if (XTYPE (tem) == Lisp_Int)
+ if (INTEGERP (tem))
{
str[0] = XINT (tem);
insert_before_markers (str, 1);
}
- else if (XTYPE (tem) == Lisp_String)
+ else if (STRINGP (tem))
{
insert_from_string_before_markers (tem, 0, XSTRING (tem)->size, 0);
}
{
tem = args[argnum];
retry:
- if (XTYPE (tem) == Lisp_Int)
+ if (INTEGERP (tem))
{
str[0] = XINT (tem);
insert_before_markers_and_inherit (str, 1);
}
- else if (XTYPE (tem) == Lisp_String)
+ else if (STRINGP (tem))
{
insert_from_string_before_markers (tem, 0, XSTRING (tem)->size, 1);
}
}
}
- XFASTINT (z) = cnt;
+ XSETFASTINT (z, cnt);
return (z);
}
(b, e)
register Lisp_Object b, e;
{
- register int i;
+ register EMACS_INT i;
CHECK_NUMBER_COERCE_MARKER (b, 0);
CHECK_NUMBER_COERCE_MARKER (e, 1);
{
i = XFASTINT (b);
b = e;
- XFASTINT (e) = i;
+ XSETFASTINT (e, i);
}
if (!(BEG <= XINT (b) && XINT (b) <= XINT (e) && XINT (e) <= Z))
/* Note: I tried using markers here, but it does not win
because insertion at the end of the saved region
does not advance mh and is considered "outside" the saved region. */
- XFASTINT (bottom) = BEGV - BEG;
- XFASTINT (top) = Z - ZV;
+ XSETFASTINT (bottom, BEGV - BEG);
+ XSETFASTINT (top, Z - ZV);
return Fcons (Fcurrent_buffer (), Fcons (bottom, top));
}
}
}
+DEFUN ("message-box", Fmessage_box, Smessage_box, 1, MANY, 0,
+ "Display a message, in a dialog box if possible.\n\
+If a dialog box is not available, use the echo area.\n\
+The first argument is a control string.\n\
+It may contain %s or %d or %c to print successive following arguments.\n\
+%s means print an argument as a string, %d means print as number in decimal,\n\
+%c means print a number as a single character.\n\
+The argument used by %s must be a string or a symbol;\n\
+the argument used by %d or %c must be a number.\n\
+If the first argument is nil, clear any existing message; let the\n\
+minibuffer contents show.")
+ (nargs, args)
+ int nargs;
+ Lisp_Object *args;
+{
+ if (NILP (args[0]))
+ {
+ message (0);
+ return Qnil;
+ }
+ else
+ {
+ register Lisp_Object val;
+ val = Fformat (nargs, args);
+#ifdef HAVE_X_MENU
+ {
+ Lisp_Object pane, menu, obj;
+ struct gcpro gcpro1;
+ pane = Fcons (Fcons (build_string ("OK"), Qt), Qnil);
+ GCPRO1 (pane);
+ menu = Fcons (val, pane);
+ obj = Fx_popup_dialog (Qt, menu);
+ UNGCPRO;
+ return val;
+ }
+#else
+ /* Copy the data so that it won't move when we GC. */
+ if (! message_text)
+ {
+ message_text = (char *)xmalloc (80);
+ message_length = 80;
+ }
+ if (XSTRING (val)->size > message_length)
+ {
+ message_length = XSTRING (val)->size;
+ message_text = (char *)xrealloc (message_text, message_length);
+ }
+ bcopy (XSTRING (val)->data, message_text, XSTRING (val)->size);
+ message2 (message_text, XSTRING (val)->size);
+ return val;
+#endif
+ }
+}
+#ifdef HAVE_X_MENU
+extern Lisp_Object last_nonmenu_event;
+#endif
+DEFUN ("message-or-box", Fmessage_or_box, Smessage_or_box, 1, MANY, 0,
+ "Display a message in a dialog box or in the echo area.\n\
+If this command was invoked with the mouse, use a dialog box.\n\
+Otherwise, use the echo area.\n\
+\n\
+The first argument is a control string.\n\
+It may contain %s or %d or %c to print successive following arguments.\n\
+%s means print an argument as a string, %d means print as number in decimal,\n\
+%c means print a number as a single character.\n\
+The argument used by %s must be a string or a symbol;\n\
+the argument used by %d or %c must be a number.\n\
+If the first argument is nil, clear any existing message; let the\n\
+minibuffer contents show.")
+ (nargs, args)
+ int nargs;
+ Lisp_Object *args;
+{
+#ifdef HAVE_X_MENU
+ if (NILP (last_nonmenu_event) || CONSP (last_nonmenu_event))
+ return Fmessage_box (nargs, args);
+#endif
+ return Fmessage (nargs, args);
+}
+
DEFUN ("format", Fformat, Sformat, 1, MANY, 0,
"Format a string out of a control-string and arguments.\n\
The first argument is a control string.\n\
args[n] = tem;
goto string;
}
- else if (XTYPE (args[n]) == Lisp_Symbol)
+ else if (SYMBOLP (args[n]))
{
- XSET (args[n], Lisp_String, XSYMBOL (args[n])->name);
+ XSETSTRING (args[n], XSYMBOL (args[n])->name);
goto string;
}
- else if (XTYPE (args[n]) == Lisp_String)
+ else if (STRINGP (args[n]))
{
string:
if (*format != 's' && *format != 'S')
total += XSTRING (args[n])->size;
}
/* Would get MPV otherwise, since Lisp_Int's `point' to low memory. */
- else if (XTYPE (args[n]) == Lisp_Int && *format != 's')
+ else if (INTEGERP (args[n]) && *format != 's')
{
#ifdef LISP_FLOAT_TYPE
/* The following loop assumes the Lisp type indicates
total += 10;
}
#ifdef LISP_FLOAT_TYPE
- else if (XTYPE (args[n]) == Lisp_Float && *format != 's')
+ else if (FLOATP (args[n]) && *format != 's')
{
if (! (*format == 'e' || *format == 'f' || *format == 'g'))
args[n] = Ftruncate (args[n]);
{
if (n >= nargs)
strings[i++] = (unsigned char *) "";
- else if (XTYPE (args[n]) == Lisp_Int)
+ else if (INTEGERP (args[n]))
/* We checked above that the corresponding format effector
isn't %s, which would cause MPV. */
strings[i++] = (unsigned char *) XINT (args[n]);
#ifdef LISP_FLOAT_TYPE
- else if (XTYPE (args[n]) == Lisp_Float)
+ else if (FLOATP (args[n]))
{
union { double d; int half[2]; } u;
Lisp_Object
#ifdef NO_ARG_ARRAY
format1 (string1, arg0, arg1, arg2, arg3, arg4)
- int arg0, arg1, arg2, arg3, arg4;
+ EMACS_INT arg0, arg1, arg2, arg3, arg4;
#else
format1 (string1)
#endif
{
char buf[100];
#ifdef NO_ARG_ARRAY
- int args[5];
+ EMACS_INT args[5];
args[0] = arg0;
args[1] = arg1;
args[2] = arg2;
void
syms_of_editfns ()
{
- staticpro (&Vuser_name);
- staticpro (&Vuser_full_name);
- staticpro (&Vuser_real_name);
- staticpro (&Vsystem_name);
+ DEFVAR_LISP ("system-name", &Vsystem_name,
+ "The name of the machine Emacs is running on.");
+
+ DEFVAR_LISP ("user-full-name", &Vuser_full_name,
+ "The full name of the user logged in.");
+
+ DEFVAR_LISP ("user-name", &Vuser_name,
+ "The user's name, taken from environment variables if possible.");
+
+ DEFVAR_LISP ("user-real-name", &Vuser_real_name,
+ "The user's name, based upon the real uid only.");
defsubr (&Schar_equal);
defsubr (&Sgoto_char);
defsubr (&Suser_full_name);
defsubr (&Semacs_pid);
defsubr (&Scurrent_time);
+ defsubr (&Sformat_time_string);
defsubr (&Scurrent_time_string);
defsubr (&Scurrent_time_zone);
defsubr (&Ssystem_name);
defsubr (&Smessage);
+ defsubr (&Smessage_box);
+ defsubr (&Smessage_or_box);
defsubr (&Sformat);
defsubr (&Sinsert_buffer_substring);
HCoop / bpt / emacs.git / blobdiff