[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108048: Backport: Really fix bug #11519, by fixing the last change in ralloc.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 108048
fixes bug: http://debbugs.gnu.org/11519
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Sat 2012-06-23 14:07:01 +0300
message:
  Backport: Really fix bug #11519, by fixing the last change in ralloc.c.
  
   src/ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko
   in the logic of incrementing and decrementing the value of
   use_relocatable_buffers.
modified:
  src/ChangeLog
  src/ralloc.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-06-21 20:06:07 +0000
+++ b/src/ChangeLog     2012-06-23 11:07:01 +0000
@@ -1,3 +1,9 @@
+2012-06-23  Eli Zaretskii  <address@hidden>
+
+       * ralloc.c (r_alloc_inhibit_buffer_relocation): Fix stupid thinko
+       in the logic of incrementing and decrementing the value of
+       use_relocatable_buffers.
+
 2012-06-21  Glenn Morris  <address@hidden>
 
        * charset.c (init_charset): Make lack of etc/charsets fatal.

=== modified file 'src/ralloc.c'
--- a/src/ralloc.c      2012-05-28 16:50:10 +0000
+++ b/src/ralloc.c      2012-06-23 11:07:01 +0000
@@ -757,7 +757,7 @@
   if (! r_alloc_initialized)
     r_alloc_init ();
 
-  if (! use_relocatable_buffers)
+  if (use_relocatable_buffers <= 0)
     return (*real_morecore) (size);
 
   if (size == 0)
@@ -1204,12 +1204,12 @@
 void
 r_alloc_inhibit_buffer_relocation (int inhibit)
 {
-  if (use_relocatable_buffers < 0)
-    use_relocatable_buffers = 0;
+  if (use_relocatable_buffers > 1)
+    use_relocatable_buffers = 1;
   if (inhibit)
+    use_relocatable_buffers--;
+  else if (use_relocatable_buffers < 1)
     use_relocatable_buffers++;
-  else if (use_relocatable_buffers > 0)
-    use_relocatable_buffers--;
 }