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.

2 files changed, 9 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d393190803d..8da573ed2f7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-14  Daniel Colascione  <dancol@dancol.org>
+
+        * startup.el (command-line): Process "--no-x-resources".
+
 2015-03-13  Kevin Ryde  <user42_kevin@yahoo.com.au>
 
         info-look fixes for Texinfo 5
diff --git a/lisp/startup.el b/lisp/startup.el
index 999e53e56dd..7fa929a659d 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)