(x-handle-xrm-switch): Accept more than one -xrm

switch, like xterm, and concat resource strings, with a newline
between them.

diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index dd792a93e0f39cb3b740fa235880a0930c063a6a..13228d96a5d29b06e29689218447d026ef96845c 100644 (file)
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,6 +1,6 @@
 ;;; x-win.el --- parse switches controlling interface with X window system
 
-;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2001 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
@@ -117,9 +117,12 @@
 
 ;; Handle the -xrm option.
 (defun x-handle-xrm-switch (switch)
-  (or (consp x-invocation-args)
-      (error "%s: missing argument to `%s' option" (invocation-name) switch))
-  (setq x-command-line-resources (car x-invocation-args))
+  (unless (consp x-invocation-args)
+    (error "%s: missing argument to `%s' option" (invocation-name) switch))
+  (setq x-command-line-resources
+       (if (null x-command-line-resources)
+           (car x-invocation-args)
+         (concat x-command-line-resources "\n" (car x-invocation-args))))
   (setq x-invocation-args (cdr x-invocation-args)))
 
 ;; Handle the geometry option