diff src/lisp.h @ 105069:4cbb223d0b1c

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.

--- a/src/lisp.h	Thu Sep 17 20:47:48 2009 +0000
+++ b/src/lisp.h	Thu Sep 17 23:04:41 2009 +0000
@@ -3143,6 +3143,9 @@
 /* Nonzero means don't do interactive redisplay and don't change tty modes */
 extern int noninteractive;
 
+/* Nonzero means don't load X resources or Windows Registry settings.  */
+extern int inhibit_x_resources;
+
 /* Pipe used to send exit notification to the daemon parent at
    startup.  */
 extern int daemon_pipe[2];