xemacs-beta: src/editfns.c comparison

comparison src/editfns.c @ 70:131b0175ea99 r20-0b30

Import from CVS: tag r20-0b30

author	cvs
date	Mon, 13 Aug 2007 09:02:59 +0200
parents	56c54cf7c5b6
children	c7528f8e288d

comparison

equal deleted inserted replaced

-:804d1389bcd6
+:131b0175ea99
 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;
+if (BUF_PT (b) == BUF_BEGV (b))
+return Qt;
+return Qnil;
 }
 DEFUN ("eobp", Feobp, 0, 1, 0, /*
 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))
 {
 struct buffer *b = decode_buffer (buffer, 1);
-return BUF_PT (b) == BUF_ZV (b) ? Qt : Qnil;
+if (BUF_PT (b) == BUF_ZV (b))
+return Qt;
+return Qnil;
 }
 int
 beginning_of_line_p (struct buffer *b, Bufpos pt)
 {
 if (BUF_PT (b) == BUF_ZV (b) || BUF_FETCH_CHAR (b, BUF_PT (b)) == '\n')
 return Qt;
 return Qnil;
 }
-DEFUN ("char-after", Fchar_after, 0, 2, 0, /*
+DEFUN ("char-after", Fchar_after, 1, 2, 0, /*
 Return character in BUFFER at position POS.
 POS is an integer or a buffer pointer.
 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.
 */
 (pos, buffer))
 {
 struct buffer *b = decode_buffer (buffer, 1);
-Bufpos n = (NILP (pos) ? BUF_PT (b) :
+Bufpos n = get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD);
-	      get_buffer_pos_char (b, pos, GB_NO_ERROR_IF_BAD));
 if (n < 0 || n == BUF_ZV (b))
 return Qnil;
-return make_char (BUF_FETCH_CHAR (b, n));
+return (make_char (BUF_FETCH_CHAR (b, n)));
-}
-DEFUN ("char-before", Fchar_before, 0, 2, 0, /*
-Return character in BUFFER before position POS.
-POS is an integer or a buffer pointer.
-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.
-*/
-(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)));
-n--;
-if (n < BUF_BEGV (b))
-return Qnil;
-return make_char (BUF_FETCH_CHAR (b, n));
 }
 DEFUN ("user-login-name", Fuser_login_name, 0, 1, 0, /*
 Return the name under which the user logged in, as a string.
 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, /*
+DEFUN ("format-time-string", Fformat_time_string, 2, 2, 0, /*
 Use FORMAT-STRING to format the time TIME.
 TIME is specified as (HIGH LOW . IGNORED) or (HIGH . LOW), as from
-`current-time' and `file-attributes'.  If TIME is not specified it
+`current-time' and `file-attributes'.
-defaults to the current time.
 FORMAT-STRING may contain %-sequences to substitute parts of the time.
 %a is replaced by the abbreviated name of the day of week.
 %A is replaced by the full name of the day of week.
 %b is replaced by the abbreviated name of the month.
 %B is replaced by the full name of the month.
 DEFUN ("subst-char-in-region", Fsubst_char_in_region, 4, 5, 0, /*
 From START to END, replace FROMCHAR with TOCHAR each time it occurs.
 If optional arg NOUNDO is non-nil, don't record this change for undo
 and don't mark the buffer as really changed.
 */
 (start, end, fromchar, tochar, noundo))
 {
 /* This function can GC */
 Bufpos pos, stop;
 Emchar fromc, toc;
 int mc_count;
 any markers that happen to be located in the regions. (#### BUG: currently
 this function always acts as if LEAVE_MARKERS is non-nil.)
 Transposing beyond buffer boundaries is an error.
 */
 (startr1, endr1, startr2, endr2, leave_markers))
 {
 Bufpos start1, end1, start2, end2;
 Charcount len1, len2;
 Lisp_Object string1, string2;
 struct buffer *buf = current_buffer;
 DEFSUBR (Fbolp);
 DEFSUBR (Feolp);
 DEFSUBR (Ffollowing_char);
 DEFSUBR (Fpreceding_char);
 DEFSUBR (Fchar_after);
-DEFSUBR (Fchar_before);
 DEFSUBR (Finsert);
 DEFSUBR (Finsert_string);
 DEFSUBR (Finsert_before_markers);
 DEFSUBR (Finsert_char);
 - \"Motion\" commands do not change whether the region is active or not.
 set-mark-command (C-SPC) pushes a mark and activates the region.  Moving the
 cursor with normal motion commands (C-n, C-p, etc) will cause the region
 between point and the recently-pushed mark to be highlighted.  It will
-remain highlighted until some non-motion command is executed.
+remain highlighted until some non-motion comand is executed.
 exchange-point-and-mark (\\[exchange-point-and-mark]) activates the region.  So if you mark a
 region and execute a command that operates on it, you can reactivate the
 same region with \\[exchange-point-and-mark] (or perhaps \\[exchange-point-and-mark] \\[exchange-point-and-mark]) to operate on it
 again.

Mercurial > hg > xemacs-beta

comparison src/editfns.c @ 70:131b0175ea99 r20-0b30