From 2025ddca1589b0dc84e1e06c0d2622fcbe2c7d79 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Tue, 6 Mar 2001 14:02:02 +0000 Subject: [PATCH] (x-handle-xrm-switch): Accept more than one -xrm switch, like xterm, and concat resource strings, with a newline between them. --- lisp/term/x-win.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index dd792a93e0f..13228d96a5d 100644 --- 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 -- 2.39.5