aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorPaul Eggert2011-04-27 15:29:33 -0700
committerPaul Eggert2011-04-27 15:29:33 -0700
commit54b8e3f7753cdd63ba6dac998d56fcd34dd59d8e (patch)
tree9d2fdec724dec1b168c7b6fe5155e30282090909 /src/eval.c
parent8f41de3a66a32996d77512569eae74c926a81c84 (diff)
parentfc3b729195fbe5297aa23320f83adb11225b6ded (diff)
downloademacs-54b8e3f7753cdd63ba6dac998d56fcd34dd59d8e.tar.gz
emacs-54b8e3f7753cdd63ba6dac998d56fcd34dd59d8e.zip
Merge from mainline.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/eval.c b/src/eval.c
index 8716ad78468..bcbbf740153 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1994,8 +1994,7 @@ verror (const char *m, va_list ap)
1994{ 1994{
1995 char buf[4000]; 1995 char buf[4000];
1996 size_t size = sizeof buf; 1996 size_t size = sizeof buf;
1997 size_t size_max = 1997 size_t size_max = min (MOST_POSITIVE_FIXNUM, SIZE_MAX);
1998 min (MOST_POSITIVE_FIXNUM, min (INT_MAX, SIZE_MAX - 1)) + 1;
1999 size_t mlen = strlen (m); 1998 size_t mlen = strlen (m);
2000 char *buffer = buf; 1999 char *buffer = buf;
2001 size_t used; 2000 size_t used;