auto upstream

4 files changed, 16 insertions, 4 deletions

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