aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorJuanma Barranquero <[email protected]>2009-09-17 23:04:41 +0000
committerJuanma Barranquero <[email protected]>2009-09-17 23:04:41 +0000
commit8686ac7162bb6ba995e1c66c08c8815315c1bd60 (patch)
treebfa97d92e97e34af73a424e5547decfe030b73ce /etc
parenta69c67e84f2896613eb4e6848ef844e0a312f8c7 (diff)
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 'etc')
-rw-r--r--etc/ChangeLog5
-rw-r--r--etc/NEWS5
2 files changed, 10 insertions, 0 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 54f1510148..68fcba4ee0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-15 Juanma Barranquero <[email protected]>
+
+ * NEWS: Mention new behavior of -Q and new variable
+ `inhibit-x-resources'.
+
2009-09-13 Chong Yidong <[email protected]>
* PROBLEMS: Document Athena/Lucid internationalization
diff --git a/etc/NEWS b/etc/NEWS
index c0aa482dc6..ee497b4431 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -38,6 +38,11 @@ world-readable install.
* Changes in Emacs 23.2
+** Command-line option -Q (--quick) now also disables loading X resources.
+On Windows, Registry settings are ignored, though environment variables set
+on the Registry are still honored. The new variable `inhibit-x-resources'
+shows whether X resources were loaded or not.
+
** New completion-style `initials' to complete M-x lch to list-command-history.
** Unibyte sessions are declared obsolete.