Re: Changes in update-game-score.c

[Paul Eggert <eggert@cs.ucla.edu>]

[-- Attachment #1: Type: text/plain, Size: 1096 bytes --]

On 01/23/2014 12:27 PM, Juanma Barranquero wrote:
> On Thu, Jan 23, 2014 at 5:07 PM, Eli Zaretskii<eliz@gnu.org>  wrote:
>
>> >That is exactly what we all should do: each commit is one coherent
>> >changeset, solving a problem that is independent of others.
> Very emphatically agree.

It's easy to nod one's head and say "yes, that's right! and whoever 
commits independent changes should be taken out and shot!". But in 
practice that's far too extreme. For example, if we look at a recent 
simple patch (attached), it's actually two changes, one change for each 
variable that was declared on WINDOWSNT platforms but not used there.

Now, suppose someone complained "Hey! Wait a minute! You should have 
broken that into two independent fixes and installed each fix 
separately!" I hope our response would be something like "Sure, we could 
have installed two separate patches. But that would have been overkill 
here; it would have been too much work for everybody for too little 
benefit." The situation for update-game-score was similar, and this is 
true of many changes we make to Emacs.

[-- Attachment #2: windowsnt.diff --]
[-- Type: text/x-patch, Size: 999 bytes --]

=== modified file 'src/ChangeLog'
--- src/ChangeLog	2013-12-30 17:51:28 +0000
+++ src/ChangeLog	2013-12-30 22:36:44 +0000
@@ -1,3 +1,8 @@
+2013-12-30  Juanma Barranquero  <lekktu@gmail.com>
+
+	* fileio.c (Fcopy_file) [!WINDOWSNT]: Don't declare on Windows
+	variables not used there.
+
 2013-12-30  Eli Zaretskii  <eliz@gnu.org>
 
 	* w32.c (sys_umask): New function.  (Bug#16299)

=== modified file 'src/fileio.c'
--- src/fileio.c	2013-12-29 18:18:45 +0000
+++ src/fileio.c	2013-12-30 22:36:44 +0000
@@ -1943,15 +1943,15 @@
   struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
   ptrdiff_t count = SPECPDL_INDEX ();
   Lisp_Object encoded_file, encoded_newname;
+#if HAVE_LIBSELINUX
+  security_context_t con;
+  int conlength = 0;
+#endif
+#ifdef WINDOWSNT
+  int result;
+#else
   bool already_exists = false;
   mode_t new_mask;
-#if HAVE_LIBSELINUX
-  security_context_t con;
-  int conlength = 0;
-#endif
-#ifdef WINDOWSNT
-  int result;
-#else
   int ifd, ofd;
   int n;
   char buf[16 * 1024];