diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-05-31 14:08:06 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-05-31 14:08:06 +0800 |
| commit | efc00ab16e2890b75d7224434ac43fe944ade4dd (patch) | |
| tree | 28c1078ca32b96402cd1a5f618a17b3526143f27 /src/ralloc.c | |
| parent | ba93a18774352c97d6dd73c73141cbff6305581b (diff) | |
| parent | dd41169b6cb0105b0766f3d368c657ebafc19cba (diff) | |
| download | emacs-efc00ab16e2890b75d7224434ac43fe944ade4dd.tar.gz | |
Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de
Diffstat (limited to 'src/ralloc.c')
| -rw-r--r-- | src/ralloc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/ralloc.c b/src/ralloc.c index 7fdef69842a..19d15664eec 100644 --- a/src/ralloc.c +++ b/src/ralloc.c @@ -1142,7 +1142,12 @@ r_alloc_reset_variable (POINTER *old, POINTER *new) void r_alloc_inhibit_buffer_relocation (int inhibit) { - use_relocatable_buffers = !inhibit; + if (use_relocatable_buffers < 0) + use_relocatable_buffers = 0; + if (inhibit) + use_relocatable_buffers++; + else if (use_relocatable_buffers > 0) + use_relocatable_buffers--; } |