/* Lisp functions pertaining to editing.
- Copyright (C) 1985,86,87,89,93,94 Free Software Foundation, Inc.
+ Copyright (C) 1985,86,87,89,93,94,95 Free Software Foundation, Inc.
This file is part of GNU Emacs.
GNU Emacs is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 1, or (at your option)
+the Free Software Foundation; either version 2, or (at your option)
any later version.
GNU Emacs is distributed in the hope that it will be useful,
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA. */
#include <sys/types.h>
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
+extern char **environ;
+extern Lisp_Object make_time ();
+extern void insert_from_buffer ();
+static long difftm ();
+static void update_buffer_properties ();
+void set_time_zone_rule ();
+
+Lisp_Object Vbuffer_access_fontify_functions;
+Lisp_Object Qbuffer_access_fontify_functions;
+Lisp_Object Vbuffer_access_fontified_property;
+
/* Some static data, and a function to initialize it for each run */
Lisp_Object Vsystem_name;
-Lisp_Object Vuser_real_name; /* login name of current user ID */
-Lisp_Object Vuser_full_name; /* full name of current user */
-Lisp_Object Vuser_name; /* user name from LOGNAME or USER */
+Lisp_Object Vuser_real_login_name; /* login name of current user ID */
+Lisp_Object Vuser_full_name; /* full name of current user */
+Lisp_Object Vuser_login_name; /* user name from LOGNAME or USER */
void
init_editfns ()
Lisp_Object tem;
/* Set up system_name even when dumping. */
-
- Vsystem_name = build_string (get_system_name ());
- p = XSTRING (Vsystem_name)->data;
- while (*p)
- {
- if (*p == ' ' || *p == '\t')
- *p = '-';
- p++;
- }
+ init_system_name ();
#ifndef CANNOT_DUMP
/* Don't bother with this on initial start when just dumping out */
#endif /* not CANNOT_DUMP */
pw = (struct passwd *) getpwuid (getuid ());
- Vuser_real_name = build_string (pw ? pw->pw_name : "unknown");
+#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_login_name = build_string (pw ? pw->pw_name : "root");
+#else
+ Vuser_real_login_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. */
user_name = (char *) getenv ("LOGNAME");
if (!user_name)
+#ifdef WINDOWSNT
+ user_name = (char *) getenv ("USERNAME"); /* it's USERNAME on NT */
+#else /* WINDOWSNT */
user_name = (char *) getenv ("USER");
+#endif /* WINDOWSNT */
if (!user_name)
{
pw = (struct passwd *) getpwuid (geteuid ());
user_name = (char *) (pw ? pw->pw_name : "unknown");
}
- Vuser_name = build_string (user_name);
+ Vuser_login_name = build_string (user_name);
/* If the user name claimed in the environment vars differs from
the real uid, use the claimed name to find the full name. */
- tem = Fstring_equal (Vuser_name, Vuser_real_name);
+ tem = Fstring_equal (Vuser_login_name, Vuser_real_login_name);
if (NILP (tem))
- pw = (struct passwd *) getpwnam (XSTRING (Vuser_name)->data);
+ pw = (struct passwd *) getpwnam (XSTRING (Vuser_login_name)->data);
p = (unsigned char *) (pw ? USER_FULL_NAME : "unknown");
q = (unsigned char *) index (p, ',');
#ifdef AMPERSAND_FULL_NAME
p = XSTRING (Vuser_full_name)->data;
- q = (char *) index (p, '&');
+ q = (unsigned char *) index (p, '&');
/* Substitute the login name for the &, upcasing the first character. */
if (q)
{
- r = (char *) alloca (strlen (p) + XSTRING (Vuser_name)->size + 1);
+ r = (unsigned char *) alloca (strlen (p)
+ + XSTRING (Vuser_login_name)->size + 1);
bcopy (p, r, q - p);
r[q - p] = 0;
- strcat (r, XSTRING (Vuser_name)->data);
+ strcat (r, XSTRING (Vuser_login_name)->data);
r[q - p] = UPCASE (r[q - p]);
strcat (r, q + 1);
Vuser_full_name = build_string (r);
}
#endif /* AMPERSAND_FULL_NAME */
+
+ p = (unsigned char *) getenv ("NAME");
+ if (p)
+ Vuser_full_name = build_string (p);
}
\f
DEFUN ("char-to-string", Fchar_to_string, Schar_to_string, 1, 1, 0,
- "Convert arg CHAR to a one-character string containing that character.")
- (n)
- Lisp_Object n;
+ "Convert arg CHARACTER to a one-character string containing that character.")
+ (character)
+ Lisp_Object character;
{
char c;
- CHECK_NUMBER (n, 0);
+ CHECK_NUMBER (character, 0);
- c = XINT (n);
+ c = XINT (character);
return make_string (&c, 1);
}
DEFUN ("string-to-char", Fstring_to_char, Sstring_to_char, 1, 1, 0,
"Convert arg STRING to a character, the first character of that string.")
- (str)
- register Lisp_Object str;
+ (string)
+ register Lisp_Object string;
{
register Lisp_Object val;
register struct Lisp_String *p;
- CHECK_STRING (str, 0);
+ CHECK_STRING (string, 0);
- p = XSTRING (str);
+ p = XSTRING (string);
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;
}
DEFUN ("goto-char", Fgoto_char, Sgoto_char, 1, 1, "NGoto char: ",
"Set point to POSITION, a number or marker.\n\
Beginning of buffer is position (point-min), end is (point-max).")
- (n)
- register Lisp_Object n;
+ (position)
+ register Lisp_Object position;
{
- CHECK_NUMBER_COERCE_MARKER (n, 0);
+ CHECK_NUMBER_COERCE_MARKER (position, 0);
- SET_PT (clip_to_bounds (BEGV, XINT (n), ZV));
- return n;
+ SET_PT (clip_to_bounds (BEGV, XINT (position), ZV));
+ return position;
}
static Lisp_Object
return (region_limit (0));
}
-#if 0 /* now in lisp code */
-DEFUN ("mark", Fmark, Smark, 0, 0, 0,
- "Return this buffer's mark value as integer, or nil if no mark.\n\
-If you are using this in an editing command, you are most likely making\n\
-a mistake; see the documentation of `set-mark'.")
- ()
-{
- return Fmarker_position (current_buffer->mark);
-}
-#endif /* commented out code */
-
DEFUN ("mark-marker", Fmark_marker, Smark_marker, 0, 0, 0,
"Return this buffer's mark, as a marker object.\n\
Watch out! Moving this marker changes the mark position.\n\
return current_buffer->mark;
}
-#if 0 /* this is now in lisp code */
-DEFUN ("set-mark", Fset_mark, Sset_mark, 1, 1, 0,
- "Set this buffer's mark to POS. Don't use this function!\n\
-That is to say, don't use this function unless you want\n\
-the user to see that the mark has moved, and you want the previous\n\
-mark position to be lost.\n\
-\n\
-Normally, when a new mark is set, the old one should go on the stack.\n\
-This is why most applications should use push-mark, not set-mark.\n\
-\n\
-Novice programmers often try to use the mark for the wrong purposes.\n\
-The mark saves a location for the user's convenience.\n\
-Most editing commands should not alter the mark.\n\
-To remember a location for internal use in the Lisp program,\n\
-store it in a Lisp variable. Example:\n\
-\n\
- (let ((beg (point))) (forward-line 1) (delete-region beg (point))).")
- (pos)
- Lisp_Object pos;
-{
- if (NILP (pos))
- {
- current_buffer->mark = Qnil;
- return Qnil;
- }
- CHECK_NUMBER_COERCE_MARKER (pos, 0);
-
- if (NILP (current_buffer->mark))
- current_buffer->mark = Fmake_marker ();
-
- Fset_marker (current_buffer->mark, pos, Qnil);
- return pos;
-}
-#endif /* commented-out code */
-
Lisp_Object
save_excursion_save ()
{
== current_buffer);
return Fcons (Fpoint_marker (),
- Fcons (Fcopy_marker (current_buffer->mark),
+ Fcons (Fcopy_marker (current_buffer->mark, Qnil),
Fcons (visible ? Qt : Qnil,
current_buffer->mark_active)));
}
Lisp_Object
save_excursion_restore (info)
- register Lisp_Object info;
+ Lisp_Object info;
{
- register Lisp_Object tem, tem1, omark, nmark;
+ Lisp_Object tem, tem1, omark, nmark;
+ struct gcpro gcpro1, gcpro2, gcpro3;
tem = Fmarker_buffer (Fcar (info));
/* If buffer being returned to is now deleted, avoid error */
/* In that case, Fmarker_buffer returns nil now. */
if (NILP (tem))
return Qnil;
+
+ omark = nmark = Qnil;
+ GCPRO3 (info, omark, nmark);
+
Fset_buffer (tem);
tem = Fcar (info);
Fgoto_char (tem);
else if (! NILP (tem1))
call1 (Vrun_hooks, intern ("deactivate-mark-hook"));
}
+ UNGCPRO;
return Qnil;
}
()
{
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_login_name))
+ init_editfns ();
+
+ if (NILP (uid))
+ return Vuser_login_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'.")
()
{
- return Vuser_real_name;
+ /* 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_login_name))
+ init_editfns ();
+ return Vuser_real_login_name;
}
DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0,
return Vsystem_name;
}
+/* For the benefit of callers who don't want to include lisp.h */
+char *
+get_system_name ()
+{
+ return (char *) XSTRING (Vsystem_name)->data;
+}
+
DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,
"Return the process ID of Emacs, as an integer.")
()
}
DEFUN ("current-time", Fcurrent_time, Scurrent_time, 0, 0, 0,
- "Return the current time, as the number of seconds since 12:00 AM January 1970.\n\
+ "Return the current time, as the number of seconds since 1970-01-01 00:00:00.\n\
The time is returned as a list of three integers. The first has the\n\
most significant 16 bits of the seconds, while the second has the\n\
least significant 16 bits. The third integer gives the microsecond\n\
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, 1, 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 stands for the preferred date/time format of 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 minute (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 second (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 (00-53), 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 (00-53), 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' 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);
+ *buf = 1;
+ if (emacs_strftime (buf, size, XSTRING (format_string)->data,
+ localtime (&value))
+ || !*buf)
+ return build_string (buf);
+ /* If buffer was too small, make it bigger. */
+ size *= 2;
+ }
+}
+
+DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0,
+ "Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST ZONE).\n\
+The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED)\n\
+or (HIGH . LOW), as from `current-time' and `file-attributes', or `nil'\n\
+to use the current time. The list has the following nine members:\n\
+SEC is an integer between 0 and 60; SEC is 60 for a leap second, which\n\
+only some operating systems support. MINUTE is an integer between 0 and 59.\n\
+HOUR is an integer between 0 and 23. DAY is an integer between 1 and 31.\n\
+MONTH is an integer between 1 and 12. YEAR is an integer indicating the\n\
+four-digit year. DOW is the day of week, an integer between 0 and 6, where\n\
+0 is Sunday. DST is t if daylight savings time is effect, otherwise nil.\n\
+ZONE is an integer indicating the number of seconds east of Greenwich.\n\
+\(Note that Common Lisp has different meanings for DOW and ZONE.)")
+ (specified_time)
+ Lisp_Object specified_time;
+{
+ time_t time_spec;
+ struct tm save_tm;
+ struct tm *decoded_time;
+ Lisp_Object list_args[9];
+
+ if (! lisp_time_argument (specified_time, &time_spec))
+ error ("Invalid time specification");
+
+ decoded_time = localtime (&time_spec);
+ XSETFASTINT (list_args[0], decoded_time->tm_sec);
+ XSETFASTINT (list_args[1], decoded_time->tm_min);
+ XSETFASTINT (list_args[2], decoded_time->tm_hour);
+ XSETFASTINT (list_args[3], decoded_time->tm_mday);
+ XSETFASTINT (list_args[4], decoded_time->tm_mon + 1);
+ XSETINT (list_args[5], decoded_time->tm_year + 1900);
+ XSETFASTINT (list_args[6], decoded_time->tm_wday);
+ list_args[7] = (decoded_time->tm_isdst)? Qt : Qnil;
+
+ /* Make a copy, in case gmtime modifies the struct. */
+ save_tm = *decoded_time;
+ decoded_time = gmtime (&time_spec);
+ if (decoded_time == 0)
+ list_args[8] = Qnil;
+ else
+ XSETINT (list_args[8], difftm (&save_tm, decoded_time));
+ return Flist (9, list_args);
+}
+
+DEFUN ("encode-time", Fencode_time, Sencode_time, 6, MANY, 0,
+ "Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.\n\
+This is the reverse operation of `decode-time', which see.\n\
+ZONE defaults to the current time zone rule. This can\n\
+be a string or t (as from `set-time-zone-rule'), or it can be a list\n\
+(as from `current-time-zone') or an integer (as from `decode-time')\n\
+applied without consideration for daylight savings time.\n\
+\n\
+You can pass more than 7 arguments; then the first six arguments\n\
+are used as SECOND through YEAR, and the *last* argument is used as ZONE.\n\
+The intervening arguments are ignored.\n\
+This feature lets (apply 'encode-time (decode-time ...)) work.\n\
+\n\
+Out-of-range values for SEC, MINUTE, HOUR, DAY, or MONTH are allowed;\n\
+for example, a DAY of 0 means the day preceding the given month.\n\
+Year numbers less than 100 are treated just like other year numbers.\n\
+If you want them to stand for years in this century, you must do that yourself.")
+ (nargs, args)
+ int nargs;
+ register Lisp_Object *args;
+{
+ time_t time;
+ struct tm tm;
+ Lisp_Object zone = (nargs > 6)? args[nargs - 1] : Qnil;
+
+ CHECK_NUMBER (args[0], 0); /* second */
+ CHECK_NUMBER (args[1], 1); /* minute */
+ CHECK_NUMBER (args[2], 2); /* hour */
+ CHECK_NUMBER (args[3], 3); /* day */
+ CHECK_NUMBER (args[4], 4); /* month */
+ CHECK_NUMBER (args[5], 5); /* year */
+
+ tm.tm_sec = XINT (args[0]);
+ tm.tm_min = XINT (args[1]);
+ tm.tm_hour = XINT (args[2]);
+ tm.tm_mday = XINT (args[3]);
+ tm.tm_mon = XINT (args[4]) - 1;
+ tm.tm_year = XINT (args[5]) - 1900;
+ tm.tm_isdst = -1;
+
+ if (CONSP (zone))
+ zone = Fcar (zone);
+ if (NILP (zone))
+ time = mktime (&tm);
+ else
+ {
+ char tzbuf[100];
+ char *tzstring;
+ char **oldenv = environ, **newenv;
+
+ if (zone == Qt)
+ tzstring = "UTC0";
+ else if (STRINGP (zone))
+ tzstring = (char *) XSTRING (zone)->data;
+ else if (INTEGERP (zone))
+ {
+ int abszone = abs (XINT (zone));
+ sprintf (tzbuf, "XXX%s%d:%02d:%02d", "-" + (XINT (zone) < 0),
+ abszone / (60*60), (abszone/60) % 60, abszone % 60);
+ tzstring = tzbuf;
+#ifdef _NEXT_SOURCE
+ /* On NEXTSTEP, timezone environment var is ignored. */
+ tm.tm_gmtoff = -abszone;
+#endif
+ }
+ else
+ error ("Invalid time zone specification");
+
+ /* Set TZ before calling mktime; merely adjusting mktime's returned
+ value doesn't suffice, since that would mishandle leap seconds. */
+ set_time_zone_rule (tzstring);
+
+ time = mktime (&tm);
+
+ /* Restore TZ to previous value. */
+ newenv = environ;
+ environ = oldenv;
+ free (newenv);
+#ifdef LOCALTIME_CACHE
+ tzset ();
+#endif
+ }
+
+ if (time == (time_t) -1)
+ error ("Specified time is not representable");
+
+ return make_time (time);
+}
+
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\
{
int ay = a->tm_year + (TM_YEAR_ORIGIN - 1);
int by = b->tm_year + (TM_YEAR_ORIGIN - 1);
+ /* Divide years by 100, rounding towards minus infinity. */
+ int ac = ay / 100 - (ay % 100 < 0);
+ int bc = by / 100 - (by % 100 < 0);
/* Some compilers can't handle this as a single return statement. */
- int days = (
+ long days = (
/* difference in day of year */
a->tm_yday - b->tm_yday
/* + intervening leap days */
+ ((ay >> 2) - (by >> 2))
- - (ay/100 - by/100)
- + ((ay/100 >> 2) - (by/100 >> 2))
+ - (ac - bc)
+ + ((ac >> 2) - (bc >> 2))
/* + difference in years * 365 */
+ (long)(ay-by) * 365
);
return Fmake_list (2, Qnil);
}
+/* This holds the value of `environ' produced by the previous
+ call to Fset_time_zone_rule, or 0 if Fset_time_zone_rule
+ has never been called. */
+static char **environbuf;
+
+DEFUN ("set-time-zone-rule", Fset_time_zone_rule, Sset_time_zone_rule, 1, 1, 0,
+ "Set the local time zone using TZ, a string specifying a time zone rule.\n\
+If TZ is nil, use implementation-defined default time zone information.\n\
+If TZ is t, use Universal Time.")
+ (tz)
+ Lisp_Object tz;
+{
+ char *tzstring;
+
+ if (NILP (tz))
+ tzstring = 0;
+ else if (tz == Qt)
+ tzstring = "UTC0";
+ else
+ {
+ CHECK_STRING (tz, 0);
+ tzstring = (char *) XSTRING (tz)->data;
+ }
+
+ set_time_zone_rule (tzstring);
+ if (environbuf)
+ free (environbuf);
+ environbuf = environ;
+
+ return Qnil;
+}
+
+/* These two values are known to load tz files in buggy implementations.
+ Their values shouldn't matter in non-buggy implementations.
+ We don't use string literals for these strings,
+ since if a string in the environment is in readonly
+ storage, it runs afoul of bugs in SVR4 and Solaris 2.3.
+ See Sun bugs 1113095 and 1114114, ``Timezone routines
+ improperly modify environment''. */
+
+static char set_time_zone_rule_tz1[] = "TZ=GMT0";
+static char set_time_zone_rule_tz2[] = "TZ=GMT1";
+
+/* Set the local time zone rule to TZSTRING.
+ This allocates memory into `environ', which it is the caller's
+ responsibility to free. */
+void
+set_time_zone_rule (tzstring)
+ char *tzstring;
+{
+ int envptrs;
+ char **from, **to, **newenv;
+
+ /* Make the ENVIRON vector longer with room for TZSTRING. */
+ for (from = environ; *from; from++)
+ continue;
+ envptrs = from - environ + 2;
+ newenv = to = (char **) xmalloc (envptrs * sizeof (char *)
+ + (tzstring ? strlen (tzstring) + 4 : 0));
+
+ /* Add TZSTRING to the end of environ, as a value for TZ. */
+ if (tzstring)
+ {
+ char *t = (char *) (to + envptrs);
+ strcpy (t, "TZ=");
+ strcat (t, tzstring);
+ *to++ = t;
+ }
+
+ /* Copy the old environ vector elements into NEWENV,
+ but don't copy the TZ variable.
+ So we have only one definition of TZ, which came from TZSTRING. */
+ for (from = environ; *from; from++)
+ if (strncmp (*from, "TZ=", 3) != 0)
+ *to++ = *from;
+ *to = 0;
+
+ environ = newenv;
+
+ /* If we do have a TZSTRING, NEWENV points to the vector slot where
+ the TZ variable is stored. If we do not have a TZSTRING,
+ TO points to the vector slot which has the terminating null. */
+
+#ifdef LOCALTIME_CACHE
+ {
+ /* In SunOS 4.1.3_U1 and 4.1.4, if TZ has a value like
+ "US/Pacific" that loads a tz file, then changes to a value like
+ "XXX0" that does not load a tz file, and then changes back to
+ its original value, the last change is (incorrectly) ignored.
+ Also, if TZ changes twice in succession to values that do
+ not load a tz file, tzset can dump core (see Sun bug#1225179).
+ The following code works around these bugs. */
+
+ if (tzstring)
+ {
+ /* Temporarily set TZ to a value that loads a tz file
+ and that differs from tzstring. */
+ char *tz = *newenv;
+ *newenv = (strcmp (tzstring, set_time_zone_rule_tz1 + 3) == 0
+ ? set_time_zone_rule_tz2 : set_time_zone_rule_tz1);
+ tzset ();
+ *newenv = tz;
+ }
+ else
+ {
+ /* The implied tzstring is unknown, so temporarily set TZ to
+ two different values that each load a tz file. */
+ *to = set_time_zone_rule_tz1;
+ to[1] = 0;
+ tzset ();
+ *to = set_time_zone_rule_tz2;
+ tzset ();
+ *to = 0;
+ }
+
+ /* Now TZ has the desired value, and tzset can be invoked safely. */
+ }
+
+ tzset ();
+#endif
+}
\f
void
insert1 (arg)
{
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 (str, 1);
+ 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 (str, 1);
+ 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);
}
return Qnil;
}
\f
-DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 2, 0,
- "Insert COUNT (second arg) copies of CHAR (first arg).\n\
+DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0,
+ "Insert COUNT (second arg) copies of CHARACTER (first arg).\n\
Point and all markers are affected as in the function `insert'.\n\
-Both arguments are required.")
- (chr, count)
- Lisp_Object chr, count;
+Both arguments are required.\n\
+The optional third arg INHERIT, if non-nil, says to inherit text properties\n\
+from adjoining text, if those properties are sticky.")
+ (character, count, inherit)
+ Lisp_Object character, count, inherit;
{
register unsigned char *string;
register int strlen;
register int i, n;
- CHECK_NUMBER (chr, 0);
+ CHECK_NUMBER (character, 0);
CHECK_NUMBER (count, 1);
n = XINT (count);
strlen = min (n, 256);
string = (unsigned char *) alloca (strlen);
for (i = 0; i < strlen; i++)
- string[i] = XFASTINT (chr);
+ string[i] = XFASTINT (character);
while (n >= strlen)
{
- insert (string, strlen);
+ if (!NILP (inherit))
+ insert_and_inherit (string, strlen);
+ else
+ insert (string, strlen);
n -= strlen;
}
if (n > 0)
- insert (string, n);
+ {
+ if (!NILP (inherit))
+ insert_and_inherit (string, n);
+ else
+ insert (string, n);
+ }
return Qnil;
}
/* Return a Lisp_String containing the text of the current buffer from
START to END. If text properties are in use and the current buffer
has properties in the range specified, the resulting string will also
- have them.
+ have them, if PROPS is nonzero.
We don't want to use plain old make_string here, because it calls
make_uninit_string, which can cause the buffer arena to be
buffer substrings. */
Lisp_Object
-make_buffer_string (start, end)
+make_buffer_string (start, end, props)
int start, end;
+ int props;
{
Lisp_Object result, tem, tem1;
result = make_uninit_string (end - start);
bcopy (&FETCH_CHAR (start), XSTRING (result)->data, end - start);
- tem = Fnext_property_change (make_number (start), Qnil, make_number (end));
- tem1 = Ftext_properties_at (make_number (start), Qnil);
-
+ /* If desired, update and copy the text properties. */
#ifdef USE_TEXT_PROPERTIES
- if (XINT (tem) != end || !NILP (tem1))
- copy_intervals_to_string (result, current_buffer, start, end - start);
+ if (props)
+ {
+ update_buffer_properties (start, end);
+
+ tem = Fnext_property_change (make_number (start), Qnil, make_number (end));
+ tem1 = Ftext_properties_at (make_number (start), Qnil);
+
+ if (XINT (tem) != end || !NILP (tem1))
+ copy_intervals_to_string (result, current_buffer, start, end - start);
+ }
#endif
return result;
}
+/* Call Vbuffer_access_fontify_functions for the range START ... END
+ in the current buffer, if necessary. */
+
+static void
+update_buffer_properties (start, end)
+ int start, end;
+{
+#ifdef USE_TEXT_PROPERTIES
+ /* If this buffer has some access functions,
+ call them, specifying the range of the buffer being accessed. */
+ if (!NILP (Vbuffer_access_fontify_functions))
+ {
+ Lisp_Object args[3];
+ Lisp_Object tem;
+
+ args[0] = Qbuffer_access_fontify_functions;
+ XSETINT (args[1], start);
+ XSETINT (args[2], end);
+
+ /* But don't call them if we can tell that the work
+ has already been done. */
+ if (!NILP (Vbuffer_access_fontified_property))
+ {
+ tem = Ftext_property_any (args[1], args[2],
+ Vbuffer_access_fontified_property,
+ Qnil, Qnil);
+ if (! NILP (tem))
+ Frun_hook_with_args (3, args);
+ }
+ else
+ Frun_hook_with_args (3, args);
+ }
+#endif
+}
+
DEFUN ("buffer-substring", Fbuffer_substring, Sbuffer_substring, 2, 2, 0,
"Return the contents of part of the current buffer as a string.\n\
The two arguments START and END are character positions;\n\
they can be in either order.")
- (b, e)
- Lisp_Object b, e;
+ (start, end)
+ Lisp_Object start, end;
{
- register int beg, end;
+ register int b, e;
- validate_region (&b, &e);
- beg = XINT (b);
- end = XINT (e);
+ validate_region (&start, &end);
+ b = XINT (start);
+ e = XINT (end);
- return make_buffer_string (beg, end);
+ return make_buffer_string (b, e, 1);
+}
+
+DEFUN ("buffer-substring-no-properties", Fbuffer_substring_no_properties,
+ Sbuffer_substring_no_properties, 2, 2, 0,
+ "Return the characters of part of the buffer, without the text properties.\n\
+The two arguments START and END are character positions;\n\
+they can be in either order.")
+ (start, end)
+ Lisp_Object start, end;
+{
+ register int b, e;
+
+ validate_region (&start, &end);
+ b = XINT (start);
+ e = XINT (end);
+
+ return make_buffer_string (b, e, 0);
}
DEFUN ("buffer-string", Fbuffer_string, Sbuffer_string, 0, 0, 0,
- "Return the contents of the current buffer as a string.")
+ "Return the contents of the current buffer as a string.\n\
+If narrowing is in effect, this function returns only the visible part\n\
+of the buffer.")
()
{
- return make_buffer_string (BEGV, ZV);
+ return make_buffer_string (BEGV, ZV, 1);
}
DEFUN ("insert-buffer-substring", Finsert_buffer_substring, Sinsert_buffer_substring,
BUFFER may be a buffer or a buffer name.\n\
Arguments START and END are character numbers specifying the substring.\n\
They default to the beginning and the end of BUFFER.")
- (buf, b, e)
- Lisp_Object buf, b, e;
+ (buf, start, end)
+ Lisp_Object buf, start, end;
{
- register int beg, end, temp, len, opoint, start;
- register struct buffer *bp;
+ register int b, e, temp;
+ register struct buffer *bp, *obuf;
Lisp_Object buffer;
buffer = Fget_buffer (buf);
nsberror (buf);
bp = XBUFFER (buffer);
- if (NILP (b))
- beg = BUF_BEGV (bp);
+ if (NILP (start))
+ b = BUF_BEGV (bp);
else
{
- CHECK_NUMBER_COERCE_MARKER (b, 0);
- beg = XINT (b);
+ CHECK_NUMBER_COERCE_MARKER (start, 0);
+ b = XINT (start);
}
- if (NILP (e))
- end = BUF_ZV (bp);
+ if (NILP (end))
+ e = BUF_ZV (bp);
else
{
- CHECK_NUMBER_COERCE_MARKER (e, 1);
- end = XINT (e);
+ CHECK_NUMBER_COERCE_MARKER (end, 1);
+ e = XINT (end);
}
- if (beg > end)
- temp = beg, beg = end, end = temp;
-
- /* Move the gap or create enough gap in the current buffer. */
+ if (b > e)
+ temp = b, b = e, e = temp;
- if (point != GPT)
- move_gap (point);
- if (GAP_SIZE < end - beg)
- make_gap (end - beg - GAP_SIZE);
+ if (!(BUF_BEGV (bp) <= b && e <= BUF_ZV (bp)))
+ args_out_of_range (start, end);
- len = end - beg;
- start = beg;
- opoint = point;
-
- if (!(BUF_BEGV (bp) <= beg
- && beg <= end
- && end <= BUF_ZV (bp)))
- args_out_of_range (b, e);
-
- /* Now the actual insertion will not do any gap motion,
- so it matters not if BUF is the current buffer. */
- if (beg < BUF_GPT (bp))
- {
- insert (BUF_CHAR_ADDRESS (bp, beg), min (end, BUF_GPT (bp)) - beg);
- beg = min (end, BUF_GPT (bp));
- }
- if (beg < end)
- insert (BUF_CHAR_ADDRESS (bp, beg), end - beg);
-
- /* Only defined if Emacs is compiled with USE_TEXT_PROPERTIES */
- graft_intervals_into_buffer (copy_intervals (bp->intervals, start, len),
- opoint, len, current_buffer, 0);
+ obuf = current_buffer;
+ set_buffer_internal_1 (bp);
+ update_buffer_properties (b, e);
+ set_buffer_internal_1 (obuf);
+ insert_from_buffer (bp, b, e - b, 0);
return Qnil;
}
{
register int begp1, endp1, begp2, endp2, temp, len1, len2, length, i;
register struct buffer *bp1, *bp2;
- register unsigned char *trt
+ register Lisp_Object *trt
= (!NILP (current_buffer->case_fold_search)
- ? XSTRING (current_buffer->case_canon_table)->data : 0);
+ ? XCHAR_TABLE (current_buffer->case_canon_table)->contents : 0);
/* Find the first buffer and its substring. */
buf2 = Fget_buffer (buffer2);
if (NILP (buf2))
nsberror (buffer2);
- bp2 = XBUFFER (buffer2);
+ bp2 = XBUFFER (buf2);
}
if (NILP (start2))
return make_number (0);
}
\f
+static Lisp_Object
+subst_char_in_region_unwind (arg)
+ Lisp_Object arg;
+{
+ return current_buffer->undo_list = arg;
+}
+
+static Lisp_Object
+subst_char_in_region_unwind_1 (arg)
+ Lisp_Object arg;
+{
+ return current_buffer->filename = arg;
+}
+
DEFUN ("subst-char-in-region", Fsubst_char_in_region,
Ssubst_char_in_region, 4, 5, 0,
"From START to END, replace FROMCHAR with TOCHAR each time it occurs.\n\
{
register int pos, stop, look;
int changed = 0;
+ int count = specpdl_ptr - specpdl;
validate_region (&start, &end);
CHECK_NUMBER (fromchar, 2);
stop = XINT (end);
look = XINT (fromchar);
+ /* If we don't want undo, turn off putting stuff on the list.
+ That's faster than getting rid of things,
+ and it prevents even the entry for a first change.
+ Also inhibit locking the file. */
+ if (!NILP (noundo))
+ {
+ record_unwind_protect (subst_char_in_region_unwind,
+ current_buffer->undo_list);
+ current_buffer->undo_list = Qt;
+ /* Don't do file-locking. */
+ record_unwind_protect (subst_char_in_region_unwind_1,
+ current_buffer->filename);
+ current_buffer->filename = Qnil;
+ }
+
while (pos < stop)
{
if (FETCH_CHAR (pos) == look)
if (! NILP (noundo))
{
- if (MODIFF - 1 == current_buffer->save_modified)
- current_buffer->save_modified++;
+ if (MODIFF - 1 == SAVE_MODIFF)
+ SAVE_MODIFF++;
if (MODIFF - 1 == current_buffer->auto_save_modified)
current_buffer->auto_save_modified++;
}
signal_after_change (XINT (start),
stop - XINT (start), stop - XINT (start));
+ unbind_to (count, Qnil);
return Qnil;
}
}
}
- XFASTINT (z) = cnt;
+ XSETFASTINT (z, cnt);
return (z);
}
"Delete the text between point and mark.\n\
When called from a program, expects two arguments,\n\
positions (integers or markers) specifying the stretch to be deleted.")
- (b, e)
- Lisp_Object b, e;
+ (start, end)
+ Lisp_Object start, end;
{
- validate_region (&b, &e);
- del_range (XINT (b), XINT (e));
+ validate_region (&start, &end);
+ del_range (XINT (start), XINT (end));
return Qnil;
}
\f
{
BEGV = BEG;
SET_BUF_ZV (current_buffer, Z);
- clip_changed = 1;
+ current_buffer->clip_changed = 1;
/* Changing the buffer bounds invalidates any recorded current column. */
invalidate_current_column ();
return Qnil;
\n\
When calling from a program, pass two arguments; positions (integers\n\
or markers) bounding the text that should remain visible.")
- (b, e)
- register Lisp_Object b, e;
+ (start, end)
+ register Lisp_Object start, end;
{
- register int i;
-
- CHECK_NUMBER_COERCE_MARKER (b, 0);
- CHECK_NUMBER_COERCE_MARKER (e, 1);
+ CHECK_NUMBER_COERCE_MARKER (start, 0);
+ CHECK_NUMBER_COERCE_MARKER (end, 1);
- if (XINT (b) > XINT (e))
+ if (XINT (start) > XINT (end))
{
- i = XFASTINT (b);
- b = e;
- XFASTINT (e) = i;
+ Lisp_Object tem;
+ tem = start; start = end; end = tem;
}
- if (!(BEG <= XINT (b) && XINT (b) <= XINT (e) && XINT (e) <= Z))
- args_out_of_range (b, e);
+ if (!(BEG <= XINT (start) && XINT (start) <= XINT (end) && XINT (end) <= Z))
+ args_out_of_range (start, end);
- BEGV = XFASTINT (b);
- SET_BUF_ZV (current_buffer, XFASTINT (e));
- if (point < XFASTINT (b))
- SET_PT (XFASTINT (b));
- if (point > XFASTINT (e))
- SET_PT (XFASTINT (e));
- clip_changed = 1;
+ BEGV = XFASTINT (start);
+ SET_BUF_ZV (current_buffer, XFASTINT (end));
+ if (point < XFASTINT (start))
+ SET_PT (XFASTINT (start));
+ if (point > XFASTINT (end))
+ SET_PT (XFASTINT (end));
+ current_buffer->clip_changed = 1;
/* Changing the buffer bounds invalidates any recorded current column. */
invalidate_current_column ();
return Qnil;
/* 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));
}
}
BUF_BEGV (buf) = BUF_BEG (buf) + newhead;
SET_BUF_ZV (buf, BUF_Z (buf) - newtail);
- clip_changed = 1;
+ current_buffer->clip_changed = 1;
/* If point is outside the new visible range, move it inside. */
SET_BUF_PT (buf,
DEFUN ("message", Fmessage, Smessage, 1, MANY, 0,
"Print a one-line message at the bottom of the screen.\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\
+The first argument is a format control string, and the rest are data\n\
+to be formatted under control of the string. See `format' for details.\n\
+\n\
If the first argument is nil, clear any existing message; let the\n\
minibuffer contents show.")
(nargs, args)
}
}
+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 format control string, and the rest are data\n\
+to be formatted under control of the string. See `format' for details.\n\
+\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_MENUS
+ {
+ 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 /* not HAVE_MENUS */
+ /* 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 /* not HAVE_MENUS */
+ }
+}
+#ifdef HAVE_MENUS
+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\
+The first argument is a format control string, and the rest are data\n\
+to be formatted under control of the string. See `format' for details.\n\
+\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_MENUS
+ 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\
It may contain %-sequences meaning to substitute the next argument.\n\
%s means print a string argument. Actually, prints any object, with `princ'.\n\
%d means print as number in decimal (%o octal, %x hex).\n\
+%e means print a number in exponential notation.\n\
+%f means print a number in decimal-point notation.\n\
+%g means print a number in exponential notation\n\
+ or decimal-point notation, whichever uses fewer characters.\n\
%c means print a number as a single character.\n\
%S means print any object as an s-expression (using prin1).\n\
- The argument used for %d, %o, %x or %c must be a number.\n\
+ The argument used for %d, %o, %x, %e, %f, %g or %c must be a number.\n\
Use %% to put a single % into the output.")
(nargs, args)
int nargs;
/* Process a numeric arg and skip it. */
minlen = atoi (format);
- if (minlen > 0)
- total += minlen;
- else
- total -= minlen;
+ if (minlen < 0)
+ minlen = - minlen;
+
while ((*format >= '0' && *format <= '9')
|| *format == '-' || *format == ' ' || *format == '.')
format++;
if (*format == '%')
format++;
else if (++n >= nargs)
- error ("not enough arguments for format string");
+ error ("Not enough arguments for format string");
else if (*format == 'S')
{
/* For `S', prin1 the argument and then treat like a string. */
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')
error ("format specifier doesn't match argument type");
total += XSTRING (args[n])->size;
+ /* We have to put an arbitrary limit on minlen
+ since otherwise it could make alloca fail. */
+ if (minlen < XSTRING (args[n])->size + 1000)
+ total += minlen;
}
/* 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
if (*format == 'e' || *format == 'f' || *format == 'g')
args[n] = Ffloat (args[n]);
#endif
- total += 10;
+ total += 30;
+ /* We have to put an arbitrary limit on minlen
+ since otherwise it could make alloca fail. */
+ if (minlen < 1000)
+ total += minlen;
}
#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]);
- total += 20;
+ total += 30;
+ /* We have to put an arbitrary limit on minlen
+ since otherwise it could make alloca fail. */
+ if (minlen < 1000)
+ total += minlen;
}
#endif
else
{
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;
+ union { double d; char *half[2]; } u;
u.d = XFLOAT (args[n])->data;
strings[i++] = (unsigned char *) u.half[0];
strings[i++] = (unsigned char *) u.half[1];
}
#endif
- else
+ else if (i == 0)
+ /* The first string is treated differently
+ because it is the format string. */
strings[i++] = XSTRING (args[n])->data;
+ else
+ strings[i++] = (unsigned char *) XFASTINT (args[n]);
}
+ /* Make room in result for all the non-%-codes in the control string. */
+ total += XSTRING (args[0])->size;
+
/* Format it in bigger and bigger buf's until it all fits. */
while (1)
{
buf = (char *) alloca (total + 1);
buf[total - 1] = 0;
- length = doprnt (buf, total + 1, strings[0], end, i-1, strings + 1);
+ length = doprnt_lisp (buf, total + 1, strings[0],
+ end, i-1, strings + 1);
if (buf[total - 1] == 0)
break;
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;
args[3] = arg3;
args[4] = arg4;
- doprnt (buf, sizeof buf, string1, 0, 5, args);
+ doprnt (buf, sizeof buf, string1, (char *)0, 5, args);
#else
- doprnt (buf, sizeof buf, string1, 0, 5, &string1 + 1);
+ doprnt (buf, sizeof buf, string1, (char *)0, 5, &string1 + 1);
#endif
return build_string (buf);
}
(c1, c2)
register Lisp_Object c1, c2;
{
- unsigned char *downcase = DOWNCASE_TABLE;
+ Lisp_Object *downcase = DOWNCASE_TABLE;
CHECK_NUMBER (c1, 0);
CHECK_NUMBER (c2, 1);
if (!NILP (current_buffer->case_fold_search)
- ? (downcase[0xff & XFASTINT (c1)] == downcase[0xff & XFASTINT (c2)]
+ ? ((XINT (downcase[0xff & XFASTINT (c1)])
+ == XINT (downcase[0xff & XFASTINT (c2)]))
&& (XFASTINT (c1) & ~0xff) == (XFASTINT (c2) & ~0xff))
: XINT (c1) == XINT (c2))
return Qt;
appropriate amount to some, subtracting from some, and leaving the
rest untouched. Most of this is copied from adjust_markers in insdel.c.
- It's caller's job to see that (start1 <= end1 <= start2 <= end2),
- and that the buffer gap will not conflict with the markers. This
- last requirement is odd and maybe should be taken out, but it works
- for now because Ftranspose_regions does in fact guarantee that, in
- addition to providing universal health-care coverage. */
+ It's the caller's job to see that (start1 <= end1 <= start2 <= end2). */
void
transpose_markers (start1, end1, start2, end2)
{
register int amt1, amt2, diff, mpos;
register Lisp_Object marker;
- register struct Lisp_Marker *m;
- /* Update point as if it were a marker.
- Do this before adjusting the start/end values for the gap. */
+ /* Update point as if it were a marker. */
if (PT < start1)
;
else if (PT < end1)
else if (PT < end2)
TEMP_SET_PT (PT - (start2 - start1));
- /* Internally, marker positions take the gap into account, so if the
- * gap is before one or both of the regions, the region's limits
- * must be adjusted to compensate. The caller guaranteed that the
- * gap is not inside any of the regions, however, so this is fairly
- * simple.
- */
- if (GPT < start1)
- {
- register int gs = GAP_SIZE;
- start1 += gs; end1 += gs;
- start2 += gs; end2 += gs;
- }
- else if (GPT < start2)
- {
- /* If the regions are of equal size, the gap could, in theory,
- * be somewhere between them. */
- register int gs = GAP_SIZE;
- start2 += gs; end2 += gs;
- }
+ /* We used to adjust the endpoints here to account for the gap, but that
+ isn't good enough. Even if we assume the caller has tried to move the
+ gap out of our way, it might still be at start1 exactly, for example;
+ and that places it `inside' the interval, for our purposes. The amount
+ of adjustment is nontrivial if there's a `denormalized' marker whose
+ position is between GPT and GPT + GAP_SIZE, so it's simpler to leave
+ the dirty work to Fmarker_position, below. */
/* The difference between the region's lengths */
diff = (end2 - start2) - (end1 - start1);
amt1 = (end2 - start2) + (start2 - end1);
amt2 = (end1 - start1) + (start2 - end1);
- marker = current_buffer->markers;
-
- while (!NILP (marker))
+ for (marker = BUF_MARKERS (current_buffer); !NILP (marker);
+ marker = XMARKER (marker)->chain)
{
- m = XMARKER (marker);
- mpos = m->bufpos;
- if (mpos >= start1 && mpos < end1) /* in region 1 */
- {
- m->bufpos += amt1;
- }
- else if (mpos >= start2 && mpos < end2) /* in region 2 */
- {
- m->bufpos -= amt2;
- }
- else if (mpos >= end1 && mpos < start2) /* between the regions */
- {
- m->bufpos += diff;
- }
- marker = m->chain;
+ mpos = Fmarker_position (marker);
+ if (mpos >= start1 && mpos < end2)
+ {
+ if (mpos < end1)
+ mpos += amt1;
+ else if (mpos < start2)
+ mpos += diff;
+ else
+ mpos -= amt2;
+ if (mpos > GPT) mpos += GAP_SIZE;
+ XMARKER (marker)->bufpos = mpos;
+ }
}
}
#ifdef USE_TEXT_PROPERTIES
INTERVAL cur_intv, tmp_interval1, tmp_interval_mid, tmp_interval2;
- cur_intv = current_buffer->intervals;
+ cur_intv = BUF_INTERVALS (current_buffer);
#endif /* USE_TEXT_PROPERTIES */
validate_region (&startr1, &endr1);
else
move_gap (end2);
}
-
- start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1);
- start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2);
/* Hmmm... how about checking to see if the gap is large
enough to use as the temporary storage? That would avoid an
temp = (unsigned char *) xmalloc (len2);
else
temp = (unsigned char *) alloca (len2);
+
+ /* Don't precompute these addresses. We have to compute them
+ at the last minute, because the relocating allocator might
+ have moved the buffer around during the xmalloc. */
+ start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1);
+ start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2);
+
bcopy (start2_addr, temp, len2);
bcopy (start1_addr, start1_addr + len2, len1);
bcopy (temp, start1_addr, len2);
temp = (unsigned char *) xmalloc (len1);
else
temp = (unsigned char *) alloca (len1);
+ start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1);
+ start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2);
bcopy (start1_addr, temp, len1);
bcopy (start2_addr, start1_addr, len2);
bcopy (temp, start1_addr + len2, len1);
temp = (unsigned char *) xmalloc (len1);
else
temp = (unsigned char *) alloca (len1);
+ start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1);
+ start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2);
bcopy (start1_addr, temp, len1);
bcopy (start2_addr, start1_addr, len2);
bcopy (temp, start2_addr, len1);
temp = (unsigned char *) xmalloc (len2);
else
temp = (unsigned char *) alloca (len2);
+ start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1);
+ start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2);
bcopy (start2_addr, temp, len2);
bcopy (start1_addr, start1_addr + len_mid + len2, len1);
safe_bcopy (start1_addr + len1, start1_addr + len2, len_mid);
temp = (unsigned char *) xmalloc (len1);
else
temp = (unsigned char *) alloca (len1);
+ start1_addr = BUF_CHAR_ADDRESS (current_buffer, start1);
+ start2_addr = BUF_CHAR_ADDRESS (current_buffer, start2);
bcopy (start1_addr, temp, len1);
bcopy (start2_addr, start1_addr, len2);
bcopy (start1_addr + len1, start1_addr + len2, len_mid);
void
syms_of_editfns ()
{
- staticpro (&Vuser_name);
- staticpro (&Vuser_full_name);
- staticpro (&Vuser_real_name);
- staticpro (&Vsystem_name);
+ environbuf = 0;
+
+ Qbuffer_access_fontify_functions
+ = intern ("buffer-access-fontify-functions");
+ staticpro (&Qbuffer_access_fontify_functions);
+
+ DEFVAR_LISP ("buffer-access-fontify-functions",
+ &Vbuffer_access_fontify_functions,
+ "List of functions called by `buffer-substring' to fontify if necessary.\n\
+Each function is called with two arguments which specify the range\n\
+of the buffer being accessed.");
+ Vbuffer_access_fontify_functions = Qnil;
+
+ {
+ Lisp_Object obuf;
+ extern Lisp_Object Vprin1_to_string_buffer;
+ obuf = Fcurrent_buffer ();
+ /* Do this here, because init_buffer_once is too early--it won't work. */
+ Fset_buffer (Vprin1_to_string_buffer);
+ /* Make sure buffer-access-fontify-functions is nil in this buffer. */
+ Fset (Fmake_local_variable (intern ("buffer-access-fontify-functions")),
+ Qnil);
+ Fset_buffer (obuf);
+ }
+
+ DEFVAR_LISP ("buffer-access-fontified-property",
+ &Vbuffer_access_fontified_property,
+ "Property which (if non-nil) indicates text has been fontified.\n\
+`buffer-substring' need not call the `buffer-access-fontify-functions'\n\
+functions if all the text being accessed has this property.");
+ Vbuffer_access_fontified_property = Qnil;
+
+ 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-login-name", &Vuser_login_name,
+ "The user's name, taken from environment variables if possible.");
+
+ DEFVAR_LISP ("user-real-login-name", &Vuser_real_login_name,
+ "The user's name, based upon the real uid only.");
defsubr (&Schar_equal);
defsubr (&Sgoto_char);
defsubr (&Sstring_to_char);
defsubr (&Schar_to_string);
defsubr (&Sbuffer_substring);
+ defsubr (&Sbuffer_substring_no_properties);
defsubr (&Sbuffer_string);
defsubr (&Spoint_marker);
defsubr (&Suser_full_name);
defsubr (&Semacs_pid);
defsubr (&Scurrent_time);
+ defsubr (&Sformat_time_string);
+ defsubr (&Sdecode_time);
+ defsubr (&Sencode_time);
defsubr (&Scurrent_time_string);
defsubr (&Scurrent_time_zone);
+ defsubr (&Sset_time_zone_rule);
defsubr (&Ssystem_name);
defsubr (&Smessage);
+ defsubr (&Smessage_box);
+ defsubr (&Smessage_or_box);
defsubr (&Sformat);
defsubr (&Sinsert_buffer_substring);
HCoop / bpt / emacs.git / blobdiff