[Emacs-diffs] /srv/bzr/emacs/trunk r107586: * buffer.c (compare_overlays): Don't assume args differ (Bug#6830).

[Paul Eggert]

------------------------------------------------------------
revno: 107586
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Mon 2012-03-12 01:27:25 -0700
message:
  * buffer.c (compare_overlays): Don't assume args differ (Bug#6830).
modified:
  src/ChangeLog
  src/buffer.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-03-12 06:34:32 +0000
+++ b/src/ChangeLog     2012-03-12 08:27:25 +0000
@@ -1,3 +1,7 @@
+2012-03-12  Paul Eggert  <address@hidden>
+
+       * buffer.c (compare_overlays): Don't assume args differ (Bug#6830).
+
 2012-03-12  Chong Yidong  <address@hidden>
 
        * eval.c (inhibit_lisp_code): Rename from

=== modified file 'src/buffer.c'
--- a/src/buffer.c      2012-03-09 16:46:25 +0000
+++ b/src/buffer.c      2012-03-12 08:27:25 +0000
@@ -2868,7 +2868,9 @@
      between "equal" overlays.  The result can still change between
      invocations of Emacs, but it won't change in the middle of
      `find_field' (bug#6830).  */
-  return XHASH (s1->overlay) < XHASH (s2->overlay) ? -1 : 1;
+  if (XHASH (s1->overlay) != XHASH (s2->overlay))
+    return XHASH (s1->overlay) < XHASH (s2->overlay) ? -1 : 1;
+  return 0;
 }
 
 /* Sort an array of overlays by priority.  The array is modified in place.