Fix handling of frame color parameters in TTY sessions (Bug#19802)

 src/xfaces.c (map_tty_color): Use assoc_no_quit instead of
 assq_no_quit to fetch color definition by its string name.

 lisp/frame.el (frame-notice-user-settings): Refresh the value of
 frame parameters after calling tty-handle-reverse-video.  Call
 face-set-after-frame-default with the actual parameters, to avoid
 resetting colors back to unspecified.
 (set-background-color, set-foreground-color): Pass the selected
 color to face-set-after-frame-default.

2 files changed, 20 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 17b3d112432..79e3378b2e8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2015-02-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (frame-notice-user-settings): Refresh the value of
+        frame parameters after calling tty-handle-reverse-video.  Call
+        face-set-after-frame-default with the actual parameters, to avoid
+        resetting colors back to unspecified.
+        (set-background-color, set-foreground-color): Pass the selected
+        color to face-set-after-frame-default.  (Bug#19802)
+
 2015-02-06  Wolfgang Jenkner  <wjenkner@inode.at>
 
         * net/network-stream.el (network-stream-open-tls): Respect the
diff --git a/lisp/frame.el b/lisp/frame.el
index c77df558da8..eea5c24a82d 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -251,6 +251,10 @@ there (in decreasing order of priority)."
             (let ((newparms (frame-parameters))
                   (frame (selected-frame)))
               (tty-handle-reverse-video frame newparms)
+              ;; tty-handle-reverse-video might change the frame's
+              ;; color parameters, and we need to use the updated
+              ;; value below.
+              (setq newparms (frame-parameters))
               ;; If we changed the background color, we need to update
               ;; the background-mode parameter, and maybe some faces,
               ;; too.
@@ -258,7 +262,7 @@ there (in decreasing order of priority)."
                 (unless (or (assq 'background-mode initial-frame-alist)
                             (assq 'background-mode default-frame-alist))
                   (frame-set-background-mode frame))
-                (face-set-after-frame-default frame))))))
+                (face-set-after-frame-default frame newparms))))))
 
     ;; If the initial frame is still around, apply initial-frame-alist
     ;; and default-frame-alist to it.
@@ -1185,7 +1189,9 @@ To get the frame's current background color, use `frame-parameters'."
   (modify-frame-parameters (selected-frame)
                            (list (cons 'background-color color-name)))
   (or window-system
-      (face-set-after-frame-default (selected-frame))))
+      (face-set-after-frame-default (selected-frame)
+                                    (list
+                                     (cons 'background-color color-name)))))
 
 (defun set-foreground-color (color-name)
   "Set the foreground color of the selected frame to COLOR-NAME.
@@ -1195,7 +1201,9 @@ To get the frame's current foreground color, use `frame-parameters'."
   (modify-frame-parameters (selected-frame)
                            (list (cons 'foreground-color color-name)))
   (or window-system
-      (face-set-after-frame-default (selected-frame))))
+      (face-set-after-frame-default (selected-frame)
+                                    (list
+                                     (cons 'foreground-color color-name)))))
 
 (defun set-cursor-color (color-name)
   "Set the text cursor color of the selected frame to COLOR-NAME.