xemacs-beta: src/editfns.c comparison

comparison src/editfns.c @ 272:c5d627a313b1 r21-0b34

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	727739f917cb
children	e11d67e05968

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 /* Hacked on for Mule by Ben Wing, December 1994. */
 #include <config.h>
 #include "lisp.h"
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
 #include "buffer.h"
 #include "commands.h"
 #include "events.h"             /* for EVENTP */
 #include "extents.h"
 #endif
 /* It's useful to be able to set this as user customization, so we'll
 keep it. */
 Lisp_Object Vuser_full_name;
-Lisp_Object Fuser_full_name (Lisp_Object);
+EXFUN (Fuser_full_name, 1);
-extern char *get_system_name (void);
+char *get_system_name (void);
 Lisp_Object Qformat;
 Lisp_Object Qpoint, Qmark, Qregion_beginning, Qregion_end;
 void
 init_editfns (void)
 {
 /* Only used in removed code below. */
-Bufbyte *p;
+char *p;
 environbuf = 0;
 /* Set up system_name even when dumping.  */
 init_system_name ();
 #ifndef CANNOT_DUMP
 if (!initialized)
 return;
 #endif
-if ((p = (Bufbyte *) getenv ("NAME")))
+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);
 else
 Vuser_full_name = Fuser_full_name (Qnil);
 static Lisp_Object
 buildmark (Bufpos val, Lisp_Object buffer)
 {
-Lisp_Object mark;
+Lisp_Object mark = Fmake_marker ();
-mark = Fmake_marker ();
 Fset_marker (mark, make_int (val), buffer);
 return mark;
 }
 DEFUN ("point", Fpoint, 0, 1, 0, /*
 cleaner to declare them separately. */
 Bufpos
 bufpos_clip_to_bounds (Bufpos lower, Bufpos num, Bufpos upper)
 {
-if (num < lower)
+return (num < lower ? lower :
-return lower;
+	  num > upper ? upper :
-else if (num > upper)
+	  num);
-return upper;
-else
-return num;
 }
 Bytind
 bytind_clip_to_bounds (Bytind lower, Bytind num, Bytind upper)
 {
-if (num < lower)
+return (num < lower ? lower :
-return lower;
+	  num > upper ? upper :
-else if (num > upper)
+	  num);
-return upper;
-else
-return num;
 }
 /*
 * Chuck says:
 * There is no absolute way to determine if goto-char is the function
 save_current_buffer_restore (Lisp_Object buffer)
 {
 struct buffer *buf = XBUFFER (buffer);
 /* Avoid signaling an error if the buffer is no longer alive.  This
 is for consistency with save-excursion.  */
-if (!BUFFER_LIVE_P (buf))
+if (BUFFER_LIVE_P (buf))
-return Qnil;
+set_buffer_internal (buf);
-set_buffer_internal (buf);
 return Qnil;
 }
 DEFUN ("save-current-buffer", Fsave_current_buffer, 0, UNEVALLED, 0, /*
 Save the current buffer; execute BODY; restore the current buffer.
 record_unwind_protect (save_current_buffer_restore, Fcurrent_buffer ());
 return unbind_to (speccount, Fprogn (args));
 }
-DEFUN ("buffer-size", Fbufsize, 0, 1, 0, /*
+DEFUN ("buffer-size", Fbuffer_size, 0, 1, 0, /*
 Return the number of characters in BUFFER.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 else
 return make_char (BUF_FETCH_CHAR (b, BUF_PT (b) - 1));
 }
 DEFUN ("bobp", Fbobp, 0, 1, 0, /*
-Return T if point is at the beginning of the buffer.
+Return t if point is at the beginning of the buffer.
 If the buffer is narrowed, this means the beginning of the narrowed part.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 return BUF_PT (b) == BUF_BEGV (b) ? Qt : Qnil;
 }
 DEFUN ("eobp", Feobp, 0, 1, 0, /*
-Return T if point is at the end of the buffer.
+Return t if point is at the end of the buffer.
 If the buffer is narrowed, this means the end of the narrowed part.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 }
 int
 beginning_of_line_p (struct buffer *b, Bufpos pt)
 {
-if (pt <= BUF_BEGV (b))
+return pt <= BUF_BEGV (b) || BUF_FETCH_CHAR (b, pt - 1) == '\n';
-return 1;
-return BUF_FETCH_CHAR (b, pt - 1) == '\n';
 }
 DEFUN ("bolp", Fbolp, 0, 1, 0, /*
-Return T if point is at the beginning of a line.
+Return t if point is at the beginning of a line.
 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;
 }
 DEFUN ("eolp", Feolp, 0, 1, 0, /*
-Return T if point is at the end of a line.
+Return t if point is at the end of a line.
 `End of a line' includes point being at the end of the buffer.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
-if (BUF_PT (b) == BUF_ZV (b) || BUF_FETCH_CHAR (b, BUF_PT (b)) == '\n')
+return (BUF_PT (b) == BUF_ZV (b) || BUF_FETCH_CHAR (b, BUF_PT (b)) == '\n')
-return Qt;
+? Qt : Qnil;
-return Qnil;
 }
 DEFUN ("char-after", Fchar_after, 0, 2, 0, /*
 Return character in BUFFER at position POS.
 POS is an integer or a buffer pointer.
 On Unix it is obtained from TMPDIR, with /tmp as the default
 */
 ())
 {
 char *tmpdir;
 #if defined(WINDOWSNT) || defined(MSDOS)
-tmpdir = (char *) getenv ("TEMP");
+tmpdir = getenv ("TEMP");
 if (!tmpdir)
-tmpdir = (char *) getenv ("TMP");
+tmpdir = getenv ("TMP");
 if (!tmpdir)
-tmpdir = "/";	/* what should this be on NT/MSDOS ? */
+tmpdir = "/";
 #else /* WINDOWSNT || MSDOS */
-tmpdir = (char *) getenv ("TMPDIR");
+tmpdir = getenv ("TMPDIR");
 if (!tmpdir)
 tmpdir = "/tmp";
 #endif
 return build_ext_string (tmpdir, FORMAT_FILENAME);
 }
 struct passwd *pw = NULL;
 if (!NILP (uid))
 {
 CHECK_INT (uid);
-pw = (struct passwd *) getpwuid (XINT (uid));
+pw = getpwuid (XINT (uid));
 }
 else
 {
-char *user_name;
 /* #### - when euid != uid, then LOGNAME and USER are leftovers from the
 	 old environment (I site observed behavior on sunos and linux), so the
 	 environment variables should be disregarded in that case.  --Stig */
-user_name = getenv ("LOGNAME");
+char *user_name = getenv ("LOGNAME");
 if (!user_name)
+	user_name = getenv (
 #ifdef WINDOWSNT
-user_name = (char *) getenv ("USERNAME"); /* it's USERNAME on NT */
+			    "USERNAME" /* it's USERNAME on NT */
-#else  /* WINDOWSNT */
+#else
-user_name = (char *) getenv ("USER");
+			    "USER"
-#endif /* WINDOWSNT */
+#endif
+			    );
 if (user_name)
 	return build_string (user_name);
 else
-	pw = (struct passwd *) getpwuid (geteuid ());
+	pw = getpwuid (geteuid ());
 }
 /* #### - I believe this should return nil instead of "unknown" when pw==0 */
 return pw ? build_string (pw->pw_name) : Qnil;
 }
 This ignores the environment variables LOGNAME and USER, so it differs from
 `user-login-name' when running under `su'.
 */
 ())
 {
-struct passwd *pw = (struct passwd *) getpwuid (getuid ());
+struct passwd *pw = getpwuid (getuid ());
 /* #### - I believe this should return nil instead of "unknown" when pw==0 */
 #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.
 }
 /* #### - Stig sez: this should return nil instead of "unknown" when pw==0 */
 /* Ben sez: bad idea because it's likely to break something */
 #ifndef AMPERSAND_FULL_NAME
