xemacs-beta: src/editfns.c comparison

comparison src/editfns.c @ 153:25f70ba0133c r20-3b3

Import from CVS: tag r20-3b3

author	cvs
date	Mon, 13 Aug 2007 09:38:25 +0200
parents	59463afc5666
children	28f395d8dc7a

comparison

equal deleted inserted replaced

-:4c132ee2d62b
+:25f70ba0133c
 Beginning of buffer is position (point-min).
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
-return make_int (BUF_PT (decode_buffer (buffer, 1)));
+struct buffer *b = decode_buffer (buffer, 1);
+return make_int (BUF_PT (b));
 }
 DEFUN ("point-marker", Fpoint_marker, 0, 2, 0, /*
 Return value of point, as a marker object.
 This marker is a copy; you may modify it with reckless abandon.
 else
 return m;
 }
 DEFUN ("region-beginning", Fregion_beginning, 0, 1, 0, /*
-Return position of beginning of region, as an integer.
+Return position of beginning of region in BUFFER, as an integer.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
-return (region_limit (1, decode_buffer (buffer, 1)));
+return region_limit (1, decode_buffer (buffer, 1));
 }
 DEFUN ("region-end", Fregion_end, 0, 1, 0, /*
-Return position of end of region, as an integer.
+Return position of end of region in BUFFER, as an integer.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 return region_limit (0, decode_buffer (buffer, 1));
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
-return (make_int (BUF_SIZE (b)));
+return make_int (BUF_SIZE (b));
 }
 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.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
-return (make_int (BUF_BEGV (b)));
+return make_int (BUF_BEGV (b));
 }
 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.
 is in effect, in which case it is less.
 If BUFFER is nil, the current buffer is assumed.
 */
 (buffer))
 {
-return make_int (BUF_ZV (decode_buffer (buffer,1)));
+struct buffer *b = decode_buffer (buffer, 1);
+return make_int (BUF_ZV (b));
 }
 DEFUN ("point-max-marker", Fpoint_max_marker, 0, 1, 0, /*
 Return a marker to the maximum permissible value of point BUFFER.
 This is (1+ (buffer-size)), unless narrowing (a buffer restriction)
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 if (BUF_PT (b) >= BUF_ZV (b))
-return (Qzero);             /* #### Gag me! */
+return Qzero;             /* #### Gag me! */
 else
-return (make_char (BUF_FETCH_CHAR (b, BUF_PT (b))));
+return make_char (BUF_FETCH_CHAR (b, BUF_PT (b)));
 }
 DEFUN ("preceding-char", Fpreceding_char, 0, 1, 0, /*
 Return the character preceding point.
 At the beginning of the buffer or accessible region, return 0.
 */
 (buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
 if (BUF_PT (b) <= BUF_BEGV (b))
-return (Qzero);             /* #### Gag me! */
+return Qzero;             /* #### Gag me! */
 else
-return (make_char (BUF_FETCH_CHAR (b, BUF_PT (b) - 1)));
+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.
 If the buffer is narrowed, this means the beginning of the narrowed part.
 (The DVX libraries override the Djgpp libraries here.)  */
 Lisp_Object tem = build_string (pw ? pw->pw_name : "root");/* no gettext */
 #else
 Lisp_Object tem = build_string (pw ? pw->pw_name : "unknown");/* no gettext */
 #endif
-return (tem);
+return tem;
 }
 DEFUN ("user-uid", Fuser_uid, 0, 0, 0, /*
 Return the effective uid of Emacs, as an integer.
 */
 #endif /* AMPERSAND_FULL_NAME */
 p = getenv ("NAME");
 if (p)
 tem = build_string (p);
-return (tem);
+return tem;
 }
 DEFUN ("system-name", Fsystem_name, 0, 0, 0, /*
 Return the name of the machine you are running on, as a string.
 */
 ())
 {
-return (Fcopy_sequence (Vsystem_name));
+return Fcopy_sequence (Vsystem_name);
 }
 /* For the benefit of callers who don't want to include lisp.h.
 Caller must free! */
 char *
 If a string has non-null string-extent-data, new extents will be created.
 BUFFER defaults to the current buffer.
 */
 (string, buffer))
 {
-struct buffer *buf = decode_buffer (buffer, 1);
+struct buffer *b = decode_buffer (buffer, 1);
 CHECK_STRING (string);
-buffer_insert_lisp_string (buf, string);
+buffer_insert_lisp_string (b, string);
 zmacs_region_stays = 0;
 return Qnil;
 }
 /* Third argument in FSF is INHERIT:
 REGISTER int slen;
 REGISTER int i, j;
 REGISTER Bytecount n;
 REGISTER Bytecount charlen;
 Bufbyte str[MAX_EMCHAR_LEN];
-struct buffer *buf = decode_buffer (buffer, 1);
+struct buffer *b = decode_buffer (buffer, 1);
 int cou;
 CHECK_CHAR_COERCE_INT (chr);
 if (NILP (count))
 cou = 1;
 for (j = 0; j < charlen; j++)
 string[i + j] = str[j];
 slen = i;
 while (n >= slen)
 {
-buffer_insert_raw_string (buf, string, slen);
+buffer_insert_raw_string (b, string, slen);
 n -= slen;
 }
 if (n > 0)
 #if 0 /* FSFmacs bogosity */
 {
 	insert_and_inherit (string, n);
 else
 	insert (string, n);
 }
 #else
-buffer_insert_raw_string (buf, string, n);
+buffer_insert_raw_string (b, string, n);
 #endif
 zmacs_region_stays = 0;
 return Qnil;
 }
 If BUFFER is nil, the current buffer is assumed.
 */
 (c1, c2, buffer))
 {
 Emchar x1, x2;
-struct buffer *buf = decode_buffer (buffer, 1);
+struct buffer *b = decode_buffer (buffer, 1);
 CHECK_CHAR_COERCE_INT (c1);
 CHECK_CHAR_COERCE_INT (c2);
 x1 = XCHAR (c1);
 x2 = XCHAR (c2);
-if (!NILP (buf->case_fold_search)
+return (!NILP (b->case_fold_search)
-? DOWNCASE (buf, x1) == DOWNCASE (buf, x2)
+	  ? DOWNCASE (b, x1) == DOWNCASE (b, x2)
-: x1 == x2)
+	  : x1 == x2)
-return Qt;
+? Qt : Qnil;
-return Qnil;
 }
 DEFUN ("char=", Fchar_Equal, 2, 3, 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))
 {
-Emchar x1, x2;
 CHECK_CHAR_COERCE_INT (c1);
 CHECK_CHAR_COERCE_INT (c2);
-x1 = XCHAR (c1);
-x2 = XCHAR (c2);
+return XCHAR(c1) == XCHAR(c2) ? Qt : Qnil;
-return x1 == x2 ? Qt : Qnil;
 }
 #if 0 /* Undebugged FSFmacs code */
 /* Transpose the markers in two regions of the current buffer, and
 adjust the ones between them if necessary (i.e.: if the regions
 	  set_marker_position (marker, mpos);
 	}
 }
 }
-#endif
+#endif /* 0 */
 DEFUN ("transpose-regions", Ftranspose_regions, 4, 5, 0, /*
 Transpose region START1 to END1 with START2 to END2.
 The regions may not be overlapping, because the size of the buffer is
 never changed in a transposition.

Mercurial > hg > xemacs-beta

comparison src/editfns.c @ 153:25f70ba0133c r20-3b3