xemacs-beta: src/editfns.c comparison

comparison src/editfns.c @ 5125:b5df3737028a ben-lisp-object

merge

author	Ben Wing <ben@xemacs.org>
date	Wed, 24 Feb 2010 01:58:04 -0600
parents	3c3c1d139863
children	1537701f08a1

comparison

equal deleted inserted replaced

-:623d57b7fbe8
+:b5df3737028a
 return;
 if ((p = egetenv ("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_intstring (p);
+Vuser_full_name = build_istring (p);
 else
 Vuser_full_name = Fuser_full_name (Qnil);
 }
 DEFUN ("char-to-string", Fchar_to_string, 1, 1, 0, /*
 	    tmpdir = (Ibyte *) "/tmp";
 	}
 }
 #endif
-return build_intstring (tmpdir);
+return build_istring (tmpdir);
 }
 DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
 Return the name under which the user logged in, as a string.
 This is based on the effective uid, not the real uid.
 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
 */
-return returned_name ? build_intstring (returned_name) : Qnil;
+return returned_name ? build_istring (returned_name) : Qnil;
 }
 /* This function may be called from other C routines when a
 character string representation of the user_login_name is
 needed but a Lisp Object is not.  The UID is passed by
 ())
 {
 struct passwd *pw = qxe_getpwuid (getuid ());
 /* #### - I believe this should return nil instead of "unknown" when pw==0 */
-return build_string (pw ? pw->pw_name : "unknown");
+return build_extstring (pw ? pw->pw_name : "unknown", Quser_name_encoding);
 }
 DEFUN ("user-uid", Fuser_uid, 0, 0, 0, /*
 Return the effective uid of Emacs, as an integer.
 */
 void
 uncache_home_directory (void)
 {
 if (cached_home_directory)
-xfree (cached_home_directory, Ibyte *);
+xfree (cached_home_directory);
 cached_home_directory = NULL;
 }
 /* Returns the home directory */
 Ibyte *
 /* Unix, typically.
 Using "/" isn't quite right, but what should we do?
 We probably should try to extract pw_dir from /etc/passwd,
 before falling back to this. */
 	      cached_home_directory
-= qxestrdup ((const Ibyte *)DEFAULT_DIRECTORY_FALLBACK);
+= qxestrdup ((const Ibyte *) DEFAULT_DIRECTORY_FALLBACK);
 	      output_home_warning = 1;
 	    }
 	}
 if (initialized && output_home_warning)
 	{
 ())
 {
 Ibyte *path = get_home_directory ();
 return !path ? Qnil :
-Fexpand_file_name (Fsubstitute_in_file_name (build_intstring (path)),
+Fexpand_file_name (Fsubstitute_in_file_name (build_istring (path)),
 		       Qnil);
 }
 DEFUN ("system-name", Fsystem_name, 0, 0, 0, /*
 Return the name of the machine you are running on, as a string.
 while (1)
 {
 Extbyte *buf = alloca_extbytes (size);
 Extbyte *formext;
 /* make a copy of the static buffer returned by localtime() */
-struct tm tm = * localtime(&value);
+struct tm tm = *localtime (&value);
 *buf = 1;
 /* !!#### this use of external here is not totally safe, and
 	 potentially data lossy. */
-LISP_STRING_TO_EXTERNAL (format_string, formext, Qnative);
+formext = LISP_STRING_TO_EXTERNAL (format_string,
+					 Qtime_function_encoding);
 if (emacs_strftime (buf, size, formext, &tm)
 	  || !*buf)
-	return build_ext_string (buf, Qnative);
+	return build_extstring (buf, Qtime_function_encoding);
 /* If buffer was too small, make it bigger.  */
 size *= 2;
 }
 }
 Extbyte tzbuf[100];
 Extbyte *tzstring;
 Extbyte **oldenv = environ, **newenv;
 if (STRINGP (zone))
-	LISP_STRING_TO_EXTERNAL (zone, tzstring, Qnative);
+	tzstring = LISP_STRING_TO_EXTERNAL (zone, Qtime_zone_encoding);
 else if (INTP (zone))
 	{
 	  int abszone = abs (XINT (zone));
 	  sprintf (tzbuf, "XXX%s%d:%02d:%02d", "-" + (XINT (zone) < 0),
 		   abszone / (60*60), (abszone/60) % 60, abszone % 60);
 */
 (specified_time))
 {
 time_t value;
 Ibyte *the_ctime;
-EMACS_INT len; /* this is what make_ext_string() accepts; ####
+EMACS_INT len; /* this is what make_extstring() accepts; ####
 		    should it be an Bytecount? */
 if (! lisp_to_time (specified_time, &value))
 value = -1;
 the_ctime = qxe_ctime (&value);
 if (t->tm_isdst == 0 || t->tm_isdst == 1)
 	s = tzname[t->tm_isdst];
 #endif
 #endif /* not HAVE_TM_ZONE */
 if (s)
-	tem = build_ext_string (s, Qnative);
+	tem = build_extstring (s, Qtime_zone_encoding);
 else
 	{
 	  Ibyte buf[6];
 	  /* No local time zone name is available; use "+-NNNN" instead.  */
 	  int am = (offset < 0 ? -offset : offset) / 60;
 	  qxesprintf (buf, "%c%02d%02d", (offset < 0 ? '-' : '+'), am/60,
 		      am%60);
-	  tem = build_intstring (buf);
+	  tem = build_istring (buf);
 	}
 return list2 (make_int (offset), tem);
 }
 else
 return list2 (Qnil, Qnil);
 if (NILP (tz))
 tzstring = 0;
 else
 {
 CHECK_STRING (tz);
-LISP_STRING_TO_EXTERNAL (tz, tzstring, Qnative);
+tzstring = LISP_STRING_TO_EXTERNAL (tz, Qtime_zone_encoding);
 }
 set_time_zone_rule (tzstring);
 if (environbuf)
-xfree (environbuf, Extbyte **);
+xfree (environbuf);
 environbuf = environ;
 return Qnil;
 }
 DEFUN ("save-restriction", Fsave_restriction, 0, UNEVALLED, 0, /*
 Execute BODY, saving and restoring current buffer's restrictions.
 The buffer's restrictions make parts of the beginning and end invisible.
 \(They are set up with `narrow-to-region' and eliminated with `widen'.)
-This special form, `save-restriction', saves the current buffer's restrictions
+This special operator, `save-restriction', saves the current buffer's
-when it is entered, and restores them when it is exited.
+restrictions when it is entered, and restores them when it is exited.
 So any `narrow-to-region' within BODY lasts only until the end of the form.
 The old restrictions settings are restored
 even in case of abnormal exit (throw or error).
 The value returned is the value of the last form in BODY.
 CHECK_CHAR_COERCE_INT (character2);
 x1 = XCHAR (character1);
 x2 = XCHAR (character2);
 return (!NILP (b->case_fold_search)
-	  ? DOWNCASE (b, x1) == DOWNCASE (b, x2)
+	  ? CANONCASE (b, x1) == CANONCASE (b, x2)
 	  : x1 == x2)
 ? Qt : Qnil;
 }
 DEFUN ("char=", Fchar_Equal, 2, 2, 0, /*

Mercurial > hg > xemacs-beta

comparison src/editfns.c @ 5125:b5df3737028a ben-lisp-object