18 files changed, 502 insertions, 162 deletions

diff --git a/src/buffer.c b/src/buffer.c
index c1c0441a70e..b55284a4a26 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -3120,14 +3120,13 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend,
 {
   ptrdiff_t idx = 0;
   ptrdiff_t len = *len_ptr;
-  ptrdiff_t next = ZV;
+  ptrdiff_t next = Z;
   Lisp_Object *vec = *vec_ptr;
   struct itree_node *node;
 
-  /* Extend the search range if overlays beginning at ZV are
-     wanted.  */
-  ptrdiff_t search_end = ZV;
-  if (end >= ZV && (empty || trailing))
+  /* Extend the search range if overlays beginning at Z are wanted.  */
+  ptrdiff_t search_end = Z;
+  if (end >= Z && (empty || trailing))
     ++search_end;
 
   ITREE_FOREACH (node, current_buffer->overlays, beg, search_end,
@@ -3141,7 +3140,7 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend,
       else if (node->begin == end)
         {
           next = node->begin;
-          if ((! empty || end < ZV) && beg < end)
+          if ((! empty || end < Z) && beg < end)
             break;
           if (empty && node->begin != node->end)
             continue;
@@ -3168,7 +3167,7 @@ overlays_in (ptrdiff_t beg, ptrdiff_t end, bool extend,
       idx++;
     }
   if (next_ptr)
-    *next_ptr = next ? next : ZV;
+    *next_ptr = next ? next : Z;
 
   return idx;
 }
diff --git a/src/data.c b/src/data.c
index 4314ca0294e..6d7a882dcfd 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1789,16 +1789,9 @@ set_internal (Lisp_Object symbol, Lisp_Object newval, Lisp_Object where,
         set_blv_value (blv, newval);
 
         if (blv->fwd)
-          {
-            if (unbinding_p)
-              /* If storing void (making the symbol void), forward only through
-                 buffer-local indicator, not through Lisp_Objfwd, etc.  */
-              blv->fwd = NULL;
-            else
-              store_symval_forwarding (blv->fwd, newval,
-                                       BUFFERP (where)
-                                       ? XBUFFER (where) : current_buffer);
-          }
+          store_symval_forwarding (blv->fwd, newval, (BUFFERP (where)
+                                                      ? XBUFFER (where)
+                                                      : current_buffer));
         break;
       }
     case SYMBOL_FORWARDED:
diff --git a/src/dbusbind.c b/src/dbusbind.c
index cb705e9e92a..60ac38b5479 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -129,6 +129,8 @@ static bool xd_in_read_queued_messages = 0;
 #endif
 
 /* Check whether TYPE is a basic DBusType.  */
+/* TODO: Shouldn't we assume, that recent D-Bus implementations carry
+   HAVE_DBUS_TYPE_IS_VALID and DBUS_TYPE_UNIX_FD?  See configure.ac.  */
 #ifdef HAVE_DBUS_TYPE_IS_VALID
 #define XD_BASIC_DBUS_TYPE(type)                                        \
   (dbus_type_is_valid (type) && dbus_type_is_basic (type))
@@ -310,6 +312,8 @@ XD_OBJECT_TO_STRING (Lisp_Object object)
       }                                                                 \
   } while (0)
 
+/* TODO: Shouldn't we assume, that recent D-Bus implementations carry
+   HAVE_DBUS_VALIDATE_*?  See configure.ac.  */
 #if (HAVE_DBUS_VALIDATE_BUS_NAME || HAVE_DBUS_VALIDATE_PATH             \
      || HAVE_DBUS_VALIDATE_INTERFACE || HAVE_DBUS_VALIDATE_MEMBER)
 #define XD_DBUS_VALIDATE_OBJECT(object, func)                           \
@@ -1044,6 +1048,8 @@ xd_get_connection_address (Lisp_Object bus)
 }
 
 /* Return the file descriptor for WATCH, -1 if not found.  */
+/* TODO: Shouldn't we assume, that recent D-Bus implementations carry
+   HAVE_DBUS_WATCH_GET_UNIX_FD?  See configure.ac.  */
 static int
 xd_find_watch_fd (DBusWatch *watch)
 {
@@ -1372,6 +1378,7 @@ usage: (dbus-message-internal &rest REST)  */)
   dbus_uint32_t serial = 0;
   unsigned int ui_serial;
   int timeout = -1;
+  dbus_bool_t keepfd = FALSE;
   ptrdiff_t count, count0;
   char signature[DBUS_MAXIMUM_SIGNATURE_LENGTH];
 
@@ -1548,6 +1555,7 @@ usage: (dbus-message-internal &rest REST)  */)
           timeout = min (XFIXNAT (args[count+1]), INT_MAX);
           count = count + 2;
         }
+
       /* Check for authorizable parameter.  */
       else if (EQ (args[count], QCauthorizable))
         {
@@ -1565,6 +1573,24 @@ usage: (dbus-message-internal &rest REST)  */)
 
           count = count + 2;
         }
+
+      /* Check for keepfd parameter.  */
+      else if (EQ (args[count], QCkeep_fd))
+        {
+          if (mtype != DBUS_MESSAGE_TYPE_METHOD_CALL)
+            XD_SIGNAL1
+              (build_string (":keep-fd is only supported on method calls"));
+
+          /* Ignore this keyword if unsupported.  */
+#ifdef DBUS_TYPE_UNIX_FD
+          keepfd = TRUE;
+#else
+          XD_DEBUG_MESSAGE (":keep-fd not supported");
+#endif
+
+          ++count;
+        }
+
       else break;
 
     }
