aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGerd Moellmann2000-11-18 15:51:00 +0000
committerGerd Moellmann2000-11-18 15:51:00 +0000
commitedaa9aed5a8bccb5564943194f3a17759e3bfc36 (patch)
treeb7947cc38baf8f5caa530897055e2fee6ea7ee2c /src
parente47306e6461ea6b819f951f5e9d38d62be7f2c77 (diff)
downloademacs-edaa9aed5a8bccb5564943194f3a17759e3bfc36.tar.gz
emacs-edaa9aed5a8bccb5564943194f3a17759e3bfc36.zip
(mmap_enlarge): Don't print a message on stderr
if mapping new memory at the end of the existing region fails.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/buffer.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f7fef12be29..0146a543e01 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12000-11-18 Gerd Moellmann <gerd@gnu.org> 12000-11-18 Gerd Moellmann <gerd@gnu.org>
2 2
3 * buffer.c (mmap_enlarge): Don't print a message on stderr
4 if mapping new memory at the end of the existing region fails.
5
3 * dispnew.c (update_text_area): Don't skip over equal glyphs 6 * dispnew.c (update_text_area): Don't skip over equal glyphs
4 when the last current glyph overlaps the glyph to its right. 7 when the last current glyph overlaps the glyph to its right.
5 8
diff --git a/src/buffer.c b/src/buffer.c
index ae04d7a1511..1e31c93ea5c 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -4275,7 +4275,7 @@ mmap_enlarge (r, npages)
4275 p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE, 4275 p = mmap (region_end, nbytes, PROT_READ | PROT_WRITE,
4276 MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0); 4276 MAP_ANON | MAP_PRIVATE | MAP_FIXED, mmap_fd, 0);
4277 if (p == MAP_FAILED) 4277 if (p == MAP_FAILED)
4278 fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); 4278 ; /* fprintf (stderr, "mmap: %s\n", emacs_strerror (errno)); */
4279 else if (p != (POINTER_TYPE *) region_end) 4279 else if (p != (POINTER_TYPE *) region_end)
4280 { 4280 {
4281 /* Kernels are free to choose a different address. In 4281 /* Kernels are free to choose a different address. In