diff options
| author | Gerd Moellmann <[email protected]> | 2001-03-06 14:02:02 +0000 |
|---|---|---|
| committer | Gerd Moellmann <[email protected]> | 2001-03-06 14:02:02 +0000 |
| commit | 2025ddca1589b0dc84e1e06c0d2622fcbe2c7d79 (patch) | |
| tree | 769c8ff39d696b7573edca13397a736b6da11109 /lisp/term | |
| parent | 6961e0c1c8e194c1403cbb6c64eec7a56f4d19d8 (diff) | |
(x-handle-xrm-switch): Accept more than one -xrm
switch, like xterm, and concat resource strings, with a newline
between them.
Diffstat (limited to 'lisp/term')
| -rw-r--r-- | lisp/term/x-win.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index dd792a93e0..13228d96a5 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 |