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/w32reg.c | |
| parent | a69c67e84f2896613eb4e6848ef844e0a312f8c7 (diff) | |
| download | emacs-8686ac7162bb6ba995e1c66c08c8815315c1bd60.tar.gz emacs-8686ac7162bb6ba995e1c66c08c8815315c1bd60.tar.bz2 emacs-8686ac7162bb6ba995e1c66c08c8815315c1bd60.zip | |
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/w32reg.c')
| -rw-r--r-- | src/w32reg.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/w32reg.c b/src/w32reg.c index d2330e77a1a..2b5b352c583 100644 --- a/src/w32reg.c +++ b/src/w32reg.c @@ -76,7 +76,7 @@ w32_get_rdb_resource (rdb, resource) return NULL; } -LPBYTE +static LPBYTE w32_get_string_resource (name, class, dwexptype) char *name, *class; DWORD dwexptype; @@ -160,6 +160,10 @@ x_get_string_resource (rdb, name, class) return resource; } + if (inhibit_x_resources) + /* --quick was passed, so this is a no-op. */ + return NULL; + return (w32_get_string_resource (name, class, REG_SZ)); } |