@@ -1618,7 +1644,8 @@ usage: (dbus-message-internal &rest REST)  */)
       result = list3 (QCserial, bus, INT_TO_INTEGER (serial));
 
       /* Create a hash table entry.  */
-      Fputhash (result, handler, Vdbus_registered_objects_table);
+      Fputhash (result, keepfd ? Fcons (handler, path) : handler,
+                Vdbus_registered_objects_table);
     }
   else
     {
@@ -1640,106 +1667,81 @@ usage: (dbus-message-internal &rest REST)  */)
   return result;
 }
 
-/* Alist of registered inhibitor locks for D-Bus.
-   An entry in this list is a list (FD WHAT WHY BLOCK).
-   The car of the list is a file descriptor retrieved from a
-   'dbus-make-inhibitor-lock` call.  The cdr of the list represents the
-   three arguments 'dbus-make-inhibitor-lock` was called with.  */
-static Lisp_Object xd_registered_inhibitor_locks;
-
-DEFUN ("dbus-make-inhibitor-lock", Fdbus_make_inhibitor_lock,
-       Sdbus_make_inhibitor_lock,
-       2, 3, 0,
-       doc: /* Inhibit system shutdowns and sleep states.
-
-WHAT is a colon-separated string of lock types, i.e. "shutdown",
-"sleep", "idle", "handle-power-key", "handle-suspend-key",
-"handle-hibernate-key", "handle-lid-switch". Example: "shutdown:idle".
-
-WHY is a descriptive string of why the lock is taken. Example: "Package
-Update in Progress".
-
-The optional BLOCK is the mode of the inhibitor lock, either "block"
-(BLOCK is non-nil), or "delay".
-
-It returns a file descriptor or nil, if the lock cannot be acquired.  If
-there is already an inhibitor lock for the triple (WHAT WHY BLOCK), this
-lock is returned.
-
-For details of the arguments, see Info node `(dbus)Inhibitor Locks'.  */)
-  (Lisp_Object what, Lisp_Object why, Lisp_Object block)
+/* Alist of registered file descriptors for D-Bus.
+   The key is an open file descriptor, retrieved via `dbus-call-method'
+   or `dbus--open-fd'.  The value is a string OBJECT-PATH or FILENAME,
+   which represents the arguments the function was called with.  Those
+   values are not needed for further operations; they are just shown for
+   information.  */
+static Lisp_Object xd_registered_fds;
+
+DEFUN ("dbus--fd-open", Fdbus__fd_open, Sdbus__fd_open, 1, 1, 0,
+       doc: /* Open FILENAME and return the respective read-only file descriptor.  */)
+  (Lisp_Object filename)
 {
-  CHECK_STRING (what);
-  CHECK_STRING (why);
-  if (!NILP (block))
-    block = Qt;
-  Lisp_Object who = build_string ("Emacs");
-  Lisp_Object mode =
-    (NILP (block)) ? build_string ("delay") : build_string ("block");
+  CHECK_STRING (filename);
+  filename = Fexpand_file_name (filename, Qnil);
+  filename = ENCODE_FILE (filename);
 
   /* Check, whether it is registered already.  */
-  Lisp_Object triple = list3 (what, why, block);
-  Lisp_Object registered = Frassoc (triple, xd_registered_inhibitor_locks);
+  Lisp_Object registered = Frassoc (filename, xd_registered_fds);
   if (!NILP (registered))
     return CAR_SAFE (registered);
 
-  /* Register lock.  */
-  Lisp_Object lock =
-    calln (Qdbus_call_method, QCsystem,
-           build_string ("org.freedesktop.login1"),
-           build_string ("/org/freedesktop/login1"),
-           build_string ("org.freedesktop.login1.Manager"),
-           build_string ("Inhibit"), what, who, why, mode);
-
-  xd_registered_inhibitor_locks =
-    Fcons (Fcons (lock, triple), xd_registered_inhibitor_locks);
-  return lock;
-}
+  /* Open file descriptor.  */
+  int fd = emacs_open (SSDATA (filename), O_RDONLY, 0);
 
-DEFUN ("dbus-close-inhibitor-lock", Fdbus_close_inhibitor_lock,
-       Sdbus_close_inhibitor_lock,
-       1, 1, 0,
-       doc: /* Close inhibitor lock file descriptor.
+  if (fd <= 0)
+    XD_SIGNAL2 (build_string ("Cannot open file"), filename);
 
-LOCK, a file descriptor, must be the result of a `dbus-make-inhibitor-lock'
-call.  It returns t in case of success, or nil if it isn't be possible
-to close the lock, or if the lock is closed already.
+  /* Register file descriptor.  */
+  xd_registered_fds =
+    Fcons (Fcons (INT_TO_INTEGER (fd), filename), xd_registered_fds);
+  return INT_TO_INTEGER (fd);
+}
 
