diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2009-09-17 23:04:41 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2009-09-17 23:04:41 +0000 |
| commit | 8686ac7162bb6ba995e1c66c08c8815315c1bd60 (patch) | |
| tree | bfa97d92e97e34af73a424e5547decfe030b73ce /lisp/startup.el | |
| parent | a69c67e84f2896613eb4e6848ef844e0a312f8c7 (diff) | |
| download | emacs-8686ac7162bb6ba995e1c66c08c8815315c1bd60.tar.gz | |
The --quick command line option now ignores X resources and Registry settings.
* etc/NEWS: Mention new behavior of -Q and new variable `inhibit-x-resources'.
* lisp/startup.el (emacs-quick-startup): Remove variable and all uses.
(command-line): Set `inhibit-x-resources' instead.
(command-line-1): Use `inhibit-x-resources' instead.
* src/emacs.c (inhibit_x_resources): New variable.
(main) [HAVE_NS]: Don't process --quick command line option.
(syms_of_emacs) <inhibit-x-resources>: DEFVAR_BOOL it.
* src/lisp.h (inhibit_x_resources): Declare it extern.
* src/w32reg.c (x_get_string_resource):
* src/xrdb.c (x_get_string_resource): Obey inhibit_x_resources.
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 8ce63b3f037..c3cfcdcc56a 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -366,8 +366,6 @@ from being initialized." string) :group 'auto-save) -(defvar emacs-quick-startup nil) - (defvar emacs-basic-display nil) (defvar init-file-debug nil) @@ -799,7 +797,7 @@ opening the first frame (e.g. open a connection to an X server).") ((member argi '("-Q" "-quick")) (setq init-file-user nil site-run-file nil - emacs-quick-startup t)) + inhibit-x-resources t)) ((member argi '("-D" "-basic-display")) (setq no-blinking-cursor t emacs-basic-display t) @@ -2274,7 +2272,7 @@ A fancy display is used on graphic displays, normal otherwise." (if (or inhibit-startup-screen initial-buffer-choice noninteractive - emacs-quick-startup) + inhibit-x-resources) ;; Not displaying a startup screen. If 3 or more files ;; visited, and not all visible, show user what they all are. |