(custom-face-hack): Avoid evalling the args

in the list that the export function returns.

diff --git a/lisp/custom.el b/lisp/custom.el
index cb566cf8fe75594a34e5ab654ef888691143fd22..686cc843cdff2a403d3ed10716def19c0117fa3d 100644 (file)
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1504,8 +1504,8 @@ FG BG STIPPLE BOLD ITALIC UNDERLINE"
 (defun custom-face-hack (field value)
   "Face that should be used for highlighting FIELD containing VALUE."
   (let* ((custom (custom-field-custom field))
-        (face (eval (funcall (custom-property custom 'export) 
-                             custom value))))
+        (form (funcall (custom-property custom 'export) custom value))
+        (face (apply (car form) (cdr form))))
     (if (custom-facep face) face nil)))
 
 (defun custom-const-insert (custom level)