-For details, see Info node `(dbus)Inhibitor Locks'.  */)
-  (Lisp_Object lock)
+DEFUN ("dbus--fd-close", Fdbus__fd_close, Sdbus__fd_close, 1, 1, 0,
+       doc: /* Close file descriptor FD.
+FD must be the result of a `dbus-call-method' or `dbus--fd-open' call,
+see `dbus--registered-fds'.  It returns t in case of success, or nil if
+it isn't be possible to close the file descriptor, or if the file
+descriptor is closed already.  */)
+  (Lisp_Object fd)
 {
-  CHECK_FIXNUM (lock);
+  CHECK_FIXNUM (fd);
 
   /* Check, whether it is registered.  */
-  Lisp_Object registered =  assoc_no_quit (lock, xd_registered_inhibitor_locks);
+  Lisp_Object registered =  assoc_no_quit (fd, xd_registered_fds);
   if (NILP (registered))
     return Qnil;
   else
     {
-      xd_registered_inhibitor_locks =
-        Fdelete (registered, xd_registered_inhibitor_locks);
-      return (emacs_close (XFIXNAT (lock)) == 0) ? Qt : Qnil;
+      xd_registered_fds = Fdelete (registered, xd_registered_fds);
+      return (emacs_close (XFIXNAT (fd)) == 0) ? Qt : Qnil;
     }
 }
 
-DEFUN ("dbus-registered-inhibitor-locks", Fdbus_registered_inhibitor_locks,
-       Sdbus_registered_inhibitor_locks,
+DEFUN ("dbus--registered-fds", Fdbus__registered_fds, Sdbus__registered_fds,
        0, 0, 0,
-       doc: /* Return registered inhibitor locks, an alist.
-This allows to check, whether other packages of the running Emacs
-instance have acquired an inhibitor lock as well.
-An entry in this list is a list (FD WHAT WHY BLOCK).
-The car of the list is the file descriptor retrieved from a
-'dbus-make-inhibitor-lock` call.  The cdr of the list represents the
-three arguments 'dbus-make-inhibitor-lock` was called with.  */)
+       doc: /* Return registered file descriptors, an alist.
+The key is an open file descriptor, retrieved via `dbus-call-method' or
+`dbus--open-fd'.  The value is a string OBJECT-PATH or FILENAME, which
+represents the arguments the function was called with.  Those values are
+not needed for further operations; they are just shown for information.
+
+This alist allows to check, whether other packages of the running Emacs
+instance have acquired a file descriptor as well.  */)
   (void)
 {
-  /* We return a copy of xd_registered_inhibitor_locks, in order to
-     protect it against malicious manipulation.  */
-  Lisp_Object registered = xd_registered_inhibitor_locks;
+  /* We return a copy of xd_registered_fds, in order to protect it
+     against malicious manipulation.  */
+  Lisp_Object registered = xd_registered_fds;
   Lisp_Object result = Qnil;
   for (; !NILP (registered); registered = CDR_SAFE (registered))
-    result = Fcons (Fcopy_sequence (CAR_SAFE (registered)), result);
+    {
+      Lisp_Object tem = CAR_SAFE (registered);
+      result = Fcons (Fcons (CAR_SAFE (tem), CDR_SAFE (tem)), result);
+    }
   return Fnreverse (result);
 }
 
@@ -1859,7 +1861,22 @@ xd_read_message_1 (DBusConnection *connection, Lisp_Object bus)
       Fremhash (key, Vdbus_registered_objects_table);
 
       /* Store the event.  */
-      xd_store_event (value, args, event_args);
+      xd_store_event (CONSP (value) ? CAR_SAFE (value) : value, args, event_args);
+
+#ifdef DBUS_TYPE_UNIX_FD
+      /* Check, whether there is a file descriptor to be kept.
+         value is (handler . path)
+         args is ((:unix-fd NN) ...)  */
+      if (CONSP (value)
+          && CONSP (CAR_SAFE (args))
+          && EQ (CAR_SAFE (CAR_SAFE (args)), QCunix_fd))
+        {
+          xd_registered_fds =
+            Fcons (Fcons (CAR_SAFE (CDR_SAFE (CAR_SAFE (args))),
+                          CDR_SAFE (value)),
+                   xd_registered_fds);
+        }
+#endif
     }
 
   else /* DBUS_MESSAGE_TYPE_METHOD_CALL, DBUS_MESSAGE_TYPE_SIGNAL.  */
@@ -1995,7 +2012,7 @@ static void
 syms_of_dbusbind_for_pdumper (void)
 {
   xd_registered_buses = Qnil;
-  xd_registered_inhibitor_locks = Qnil;
+  xd_registered_fds = Qnil;
 }
 
 void
@@ -2003,9 +2020,9 @@ syms_of_dbusbind (void)
 {
   defsubr (&Sdbus__init_bus);
   defsubr (&Sdbus_get_unique_name);
-  defsubr (&Sdbus_make_inhibitor_lock);
-  defsubr (&Sdbus_close_inhibitor_lock);
-  defsubr (&Sdbus_registered_inhibitor_locks);
+  defsubr (&Sdbus__fd_open);
+  defsubr (&Sdbus__fd_close);
+  defsubr (&Sdbus__registered_fds);
 
   DEFSYM (Qdbus_message_internal, "dbus-message-internal");
   defsubr (&Sdbus_message_internal);
@@ -2030,6 +2047,11 @@ syms_of_dbusbind (void)
   /* Lisp symbol for method interactive authorization.  */
   DEFSYM (QCauthorizable, ":authorizable");
 
+  /* Lisp symbol for file descriptor kept.  */
+#ifdef DBUS_TYPE_UNIX_FD
+  DEFSYM (QCkeep_fd, ":keep-fd");
+#endif
+
   /* Lisp symbols of D-Bus types.  */
   DEFSYM (QCbyte, ":byte");
   DEFSYM (QCboolean, ":boolean");
@@ -2166,7 +2188,7 @@ be called when the D-Bus reply message arrives.  */);
   /* Initialize internal objects.  */
   pdumper_do_now_and_after_load (syms_of_dbusbind_for_pdumper);
   staticpro (&xd_registered_buses);
