The --quick command line option now ignores X resources and Registry settings.
authorJuanma Barranquero <lekktu@gmail.com>
Thu, 17 Sep 2009 23:04:41 +0000 (23:04 +0000)
committerJuanma Barranquero <lekktu@gmail.com>
Thu, 17 Sep 2009 23:04:41 +0000 (23:04 +0000)
commit8686ac7162bb6ba995e1c66c08c8815315c1bd60
treebfa97d92e97e34af73a424e5547decfe030b73ce
parenta69c67e84f2896613eb4e6848ef844e0a312f8c7
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.
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/startup.el
src/ChangeLog
src/emacs.c
src/lisp.h
src/w32reg.c
src/xrdb.c