auto upstream

9 files changed, 43 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index dabe3b3d7db..cf2d0dc250c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating:
+        2013-01-16 largefile: port better to Mac OS X 10.5
+        2013-01-15 stdint: fix build with Android's Bionic fox x86
+
+2013-01-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * configure.ac: Document that --enable-gcc-warnings emits errors.
+        (Bug#13448)
+
 2013-01-13  Glenn Morris  <rgm@gnu.org>
 
         * make-dist: Add options for xz compression and no compression.
diff --git a/autogen/configure b/autogen/configure
index 750e8a8087d..8b9b502fb19 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -2076,9 +2076,10 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-largefile     omit support for large files
-  --enable-gcc-warnings   turn on lots of GCC warnings. This is intended for
-                          developers, and may generate false alarms when used
-                          with older or non-GNU development tools.
+  --enable-gcc-warnings   turn on lots of GCC warnings/errors. This is
+                          intended for developers, and may generate false
+                          alarms when used with older or non-GNU development
+                          tools.
   --enable-link-time-optimization
                           build emacs with link-time optimization. This is
                           supported only for GCC since 4.5.0.
diff --git a/configure.ac b/configure.ac
index 30c1ae075da..c88c6b9577b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -629,7 +629,7 @@ fi
 
 AC_ARG_ENABLE([gcc-warnings],
   [AS_HELP_STRING([--enable-gcc-warnings],
-                  [turn on lots of GCC warnings. This is intended for
+                  [turn on lots of GCC warnings/errors. This is intended for
                    developers, and may generate false alarms when used
                    with older or non-GNU development tools.])],
   [case $enableval in
diff --git a/lib/stdint.in.h b/lib/stdint.in.h
index 6e5824b5b67..2db8b2e378b 100644
--- a/lib/stdint.in.h
+++ b/lib/stdint.in.h
@@ -39,7 +39,7 @@
    Ideally we should test __BIONIC__ here, but it is only defined after
    <sys/cdefs.h> has been included; hence test __ANDROID__ instead.  */
 #if defined __ANDROID__ \
-    && defined _SYS_TYPES_H_ && !defined _SSIZE_T_DEFINED_
+    && defined _SYS_TYPES_H_ && !defined __need_size_t
 # @INCLUDE_NEXT@ @NEXT_STDINT_H@
 #else
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f324ebbad51..676ce21ff14 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/trace.el (trace--read-args): Use a closure and an honest
+        call to `eval' rather than a backquoted lambda.
+
 2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/nadvice.el (advice--tweak): Make it possible for `tweak'
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index fb1b995be2b..09c4969cf18 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -256,9 +256,9 @@ be printed along with the arguments in the trace."
                (read-from-minibuffer "Context expression: "
                                      nil read-expression-map t
                                      'read-expression-history))))
-        `(lambda ()
-           (let ((print-circle t))
-             (concat " [" (prin1-to-string ,exp) "]"))))))))
+        (lambda ()
+          (let ((print-circle t))
+            (concat " [" (prin1-to-string (eval exp t)) "]"))))))))
 
 ;;;###autoload
 (defun trace-function-foreground (function &optional buffer context)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 733f1d26510..1f1b46c8532 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-16  Glenn Morris  <rgm@gnu.org>
+
+        * smiley.el (smiley-style): Make the file loadable in batch mode.
+
 2013-01-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * nnimap.el (nnimap-keepalive): Don't throw an error if there's no more
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 6381f5bf9d9..eb71134457c 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -59,7 +59,10 @@
 
 (defcustom smiley-style
   (if (or (and (fboundp 'face-attribute)
-               (>= (face-attribute 'default :height) 160))
+               ;; In batch mode, attributes can be unspecified.
+               (condition-case nil
+                   (>= (face-attribute 'default :height) 160)
+                 (error nil)))
           (and (fboundp 'face-height)
                (>= (face-height 'default) 14)))
       'medium
diff --git a/m4/largefile.m4 b/m4/largefile.m4
index 62f2b1403c4..1e605e3d829 100644
--- a/m4/largefile.m4
+++ b/m4/largefile.m4
@@ -5,9 +5,10 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# The following implementation works around a problem in autoconf <= 2.68;
-# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5.
-m4_version_prereq([2.69], [] ,[
+# The following implementation works around a problem in autoconf <= 2.69;
+# AC_SYS_LARGEFILE does not configure for large inodes on Mac OS X 10.5,
+# or configures them incorrectly in some cases.
+m4_version_prereq([2.70], [] ,[
 
 # _AC_SYS_LARGEFILE_TEST_INCLUDES
 # -------------------------------
@@ -25,9 +26,9 @@ m4_define([_AC_SYS_LARGEFILE_TEST_INCLUDES],
 
 
 # _AC_SYS_LARGEFILE_MACRO_VALUE(C-MACRO, VALUE,
-#                               CACHE-VAR,
-#                               DESCRIPTION,
-#                               PROLOGUE, [FUNCTION-BODY])
+#                               CACHE-VAR,
+#                               DESCRIPTION,
+#                               PROLOGUE, [FUNCTION-BODY])
 # --------------------------------------------------------
 m4_define([_AC_SYS_LARGEFILE_MACRO_VALUE],
 [AC_CACHE_CHECK([for $1 value needed for large files], [$3],
@@ -93,15 +94,11 @@ if test "$enable_largefile" != no; then
       [_AC_SYS_LARGEFILE_TEST_INCLUDES])
   fi
 
-  AH_VERBATIM([_DARWIN_USE_64_BIT_INODE],
-[/* Enable large inode numbers on Mac OS X.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif])
+  AC_DEFINE([_DARWIN_USE_64_BIT_INODE], [1],
+    [Enable large inode numbers on Mac OS X 10.5.])
 fi
 ])# AC_SYS_LARGEFILE
-
-])# m4_version_prereq 2.69
+])# m4_version_prereq 2.70
 
 # Enable large files on systems where this is implemented by Gnulib, not by the
 # system headers.