-  staticpro (&xd_registered_inhibitor_locks);
+  staticpro (&xd_registered_fds);
 
   Fprovide (intern_c_string ("dbusbind"), Qnil);
 }
diff --git a/src/dispnew.c b/src/dispnew.c
index d976660db5c..841faef8e7f 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3677,7 +3677,7 @@ box_from_display_table (struct frame *f, enum box box, GLYPH *g)
 static void
 box_default (struct frame *f, enum box box, GLYPH *g)
 {
-  int dflt;
+  int dflt UNINIT;
   switch (box)
     {
     case BOX_VERTICAL:
diff --git a/src/fileio.c b/src/fileio.c
index 7a3ef3267cb..c50259239a0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -4520,7 +4520,7 @@ by calling `format-decode', which see.  */)
       /* Find the end position, which is end_offset if given,
          the file's end otherwise.  */
 
-      off_t endpos;
+      off_t endpos UNINIT;
       if (!giveup_match_end)
         {
           endpos = end_offset;
diff --git a/src/fns.c b/src/fns.c
index 5dbdb21202b..7c528ff0139 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -7713,4 +7713,8 @@ For best results this should end in a space.  */);
   DEFSYM (QCin_place, ":in-place");
   DEFSYM (QCreverse, ":reverse");
   DEFSYM (Qvaluelt, "value<");
+
+  /* sleep-event states.  */
+  DEFSYM (Qpre_sleep, "pre-sleep");
+  DEFSYM (Qpost_wake, "post-wake");
 }
diff --git a/src/frame.c b/src/frame.c
index ffac559252d..e8cdecc5f94 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2604,7 +2604,7 @@ delete_frame (Lisp_Object frame, Lisp_Object force)
   struct frame *f = decode_any_frame (frame);
   struct frame *sf;
   struct kboard *kb;
-  Lisp_Object frames, frame1;
+  Lisp_Object frames, frame1 UNINIT;
   int is_tooltip_frame;
   bool nochild = !FRAME_PARENT_FRAME (f);
   Lisp_Object minibuffer_child_frame = Qnil;
diff --git a/src/gtkutil.c b/src/gtkutil.c
index bf69fb2d96c..8bdc6f03dac 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1425,6 +1425,8 @@ xg_frame_set_size_and_position (struct frame *f, int width, int height)
 
   outer_height /= scale;
   outer_width /= scale;
+  x /= scale;
+  y /= scale;
 
   /* Full force ahead.  For top-level frames the gravity will get reset
      to NorthWestGravity anyway.  */
diff --git a/src/lisp.h b/src/lisp.h
index 2d25f781091..80e01492c37 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3480,15 +3480,15 @@ struct Lisp_Fwd
   enum Lisp_Fwd_Type type : 8;
   union
   {
-    intmax_t *intvar;
-    bool *boolvar;
-    Lisp_Object *objvar;
+    intmax_t *intvar;           /* when type == Lisp_Fwd_Int */
+    bool *boolvar;              /* when type == Lisp_Fwd_Bool */
+    Lisp_Object *objvar;        /* when type == Lisp_Fwd_Obj */
     struct
     {
       uint16_t offset;
       enum Lisp_Fwd_Predicate predicate : 8;
-    } buf;
-    int kbdoffset;
+    } buf;                      /* when type == Lisp_Fwd_Buffer_Obj */
+    int kbdoffset;              /* when type == Lisp_Fwd_Kboard_Obj */
   } u;
 };
 
diff --git a/src/nsfns.m b/src/nsfns.m
index 6992eaa74ce..c8de5583bf3 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -2210,6 +2210,62 @@ font descriptor.  If string contains `fontset' and not
   return build_string (ns_xlfd_to_fontname (SSDATA (name)));
 }
 
+static void
+ns_init_colors (void)
+{
+  NSTRACE ("ns_init_colors");
+
+  NSColorList *cl = [NSColorList colorListNamed: @"Emacs"];
+
+  /* There are 752 colors defined in rgb.txt.  */
+  if ( cl == nil || [[cl allKeys] count] < 752)
+    {
+      Lisp_Object color_file, color_map, color, name;
+      unsigned long c;
+
+      color_file = Fexpand_file_name (build_string ("rgb.txt"),
+                                      Fsymbol_value (intern ("data-directory")));
+
+      color_map = Fx_load_color_file (color_file);
+      if (NILP (color_map))
+        fatal ("Could not read %s.\n", SDATA (color_file));
+
+      cl = [[NSColorList alloc] initWithName: @"Emacs"];
+      for ( ; CONSP (color_map); color_map = XCDR (color_map))
+        {
+          color = XCAR (color_map);
+          name = XCAR (color);
+          c = XFIXNUM (XCDR (color));
+          c |= 0xFF000000;
+          [cl setColor:
+                [NSColor colorWithUnsignedLong:c]
+                forKey: [NSString stringWithLispString: name]];
+        }
+      @try
+        {
+#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+          if ([cl respondsToSelector:@selector(writeToURL:error:)])
+#endif
+            if ([cl writeToURL:nil error:nil] == false)
+              fprintf (stderr, "ns_init_colors: could not write Emacs.clr\n");
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
+            else
+#endif
+#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 */
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100 || defined (NS_IMPL_GNUSTEP)
+              if ([cl writeToFile: nil] == false)
+                fprintf (stderr, "ns_init_colors: could not write Emacs.clr\n");
+#endif
+        }
+      @catch (NSException *e)
+        {
+          NSLog(@"ns_init_colors: could not write Emacs.clr: %@", e.reason);
+        }
+    }
+}
+
+static BOOL ns_init_colors_done = NO;
 
 DEFUN ("ns-list-colors", Fns_list_colors, Sns_list_colors, 0, 1, 0,
        doc: /* Return a list of all available colors.
@@ -2221,6 +2277,12 @@ The optional argument FRAME is currently ignored.  */)
   NSColorList *clist;
   NSAutoreleasePool *pool;
 
+  if (ns_init_colors_done == NO)
+    {
+      ns_init_colors ();
+      ns_init_colors_done = YES;
+    }
+
   if (!NILP (frame))
     {
       CHECK_FRAME (frame);
@@ -3806,6 +3868,88 @@ If PROGRESS is nil, remove the progress indicator.  */)
   return Qnil;
 }
 
