[Emacs-diffs] emacs etc/ChangeLog etc/NEWS lisp/ChangeLog lis...

[Juanma Barranquero]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Juanma Barranquero <lektu>      09/09/17 23:04:47

Modified files:
        etc            : ChangeLog NEWS 
        lisp           : ChangeLog startup.el 
        src            : ChangeLog emacs.c lisp.h w32reg.c xrdb.c 

Log message:
        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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/ChangeLog?cvsroot=emacs&r1=1.803&r2=1.804
http://cvs.savannah.gnu.org/viewcvs/emacs/etc/NEWS?cvsroot=emacs&r1=1.2084&r2=1.2085
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16194&r2=1.16195
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/startup.el?cvsroot=emacs&r1=1.546&r2=1.547
http://cvs.savannah.gnu.org/viewcvs/emacs/src/ChangeLog?cvsroot=emacs&r1=1.7751&r2=1.7752
http://cvs.savannah.gnu.org/viewcvs/emacs/src/emacs.c?cvsroot=emacs&r1=1.468&r2=1.469
http://cvs.savannah.gnu.org/viewcvs/emacs/src/lisp.h?cvsroot=emacs&r1=1.663&r2=1.664
http://cvs.savannah.gnu.org/viewcvs/emacs/src/w32reg.c?cvsroot=emacs&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/emacs/src/xrdb.c?cvsroot=emacs&r1=1.67&r2=1.68

Patches:
Index: etc/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/ChangeLog,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -b -r1.803 -r1.804
--- etc/ChangeLog       13 Sep 2009 20:46:46 -0000      1.803
+++ etc/ChangeLog       17 Sep 2009 23:04:41 -0000      1.804
@@ -1,3 +1,8 @@
+2009-09-15  Juanma Barranquero  <address@hidden>
+
+       * NEWS: Mention new behavior of -Q and new variable
+       `inhibit-x-resources'.
+
 2009-09-13  Chong Yidong  <address@hidden>
 
        * PROBLEMS: Document Athena/Lucid internationalization

Index: etc/NEWS
===================================================================
RCS file: /cvsroot/emacs/emacs/etc/NEWS,v
retrieving revision 1.2084
retrieving revision 1.2085
diff -u -b -r1.2084 -r1.2085
--- etc/NEWS    17 Sep 2009 15:58:56 -0000      1.2084
+++ etc/NEWS    17 Sep 2009 23:04:41 -0000      1.2085
@@ -38,6 +38,11 @@
 
 * 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.

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16194
retrieving revision 1.16195
diff -u -b -r1.16194 -r1.16195
--- lisp/ChangeLog      17 Sep 2009 20:47:48 -0000      1.16194
+++ lisp/ChangeLog      17 Sep 2009 23:04:42 -0000      1.16195
@@ -1,3 +1,9 @@
+2009-09-17  Juanma Barranquero  <address@hidden>
+
+       * 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.
+
 2009-09-17  Chong Yidong  <address@hidden>
 
        * subr.el: Fix last change to avoid using the `unless' macro,

Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.546
retrieving revision 1.547
diff -u -b -r1.546 -r1.547
--- lisp/startup.el     16 Sep 2009 17:54:16 -0000      1.546
+++ lisp/startup.el     17 Sep 2009 23:04:45 -0000      1.547
@@ -366,8 +366,6 @@
                 string)
   :group 'auto-save)
 
-(defvar emacs-quick-startup nil)
-
 (defvar emacs-basic-display nil)
 
 (defvar init-file-debug nil)
