diff options
| author | Richard M. Stallman | 1993-05-25 16:21:12 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1993-05-25 16:21:12 +0000 |
| commit | f6f6d98c0fd7393dd99826eec5d63fdb12f4f897 (patch) | |
| tree | 730bb5490d3a5837e66ea686f1311dc3bde171d0 | |
| parent | 6c703f4ab94369d580102414025273e16197bc52 (diff) | |
| download | emacs-f6f6d98c0fd7393dd99826eec5d63fdb12f4f897.tar.gz emacs-f6f6d98c0fd7393dd99826eec5d63fdb12f4f897.zip | |
Pass x-command-line-resources to x-open-connection.
(x-command-line-resources): New variable.
(x-handle-rn-switch): New function.
(command-switch-alist): Add -rn.
| -rw-r--r-- | lisp/term/x-win.el | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el index c19bf41259d..84a09026618 100644 --- a/lisp/term/x-win.el +++ b/lisp/term/x-win.el | |||
| @@ -76,6 +76,8 @@ | |||
| 76 | (require 'select) | 76 | (require 'select) |
| 77 | (require 'menu-bar) | 77 | (require 'menu-bar) |
| 78 | 78 | ||
| 79 | (defvar x-command-line-resources nil) | ||
| 80 | |||
| 79 | (setq command-switch-alist | 81 | (setq command-switch-alist |
| 80 | (append '(("-bw" . x-handle-numeric-switch) | 82 | (append '(("-bw" . x-handle-numeric-switch) |
| 81 | ("-d" . x-handle-display) | 83 | ("-d" . x-handle-display) |
| @@ -98,6 +100,7 @@ | |||
| 98 | ("-itype" . x-handle-switch) | 100 | ("-itype" . x-handle-switch) |
| 99 | ("-i" . x-handle-switch) | 101 | ("-i" . x-handle-switch) |
| 100 | ("-iconic" . x-handle-switch) | 102 | ("-iconic" . x-handle-switch) |
| 103 | ("-rn" . x-handle-rn-switch) | ||
| 101 | ("-cr" . x-handle-switch) | 104 | ("-cr" . x-handle-switch) |
| 102 | ("-vb" . x-handle-switch) | 105 | ("-vb" . x-handle-switch) |
| 103 | ("-hb" . x-handle-switch) | 106 | ("-hb" . x-handle-switch) |
| @@ -152,6 +155,11 @@ | |||
| 152 | x-invocation-args | 155 | x-invocation-args |
| 153 | (cdr x-invocation-args))))) | 156 | (cdr x-invocation-args))))) |
| 154 | 157 | ||
| 158 | ;; Handle the -rn option. | ||
| 159 | (defun x-handle-rn-switch (switch) | ||
| 160 | (setq x-command-line-resources (car x-invocation-args)) | ||
| 161 | (setq x-invocation-args (cdr x-invocation-args))) | ||
| 162 | |||
| 155 | ;; Handle the geometry option | 163 | ;; Handle the geometry option |
| 156 | (defun x-handle-geometry (switch) | 164 | (defun x-handle-geometry (switch) |
| 157 | (setq initial-frame-alist | 165 | (setq initial-frame-alist |
| @@ -508,7 +516,8 @@ This returns ARGS with the arguments that have been processed removed." | |||
| 508 | 516 | ||
| 509 | (setq command-line-args (x-handle-args command-line-args)) | 517 | (setq command-line-args (x-handle-args command-line-args)) |
| 510 | (x-open-connection (or x-display-name | 518 | (x-open-connection (or x-display-name |
| 511 | (setq x-display-name (getenv "DISPLAY")))) | 519 | (setq x-display-name (getenv "DISPLAY"))) |
| 520 | x-command-line-resources) | ||
| 512 | 521 | ||
| 513 | (setq frame-creation-function 'x-create-frame-with-faces) | 522 | (setq frame-creation-function 'x-create-frame-with-faces) |
| 514 | 523 | ||