(byte-compile-current-file): Don't bind

[gnu-emacs] / src / marker.c

diff --git a/src/marker.c b/src/marker.c
index dd53628462e1ede9f43724b16dda4306ea6d56a3..b3f9e0b4b84e96932b5a406c0474101925bbf440 100644 (file)
--- a/src/marker.c
+++ b/src/marker.c
@@ -32,10 +32,13 @@ static int cached_bytepos;
 static struct buffer *cached_buffer;
 static int cached_modiff;
 
+static void byte_char_debug_check P_ ((struct buffer *, int, int));
+
 /* Nonzero means enable debugging checks on byte/char correspondences.  */
 
 static int byte_debug_flag;
 
+void
 clear_charpos_cache (b)
      struct buffer *b;
 {
@@ -96,7 +99,7 @@ clear_charpos_cache (b)
     }                                                                  \
 }
 
-int
+static void
 byte_char_debug_check (b, charpos, bytepos)
      struct buffer *b;
      int charpos, bytepos;
@@ -167,7 +170,7 @@ buf_charpos_to_bytepos (b, charpos)
     CONSIDER (cached_charpos, cached_bytepos);
 
   tail = BUF_MARKERS (b);
-  while (XSYMBOL (tail) != XSYMBOL (Qnil))
+  while (! NILP (tail))
     {
       CONSIDER (XMARKER (tail)->charpos, XMARKER (tail)->bytepos);
 
@@ -199,9 +202,10 @@ buf_charpos_to_bytepos (b, charpos)
         It will last until the next GC.  */
       if (record)
        {
-         Lisp_Object marker;
+         Lisp_Object marker, buffer;
          marker = Fmake_marker ();
-         set_marker_both (marker, Qnil, best_below, best_below_byte);
+         XSETBUFFER (buffer, b);
+         set_marker_both (marker, buffer, best_below, best_below_byte);
        }
 
       if (byte_debug_flag)
@@ -229,9 +233,10 @@ buf_charpos_to_bytepos (b, charpos)
         It will last until the next GC.  */
       if (record)
        {
-         Lisp_Object marker;
+         Lisp_Object marker, buffer;
          marker = Fmake_marker ();
-         set_marker_both (marker, Qnil, best_above, best_above_byte);
+         XSETBUFFER (buffer, b);
+         set_marker_both (marker, buffer, best_above, best_above_byte);
        }
 
       if (byte_debug_flag)
@@ -333,7 +338,7 @@ buf_bytepos_to_charpos (b, bytepos)
     CONSIDER (cached_bytepos, cached_charpos);
 
   tail = BUF_MARKERS (b);
-  while (XSYMBOL (tail) != XSYMBOL (Qnil))
+  while (! NILP (tail))
     {
       CONSIDER (XMARKER (tail)->bytepos, XMARKER (tail)->charpos);
 
@@ -352,7 +357,7 @@ buf_bytepos_to_charpos (b, bytepos)
 
   if (bytepos - best_below_byte < best_above_byte - bytepos)
     {
-      int record = best_above_byte - bytepos > 5000;
+      int record = bytepos - best_below_byte > 5000;
 
       while (best_below_byte < bytepos)
        {
@@ -362,12 +367,15 @@ buf_bytepos_to_charpos (b, bytepos)
 
       /* If this position is quite far from the nearest known position,
         cache the correspondence by creating a marker here.
-        It will last until the next GC.  */
-      if (record)
+        It will last until the next GC.
+        But don't do it if BUF_MARKERS is nil;
+        that is a signal from Fset_buffer_multibyte.  */
+      if (record && ! NILP (BUF_MARKERS (b)))
        {
-         Lisp_Object marker;
+         Lisp_Object marker, buffer;
          marker = Fmake_marker ();
-         set_marker_both (marker, Qnil, best_below, best_below_byte);
+         XSETBUFFER (buffer, b);
+         set_marker_both (marker, buffer, best_below, best_below_byte);
        }
 
       if (byte_debug_flag)
@@ -392,12 +400,15 @@ buf_bytepos_to_charpos (b, bytepos)
 
       /* If this position is quite far from the nearest known position,
         cache the correspondence by creating a marker here.
-        It will last until the next GC.  */
-      if (record)
+        It will last until the next GC.
+        But don't do it if BUF_MARKERS is nil;
+        that is a signal from Fset_buffer_multibyte.  */
+      if (record && ! NILP (BUF_MARKERS (b)))
        {
-         Lisp_Object marker;
+         Lisp_Object marker, buffer;
          marker = Fmake_marker ();
-         set_marker_both (marker, Qnil, best_above, best_above_byte);
+         XSETBUFFER (buffer, b);
+         set_marker_both (marker, buffer, best_above, best_above_byte);
        }
 
       if (byte_debug_flag)
@@ -616,16 +627,7 @@ set_marker_both (marker, buffer, charpos, bytepos)
   register struct Lisp_Marker *m;
 
   CHECK_MARKER (marker, 0);
-  /* If position is nil or a marker that points nowhere,
-     make this marker point nowhere.  */
-  if (NILP (charpos)
-      || (MARKERP (charpos) && !XMARKER (charpos)->buffer))
-    {
-      unchain_marker (marker);
-      return marker;
-    }
 
-  CHECK_NUMBER_COERCE_MARKER (charpos, 1);
   if (NILP (buffer))
     b = current_buffer;
   else
@@ -743,9 +745,11 @@ unchain_marker (marker)
   if (EQ (b->name, Qnil))
     abort ();
 
+  XMARKER (marker)->buffer = 0;
+
   tail = BUF_MARKERS (b);
   prev = Qnil;
-  while (XSYMBOL (tail) != XSYMBOL (Qnil))
+  while (! GC_NILP (tail))
     {
       next = XMARKER (tail)->chain;
       XUNMARK (next);
@@ -768,13 +772,17 @@ unchain_marker (marker)
              XMARKER (prev)->chain = next;
              XSETMARKBIT (XMARKER (prev)->chain, omark);
            }
-         break;
+         /* We have removed the marker from the chain;
+            no need to scan the rest of the chain.  */
+         return;
        }
       else
        prev = tail;
       tail = next;
     }
-  XMARKER (marker)->buffer = 0;
+
+  /* Marker was not in its chain.  */
+  abort ();
 }
 
 /* Return the char position of marker MARKER, as a C integer.  */
@@ -822,16 +830,14 @@ see `marker-insertion-type'.")
 {
   register Lisp_Object new;
 
-  if (INTEGERP (marker) || MARKERP (marker))
-    {
-      new = Fmake_marker ();
-      Fset_marker (new, marker,
-                  (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
-      XMARKER (new)->insertion_type = !NILP (type);
-      return new;
-    }
-  else
+  if (! (INTEGERP (marker) || MARKERP (marker)))
     marker = wrong_type_argument (Qinteger_or_marker_p, marker);
+
+  new = Fmake_marker ();
+  Fset_marker (new, marker,
+              (MARKERP (marker) ? Fmarker_buffer (marker) : Qnil));
+  XMARKER (new)->insertion_type = !NILP (type);
+  return new;
 }
 
 DEFUN ("marker-insertion-type", Fmarker_insertion_type,
@@ -877,7 +883,7 @@ DEFUN ("buffer-has-markers-at", Fbuffer_has_markers_at, Sbuffer_has_markers_at,
     charno = Z;
 
   for (tail = BUF_MARKERS (current_buffer);
-       XSYMBOL (tail) != XSYMBOL (Qnil);
+       !NILP (tail);
        tail = XMARKER (tail)->chain)
     if (XMARKER (tail)->charpos == charno)
       return Qt;