+/* A unique integer sleep block id and a hash map of its id to opaque
+   NSObject sleep block activity tokens.  */
+static unsigned int sleep_block_id = 0;
+static NSMutableDictionary *sleep_block_map = NULL;
+
+DEFUN ("ns-block-system-sleep",
+       Fns_block_system_sleep,
+       Sns_block_system_sleep,
+       2, 2, 0,
+       doc: /* Block system idle sleep.
+WHY is a string reason for the block.
+If ALLOW-DISPLAY-SLEEP is non-nil, block the screen from sleeping.
+Return a token to unblock this block using `ns-unblock-system-sleep',
+or nil if the block fails.  */)
+  (Lisp_Object why, Lisp_Object allow_display_sleep)
+{
+  block_input ();
+
+  NSString *reason = @"Emacs";
+  if (!NILP (why))
+    {
+      CHECK_STRING (why);
+      reason = [NSString stringWithLispString: why];
+    }
+
+  unsigned long activity_options =
+    NSActivityUserInitiated | NSActivityIdleSystemSleepDisabled;
+  if (NILP (allow_display_sleep))
+    activity_options |= NSActivityIdleDisplaySleepDisabled;
+
+  NSProcessInfo *processInfo = [NSProcessInfo processInfo];
+  NSObject *activity_id = nil;
+  if ([processInfo respondsToSelector:@selector(beginActivityWithOptions:reason:)])
+    activity_id = [[NSProcessInfo processInfo]
+                             beginActivityWithOptions: activity_options
+                                               reason: reason];
+  unblock_input ();
+
+  if (!sleep_block_map)
+    sleep_block_map = [[NSMutableDictionary alloc] initWithCapacity: 25];
+
+  if (activity_id)
+    {
+      [sleep_block_map setObject: activity_id
+                          forKey: [NSNumber numberWithInt: ++sleep_block_id]];
+      return make_fixnum (sleep_block_id);
+    }
+  else
+    return Qnil;
+}
+
+DEFUN ("ns-unblock-system-sleep",
+       Fns_unblock_system_sleep,
+       Sns_unblock_system_sleep,
+       1, 1, 0,
+       doc: /* Unblock system idle sleep.
+TOKEN is an object returned by `ns-block-system-sleep'.
+Return non-nil if the TOKEN block was unblocked.  */)
+  (Lisp_Object token)
+{
+  block_input ();
+  Lisp_Object res = Qnil;
+  CHECK_FIXNAT (token);
+  if (sleep_block_map)
+    {
+      NSNumber *key = [NSNumber numberWithInt: XFIXNAT (token)];
+      NSObject *activity_id = [sleep_block_map objectForKey: key];
+      if (activity_id)
+        {
+          NSProcessInfo *processInfo = [NSProcessInfo processInfo];
+          if ([processInfo respondsToSelector:@selector(endActivity:)])
+            {
+              [[NSProcessInfo processInfo] endActivity: activity_id];
+              res = Qt;
+            }
+          [sleep_block_map removeObjectForKey: key];
+        }
+    }
+  unblock_input ();
+  return res;
+}
+
 #ifdef NS_IMPL_COCOA
 
 DEFUN ("ns-send-items",
@@ -4092,6 +4236,8 @@ The default value is t.  */);
   defsubr (&Sns_badge);
   defsubr (&Sns_request_user_attention);
   defsubr (&Sns_progress_indicator);
+  defsubr (&Sns_block_system_sleep);
+  defsubr (&Sns_unblock_system_sleep);
 #ifdef NS_IMPL_COCOA
   defsubr (&Sns_send_items);
 #endif
diff --git a/src/nsterm.m b/src/nsterm.m
index cc44c58a938..3c746f2926c 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -597,7 +597,6 @@ ns_init_locale (void)
   setenv ("LANG", lang, 1);
 }
 
