diff options
| author | Daniel Colascione <dancol@dancol.org> | 2015-03-14 14:53:33 -0700 |
|---|---|---|
| committer | Daniel Colascione <dancol@dancol.org> | 2015-03-14 14:53:33 -0700 |
| commit | 3bf369928e44fd83c27ef436b05d9cd2b4abbfba (patch) | |
| tree | 48341d5125540fe53a28840b9a9455843c2b8490 /lisp/startup.el | |
| parent | 85f1a56f156f7f9aab1464318970b3a1d97fa533 (diff) | |
| download | emacs-3bf369928e44fd83c27ef436b05d9cd2b4abbfba.tar.gz | |
Add --no-x-resources option
* lisp/startup.el (command-line): Process "--no-x-resources".
* src/emacs.c (standard_args): Add --no-x-resources.
(usage_message): Document that -Q implies --no-x-resources.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 999e53e56dd..7fa929a659d 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -875,7 +875,8 @@ please check its value") ;; processed. This is consistent with the way main in emacs.c ;; does things. (while (and (not done) args) - (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--debug-init") + (let* ((longopts '(("--no-init-file") ("--no-site-file") + ("--no-x-resources") ("--debug-init") ("--user") ("--iconic") ("--icon-type") ("--quick") ("--no-blinking-cursor") ("--basic-display"))) (argi (pop args)) @@ -906,7 +907,9 @@ please check its value") ((member argi '("-Q" "-quick")) (setq init-file-user nil site-run-file nil - inhibit-x-resources t)) + inhibit-x-resources t)) + ((member argi '("-no-x-resources")) + (setq inhibit-x-resources t)) ((member argi '("-D" "-basic-display")) (setq no-blinking-cursor t emacs-basic-display t) |