mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-22 21:50:45 -08:00
Code Issues Projects Releases Wiki Activity

Catch-up merge from master/...@185556 to branch/2014-03-30/addrset.

Browse source 
Copied from Perforce
 Change: 185563
 ServerID: perforce.ravenbrook.com
This commit is contained in:
Gareth Rees 2014-04-15 13:14:50 +01:00
commit 42f18f93af
116 changed files with 1597 additions and 934 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mps/code/cbs.c
View file

@ -1174,8 +1174,7 @@ static Res cbsDescribe(Land land, mps_lib_FILE *stream)
res = SplayTreeDescribe(cbsSplay(cbs), stream, describe);
if (res != ResOK) return res;
res = METER_WRITE(cbs->treeSearch, stream);
if (res != ResOK) return res;
METER_WRITE(cbs->treeSearch, stream);
res = WriteF(stream, "}\n", NULL);
return res;