-
 void
 ns_release_object (void *obj)
 /* --------------------------------------------------------------------------
@@ -5901,53 +5900,6 @@ ns_term_init (Lisp_Object display_name)
       ns_antialias_threshold = NILP (tmp) ? 10.0 : extract_float (tmp);
     }
 
-  NSTRACE_MSG ("Colors");
-
-  {
-    NSColorList *cl = [NSColorList colorListNamed: @"Emacs"];
-
-    /* There are 752 colors defined in rgb.txt.  */
-    if ( cl == nil || [[cl allKeys] count] < 752)
-      {
-        Lisp_Object color_file, color_map, color, name;
-        unsigned long c;
-
-        color_file = Fexpand_file_name (build_string ("rgb.txt"),
-                         Fsymbol_value (intern ("data-directory")));
-
-        color_map = Fx_load_color_file (color_file);
-        if (NILP (color_map))
-          fatal ("Could not read %s.\n", SDATA (color_file));
-
-        cl = [[NSColorList alloc] initWithName: @"Emacs"];
-        for ( ; CONSP (color_map); color_map = XCDR (color_map))
-          {
-            color = XCAR (color_map);
-            name = XCAR (color);
-            c = XFIXNUM (XCDR (color));
-            c |= 0xFF000000;
-            [cl setColor:
-                  [NSColor colorWithUnsignedLong:c]
-                  forKey: [NSString stringWithLispString: name]];
-          }
-
-        /* FIXME: Report any errors writing the color file below.  */
-#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MAX_ALLOWED >= 101100
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-        if ([cl respondsToSelector:@selector(writeToURL:error:)])
-#endif
-          [cl writeToURL:nil error:nil];
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100
-        else
-#endif
-#endif /* MAC_OS_X_VERSION_MAX_ALLOWED >= 101100 */
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 101100 \
-  || defined (NS_IMPL_GNUSTEP)
-          [cl writeToFile: nil];
-#endif
-      }
-  }
-
   NSTRACE_MSG ("Versions");
 
   delete_keyboard_wait_descriptor (0);
@@ -6382,6 +6334,20 @@ ns_term_shutdown (int sig)
 #endif
 
 #ifdef NS_IMPL_COCOA
+  /* Sleep event notification.  */
+  [[[NSWorkspace sharedWorkspace] notificationCenter]
+    addObserver: self
+       selector:@selector(systemWillSleep:)
+           name: NSWorkspaceWillSleepNotification
+         object: nil];
+  [[[NSWorkspace sharedWorkspace] notificationCenter]
+    addObserver: self
+       selector: @selector(systemDidWake:)
+           name: NSWorkspaceDidWakeNotification
+         object: nil];
+#endif
+
+#ifdef NS_IMPL_COCOA
   /* Some functions/methods in CoreFoundation/Foundation increase the
      maximum number of open files for the process in their first call.
      We make dummy calls to them and then reduce the resource limit
@@ -6419,6 +6385,31 @@ ns_term_shutdown (int sig)
 #endif
 }
 
+/* Sleep event notification.  */
+
+- (void) systemWillSleep:(NSNotification *)notification
+{
+#ifdef NS_IMPL_COCOA
+  NSTRACE ("[EmacsApp systemWillSleep:]");
+  struct input_event ie;
+  EVENT_INIT (ie);
+  ie.kind = SLEEP_EVENT;
+  ie.arg = list1 (Qpre_sleep);
+  kbd_buffer_store_event (&ie);
+#endif
+}
+
+- (void) systemDidWake:(NSNotification *)notification
+{
+#ifdef NS_IMPL_COCOA
+  NSTRACE ("[EmacsApp systemDidWake:]");
+  struct input_event ie;
+  EVENT_INIT (ie);
+  ie.kind = SLEEP_EVENT;
+  ie.arg = list1 (Qpost_wake);
+  kbd_buffer_store_event (&ie);
+#endif
+}
 
 /* Termination sequences:
     C-x C-c:
diff --git a/src/pdumper.c b/src/pdumper.c
index 41edf26b77a..89752391c84 100644
--- a/src/pdumper.c
+++ b/src/pdumper.c
@@ -2466,7 +2466,10 @@ dump_blv (struct dump_context *ctx,
   DUMP_FIELD_COPY (&out, blv, local_if_set);
   DUMP_FIELD_COPY (&out, blv, found);
   if (blv->fwd)
-    dump_field_fwd (ctx, &out, blv, &blv->fwd);
+    {
+      eassert (XFWDTYPE (blv->fwd) != Lisp_Fwd_Buffer_Obj);
+      dump_field_fwd (ctx, &out, blv, &blv->fwd);
+    }
   dump_field_lv (ctx, &out, blv, &blv->where, WEIGHT_NORMAL);
   dump_field_lv (ctx, &out, blv, &blv->defcell, WEIGHT_STRONG);
   dump_field_lv (ctx, &out, blv, &blv->valcell, WEIGHT_STRONG);
diff --git a/src/process.c b/src/process.c
index 375c9010ba8..b2810444137 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5138,11 +5138,15 @@ server_accept_connection (Lisp_Object server, int channel)
   /* If the server process is locked to this thread, lock the client
      process to the same thread, otherwise clear the thread of its I/O
      descriptors.  */
-  eassert (!fd_callback_info[p->infd].thread);
   if (NILP (ps->thread))
-    set_proc_thread (p, NULL);
+    {
+      eassert (!fd_callback_info[p->infd].thread);
+      set_proc_thread (p, NULL);
+    }
   else
     {
+      eassert (!fd_callback_info[p->infd].thread
+               || fd_callback_info[p->infd].thread == XTHREAD (ps->thread));
       eassert (XTHREAD (ps->thread) == current_thread);
       set_proc_thread (p, XTHREAD (ps->thread));
     }
