Fix Viper with simultaneous X and tty display devices. (Rep. by IRIE Tetsuya.)

* lisp/emulation/viper-init.el (viper-has-face-support-p): Acknowledge
  that Emacs has face support on ttys.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-214

2 files changed, 2 insertions, 1 deletions

diff --git a/README.multi-tty b/README.multi-tty
index c692411e757..e6ffea57ad6 100644
--- a/README.multi-tty
+++ b/README.multi-tty
@@ -184,6 +184,7 @@ Robert J. Chassell <bob at rattlesnake dot com>
 Romain Francoise <romain at orebokech dot com>
 Ami Fischman <ami at fischman dot org>
 Friedrich Delgado Friedrichs <friedel at nomaden dot org>
+IRIE Tetsuya <irie at t dot email dot ne dot jp>
 Yoshiaki Kasahara <kasahara at nc dot kyushu-u dot ac dot jp>
 Jurej Kubelka <Juraj dot Kubelka at email dot cz>
 Istvan Marko <mi-mtty ar kismala dot com>
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index 2a13f00535e..555cf9544b2 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -97,7 +97,7 @@ In all likelihood, you don't need to bother with this setting."
 (defun viper-has-face-support-p ()
   (cond ((viper-window-display-p))
         (viper-force-faces)
-        (viper-emacs-p (memq (viper-device-type) '(pc)))
+        (viper-emacs-p (memq (viper-device-type) '(nil pc)))
         (viper-xemacs-p (memq (viper-device-type) '(tty pc)))))