Mercurial > emacs
changeset 36582:30246e46027e
(x-handle-xrm-switch): Accept more than one -xrm
switch, like xterm, and concat resource strings, with a newline
between them.
| author | Gerd Moellmann <gerd@gnu.org> |
|---|---|
| date | Tue, 06 Mar 2001 14:02:02 +0000 |
| parents | de61c584d4a2 |
| children | adb23d572f63 |
| files | lisp/term/x-win.el |
| diffstat | 1 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/term/x-win.el Tue Mar 06 13:50:09 2001 +0000 +++ b/lisp/term/x-win.el Tue Mar 06 14:02:02 2001 +0000 @@ -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