Revert and cleanup some recent overlay changes.

* buffer.h (enum overlay_type): Remove.
(buffer_get_overlays, buffer_set_overlays): Likewise.
(buffer_set_overlays_before, buffer_set_overlays_after):
New function.  Adjust users.
(unchain_both): Add eassert.

1 files changed, 22 insertions, 46 deletions

diff --git a/src/buffer.h b/src/buffer.h
index 286c20d9e9c..7a6bddee5ec 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -946,52 +946,6 @@ extern void mmap_set_vars (int);
       }                                                                 \
   } while (0)
 
-enum overlay_type
-{
-  OV_BEFORE,
-  OV_AFTER
-};
-
-/* Get overlay list of type T and belonging to B.  */
-
-BUFFER_INLINE struct Lisp_Overlay *
-buffer_get_overlays (struct buffer *b, enum overlay_type t)
-{
-  if (!b)
-    b = current_buffer;
-  if (t == OV_BEFORE)
-    return b->overlays_before;
-  else if (t == OV_AFTER)
-    return b->overlays_after;
-  else
-    abort ();
-}
-
-/* Set overlay list of type T as belonging to B.  */
-
-BUFFER_INLINE void
-buffer_set_overlays (struct buffer *b, struct Lisp_Overlay *o,
-                     enum overlay_type t)
-{
-  if (!b)
-    b = current_buffer;
-  if (t == OV_BEFORE)
-    b->overlays_before = o;
-  else if (t == OV_AFTER)
-    b->overlays_after = o;
-  else
-    abort ();
-}
-
-/* Non-zero if current buffer has overlays.  */
-
-BUFFER_INLINE int
-buffer_has_overlays (void)
-{
-  return buffer_get_overlays (current_buffer, OV_BEFORE)
-    || buffer_get_overlays (current_buffer, OV_AFTER);
-}
-
 extern Lisp_Object Qbefore_change_functions;
 extern Lisp_Object Qafter_change_functions;
 extern Lisp_Object Qfirst_change_hook;
@@ -1014,6 +968,28 @@ buffer_set_intervals (struct buffer *b, INTERVAL i)
   b->text->intervals = i;
 }
 
+/* Set an appropriate overlay of B.  */
+
+BUFFER_INLINE void
+buffer_set_overlays_before (struct buffer *b, struct Lisp_Overlay *o)
+{
+  b->overlays_before = o;
+}
+
+BUFFER_INLINE void
+buffer_set_overlays_after (struct buffer *b, struct Lisp_Overlay *o)
+{
+  b->overlays_after = o;
+}
+
+/* Non-zero if current buffer has overlays.  */
+
+BUFFER_INLINE int
+buffer_has_overlays (void)
+{
+  return current_buffer->overlays_before || current_buffer->overlays_after;
+}
+
 /* Return character code of multi-byte form at byte position POS.  If POS
    doesn't point the head of valid multi-byte form, only the byte at
    POS is returned.  No range checking.