bug#11992: 24.1.50; theme faces clobbered on --daemon

bug#11992: 24.1.50; theme faces clobbered on --daemon

[Andrey Kotlarski]

Hello,

after

109142: Chong Yidong 2012-07-18 * faces.el (face-spec-reset-face):
Handle reverse video.

emacs -Q --daemon
emacsclient -c
M-x load-theme RET wombat RET

results in

set-face-attribute: Wrong type argument: stringp, (if (frame-parameter nil (quote reverse)) "unspecified-bg" "unspecified-fg")

The following trivial patch fixes it for me and possibly keeps the
original intention:

=== modified file 'lisp/faces.el'
*** lisp/faces.el	2012-07-18 14:00:09 +0000
--- lisp/faces.el	2012-07-19 08:57:24 +0000
***************
*** 1547,1560 ****
  	      ;; temacs, prior to loading frame.el.
  	      (unless (and (fboundp 'display-graphic-p)
  			   (display-graphic-p frame))
! 		'(:family "default" :foundry "default" :width normal
! 		  :height 1 :weight normal :slant normal
! 		  :foreground (if (frame-parameter nil 'reverse)
! 				  "unspecified-bg"
! 				"unspecified-fg")
! 		  :background (if (frame-parameter nil 'reverse)
! 				  "unspecified-fg"
! 				"unspecified-bg"))))
  	   ;; For all other faces, unspecify all attributes.
  	   (apply 'append
  		  (mapcar (lambda (x) (list (car x) 'unspecified))
--- 1547,1560 ----
  	      ;; temacs, prior to loading frame.el.
  	      (unless (and (fboundp 'display-graphic-p)
  			   (display-graphic-p frame))
!                 (append
!                  '(:family "default" :foundry "default" :width normal
!                    :height 1 :weight normal :slant normal)
!                  (if (frame-parameter nil 'reverse)
!                      '(:foreground "unspecified-bg"
!                        :background "unspecified-fg")
!                    '(:foreground "unspecified-fg"
!                      :background "unspecified-bg")))))
  	   ;; For all other faces, unspecify all attributes.
  	   (apply 'append
  		  (mapcar (lambda (x) (list (car x) 'unspecified))



In GNU Emacs 24.1.50.1 (x86_64-fedora-linux-gnu, X toolkit, Xaw scroll bars)
 of 2012-07-19 on ws-akotlarski.sf.vayant.com
Bzr revision: 109158 dmantipov@yandex.ru-20120719095001-6bhy4shni5xfn4ck
Windowing system distributor `Fedora Project', version 11.0.11202000
Configured using:
 `configure '--build=x86_64-fedora-linux-gnu' '--with-x-toolkit=lucid'
 '--without-gconf' '--without-gsettings' 'CFLAGS=-march=native
 -mtune=native -O3 -pipe' 'build_alias=x86_64-fedora-linux-gnu''

Important settings:
  value of $LC_COLLATE: C
  value of $LANG: bg_BG.UTF-8
  locale-coding-system: utf-8-unix
  default enable-multibyte-characters: t

Major mode: Fundamental

Minor modes in effect:
  tooltip-mode: t
  mouse-wheel-mode: t
  tool-bar-mode: t
  menu-bar-mode: t
  file-name-shadow-mode: t
  global-font-lock-mode: t
  font-lock-mode: t
  auto-composition-mode: t
  auto-encryption-mode: t
  auto-compression-mode: t
  line-number-mode: t
  transient-mark-mode: t

Recent input:
M-x l o a - t <tab> <return> w o <tab> <return> C-h 
e M-2 C-g C-g M-x r e p o - e m <tab> <return>

Recent messages:
("/home/akotlarski/Programs/emacs/trunk/src/emacs")
Starting Emacs daemon.
When done with this frame, type C-x 5 0
set-face-attribute: Wrong type argument: stringp, (if (frame-parameter nil (quote reverse)) "unspecified-bg" "unspecified-fg")
Quit [2 times]
scroll-down-command: Beginning of buffer

Load-path shadows:
None found.

Features:
(shadow sort gnus-util mail-extr emacsbug message format-spec rfc822 mml
easymenu mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231
mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums
mm-util mail-prsvr mail-utils wombat-theme server time-date tooltip
ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd
fontset image regexp-opt fringe tabulated-list newcomment lisp-mode
register page menu-bar rfn-eshadow timer select scroll-bar mouse
jit-lock font-lock syntax facemenu font-core frame cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean
japanese hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev
minibuffer loaddefs button faces cus-face files text-properties overlay
sha1 md5 base64 format env code-pages mule custom widget
hashtable-print-readable backquote make-network-process dbusbind
dynamic-setting font-render-setting x-toolkit x multi-tty emacs)