(terminal-emulator): Test system-configuration

to decide on terminfo vs termcap.
(te-terminfo-systems-regexp): Renamed from te-terminfo-systems.

diff --git a/lisp/terminal.el b/lisp/terminal.el
index ebb74c3d038bd9ce253d5539a0ada50e3978eca4..d5a89b7e49286a2f8b51f53d9c06423835a2eca7 100644 (file)
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -162,8 +162,11 @@ performance.")
 ;; Required to support terminfo systems
 (defconst te-terminal-name-prefix "emacs-virtual")
 (defvar te-terminal-name nil)
-(defvar te-terminfo-systems '(hpux usg-unix-v) 
-"List of system types that support terminfo instead of termcap")
+(defvar te-terminfo-systems-regexp "^[^-]*-[^-]*-\\(hpux\\|sysv\\)"
+  "Regexp to match system configurations for which we use terminfo.
+That means we provide a Terminfo terminal definition instead
+of a Termcap terminal definition, for the emulated terminal.
+On all other systems, we use termcap.")
 
 \f
 ;;;;  escape map
@@ -1224,7 +1227,7 @@ of the terminal-emulator"
 (defun te-create-terminfo ()
   "Create and compile a terminfo entry for the virtual terminal. This is kept 
 in the /tmp directory"
-  (if (and (member system-type te-terminfo-systems)
+  (if (and (string-match te-terminfo-systems system-configuration)
           (not (file-exists-p (concat  "/tmp/" 
                                        (substring te-terminal-name-prefix 0 1)
                                        "/" te-terminal-name))))