X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Feditfns.c;h=306315efde2e006b6e97ff1d3d7a471b1fa2ece6;hb=5e4b9842b4eae09992b4f88326dc3b88a19ded7e;hp=442a00b773296b0d5873195c2d24f7c2898f001c;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1 diff --git a/src/editfns.c b/src/editfns.c index 442a00b..306315e 100644 --- a/src/editfns.c +++ b/src/editfns.c @@ -39,11 +39,13 @@ Boston, MA 02111-1307, USA. */ #include "frame.h" #include "insdel.h" #include "window.h" +#include "chartab.h" #include "line-number.h" #include "systime.h" #include "sysdep.h" #include "syspwd.h" +#include "sysfile.h" /* for getcwd */ /* Some static data, and a function to initialize it for each run */ @@ -64,8 +66,6 @@ Lisp_Object Vuser_login_name; /* user name from LOGNAME or USER. */ Lisp_Object Vuser_full_name; EXFUN (Fuser_full_name, 1); -char *get_system_name (void); - Lisp_Object Qformat; Lisp_Object Qpoint, Qmark, Qregion_beginning, Qregion_end; @@ -96,7 +96,7 @@ init_editfns (void) if ((p = getenv ("NAME"))) /* I don't think it's the right thing to do the ampersand modification on NAME. Not that it matters anymore... -hniksic */ - Vuser_full_name = build_ext_string (p, FORMAT_OS); + Vuser_full_name = build_ext_string (p, Qnative); else Vuser_full_name = Fuser_full_name (Qnil); } @@ -131,7 +131,7 @@ An empty string will return the constant `nil'. */ (str)) { - struct Lisp_String *p; + Lisp_String *p; CHECK_STRING (str); p = XSTRING (str); @@ -369,7 +369,7 @@ save_excursion_restore (Lisp_Object info) and cleaner never to alter the window/buffer connections. */ /* I'm certain some code somewhere depends on this behavior. --jwz */ /* Even if it did, it certainly doesn't matter anymore, because - this has been the behaviour for countless XEmacs releases + this has been the behavior for countless XEmacs releases now. --hniksic */ if (visible && (current_buffer != XBUFFER (XWINDOW (selected_window)->buffer))) @@ -440,7 +440,8 @@ If BUFFER is nil, the current buffer is assumed. DEFUN ("point-min", Fpoint_min, 0, 1, 0, /* Return the minimum permissible value of point in BUFFER. -This is 1, unless narrowing (a buffer restriction) is in effect. +This is 1, unless narrowing (a buffer restriction) +is in effect, in which case it may be greater. If BUFFER is nil, the current buffer is assumed. */ (buffer)) @@ -451,7 +452,8 @@ If BUFFER is nil, the current buffer is assumed. DEFUN ("point-min-marker", Fpoint_min_marker, 0, 1, 0, /* Return a marker to the minimum permissible value of point in BUFFER. -This is the beginning, unless narrowing (a buffer restriction) is in effect. +This is the beginning, unless narrowing (a buffer restriction) +is in effect, in which case it may be greater. If BUFFER is nil, the current buffer is assumed. */ (buffer)) @@ -463,7 +465,7 @@ If BUFFER is nil, the current buffer is assumed. DEFUN ("point-max", Fpoint_max, 0, 1, 0, /* Return the maximum permissible value of point in BUFFER. This is (1+ (buffer-size)), unless narrowing (a buffer restriction) -is in effect, in which case it is less. +is in effect, in which case it may be less. If BUFFER is nil, the current buffer is assumed. */ (buffer)) @@ -473,9 +475,9 @@ If BUFFER is nil, the current buffer is assumed. } DEFUN ("point-max-marker", Fpoint_max_marker, 0, 1, 0, /* -Return a marker to the maximum permissible value of point BUFFER. +Return a marker to the maximum permissible value of point in BUFFER. This is (1+ (buffer-size)), unless narrowing (a buffer restriction) -is in effect, in which case it is less. +is in effect, in which case it may be less. If BUFFER is nil, the current buffer is assumed. */ (buffer)) @@ -548,7 +550,6 @@ If BUFFER is nil, the current buffer is assumed. (buffer)) { struct buffer *b = decode_buffer (buffer, 1); - return beginning_of_line_p (b, BUF_PT (b)) ? Qt : Qnil; } @@ -565,11 +566,11 @@ If BUFFER is nil, the current buffer is assumed. } DEFUN ("char-after", Fchar_after, 0, 2, 0, /* -Return character in BUFFER at position POS. -POS is an integer or a buffer pointer. +Return the character at position POS in BUFFER. +POS is an integer or a marker. If POS is out of range, the value is nil. -If BUFFER is nil, the current buffer is assumed. if POS is nil, the value of point is assumed. +If BUFFER is nil, the current buffer is assumed. */ (pos, buffer)) { @@ -583,17 +584,17 @@ if POS is nil, the value of point is assumed. } DEFUN ("char-before", Fchar_before, 0, 2, 0, /* -Return character in BUFFER before position POS. -POS is an integer or a buffer pointer. +Return the character preceding position POS in BUFFER. +POS is an integer or a marker. If POS is out of range, the value is nil. -If BUFFER is nil, the current buffer is assumed. if POS is nil, the value of point is assumed. +If BUFFER is nil, the current buffer is assumed. */ (pos, buffer)) { struct buffer *b = decode_buffer (buffer, 1); - Bufpos n = ((NILP (pos) ? BUF_PT (b) : - get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD))); + Bufpos n = (NILP (pos) ? BUF_PT (b) : + get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD)); n--; @@ -624,7 +625,7 @@ On Unix it is obtained from TMPDIR, with /tmp as the default tmpdir = "/tmp"; #endif - return build_ext_string (tmpdir, FORMAT_FILENAME); + return build_ext_string (tmpdir, Qfile_name); } DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /* @@ -638,17 +639,17 @@ ignored and this function returns the login name for that UID, or nil. (uid)) { char *returned_name; - int local_uid; + uid_t local_uid; if (!NILP (uid)) { CHECK_INT (uid); - local_uid = XINT(uid); - returned_name = user_login_name(&local_uid); + local_uid = XINT (uid); + returned_name = user_login_name (&local_uid); } else { - returned_name = user_login_name(NULL); + returned_name = user_login_name (NULL); } /* #### - I believe this should return nil instead of "unknown" when pw==0 pw=0 is indicated by a null return from user_login_name @@ -664,14 +665,12 @@ ignored and this function returns the login name for that UID, or nil. corresponds to a nil argument to Fuser_login_name. */ char* -user_login_name (int *uid) +user_login_name (uid_t *uid) { - struct passwd *pw = NULL; - /* uid == NULL to return name of this user */ if (uid != NULL) { - pw = getpwuid (*uid); + struct passwd *pw = getpwuid (*uid); return pw ? pw->pw_name : NULL; } else @@ -692,7 +691,7 @@ user_login_name (int *uid) return (user_name); else { - pw = getpwuid (geteuid ()); + struct passwd *pw = getpwuid (geteuid ()); #ifdef __CYGWIN32__ /* Since the Cygwin environment may not have an /etc/passwd, return "unknown" instead of the null if the username @@ -757,7 +756,7 @@ value of `user-full-name' is returned. Lisp_Object user_name; struct passwd *pw = NULL; Lisp_Object tem; - char *p, *q; + const char *p, *q; if (NILP (user) && STRINGP (Vuser_full_name)) return Vuser_full_name; @@ -765,11 +764,13 @@ value of `user-full-name' is returned. user_name = (STRINGP (user) ? user : Fuser_login_name (user)); if (!NILP (user_name)) /* nil when nonexistent UID passed as arg */ { - CONST char *user_name_ext; + const char *user_name_ext; /* Fuck me. getpwnam() can call select() and (under IRIX at least) things get wedged if a SIGIO arrives during this time. */ - GET_C_STRING_OS_DATA_ALLOCA (user_name, user_name_ext); + TO_EXTERNAL_FORMAT (LISP_STRING, user_name, + C_STRING_ALLOCA, user_name_ext, + Qnative); slow_down_interrupts (); pw = (struct passwd *) getpwnam (user_name_ext); speed_up_interrupts (); @@ -787,7 +788,7 @@ value of `user-full-name' is returned. tem = ((!NILP (user) && !pw) ? Qnil : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)), - FORMAT_OS)); + Qnative)); #ifdef AMPERSAND_FULL_NAME if (!NILP (tem)) @@ -812,7 +813,7 @@ value of `user-full-name' is returned. return tem; } -static char *cached_home_directory; +static Extbyte *cached_home_directory; void uncache_home_directory (void) @@ -821,24 +822,28 @@ uncache_home_directory (void) of a few bytes */ } -char * +/* Returns the home directory, in external format */ +Extbyte * get_home_directory (void) { int output_home_warning = 0; if (cached_home_directory == NULL) { - if ((cached_home_directory = getenv("HOME")) == NULL) + if ((cached_home_directory = (Extbyte *) getenv("HOME")) == NULL) { #if defined(WINDOWSNT) && !defined(__CYGWIN32__) - char *homedrive, *homepath; - + char *homedrive, *homepath; + if ((homedrive = getenv("HOMEDRIVE")) != NULL && (homepath = getenv("HOMEPATH")) != NULL) { cached_home_directory = - (char *) xmalloc(strlen(homedrive) + strlen(homepath) + 1); - sprintf(cached_home_directory, "%s%s", homedrive, homepath); + (Extbyte *) xmalloc (strlen (homedrive) + + strlen (homepath) + 1); + sprintf((char *) cached_home_directory, "%s%s", + homedrive, + homepath); } else { @@ -861,7 +866,7 @@ get_home_directory (void) /* * This is NT Emacs behavior */ - cached_home_directory = "C:\\"; + cached_home_directory = (Extbyte *) "C:\\"; output_home_warning = 1; # endif } @@ -872,22 +877,22 @@ get_home_directory (void) * We probably should try to extract pw_dir from /etc/passwd, * before falling back to this. */ - cached_home_directory = "/"; + cached_home_directory = (Extbyte *) "/"; output_home_warning = 1; #endif /* !WINDOWSNT */ } if (initialized && output_home_warning) { - warn_when_safe(Quser_files_and_directories, Qwarning, "\n" + warn_when_safe (Quser_files_and_directories, Qwarning, "\n" " XEmacs was unable to determine a good value for the user's $HOME\n" " directory, and will be using the value:\n" " %s\n" " This is probably incorrect.", - cached_home_directory - ); + cached_home_directory + ); } } - return (cached_home_directory); + return cached_home_directory; } DEFUN ("user-home-directory", Fuser_home_directory, 0, 0, 0, /* @@ -895,18 +900,12 @@ Return the user's home directory, as a string. */ ()) { - Lisp_Object directory; - char *path; + Extbyte *path = get_home_directory (); - directory = Qnil; - path = get_home_directory (); - if (path != NULL) - { - directory = - Fexpand_file_name (Fsubstitute_in_file_name (build_string (path)), - Qnil); - } - return (directory); + return path == NULL ? Qnil : + Fexpand_file_name (Fsubstitute_in_file_name + (build_ext_string ((char *) path, Qfile_name)), + Qnil); } DEFUN ("system-name", Fsystem_name, 0, 0, 0, /* @@ -917,14 +916,6 @@ Return the name of the machine you are running on, as a string. return Fcopy_sequence (Vsystem_name); } -/* For the benefit of callers who don't want to include lisp.h. - Caller must free! */ -char * -get_system_name (void) -{ - return xstrdup ((char *) XSTRING_DATA (Vsystem_name)); -} - DEFUN ("emacs-pid", Femacs_pid, 0, 0, 0, /* Return the process ID of Emacs, as an integer. */ @@ -1013,9 +1004,9 @@ time_to_lisp (time_t the_time) return Fcons (make_int (item >> 16), make_int (item & 0xffff)); } -size_t emacs_strftime (char *string, size_t max, CONST char *format, - CONST struct tm *tm); -static long difftm (CONST struct tm *a, CONST struct tm *b); +size_t emacs_strftime (char *string, size_t max, const char *format, + const struct tm *tm); +static long difftm (const struct tm *a, const struct tm *b); DEFUN ("format-time-string", Fformat_time_string, 1, 2, 0, /* @@ -1045,6 +1036,8 @@ FORMAT-STRING may contain %-sequences to substitute parts of the time. %p is replaced by AM or PM, as appropriate. %r is a synonym for "%I:%M:%S %p". %R is a synonym for "%H:%M". +%s is replaced by the time in seconds since 00:00:00, Jan 1, 1970 (a + nonstandard extension) %S is replaced by the second (00-60). %t is a synonym for "\\t". %T is a synonym for "%H:%M:%S". @@ -1062,14 +1055,14 @@ The number of options reflects the `strftime' function. BUG: If the charset used by the current locale is not ISO 8859-1, the characters appearing in the day and month names may be incorrect. */ - (format_string, _time)) + (format_string, time_)) { time_t value; size_t size; CHECK_STRING (format_string); - if (! lisp_to_time (_time, &value)) + if (! lisp_to_time (time_, &value)) error ("Invalid time specification"); /* This is probably enough. */ @@ -1080,10 +1073,10 @@ characters appearing in the day and month names may be incorrect. char *buf = (char *) alloca (size); *buf = 1; if (emacs_strftime (buf, size, - (CONST char *) XSTRING_DATA (format_string), + (const char *) XSTRING_DATA (format_string), localtime (&value)) || !*buf) - return build_ext_string (buf, FORMAT_BINARY); + return build_ext_string (buf, Qbinary); /* If buffer was too small, make it bigger. */ size *= 2; } @@ -1114,13 +1107,13 @@ ZONE is an integer indicating the number of seconds east of Greenwich. error ("Invalid time specification"); decoded_time = localtime (&time_spec); - XSETINT (list_args[0], decoded_time->tm_sec); - XSETINT (list_args[1], decoded_time->tm_min); - XSETINT (list_args[2], decoded_time->tm_hour); - XSETINT (list_args[3], decoded_time->tm_mday); - XSETINT (list_args[4], decoded_time->tm_mon + 1); - XSETINT (list_args[5], decoded_time->tm_year + 1900); - XSETINT (list_args[6], decoded_time->tm_wday); + list_args[0] = make_int (decoded_time->tm_sec); + list_args[1] = make_int (decoded_time->tm_min); + list_args[2] = make_int (decoded_time->tm_hour); + list_args[3] = make_int (decoded_time->tm_mday); + list_args[4] = make_int (decoded_time->tm_mon + 1); + list_args[5] = make_int (decoded_time->tm_year + 1900); + list_args[6] = make_int (decoded_time->tm_wday); list_args[7] = (decoded_time->tm_isdst)? Qt : Qnil; /* Make a copy, in case gmtime modifies the struct. */ @@ -1129,7 +1122,7 @@ ZONE is an integer indicating the number of seconds east of Greenwich. if (decoded_time == 0) list_args[8] = Qnil; else - XSETINT (list_args[8], difftm (&save_tm, decoded_time)); + list_args[8] = make_int (difftm (&save_tm, decoded_time)); return Flist (9, list_args); } @@ -1155,7 +1148,7 @@ If you want them to stand for years in this century, you must do that yourself. */ (int nargs, Lisp_Object *args)) { - time_t _time; + time_t the_time; struct tm tm; Lisp_Object zone = (nargs > 6) ? args[nargs - 1] : Qnil; @@ -1171,7 +1164,7 @@ If you want them to stand for years in this century, you must do that yourself. if (CONSP (zone)) zone = XCAR (zone); if (NILP (zone)) - _time = mktime (&tm); + the_time = mktime (&tm); else { char tzbuf[100]; @@ -1194,7 +1187,7 @@ If you want them to stand for years in this century, you must do that yourself. value doesn't suffice, since that would mishandle leap seconds. */ set_time_zone_rule (tzstring); - _time = mktime (&tm); + the_time = mktime (&tm); /* Restore TZ to previous value. */ newenv = environ; @@ -1205,10 +1198,10 @@ If you want them to stand for years in this century, you must do that yourself. #endif } - if (_time == (time_t) -1) + if (the_time == (time_t) -1) error ("Specified time is not representable"); - return wasteful_word_to_lisp (_time); + return wasteful_word_to_lisp (the_time); } DEFUN ("current-time-string", Fcurrent_time_string, 0, 1, 0, /* @@ -1237,14 +1230,14 @@ and from `file-attributes'. strncpy (buf, tem, 24); buf[24] = 0; - return build_ext_string (buf, FORMAT_BINARY); + return build_ext_string (buf, Qbinary); } #define TM_YEAR_ORIGIN 1900 /* Yield A - B, measured in seconds. */ static long -difftm (CONST struct tm *a, CONST struct tm *b) +difftm (const struct tm *a, const struct tm *b) { int ay = a->tm_year + (TM_YEAR_ORIGIN - 1); int by = b->tm_year + (TM_YEAR_ORIGIN - 1); @@ -1622,6 +1615,23 @@ If BUFFER is nil, the current buffer is assumed. return make_string_from_buffer (b, begv, zv - begv); } +/* It might make more sense to name this + `buffer-substring-no-extents', but this name is FSFmacs-compatible, + and what the function does is probably good enough for what the + user-code will typically want to use it for. */ +DEFUN ("buffer-substring-no-properties", Fbuffer_substring_no_properties, 0, 3, 0, /* +Return the text from BEG to END, as a string, without copying the extents. +*/ + (start, end, buffer)) +{ + /* This function can GC */ + Bufpos begv, zv; + struct buffer *b = decode_buffer (buffer, 1); + + get_buffer_range_char (b, start, end, &begv, &zv, GB_ALLOW_NIL); + return make_string_from_buffer_no_extents (b, begv, zv - begv); +} + DEFUN ("insert-buffer-substring", Finsert_buffer_substring, 1, 3, 0, /* Insert before point a substring of the contents of buffer BUFFER. BUFFER may be a buffer or a buffer name. @@ -1783,42 +1793,149 @@ and don't mark the buffer as really changed. return Qnil; } +/* #### Shouldn't this also accept a BUFFER argument, in the good old + XEmacs tradition? */ DEFUN ("translate-region", Ftranslate_region, 3, 3, 0, /* -From START to END, translate characters according to TABLE. -TABLE is a string; the Nth character in it is the mapping -for the character with code N. Returns the number of characters changed. +Translate characters from START to END according to TABLE. + +If TABLE is a string, the Nth character in it is the mapping for the +character with code N. + +If TABLE is a vector, its Nth element is the mapping for character +with code N. The values of elements may be characters, strings, or +nil (nil meaning don't replace.) + +If TABLE is a char-table, its elements describe the mapping between +characters and their replacements. The char-table should be of type +`char' or `generic'. + +Returns the number of substitutions performed. */ (start, end, table)) { /* This function can GC */ Bufpos pos, stop; /* Limits of the region. */ - REGISTER Emchar oc; /* Old character. */ - REGISTER Emchar nc; /* New character. */ - int cnt; /* Number of changes made. */ - Charcount size; /* Size of translate table. */ + int cnt = 0; /* Number of changes made. */ int mc_count; struct buffer *buf = current_buffer; + Emchar oc; get_buffer_range_char (buf, start, end, &pos, &stop, 0); - CHECK_STRING (table); - - size = XSTRING_CHAR_LENGTH (table); - - cnt = 0; mc_count = begin_multiple_change (buf, pos, stop); - for (; pos < stop; pos++) + if (STRINGP (table)) + { + Lisp_String *stable = XSTRING (table); + Charcount size = string_char_length (stable); +#ifdef MULE + /* Under Mule, string_char(n) is O(n), so for large tables or + large regions it makes sense to create an array of Emchars. */ + if (size * (stop - pos) > 65536) + { + Emchar *etable = alloca_array (Emchar, size); + convert_bufbyte_string_into_emchar_string + (string_data (stable), string_length (stable), etable); + for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++) + { + if (oc < size) + { + Emchar nc = etable[oc]; + if (nc != oc) + { + buffer_replace_char (buf, pos, nc, 0, 0); + ++cnt; + } + } + } + } + else +#endif /* MULE */ + { + for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++) + { + if (oc < size) + { + Emchar nc = string_char (stable, oc); + if (nc != oc) + { + buffer_replace_char (buf, pos, nc, 0, 0); + ++cnt; + } + } + } + } + } + else if (VECTORP (table)) + { + Charcount size = XVECTOR_LENGTH (table); + Lisp_Object *vtable = XVECTOR_DATA (table); + + for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++) + { + if (oc < size) + { + Lisp_Object replacement = vtable[oc]; + retry: + if (CHAR_OR_CHAR_INTP (replacement)) + { + Emchar nc = XCHAR_OR_CHAR_INT (replacement); + if (nc != oc) + { + buffer_replace_char (buf, pos, nc, 0, 0); + ++cnt; + } + } + else if (STRINGP (replacement)) + { + Charcount incr = XSTRING_CHAR_LENGTH (replacement) - 1; + buffer_delete_range (buf, pos, pos + 1, 0); + buffer_insert_lisp_string_1 (buf, pos, replacement, 0); + pos += incr, stop += incr; + ++cnt; + } + else if (!NILP (replacement)) + { + replacement = wrong_type_argument (Qchar_or_string_p, replacement); + goto retry; + } + } + } + } + else if (CHAR_TABLEP (table) + && (XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_GENERIC + || XCHAR_TABLE_TYPE (table) == CHAR_TABLE_TYPE_CHAR)) { - oc = BUF_FETCH_CHAR (buf, pos); - if (oc >= 0 && oc < size) + Lisp_Char_Table *ctable = XCHAR_TABLE (table); + + for (; pos < stop && (oc = BUF_FETCH_CHAR (buf, pos), 1); pos++) { - nc = string_char (XSTRING (table), oc); - if (nc != oc) + Lisp_Object replacement = get_char_table (oc, ctable); + retry2: + if (CHAR_OR_CHAR_INTP (replacement)) { - buffer_replace_char (buf, pos, nc, 0, 0); + Emchar nc = XCHAR_OR_CHAR_INT (replacement); + if (nc != oc) + { + buffer_replace_char (buf, pos, nc, 0, 0); + ++cnt; + } + } + else if (STRINGP (replacement)) + { + Charcount incr = XSTRING_CHAR_LENGTH (replacement) - 1; + buffer_delete_range (buf, pos, pos + 1, 0); + buffer_insert_lisp_string_1 (buf, pos, replacement, 0); + pos += incr, stop += incr; ++cnt; } + else if (!NILP (replacement)) + { + replacement = wrong_type_argument (Qchar_or_string_p, replacement); + goto retry2; + } } } + else + dead_wrong_type_argument (Qstringp, table); end_multiple_change (buf, mc_count); return make_int (cnt); @@ -2121,17 +2238,16 @@ If BUFFER is nil, the current buffer is assumed. ? Qt : Qnil; } -DEFUN ("char=", Fchar_Equal, 2, 3, 0, /* +DEFUN ("char=", Fchar_Equal, 2, 2, 0, /* Return t if two characters match, case is significant. Both arguments must be characters (i.e. NOT integers). -The optional buffer argument is for symmetry and is ignored. */ - (c1, c2, buffer)) + (c1, c2)) { CHECK_CHAR_COERCE_INT (c1); CHECK_CHAR_COERCE_INT (c2); - return XCHAR(c1) == XCHAR(c2) ? Qt : Qnil; + return EQ (c1, c2) ? Qt : Qnil; } #if 0 /* Undebugged FSFmacs code */ @@ -2263,6 +2379,7 @@ syms_of_editfns (void) DEFSUBR (Fstring_to_char); DEFSUBR (Fchar_to_string); DEFSUBR (Fbuffer_substring); + DEFSUBR (Fbuffer_substring_no_properties); DEFSUBR (Fpoint_marker); DEFSUBR (Fmark_marker);