7 files changed, 32 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 65f1c086260..f61c2ccdb00 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,25 @@
+2012-10-19  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
+
+        * font.c (Ffont_at): Fix previous change.
+
+2012-10-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * puresize.h (BASE_PURESIZE): Bump the base value to 1700000.  See
+        http://lists.gnu.org/archive/html/emacs-devel/2012-10/msg00593.html
+        for the reasons.
+
+        * alloc.c (NSTATICS): Decrease to 0x800.
+
+2012-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * fns.c (Fnreverse): Include the problem element when signalling an
+        error (bug#12677).
+
+2012-10-18  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * nsterm.m (ns_select): Check writefds before call to
+        FD_ISSET (Bug#12668).
+
 2012-10-18  Daniel Colascione  <dancol@dancol.org>
 
         * alloc.c (NSTATICS): Increase from 0x650 to 0x1000
diff --git a/src/alloc.c b/src/alloc.c
index 08dc26784cc..5bb528c64ab 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -376,7 +376,7 @@ struct gcpro *gcprolist;
 /* Addresses of staticpro'd variables.  Initialize it to a nonzero
    value; otherwise some compilers put it into BSS.  */
 
-#define NSTATICS 0x1000
+#define NSTATICS 0x800
 static Lisp_Object *staticvec[NSTATICS] = {&Vpurify_flag};
 
 /* Index of next unused slot in staticvec.  */
@@ -5030,7 +5030,7 @@ staticpro (Lisp_Object *varaddress)
 {
   staticvec[staticidx++] = varaddress;
   if (staticidx >= NSTATICS)
-    fatal ("NSTATICS too small. Try increasing and recompiling Emacs.");
+    fatal ("NSTATICS too small; try increasing and recompiling Emacs.");
 }
 
 
diff --git a/src/coding.c b/src/coding.c
index 412d7245223..7628a9fbf2e 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -415,7 +415,7 @@ enum iso_code_class_type
     ISO_shift_out,              /* ISO_CODE_SO (0x0E) */
     ISO_shift_in,               /* ISO_CODE_SI (0x0F) */
     ISO_single_shift_2_7,       /* ISO_CODE_SS2_7 (0x19) */
-    ISO_escape,                 /* ISO_CODE_SO (0x1B) */
+    ISO_escape,                 /* ISO_CODE_ESC (0x1B) */
     ISO_control_1,              /* Control codes in the range
                                    0x80..0x9F, except for the
                                    following 3 codes.  */
diff --git a/src/fns.c b/src/fns.c
index c999b5b08b9..b1ba5ce9509 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1689,7 +1689,7 @@ changing the value of a sequence `foo'.  */)
 
 DEFUN ("nreverse", Fnreverse, Snreverse, 1, 1, 0,
        doc: /* Reverse LIST by modifying cdr pointers.
-Return the reversed list.  */)
+Return the reversed list.  Expects a properly nil-terminated list.  */)
   (Lisp_Object list)
 {
   register Lisp_Object prev, tail, next;
@@ -1700,7 +1700,7 @@ Return the reversed list.  */)
   while (!NILP (tail))
     {
       QUIT;
-      CHECK_LIST_CONS (tail, list);
+      CHECK_LIST_CONS (tail, tail);
       next = XCDR (tail);
       Fsetcdr (tail, prev);
       prev = tail;
diff --git a/src/font.c b/src/font.c
index 629e8bb977a..7cb4149ac4e 100644
--- a/src/font.c
+++ b/src/font.c
@@ -4775,7 +4775,7 @@ the current buffer.  It defaults to the currently selected window.  */)
     {
       CHECK_NUMBER (position);
       CHECK_STRING (string);
-      if (! (0 < XINT (position) && XINT (position) < SCHARS (string)))
+      if (! (0 <= XINT (position) && XINT (position) < SCHARS (string)))
         args_out_of_range (string, position);
       pos = XINT (position);
     }
diff --git a/src/nsterm.m b/src/nsterm.m
index dfc84db50f7..a4eaad47ac1 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -3443,10 +3443,10 @@ ns_select (int nfds, fd_set *readfds, fd_set *writefds,
 
 /*  NSTRACE (ns_select); */
 
-  for (k = 0; readfds && k < nfds+1; k++)
+  for (k = 0; k < nfds+1; k++)
     {
-      if (FD_ISSET(k, readfds)) ++nr;
-      if (FD_ISSET(k, writefds)) ++nr;
+      if (readfds && FD_ISSET(k, readfds)) ++nr;
+      if (writefds && FD_ISSET(k, writefds)) ++nr;
     }
 
   if (NSApp == nil
diff --git a/src/puresize.h b/src/puresize.h
index 2f024345d61..26395a5729d 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -40,7 +40,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #ifndef BASE_PURESIZE
-#define BASE_PURESIZE (1620000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
+#define BASE_PURESIZE (1700000 + SYSTEM_PURESIZE_EXTRA + SITELOAD_PURESIZE_EXTRA)
 #endif
 
 /* Increase BASE_PURESIZE by a ratio depending on the machine's word size.  */