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 /src/xrdb.c | |
| 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 'src/xrdb.c')
| -rw-r--r-- | src/xrdb.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xrdb.c b/src/xrdb.c index 0a74c089f75..fac97e4350f 100644 --- a/src/xrdb.c +++ b/src/xrdb.c @@ -693,6 +693,10 @@ x_get_string_resource (rdb, name, class) { XrmValue value; + if (inhibit_x_resources) + /* --quick was passed, so this is a no-op. */ + return NULL; + if (x_get_resource (rdb, name, class, x_rm_string, &value)) return (char *) value.addr; |