diff --git a/src/w32fns.c b/src/w32fns.c
index 7fd7ce2eea8..1c780739bec 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -11337,6 +11337,135 @@ if the selected frame is not (yet) associated with a window handle  */)
 #endif /* WINDOWSNT */
 
 /***********************************************************************
+                     System Sleep Support
+ ***********************************************************************/
+
+typedef ULONG (WINAPI * SetThreadExecutionState_Proc) (IN ULONG);
+static SetThreadExecutionState_Proc SetThreadExecutionState_fn = NULL;
+
+static unsigned int sleep_block_id = 0;
+static unsigned int sleep_block_count = 0;
+
+DEFUN ("w32-block-system-sleep",
+       Fw32_block_system_sleep,
+       Sw32_block_system_sleep,
+       1, 1, 0,
+       doc: /* Block system idle sleep.
+If ALLOW-DISPLAY-SLEEP is non-nil, block the screen from sleeping.
+Return a token to unblock this block using `w32-unblock-system-sleep',
+or nil if the block fails.  */)
+  (Lisp_Object allow_display_sleep)
+{
+  if (SetThreadExecutionState_fn == NULL)
+    return Qnil;
+
+  /* ES_CONTINUOUS keeps the state until cleared.  */
+  EXECUTION_STATE new_state = ES_SYSTEM_REQUIRED | ES_CONTINUOUS;
+  if (NILP (allow_display_sleep))
+    new_state |= ES_DISPLAY_REQUIRED;
+
+  if (SetThreadExecutionState (new_state) == 0)
+    return Qnil;
+  else
+    {
+      /* One more block and next id.  */
+      ++sleep_block_count;
+      ++sleep_block_id;
+
+      /* Synthesize a token.  */
+      return make_fixnum (sleep_block_id);
+    }
+}
+
+DEFUN ("w32-unblock-system-sleep",
+       Fw32_unblock_system_sleep,
+       Sw32_unblock_system_sleep,
+       0, 0, 0,
+       doc: /* Unblock system idle sleep.
+Return non-nil if the TOKEN block was unblocked.  */)
+  (void)
+{
+  if (SetThreadExecutionState_fn == NULL)
+    return Qnil;
+
+  /* No blocks to unblock.  */
+  if (sleep_block_count == 0)
+    return Qnil;
+
+  /* One fewer block.  */
+  if (--sleep_block_count == 0
+      && SetThreadExecutionState (ES_CONTINUOUS) == 0)
+      return Qnil;
+  else
+    return Qt;
+}
+
+DEFUN ("w32-system-sleep-block-count",
+       Fw32_system_sleep_block_count,
+       Sw32_system_sleep_block_count,
+       0, 0, 0,
+       doc: /* Return the w32 sleep block count.  */)
+  (void)
+{
+  return make_fixnum (sleep_block_count);
+}
+
+typedef ULONG (CALLBACK *PMY_DEVICE_NOTIFY_CALLBACK_ROUTINE)
+  (PVOID Context,  ULONG Type,  PVOID Setting);
+
+static ULONG CALLBACK ALIGN_STACK
+sleep_notification_callback (PVOID _Context, ULONG Type, PVOID _Setting)
+{
+  struct input_event ie;
+  EVENT_INIT (ie);
+  ie.kind = SLEEP_EVENT;
+
+  switch (Type)
+    {
+    case PBT_APMRESUMEAUTOMATIC:
+      /* Ignore this event.  No user is present.  */
+      break;
+    case PBT_APMSUSPEND:
+      ie.arg = list1 (Qpre_sleep);
+      kbd_buffer_store_event (&ie);
+      break;
+    case PBT_APMRESUMESUSPEND:
+      ie.arg = list1 (Qpost_wake);
+      kbd_buffer_store_event (&ie);
+      break;
+    }
+  return 0;
+}
+
+typedef HPOWERNOTIFY (WINAPI * RegisterSuspendResumeNotification_Proc)
+  (IN HANDLE, IN DWORD);
+static RegisterSuspendResumeNotification_Proc RegisterSuspendResumeNotification_fn = NULL;
+
+static HPOWERNOTIFY sleep_notification_handle = 0;
+
+typedef struct _MY_DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS {
+  PMY_DEVICE_NOTIFY_CALLBACK_ROUTINE Callback;
+  PVOID Context;
+} MY_DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS, *PMY_DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS;
+
+void
+w32_register_for_sleep_notifications (void)
+{
+  /* PowerRegisterSuspendResumeNotification is not a user-space call so
+     we use RegisterSuspendResumeNotification.  */
+  if (RegisterSuspendResumeNotification_fn)
+    {
+      MY_DEVICE_NOTIFY_SUBSCRIBE_PARAMETERS params;
+      params.Callback = sleep_notification_callback;
+      params.Context = NULL;
+
+      /* DEVICE_NOTIFY_CALLBACK = 2  */
+      sleep_notification_handle =
+        RegisterSuspendResumeNotification_fn (&params, 2);
+    }
+}
+
+/***********************************************************************
                             Initialization
  ***********************************************************************/
 
@@ -11845,6 +11974,10 @@ keys when IME input is received.  */);
   defsubr (&Sw32_request_user_attention);
   DEFSYM (Qinformational, "informational");
   DEFSYM (Qcritical, "critical");
+  /* System sleep support.  */
+  defsubr (&Sw32_unblock_system_sleep);
+  defsubr (&Sw32_block_system_sleep);
+  defsubr (&Sw32_system_sleep_block_count);
 #endif
 }
 
@@ -12105,6 +12238,7 @@ void
 globals_of_w32fns (void)
 {
   HMODULE user32_lib = GetModuleHandle ("user32.dll");
+  HMODULE kernel32_lib = GetModuleHandle ("kernel32.dll");
   /*
     TrackMouseEvent not available in all versions of Windows, so must load
     it dynamically.  Do it once, here, instead of every time it is used.
@@ -12131,6 +12265,14 @@ globals_of_w32fns (void)
   RegisterTouchWindow_fn
     = (RegisterTouchWindow_proc) get_proc_addr (user32_lib,
                                                 "RegisterTouchWindow");
+  /* For system sleep support.  */
+  SetThreadExecutionState_fn
+    = (SetThreadExecutionState_Proc)
+    get_proc_addr (kernel32_lib, "SetThreadExecutionState");
+  RegisterSuspendResumeNotification_fn
+    = (RegisterSuspendResumeNotification_Proc)
+    get_proc_addr (user32_lib, "RegisterSuspendResumeNotification");
+
   SetGestureConfig_fn
     = (SetGestureConfig_proc) get_proc_addr (user32_lib,
                                              "SetGestureConfig");
diff --git a/src/w32term.c b/src/w32term.c
index 3f451fc552d..6e5c932b2c2 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -8255,6 +8255,7 @@ w32_initialize (void)
   }
 
   w32_get_mouse_wheel_vertical_delta ();