-p = (char *) ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */
+p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */
-q = (char *) strchr ((char *) p, ',');
+q = strchr (p, ',');
 #else
-p = (char *) ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */
+p = ((pw) ? USER_FULL_NAME : "unknown"); /* don't gettext */
-q = (char *) strchr ((char *) p, ',');
+q = strchr (p, ',');
 #endif
 tem = ((!NILP (user) && !pw)
 	 ? Qnil
-	 : make_ext_string ((unsigned char *) p, (q ? q - p : strlen (p)),
+	 : make_ext_string ((Extbyte *) p, (q ? q - p : strlen (p)),
 			    FORMAT_OS));
 #ifdef AMPERSAND_FULL_NAME
 if (!NILP (tem))
 {
 resolution finer than a second.
 */
 ())
 {
 EMACS_TIME t;
-Lisp_Object result[3];
 EMACS_GET_TIME (t);
-XSETINT (result[0], (EMACS_SECS (t) >> 16) & 0xffff);
+return list3 (make_int ((EMACS_SECS (t) >> 16) & 0xffff),
-XSETINT (result[1], (EMACS_SECS (t) >> 0)  & 0xffff);
+		make_int ((EMACS_SECS (t) >> 0)  & 0xffff),
-XSETINT (result[2], EMACS_USECS (t));
+		make_int (EMACS_USECS (t)));
-return Flist (3, result);
 }
 DEFUN ("current-process-time", Fcurrent_process_time, 0, 0, 0, /*
 Return the amount of time used by this XEmacs process so far.
 The return value is a list of three floating-point numbers, expressing
 get_process_times (&user, &sys, &real);
 return list3 (make_float (user), make_float (sys), make_float (real));
 }
+int lisp_to_time (Lisp_Object specified_time, time_t *result);
 int
 lisp_to_time (Lisp_Object specified_time, time_t *result)
 {
+Lisp_Object high, low;
 if (NILP (specified_time))
 return time (result) != -1;
-else
-{
+CHECK_CONS (specified_time);
-Lisp_Object high, low;
+high = XCAR (specified_time);
-high = Fcar (specified_time);
+low  = XCDR (specified_time);
-CHECK_INT (high);
+if (CONSP (low))
-low = Fcdr (specified_time);
+low = XCAR (low);
-if (CONSP (low))
+CHECK_INT (high);
-	low = XCAR (low);
+CHECK_INT (low);
-CHECK_INT (low);
+*result = (XINT (high) << 16) + (XINT (low) & 0xffff);
-*result = (XINT (high) << 16) + (XINT (low) & 0xffff);
+return *result >> 16 == XINT (high);
-return *result >> 16 == XINT (high);
+}
-}
-}
+Lisp_Object time_to_lisp (time_t the_time);
 Lisp_Object
 time_to_lisp (time_t the_time)
 {
 unsigned int item = (unsigned int) the_time;
 return Fcons (make_int (item >> 16), make_int (item & 0xffff));
 characters appearing in the day and month names may be incorrect.
 */
 (format_string, _time))
 {
 time_t value;
-int size;
+size_t size;
 CHECK_STRING (format_string);
 if (! lisp_to_time (_time, &value))
 error ("Invalid time specification");
 DEFUN ("encode-time", Fencode_time, 6, MANY, 0, /*
 Convert SECOND, MINUTE, HOUR, DAY, MONTH, YEAR and ZONE to internal time.
 This is the reverse operation of `decode-time', which see.
 ZONE defaults to the current time zone rule.  This can
 be a string (as from `set-time-zone-rule'), or it can be a list
-(as from `current-time-zone') or an integer (as from `decode-time')
+\(as from `current-time-zone') or an integer (as from `decode-time')
 applied without consideration for daylight savings time.
 You can pass more than 7 arguments; then the first six arguments
 are used as SECOND through YEAR, and the *last* argument is used as ZONE.
 The intervening arguments are ignored.
 the data it can't find.
 */
 (specified_time))
 {
 time_t value;
-struct tm *t;
+struct tm *t = NULL;
 if (lisp_to_time (specified_time, &value)
 && (t = gmtime (&value)) != 0)
 {
-struct tm gmt;
+struct tm gmt = *t;	/* Make a copy, in case localtime modifies *t.  */
 long offset;
 char *s, buf[6];
-gmt = *t;		/* Make a copy, in case localtime modifies *t.  */
 t = localtime (&value);
 offset = difftm (t, &gmt);
 s = 0;
 #ifdef HAVE_TM_ZONE
 if (t->tm_zone)
 #ifdef LOCALTIME_CACHE
 /* These two values are known to load tz files in buggy implementations,
 i.e. Solaris 1 executables running under either Solaris 1 or Solaris 2.
 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''.  */
 struct buffer *buf = current_buffer;
 get_buffer_range_char (buf, start, end, &pos, &stop, 0);
 CHECK_STRING (table);
-size = string_char_length (XSTRING (table));
+size = XSTRING_CHAR_LENGTH (table);
 cnt = 0;
 mc_count = begin_multiple_change (buf, pos, stop);
 for (; pos < stop; pos++)
 {
 void
 transpose_markers (Bufpos start1, Bufpos end1, Bufpos start2, Bufpos end2)
 {
 Charcount amt1, amt2, diff;
-Bufpos mpos;
 Lisp_Object marker;
 struct buffer *buf = current_buffer;
 /* Update point as if it were a marker.  */
 if (BUF_PT (buf) < start1)
 amt2 = (end1 - start1) + (start2 - end1);
 for (marker = BUF_MARKERS (buf); !NILP (marker);
 marker = XMARKER (marker)->chain)
 {
-mpos = marker_position (marker);
+Bufpos mpos = marker_position (marker);
 if (mpos >= start1 && mpos < end2)
 	{
 	  if (mpos < end1)
 	    mpos += amt1;
 	  else if (mpos < start2)
 DEFSUBR (Fregion_beginning);
 DEFSUBR (Fregion_end);
 DEFSUBR (Fsave_excursion);
 DEFSUBR (Fsave_current_buffer);
-DEFSUBR (Fbufsize);
+DEFSUBR (Fbuffer_size);
 DEFSUBR (Fpoint_max);
 DEFSUBR (Fpoint_min);
 DEFSUBR (Fpoint_min_marker);
 DEFSUBR (Fpoint_max_marker);

Mercurial > hg > xemacs-beta

comparison src/editfns.c @ 272:c5d627a313b1 r21-0b34