Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2 files changed, 3 insertions, 3 deletions

diff --git a/src/kqueue.c b/src/kqueue.c
index 76d7fc1ecbd..1383d7d3654 100644
--- a/src/kqueue.c
+++ b/src/kqueue.c
@@ -414,7 +414,7 @@ only when the upper directory of the renamed file is watched.  */)
     }
 
   /* Open file.  */
-  file = ENCODE_FILE (file);
+  Lisp_Object encoded_file = ENCODE_FILE (file);
   oflags = O_NONBLOCK;
 #if O_EVTONLY
   oflags |= O_EVTONLY;
@@ -426,7 +426,7 @@ only when the upper directory of the renamed file is watched.  */)
 #else
     oflags |= O_NOFOLLOW;
 #endif
-  fd = emacs_open (SSDATA (file), oflags, 0);
+  fd = emacs_open (SSDATA (encoded_file), oflags, 0);
   if (fd == -1)
     report_file_error ("File cannot be opened", file);
 
diff --git a/src/sysdep.c b/src/sysdep.c
index e34ab2eb587..b436bfe74a8 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -167,7 +167,7 @@ maybe_disable_address_randomization (int argc, char **argv)
     {
       /* If dumping via unexec, ASLR must be disabled, as otherwise
          data may be scattered and undumpable as a simple executable.
-         If pdumping, disabling ASLR makes the .pdmp file reproducible.  */
+         If pdumping, disabling ASLR lessens differences in the .pdmp file.  */
       bool disable_aslr = will_dump_p ();
 # ifdef __PPC64__
       disable_aslr = true;