Fix the syntax to not use eval or overshadow variable bindings.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 205e5a0..2eee379 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus.el (gnus-string-or): Fix the syntax to not use eval or
+       overshadow variable bindings.
+
 2010-09-01  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnus-html.el (gnus-html-wash-tags)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index e0b3ef6..cbb91e3 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -3288,12 +3288,12 @@ with a `subscribed' parameter."
 (defmacro gnus-string-or (&rest strings)
   "Return the first element of STRINGS that is a non-blank string.
 STRINGS will be evaluated in normal `or' order."
-  `(gnus-string-or-1 ',strings))
+  `(gnus-string-or-1 (list ,@strings)))
 
 (defun gnus-string-or-1 (strings)
   (let (string)
     (while strings
-      (setq string (eval (pop strings)))
+      (setq string (pop strings))
       (if (string-match "^[ \t]*$" string)
          (setq string nil)
        (setq strings nil)))