[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3bf3699: Add --no-x-resources option
From: |
Daniel Colascione |
Subject: |
[Emacs-diffs] master 3bf3699: Add --no-x-resources option |
Date: |
Sat, 14 Mar 2015 21:53:48 +0000 |
branch: master
commit 3bf369928e44fd83c27ef436b05d9cd2b4abbfba
Author: Daniel Colascione <address@hidden>
Commit: Daniel Colascione <address@hidden>
Add --no-x-resources option
* lisp/startup.el (command-line): Process "--no-x-resources".
* src/emacs.c (standard_args): Add --no-x-resources.
(usage_message): Document that -Q implies --no-x-resources.
---
lisp/ChangeLog | 4 ++++
lisp/startup.el | 7 +++++--
src/ChangeLog | 5 +++++
src/emacs.c | 3 +++
4 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d393190..8da573e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14 Daniel Colascione <address@hidden>
+
+ * startup.el (command-line): Process "--no-x-resources".
+
2015-03-13 Kevin Ryde <address@hidden>
info-look fixes for Texinfo 5
diff --git a/lisp/startup.el b/lisp/startup.el
index 999e53e..7fa929a 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -875,7 +875,8 @@ please check its value")
;; processed. This is consistent with the way main in emacs.c
;; does things.
(while (and (not done) args)
- (let* ((longopts '(("--no-init-file") ("--no-site-file") ("--debug-init")
+ (let* ((longopts '(("--no-init-file") ("--no-site-file")
+ ("--no-x-resources") ("--debug-init")
("--user") ("--iconic") ("--icon-type") ("--quick")
("--no-blinking-cursor") ("--basic-display")))
(argi (pop args))
@@ -906,7 +907,9 @@ please check its value")
((member argi '("-Q" "-quick"))
(setq init-file-user nil
site-run-file nil
- inhibit-x-resources t))
+ inhibit-x-resources t))
+ ((member argi '("-no-x-resources"))
+ (setq inhibit-x-resources t))
((member argi '("-D" "-basic-display"))
(setq no-blinking-cursor t
emacs-basic-display t)
diff --git a/src/ChangeLog b/src/ChangeLog
index d9612db..cb4aad6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-14 Daniel Colascione <address@hidden>
+
+ * emacs.c (standard_args): Add --no-x-resources.
+ (usage_message): Document that -Q implies --no-x-resources.
+
2015-03-13 Paul Eggert <address@hidden>
* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.
diff --git a/src/emacs.c b/src/emacs.c
index ca5633d..d318fd4 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -237,6 +237,7 @@ Initialization options:\n\
--no-init-file, -q load neither ~/.emacs nor default.el\n\
--no-loadup, -nl do not load loadup.el into bare Emacs\n\
--no-site-file do not load site-start.el\n\
+--no-x-resources do not load X resources\n\
--no-site-lisp, -nsl do not add site-lisp directories to load-path\n\
--no-splash do not display a splash screen on startup\n\
--no-window-system, -nw do not communicate with X, ignoring $DISPLAY\n\
@@ -244,6 +245,7 @@ Initialization options:\n\
"\
--quick, -Q equivalent to:\n\
-q --no-site-file --no-site-lisp --no-splash\n\
+ --no-x-resources\n\
--script FILE run FILE as an Emacs Lisp script\n\
--terminal, -t DEVICE use DEVICE for terminal I/O\n\
--user, -u USER load ~USER/.emacs instead of your own\n\
@@ -1661,6 +1663,7 @@ static const struct standard_args standard_args[] =
{ "-quick", 0, 55, 0 },
{ "-q", "--no-init-file", 50, 0 },
{ "-no-init-file", 0, 50, 0 },
+ { "-no-x-resources", "--no-x-resources", 40, 0 },
{ "-no-site-file", "--no-site-file", 40, 0 },
{ "-u", "--user", 30, 1 },
{ "-user", 0, 30, 1 },
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3bf3699: Add --no-x-resources option,
Daniel Colascione <=