+  w32_register_for_sleep_notifications ();
 }
 
 void
diff --git a/src/w32term.h b/src/w32term.h
index 2d2d209016b..505569fd298 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -274,6 +274,7 @@ extern const char *w32_get_string_resource (void *v_rdb,
 extern frame_parm_handler w32_frame_parm_handlers[];
 extern void w32_default_font_parameter (struct frame* f, Lisp_Object parms);
 extern Lisp_Object w32_process_dnd_data (int format, void *pDataObj);
+extern void w32_register_for_sleep_notifications (void);
 
 
 #define PIX_TYPE COLORREF
diff --git a/src/xdisp.c b/src/xdisp.c
index d7db4039afa..90ed743460a 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -11304,6 +11304,7 @@ move_it_vertically_backward (struct it *it, int dy)
       int line_height;
 
       RESTORE_IT (&it3, &it3, it3data);
+      last_height = 0;
       y1 = line_bottom_y (&it3);
       line_height = y1 - y0;
       RESTORE_IT (it, it, it2data);
@@ -21681,8 +21682,9 @@ try_window_reusing_current_matrix (struct window *w)
     return false;
 
   /* If top-line visibility has changed, give up.  */
-  if (window_wants_tab_line (w)
-      != MATRIX_TAB_LINE_ROW (w->current_matrix)->mode_line_p)
+  if (!w->current_matrix->header_line_p
+      && (window_wants_tab_line (w)
+          != MATRIX_TAB_LINE_ROW (w->current_matrix)->mode_line_p))
     return false;
 
   /* If top-line visibility has changed, give up.  */
diff --git a/src/xsettings.c b/src/xsettings.c
index 25edce78841..71cd6a9ad6c 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -187,6 +187,8 @@ store_tool_bar_style_changed (const char *newstyle,
 #ifndef HAVE_PGTK
 #if defined USE_CAIRO || defined HAVE_XFT
 #define XSETTINGS_FONT_NAME       "Gtk/FontName"
+#define XSETTINGS_GDK_DPI_NAME    "Gdk/UnscaledDPI"
+#define XSETTINGS_GDK_WSCALE_NAME "Gdk/WindowScalingFactor"
 #endif
 #define XSETTINGS_TOOL_BAR_STYLE  "Gtk/ToolbarStyle"
 #endif
@@ -626,6 +628,15 @@ parse_settings (unsigned char *prop,
   int bytes_parsed = 0;
   int settings_seen = 0;
   int i = 0;
+#if defined USE_CAIRO || defined HAVE_XFT
+  /* Some X environments, e.g. XWayland, communicate DPI changes only
+     through the GDK xsettings values and not the regular Xft one, so
+     recognize both schemes.  We want to see both the GDK window scaling
+     factor and the post-scaling DPI so we can compute our desired
+     actual DPI.  */
+  int gdk_unscaled_dpi = 0;
+  int gdk_window_scale = 0;
+#endif
 
   /* First 4 bytes is a serial number, skip that.  */
 
@@ -668,7 +679,9 @@ parse_settings (unsigned char *prop,
       want_this = strcmp (XSETTINGS_TOOL_BAR_STYLE, name) == 0;
 #if defined USE_CAIRO || defined HAVE_XFT
       if ((nlen > 6 && memcmp (name, "Xft/", 4) == 0)
-          || strcmp (XSETTINGS_FONT_NAME, name) == 0)
+          || strcmp (XSETTINGS_FONT_NAME, name) == 0
+          || strcmp (XSETTINGS_GDK_DPI_NAME, name) == 0
+          || strcmp (XSETTINGS_GDK_WSCALE_NAME, name) == 0)
         want_this = true;
 #endif
 
@@ -769,6 +782,10 @@ parse_settings (unsigned char *prop,
               settings->seen |= SEEN_DPI;
               settings->dpi = ival / 1024.0;
             }
+          else if (strcmp (name, XSETTINGS_GDK_DPI_NAME) == 0)
+            gdk_unscaled_dpi = ival;
+          else if (strcmp (name, XSETTINGS_GDK_WSCALE_NAME) == 0)
+            gdk_window_scale = ival;
           else if (strcmp (name, "Xft/lcdfilter") == 0)
             {
               settings->seen |= SEEN_LCDFILTER;
@@ -786,6 +803,19 @@ parse_settings (unsigned char *prop,
         }
     }
 
+#if defined USE_CAIRO || defined HAVE_XFT
+  if (gdk_unscaled_dpi > 0 && gdk_window_scale > 0)
+    {
+      /* Override any previous DPI settings.  GDK ones are intended to
+         be authoritative.
+         See
+         https://mail.gnome.org/archives/commits-list/2013-June/msg06726.html
+       */
+      settings->seen |= SEEN_DPI;
+      settings->dpi = gdk_window_scale * gdk_unscaled_dpi / 1024.0;
+    }
+#endif
+
   return settings_seen;
 }
 #endif