emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] trunk r114039: * buffer.c (Foverlays_at, Foverlays_in, Fne


From: Dmitry Antipov
Subject: [Emacs-diffs] trunk r114039: * buffer.c (Foverlays_at, Foverlays_in, Fnext_overlay_change)
Date: Wed, 28 Aug 2013 08:33:54 +0000
User-agent: Bazaar (2.6b2)

------------------------------------------------------------
revno: 114039
revision-id: address@hidden
parent: address@hidden
committer: Dmitry Antipov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-08-28 12:33:12 +0400
message:
  * buffer.c (Foverlays_at, Foverlays_in, Fnext_overlay_change)
  (Fprevious_overlay_change): Fast path for buffer with no overlays.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/buffer.c                   buffer.c-20091113204419-o5vbwnq5f7feedwu-264
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-08-28 06:01:52 +0000
+++ b/src/ChangeLog     2013-08-28 08:33:12 +0000
@@ -1,3 +1,8 @@
+2013-08-28  Dmitry Antipov  <address@hidden>
+
+       * buffer.c (Foverlays_at, Foverlays_in, Fnext_overlay_change)
+       (Fprevious_overlay_change): Fast path for buffer with no overlays.
+
 2013-08-28  Paul Eggert  <address@hidden>
 
        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2013-08-27 18:47:55 +0000
+++ b/src/buffer.c      2013-08-28 08:33:12 +0000
@@ -4161,6 +4161,9 @@
 
   CHECK_NUMBER_COERCE_MARKER (pos);
 
+  if (!buffer_has_overlays ())
+    return Qnil;
+
   len = 10;
   /* We can't use alloca here because overlays_at can call xrealloc.  */
   overlay_vec = xmalloc (len * sizeof *overlay_vec);
@@ -4193,6 +4196,9 @@
   CHECK_NUMBER_COERCE_MARKER (beg);
   CHECK_NUMBER_COERCE_MARKER (end);
 
+  if (!buffer_has_overlays ())
+    return Qnil;
+
   len = 10;
   overlay_vec = xmalloc (len * sizeof *overlay_vec);
 
@@ -4221,6 +4227,9 @@
 
   CHECK_NUMBER_COERCE_MARKER (pos);
 
+  if (!buffer_has_overlays ())
+    return make_number (ZV);
+
   len = 10;
   overlay_vec = xmalloc (len * sizeof *overlay_vec);
 
@@ -4260,6 +4269,9 @@
 
   CHECK_NUMBER_COERCE_MARKER (pos);
 
+  if (!buffer_has_overlays ())
+    return make_number (BEGV);
+
   /* At beginning of buffer, we know the answer;
      avoid bug subtracting 1 below.  */
   if (XINT (pos) == BEGV)


reply via email to

[Prev in Thread] Current Thread [Next in Thread]