xemacs-beta: src/insdel.c comparison

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

Import from CVS: tag r21-0b34

author	cvs
date	Mon, 13 Aug 2007 10:28:48 +0200
parents	966663fcf606
children	ca9a9ec9c1c1

comparison

equal deleted inserted replaced

-:c7b7086b0a39
+:c5d627a313b1
 Working with the various representations:
 ========================================= */
 #include <config.h>
 #include "lisp.h"
+#include <limits.h>
 #include "buffer.h"
 #include "device.h"
 #include "frame.h"
 #include "extents.h"
 {
 if (flags & GB_CHECK_ORDER)
 	signal_simple_error_2 ("start greater than end", from, to);
 else
 	{
-	  Bufpos temp;
+	  Bufpos temp = *from_out;
-	  temp = *from_out;
 	  *from_out = *to_out;
 	  *to_out = temp;
 	}
 }
 }
 Charcount
 get_string_pos_char (Lisp_Object string, Lisp_Object pos, unsigned int flags)
 {
 return get_string_pos_char_1 (string, pos, flags,
-				string_char_length (XSTRING (string)));
+				XSTRING_CHAR_LENGTH (string));
 }
 Bytecount
 get_string_pos_byte (Lisp_Object string, Lisp_Object pos, unsigned int flags)
 {
 get_string_range_char (Lisp_Object string, Lisp_Object from, Lisp_Object to,
 		       Charcount *from_out, Charcount *to_out,
 		       unsigned int flags)
 {
 Charcount min_allowed = 0;
-Charcount max_allowed = string_char_length (XSTRING (string));
+Charcount max_allowed = XSTRING_CHAR_LENGTH (string);
 if (NILP (from) && (flags & GB_ALLOW_NIL))
 *from_out = min_allowed;
 else
 *from_out = get_string_pos_char_1 (string, from,
 {
 if (flags & GB_CHECK_ORDER)
 	signal_simple_error_2 ("start greater than end", from, to);
 else
 	{
-	  Bufpos temp;
+	  Bufpos temp = *from_out;
-	  temp = *from_out;
 	  *from_out = *to_out;
 	  *to_out = temp;
 	}
 }
 }
 Bufpos
 buffer_or_string_accessible_end_char (Lisp_Object object)
 {
 return STRINGP (object) ?
-string_char_length (XSTRING (object)) : BUF_ZV (XBUFFER (object));
+XSTRING_CHAR_LENGTH (object) : BUF_ZV (XBUFFER (object));
 }
 Bytind
 buffer_or_string_accessible_begin_byte (Lisp_Object object)
 {
 Bufpos
 buffer_or_string_absolute_end_char (Lisp_Object object)
 {
 return STRINGP (object) ?
-string_char_length (XSTRING (object)) : BUF_Z (XBUFFER (object));
+XSTRING_CHAR_LENGTH (object) : BUF_Z (XBUFFER (object));
 }
 Bytind
 buffer_or_string_absolute_begin_byte (Lisp_Object object)
 {
 /* Don't allow a buffer size that won't fit in an int
 	 even if it will fit in a Lisp integer.
 	 That won't work because so many places use `int'.  */
 if (BUF_Z (buf) - BUF_BEG (buf) + BUF_GAP_SIZE (buf) + increment
-	  >= ((unsigned) 1 << (min (INTBITS, VALBITS) - 1)))
+	  > (int) EMACS_INT_MAX)
-	error ("Buffer exceeds maximum size");
+	error ("Maximum buffer size exceeded");
 result = BUFFER_REALLOC (buf->text->beg,
 			       BI_BUF_Z (buf) - BI_BUF_BEG (buf) +
 			       BUF_GAP_SIZE (buf) + increment +
 			       BUF_END_SENTINEL_SIZE);
 as translatable, then Fgettext() should be called on obj if it
 is a string. */
 #endif
 /* Make sure that point-max won't exceed the size of an emacs int. */
-{
+if ((length + BUF_Z (buf)) > (int) EMACS_INT_MAX)
-Lisp_Object temp;
+error ("Maximum buffer size exceeded");
-XSETINT (temp, (int) (length + BUF_Z (buf)));
-if ((int) (length + BUF_Z (buf)) != XINT (temp))
-error ("maximum buffer size exceeded");
-}
 /* theoretically not necessary -- caller should GCPRO */
 GCPRO1 (reloc);
 prepare_to_modify_buffer (buf, pos, pos, !(flags & INSDEL_NO_LOCKING));
 /* This function can GC */
 Charcount numdel;
 Bytind bi_from, bi_to;
 Bytecount bc_numdel;
 int shortage;
-Lisp_Object bufobj = Qnil;
+Lisp_Object bufobj;
 /* Defensive steps just in case a buffer gets deleted and a calling
 function doesn't notice it. */
 if (!BUFFER_LIVE_P (buf))
 return;
 BUF_MODIFF (buf)++;
 MARK_BUFFERS_CHANGED;
 /* ### Point used to be modified here, but this causes problems with MULE,
 	 as point is used to calculate bytinds, and if the offset in bc_numdel causes
 	 point to move to a non first-byte location, causing some other function to
 	 throw an assertion in ASSERT_VALID_BYTIND. I've moved the code to right after
 	  the other movements and adjustments, but before the gap is moved.
 	  -- jh 970813 */
 /* Detach any extents that are completely within the range [FROM, TO],
 }
 void
 barf_if_buffer_read_only (struct buffer *buf, Bufpos from, Bufpos to)
 {
-Lisp_Object buffer = Qnil;
+Lisp_Object buffer;
 Lisp_Object iro;
 XSETBUFFER (buffer, buf);
 back:
 iro = (buf == current_buffer ? Vinhibit_read_only :
 	 symbol_value_in_buffer (Qinhibit_read_only, buffer));
-if (!NILP (iro) && !CONSP (iro))
+if (!LISTP (iro))
 return;
 if (NILP (iro) && !NILP (buf->read_only))
 {
 Fsignal (Qbuffer_read_only, (list1 (buffer)));
 goto back;
 }
 int
 emchar_string_displayed_columns (CONST Emchar *str, Charcount len)
 {
+#ifdef MULE
 int cols = 0;
 int i;
 for (i = 0; i < len; i++)
 cols += XCHARSET_COLUMNS (CHAR_CHARSET (str[i]));
 return cols;
+#else  /* not MULE */
+return len;
+#endif
 }
 /* NOTE: Does not reset the Dynarr. */
 void

Mercurial > hg > xemacs-beta

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