Mercurial > emacs

changeset 3031:5c96dfc52433

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* buffer.c (Fmake_overlay): Put beg and end in the right order. (Fmove_overlay): If beg and end are markers, make sure they're in the right buffer.
author Jim Blandy <jimb@redhat.com>
date Mon, 24 May 1993 20:57:32 +0000
parents 2c5ea1c98256
children 371058345c42
files src/buffer.c
diffstat 1 files changed, 27 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/src/buffer.c	Mon May 24 19:54:15 1993 +0000
+++ b/src/buffer.c	Mon May 24 20:57:32 1993 +0000
@@ -1489,28 +1489,28 @@
 
   if (NILP (buffer))
     XSET (buffer, Lisp_Buffer, current_buffer);
-  CHECK_BUFFER (buffer, 2);
+  else
+    CHECK_BUFFER (buffer, 2);
+  if (MARKERP (beg)
+      && ! EQ (Fmarker_buffer (beg), buffer))
+    error ("Marker points into wrong buffer");
+  if (MARKERP (end)
+      && ! EQ (Fmarker_buffer (end), buffer))
+    error ("Marker points into wrong buffer");
+
+  CHECK_NUMBER_COERCE_MARKER (beg, 1);
+  CHECK_NUMBER_COERCE_MARKER (end, 1);
+
+  if (XINT (beg) > XINT (end))
+    {
+      Lisp_Object temp = beg;
+      beg = end; end = temp;
+    }
 
   b = XBUFFER (buffer);
 
-  if (MARKERP (beg))
-    {
-      if (! EQ (Fmarker_buffer (beg), buffer))
-	error ("Marker points into wrong buffer");
-      else
-	beg = Fcopy_marker (beg);
-    }
-  else
-    beg = Fset_marker (Fmake_marker (), beg, buffer);
-  if (MARKERP (end))
-    {
-      if (! EQ (Fmarker_buffer (end), buffer))
-	error ("Marker points into wrong buffer");
-      else
-	end = Fcopy_marker (end);
-    }
-  else
-    end = Fset_marker (Fmake_marker (), end, buffer);
+  beg = Fset_marker (Fmake_marker (), beg, buffer);
+  end = Fset_marker (Fmake_marker (), end, buffer);
 
   overlay = Fcons (Fcons (beg, end), Qnil);
   XSETTYPE (overlay, Lisp_Overlay);
@@ -1547,6 +1547,14 @@
   if (NILP (buffer))
     XSET (buffer, Lisp_Buffer, current_buffer);
   CHECK_BUFFER (buffer, 3);
+
+  if (MARKERP (beg)
+      && ! EQ (Fmarker_buffer (beg), buffer))
+    error ("Marker points into wrong buffer");
+  if (MARKERP (end)
+      && ! EQ (Fmarker_buffer (end), buffer))
+    error ("Marker points into wrong buffer");
+
   CHECK_NUMBER_COERCE_MARKER (beg, 1);
   CHECK_NUMBER_COERCE_MARKER (end, 1);