@@ -799,7 +797,7 @@
         ((member argi '("-Q" "-quick"))
          (setq init-file-user nil
                site-run-file nil
-               emacs-quick-startup t))
+               inhibit-x-resources t))
         ((member argi '("-D" "-basic-display"))
          (setq no-blinking-cursor t
                emacs-basic-display t)
@@ -2274,7 +2272,7 @@
     (if (or inhibit-startup-screen
            initial-buffer-choice
            noninteractive
-           emacs-quick-startup)
+           inhibit-x-resources)
 
        ;; Not displaying a startup screen.  If 3 or more files
        ;; visited, and not all visible, show user what they all are.

Index: src/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/src/ChangeLog,v
retrieving revision 1.7751
retrieving revision 1.7752
diff -u -b -r1.7751 -r1.7752
--- src/ChangeLog       17 Sep 2009 18:06:57 -0000      1.7751
+++ src/ChangeLog       17 Sep 2009 23:04:45 -0000      1.7752
@@ -1,3 +1,14 @@
+2009-09-17  Juanma Barranquero  <address@hidden>
+
+       * 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.
+
+       * lisp.h (inhibit_x_resources): Declare it extern.
+
+       * w32reg.c (x_get_string_resource):
+       * xrdb.c (x_get_string_resource): Obey inhibit_x_resources.
+
 2009-09-17  Eli Zaretskii  <address@hidden>
 
        * Makefile.in (MSDOS_SUPPORT, SOME_MACHINE_LISP): Add

Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -b -r1.468 -r1.469
--- src/emacs.c 29 Aug 2009 02:25:08 -0000      1.468
+++ src/emacs.c 17 Sep 2009 23:04:47 -0000      1.469
@@ -239,6 +239,9 @@
 
 int noninteractive1;
 
+/* Nonzero means Emacs was run in --quick mode.  */
+int inhibit_x_resources;
+
 /* Name for the server started by the daemon.*/
 static char *daemon_name;
 
@@ -1483,11 +1486,6 @@
           ns_no_defaults = 1;
           skip_args--;
         }
-      if (argmatch (argv, argc, "-Q", "--quick", 5, NULL, &skip_args))
-        {
-          ns_no_defaults = 1;
-          skip_args--;
-        }
 #ifdef NS_IMPL_COCOA
       if (skip_args < argc)
         {
@@ -2680,6 +2678,10 @@
 This is nil during initialization.  */);
   Vafter_init_time = Qnil;
 
+  DEFVAR_BOOL ("inhibit-x-resources", &inhibit_x_resources,
+              doc: /* If non-nil, X resources and Windows Registry settings 
are not used.  */);
+  inhibit_x_resources = 0;
+
   /* Make sure IS_DAEMON starts up as false.  */
   daemon_pipe[1] = 0;
 }

Index: src/lisp.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/lisp.h,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -b -r1.663 -r1.664
--- src/lisp.h  26 Aug 2009 19:57:46 -0000      1.663
+++ src/lisp.h  17 Sep 2009 23:04:47 -0000      1.664
@@ -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];

Index: src/w32reg.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/w32reg.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/w32reg.c        8 Jan 2009 03:16:06 -0000       1.21
+++ src/w32reg.c        17 Sep 2009 23:04:47 -0000      1.22
@@ -76,7 +76,7 @@
   return NULL;
 }
 
-LPBYTE
+static LPBYTE
 w32_get_string_resource (name, class, dwexptype)
      char *name, *class;
      DWORD dwexptype;
@@ -160,6 +160,10 @@
         return resource;
     }
 
+  if (inhibit_x_resources)
+    /* --quick was passed, so this is a no-op.  */
+    return NULL;
+
   return (w32_get_string_resource (name, class, REG_SZ));
 }
 

Index: src/xrdb.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xrdb.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- src/xrdb.c  10 Jan 2009 22:51:54 -0000      1.67
+++ src/xrdb.c  17 Sep 2009 23:04:47 -0000      1.68
@@ -693,6 +693,10 @@
 {
   XrmValue value;
 
+  if (inhibit_x_resources)
+    /* --quick was passed, so this is a no-op.  */
+    return NULL;
+
   if (x_get_resource (rdb, name, class, x_rm_string, &value))
     return (char *) value.addr;