merge trunk

20 files changed, 153 insertions, 114 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 44e2ff1a1f1..606a6bcb7f6 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -26,6 +26,82 @@
         * lisp.h (adjust_after_replace): Cancel externing it.
         (insert_from_gap): Adjust prototype.
 
+2013-03-15  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32fullscreen_hook): Swap FULLSCREEN_BOTH and
+        FULLSCREEN_MAXIMIZED.  (Bug#13935)
+
+2013-03-15  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * region-cache.c (find_cache_boundary, move_cache_gap)
+        (insert_cache_boundary, delete_cache_boundaries, set_cache_region):
+        Simplify debugging check and convert to eassert.  Adjust comment.
+        (pp_cache): Put under ENABLE_CHECKING.
+
+2013-03-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32_read_socket) <WM_WINDOWPOSCHANGED>: Remove old
+        and incorrect code.  Treat WM_WINDOWPOSCHANGED like WM_ACTIVATE
+        and WM_ACTIVATEAPP.
+        (w32fullscreen_hook): If the frame is visible, reset
+        f->want_fullscreen flag after changing the frame size.  If the
+        frame is not visible, set f->want_fullscreen to FULLSCREEN_WAIT.
+        (Bug#13953)
+
+2013-03-13  Daniel Colascione  <dancol@dancol.org>
+
+        * emacs.c (main): Call syms_of_cygw32 on CYGWIN non-NTGUI builds
+        too so that these builds can use Cygwin's file conversion
+        functions.  (We've been building and linking cygw32.o all along
+        and just not using it.)
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        File synchronization fixes (Bug#13944).
+        * Makefile.in (LIB_FDATASYNC): New macro.
+        (LIBES): Use it.
+        * conf_post.h (BSD_SYSTEM, BSD_SYSTEM_AHB): Remove; no longer needed.
+        * fileio.c (Fwrite_region, write_region_inhibit_fsync):
+        Don't worry about HAVE_FSYNC, since a substitute fsync is
+        available if the system lacks one.
+        (Fwrite_regin): Retry fsync if interrupted.
+
+2013-03-13  Eli Zaretskii  <eliz@gnu.org>
+
+        * w32term.c (w32_read_socket): If the Emacs frame is being
+        activated, call w32fullscreen_hook, to make sure the new frame
+        dimensions are in effect.  (Bug#13937)
+
+2013-03-13  Dmitry Antipov  <dmantipov@yandex.ru>
+
+        * xdisp.c (init_iterator): Simplify because both character and byte
+        positions are either specified or -1.  Add eassert.  Adjust comment.
+        * window.c (Fscroll_other_window): Use SET_PT_BOTH because both
+        character and byte positions can be obtained from marker.
+
+2013-03-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Static checking by Sun C 5.12.
+        * alloc.c (buffer_memory_full) [REL_ALLOC]:
+        * bytecode.c (exec_byte_code):
+        * dispnew.c (init_display):
+        * eval.c (error):
+        * fileio.c (Fsubstitute_in_file_name):
+        * keyboard.c (Fevent_convert_list):
+        * keymap.c (Fsingle_key_description):
+        * term.c (maybe_fatal, fatal):
+        * xfns.c (Fx_display_backing_store, Fx_display_visual_class):
+        * xsmfns.c (Fhandle_save_session):
+        Omit unreachable code.
+        * keymap.c (map_keymap_char_table_item): Cast void * to
+        a function pointer type; the C Standard requires this.
+
+        * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out.
+        Include <sys/param.h> unconditionally, as that works elsewhere and
+        is simpler here.  Include <sys/sysctl.h> if DARWIN_OS ||
+        __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin
+        and FreeBSD now.
+
 2013-03-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         * insdel.c (adjust_after_replace): Use bool for boolean.
diff --git a/src/Makefile.in b/src/Makefile.in
index b2034a3379d..31de9714c65 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -139,6 +139,7 @@ M17N_FLT_LIBS = @M17N_FLT_LIBS@
 
 LIB_CLOCK_GETTIME=@LIB_CLOCK_GETTIME@
 LIB_EACCESS=@LIB_EACCESS@
+LIB_FDATASYNC=@LIB_FDATASYNC@
 LIB_TIMER_TIME=@LIB_TIMER_TIME@
 
 DBUS_CFLAGS = @DBUS_CFLAGS@
@@ -391,7 +392,7 @@ ALLOBJS = $(VMLIMIT_OBJ) $(obj) $(otherobj)
 LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
    $(LIBX_OTHER) $(LIBSOUND) \
    $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
-   $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
+   $(LIB_EACCESS) $(LIB_FDATASYNC) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
    $(LIB_EXECINFO) \
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
diff --git a/src/alloc.c b/src/alloc.c
index 80086433e65..b2703c5f961 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -422,11 +422,11 @@ buffer_memory_full (ptrdiff_t nbytes)
 
 #ifndef REL_ALLOC
   memory_full (nbytes);
-#endif
-
+#else
   /* This used to call error, but if we've run out of memory, we could
      get infinite recursion trying to build the string.  */
   xsignal (Qnil, Vmemory_signal_data);
+#endif
 }
 
 /* A common multiple of the positive integers A and B.  Ideally this
diff --git a/src/bytecode.c b/src/bytecode.c
index 628c4d90cf3..acb96c1e61b 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -755,7 +755,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
               {
                 BEFORE_POTENTIAL_GC ();
                 wrong_type_argument (Qlistp, v1);
-                AFTER_POTENTIAL_GC ();
               }
             NEXT;
           }
@@ -790,7 +789,6 @@ exec_byte_code (Lisp_Object bytestr, Lisp_Object vector, Lisp_Object maxdepth,
               {
                 BEFORE_POTENTIAL_GC ();
                 wrong_type_argument (Qlistp, v1);
-                AFTER_POTENTIAL_GC ();
               }
             NEXT;
           }
diff --git a/src/conf_post.h b/src/conf_post.h
index 6c9747a436c..5cb385d9029 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -44,19 +44,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # define __has_attribute(a) 0 /* non-clang */
 #endif
 
-/* This silences a few compilation warnings on FreeBSD.  */
-#ifdef BSD_SYSTEM_AHB
-#undef BSD_SYSTEM_AHB
-#undef BSD_SYSTEM
-#if __FreeBSD__ == 1
-#define BSD_SYSTEM 199103
-#elif __FreeBSD__ == 2
-#define BSD_SYSTEM 199306
-#elif __FreeBSD__ >= 3
-#define BSD_SYSTEM 199506
-#endif
-#endif
-
 #ifdef DARWIN_OS
 #ifdef emacs
 #define malloc unexec_malloc
diff --git a/src/dispnew.c b/src/dispnew.c
index 9335365bc71..47adab6b8f7 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -6100,10 +6100,7 @@ init_display (void)
 
   /* If no window system has been specified, try to use the terminal.  */
   if (! isatty (0))
-    {
-      fatal ("standard input is not a tty");
-      exit (1);
-    }
+    fatal ("standard input is not a tty");
 
 #ifdef WINDOWSNT
   terminal_type = "w32console";
diff --git a/src/emacs.c b/src/emacs.c
index b96076b1340..bd33583af0c 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -44,7 +44,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "w32common.h"
 #endif
 
-#if defined HAVE_NTGUI && defined CYGWIN
+#if defined CYGWIN
 #include "cygw32.h"
 #endif
 
@@ -1348,7 +1348,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
 #ifdef WINDOWSNT
       syms_of_ntproc ();
 #endif /* WINDOWSNT */
-#if defined CYGWIN && defined HAVE_NTGUI
+#if defined CYGWIN
       syms_of_cygw32 ();
 #endif
       syms_of_window ();
diff --git a/src/eval.c b/src/eval.c
index 5db6f9d0bf3..69483a9b205 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1690,7 +1690,6 @@ error (const char *m, ...)
   va_list ap;
   va_start (ap, m);
   verror (m, ap);
-  va_end (ap);
 }
 
 DEFUN ("commandp", Fcommandp, Scommandp, 1, 2, 0,
diff --git a/src/fileio.c b/src/fileio.c
index d7363077b35..724250c8aaa 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1850,9 +1850,6 @@ those `/' is discarded.  */)
   error ("Missing \"}\" in environment-variable substitution");
  badvar:
   error ("Substituting nonexistent environment variable \"%s\"", target);
-
-  /* NOTREACHED */
-  return Qnil;
 }
 
 /* A slightly faster and more convenient way to get
@@ -3305,7 +3302,6 @@ Use the current time if TIMESTAMP is nil.  TIMESTAMP is in the format of
           return Qnil;
 #endif
         report_file_error ("Setting file times", Fcons (absname, Qnil));
-        return Qnil;
       }
   }
 
@@ -4963,20 +4959,23 @@ This calls `write-region-annotate-functions' at the start, and
 
   immediate_quit = 0;
 
-#ifdef HAVE_FSYNC
   /* fsync appears to change the modtime on BSD4.2.
      Disk full in NFS may be reported here.  */
   /* mib says that closing the file will try to write as fast as NFS can do
      it, and that means the fsync here is not crucial for autosave files.  */
-  if (!auto_saving && !write_region_inhibit_fsync && fsync (desc) < 0)
+  if (!auto_saving && !write_region_inhibit_fsync)
     {
-      /* If fsync fails with EINTR, don't treat that as serious.  Also
+      /* Transfer data and metadata to disk, retrying if interrupted.  Also,
          ignore EINVAL which happens when fsync is not supported on this
          file.  */
-      if (errno != EINTR && errno != EINVAL)
-        ok = 0, save_errno = errno;
+      while (fsync (desc) != 0)
+        if (errno != EINTR)
+          {
+            if (errno != EINVAL)
+              ok = 0, save_errno = errno;
+            break;
+          }
     }
-#endif
 
   modtime = invalid_emacs_time ();
   if (visiting)
@@ -6050,13 +6049,11 @@ in the buffer; this is the default behavior, because the auto-save
 file is usually more useful if it contains the deleted text.  */);
   Vauto_save_include_big_deletions = Qnil;
 
-#ifdef HAVE_FSYNC
   DEFVAR_BOOL ("write-region-inhibit-fsync", write_region_inhibit_fsync,
                doc: /* Non-nil means don't call fsync in `write-region'.
 This variable affects calls to `write-region' as well as save commands.
 A non-nil value may result in data loss!  */);
   write_region_inhibit_fsync = 0;
-#endif
 
   DEFVAR_BOOL ("delete-by-moving-to-trash", delete_by_moving_to_trash,
                doc: /* Specifies whether to use the system's trash can.
diff --git a/src/filelock.c b/src/filelock.c
index 32992896c2b..f17d3182eab 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -437,6 +437,14 @@ create_lock_file (char *lfname, char *lock_info_str, bool force)
           if (emacs_write (fd, lock_info_str, lock_info_len) != lock_info_len
               || (need_fchmod && fchmod (fd, world_readable) != 0))
             err = errno;
+          else
+            while (fsync (fd) != 0)
+              if (errno != EINTR)
+                {
+                  if (errno != EINVAL)
+                    err = errno;
+                  break;
+                }
           if (emacs_close (fd) != 0)
             err = errno;
           if (!err && rename_lock_file (nonce, lfname, force) != 0)
diff --git a/src/keyboard.c b/src/keyboard.c
index fe8b45a0130..e43b7a73172 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6552,10 +6552,7 @@ has the same base event type and all the specified modifiers.  */)
   else if (SYMBOLP (base))
     return apply_modifiers (modifiers, base);
   else
-    {
-      error ("Invalid base event");
-      return Qnil;
-    }
+    error ("Invalid base event");
 }
 
 /* Try to recognize SYMBOL as a modifier name.
diff --git a/src/keymap.c b/src/keymap.c
index 922c1703edf..00eefb375ef 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -565,7 +565,8 @@ map_keymap_char_table_item (Lisp_Object args, Lisp_Object key, Lisp_Object val)
 {
   if (!NILP (val))
     {
-      map_keymap_function_t fun = XSAVE_POINTER (args, 0);
+      map_keymap_function_t fun
+        = (map_keymap_function_t) XSAVE_POINTER (args, 0);
       /* If the key is a range, make a copy since map_char_table modifies
          it in place.  */
       if (CONSP (key))
@@ -2310,7 +2311,6 @@ around function keys and event symbols.  */)
     return Fcopy_sequence (key);
   else
     error ("KEY must be an integer, cons, symbol, or string");
-  return Qnil;
 }
 
 static char *
diff --git a/src/region-cache.c b/src/region-cache.c
index 452a5b3a065..be7d50a50e4 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -190,10 +190,9 @@ find_cache_boundary (struct region_cache *c, ptrdiff_t pos)
     }
 
   /* Some testing.  */
-  if (BOUNDARY_POS (c, low) > pos
-      || (low + 1 < c->cache_len
-          && BOUNDARY_POS (c, low + 1) <= pos))
-      emacs_abort ();
+  eassert (!(BOUNDARY_POS (c, low) > pos
+             || (low + 1 < c->cache_len
+                 && BOUNDARY_POS (c, low + 1) <= pos)));
 
   return low;
 }
@@ -214,14 +213,9 @@ move_cache_gap (struct region_cache *c, ptrdiff_t pos, ptrdiff_t min_size)
   ptrdiff_t buffer_beg = c->buffer_beg;
   ptrdiff_t buffer_end = c->buffer_end;
 
-  if (pos < 0
-      || pos > c->cache_len)
-    emacs_abort ();
-
   /* We mustn't ever try to put the gap before the dummy start
      boundary.  That must always be start-relative.  */
-  if (pos == 0)
-    emacs_abort ();
+  eassert (0 < pos && pos <= c->cache_len);
 
   /* Need we move the gap right?  */
   while (gap_start < pos)
@@ -288,26 +282,19 @@ static void
 insert_cache_boundary (struct region_cache *c, ptrdiff_t i, ptrdiff_t pos,
                        int value)
 {
-  /* i must be a valid cache index.  */
-  if (i < 0 || i > c->cache_len)
-    emacs_abort ();
-
-  /* We must never want to insert something before the dummy first
-     boundary.  */
-  if (i == 0)
-    emacs_abort ();
+  /* I must be a valid cache index, and we must never want
+     to insert something before the dummy first boundary.  */
+  eassert (0 < i && i <= c->cache_len);
 
   /* We must only be inserting things in order.  */
-  if (! (BOUNDARY_POS (c, i - 1) < pos
-         && (i == c->cache_len
-             || pos < BOUNDARY_POS (c, i))))
-    emacs_abort ();
+  eassert ((BOUNDARY_POS (c, i - 1) < pos
+            && (i == c->cache_len
+                || pos < BOUNDARY_POS (c, i))));
 
   /* The value must be different from the ones around it.  However, we
      temporarily create boundaries that establish the same value as
      the subsequent boundary, so we're not going to flag that case.  */
-  if (BOUNDARY_VALUE (c, i - 1) == value)
-    emacs_abort ();
+  eassert (BOUNDARY_VALUE (c, i - 1) != value);
 
   move_cache_gap (c, i, 1);
 
@@ -328,18 +315,13 @@ delete_cache_boundaries (struct region_cache *c,
   ptrdiff_t len = end - start;
 
   /* Gotta be in range.  */
-  if (start < 0
-      || end > c->cache_len)
-    emacs_abort ();
+  eassert (0 <= start && end <= c->cache_len);
 
   /* Gotta be in order.  */
-  if (start > end)
-    emacs_abort ();
+  eassert (start <= end);
 
   /* Can't delete the dummy entry.  */
-  if (start == 0
-      && end >= 1)
-    emacs_abort ();
+  eassert (!(start == 0 && end >= 1));
 
   /* Minimize gap motion.  If we're deleting nothing, do nothing.  */
   if (len == 0)
@@ -378,11 +360,8 @@ static void
 set_cache_region (struct region_cache *c,
                   ptrdiff_t start, ptrdiff_t end, int value)
 {
-  if (start > end)
-    emacs_abort ();
-  if (start < c->buffer_beg
-      || end   > c->buffer_end)
-    emacs_abort ();
+  eassert (start <= end);
+  eassert (c->buffer_beg <= start && end <= c->buffer_end);
 
   /* Eliminate this case; then we can assume that start and end-1 are
      both the locations of real characters in the buffer.  */
@@ -772,7 +751,8 @@ int region_cache_backward (struct buffer *buf, struct region_cache *c,
   }
 }
 
-
+#ifdef ENABLE_CHECKING
+
 /* Debugging: pretty-print a cache to the standard error output.  */
 
 void pp_cache (struct region_cache *) EXTERNALLY_VISIBLE;
@@ -803,3 +783,5 @@ pp_cache (struct region_cache *c)
       fprintf (stderr, "%"pD"d : %d\n", pos, BOUNDARY_VALUE (c, i));
     }
 }
+
+#endif /* ENABLE_CHECKING */
diff --git a/src/sysdep.c b/src/sysdep.c
index fe6371623a9..bff11fc9f75 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -38,9 +38,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "sysselect.h"
 #include "blockinput.h"
 
-#ifdef BSD_SYSTEM
-#include <sys/param.h>
-#include <sys/sysctl.h>
+#if defined DARWIN_OS || defined __FreeBSD__
+# include <sys/sysctl.h>
 #endif
 
 #ifdef __FreeBSD__
@@ -69,9 +68,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef MSDOS    /* Demacs 1.1.2 91/10/20 Manabu Higashida, MW Aug 1993 */
 #include "msdos.h"
-#include <sys/param.h>
 #endif
 
+#include <sys/param.h>
 #include <sys/file.h>
 #include <fcntl.h>
 
@@ -1290,10 +1289,9 @@ reset_sys_modes (struct tty_display_info *tty_out)
   if (tty_out->terminal->reset_terminal_modes_hook)
     tty_out->terminal->reset_terminal_modes_hook (tty_out->terminal);
 
-#ifdef BSD_SYSTEM
   /* Avoid possible loss of output when changing terminal modes.  */
-  fsync (fileno (tty_out->output));
-#endif
+  while (fdatasync (fileno (tty_out->output)) != 0 && errno == EINTR)
+    continue;
 
 #ifndef DOS_NT
 #ifdef F_SETOWN
diff --git a/src/term.c b/src/term.c
index 822b74aa44e..38706602a02 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3426,9 +3426,6 @@ maybe_fatal (int must_succeed, struct terminal *terminal,
     vfatal (str2, ap);
   else
     verror (str1, ap);
-
-  va_end (ap);
-  emacs_abort ();
 }
 
 void
@@ -3437,7 +3434,6 @@ fatal (const char *str, ...)
   va_list ap;
   va_start (ap, str);
   vfatal (str, ap);
-  va_end (ap);
 }
 
 
diff --git a/src/w32term.c b/src/w32term.c
index 6137d54c837..989ceb0f847 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -236,6 +236,7 @@ static void my_set_focus (struct frame *, HWND);
 #endif
 static void my_set_foreground_window (HWND);
 static void my_destroy_window (struct frame *, HWND);
+static void w32fullscreen_hook (FRAME_PTR);
 
 #ifdef GLYPH_DEBUG
 static void x_check_font (struct frame *, struct font *);
@@ -4704,20 +4705,23 @@ w32_read_socket (struct terminal *terminal,
           }
 
         case WM_WINDOWPOSCHANGED:
-          f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
-          if (f)
-            {
-              if (f->want_fullscreen & FULLSCREEN_WAIT)
-                f->want_fullscreen &= ~(FULLSCREEN_WAIT|FULLSCREEN_BOTH);
-            }
-          check_visibility = 1;
-          break;
-
         case WM_ACTIVATE:
         case WM_ACTIVATEAPP:
           f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
           if (f)
-            x_check_fullscreen (f);
+            {
+              /* Run the full-screen hook function also when we are
+                 being activated, to actually install the required
+                 size in effect, if the WAIT flag is set.  This is
+                 because when the hook is run from x_set_fullscreen,
+                 the frame might not yet be visible, if that call is a
+                 result of make-frame, and in that case the hook just
+                 sets the WAIT flag.  */
+              if ((msg.msg.message == WM_WINDOWPOSCHANGED || msg.msg.wParam)
+                  && (f->want_fullscreen & FULLSCREEN_WAIT))
+                w32fullscreen_hook (f);
+              x_check_fullscreen (f);
+            }
           check_visibility = 1;
           break;
 
@@ -5678,10 +5682,10 @@ w32fullscreen_hook (FRAME_PTR f)
 
       switch (f->want_fullscreen)
         {
-        case FULLSCREEN_MAXIMIZED:
+        case FULLSCREEN_BOTH:
           PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0);
           break;
-        case FULLSCREEN_BOTH:
+        case FULLSCREEN_MAXIMIZED:
           height =
             FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
             - XINT (Ftool_bar_lines_needed (selected_frame))
@@ -5729,8 +5733,11 @@ w32fullscreen_hook (FRAME_PTR f)
           x_set_window_size (f, 1, width, height);
           do_pending_window_change (0);
         }
+      f->want_fullscreen = FULLSCREEN_NONE;
       unblock_input ();
     }
+  else
+    f->want_fullscreen |= FULLSCREEN_WAIT;
 }
 
 /* Call this to change the size of frame F's x-window.
diff --git a/src/window.c b/src/window.c
index 77696131512..940e0f7565a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5021,7 +5021,7 @@ specifies the window to scroll.  This takes precedence over
   ++windows_or_buffers_changed;
 
   Fset_buffer (w->buffer);
-  SET_PT (marker_position (w->pointm));
+  SET_PT_BOTH (marker_position (w->pointm), marker_byte_position (w->pointm));
 
   if (NILP (arg))
     window_scroll (window, 1, 1, 1);
diff --git a/src/xdisp.c b/src/xdisp.c
index 511a5eeb2c3..a5bba1a81cd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -2550,7 +2550,7 @@ markpos_of_region (void)
    at character position CHARPOS.  CHARPOS < 0 means that no buffer
    position is specified which is useful when the iterator is assigned
    a position later.  BYTEPOS is the byte position corresponding to
-   CHARPOS.  BYTEPOS < 0 means compute it from CHARPOS.
+   CHARPOS.
 
    If ROW is not null, calls to produce_glyphs with IT as parameter
    will produce glyphs in that row.
@@ -2828,18 +2828,14 @@ init_iterator (struct it *it, struct window *w,
   if (charpos >= BUF_BEG (current_buffer))
     {
       it->end_charpos = ZV;
+      eassert (charpos == BYTE_TO_CHAR (bytepos));
       IT_CHARPOS (*it) = charpos;
+      IT_BYTEPOS (*it) = bytepos;
 
       /* We will rely on `reseat' to set this up properly, via
          handle_face_prop.  */
       it->face_id = it->base_face_id;
 
-      /* Compute byte position if not specified.  */
-      if (bytepos < charpos)
-        IT_BYTEPOS (*it) = CHAR_TO_BYTE (charpos);
-      else
-        IT_BYTEPOS (*it) = bytepos;
-
       it->start = it->current;
       /* Do we need to reorder bidirectional text?  Not if this is a
          unibyte buffer: by definition, none of the single-byte
diff --git a/src/xfns.c b/src/xfns.c
index a6a56c8c5e1..100fd81a155 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -3769,7 +3769,6 @@ If omitted or nil, that stands for the selected frame's display.  */)
 
     default:
       error ("Strange value for BackingStore parameter of screen");
-      result = Qnil;
     }
 
   return result;
@@ -3811,7 +3810,6 @@ If omitted or nil, that stands for the selected frame's display.  */)
       break;
     default:
       error ("Display has an unknown visual class");
-      result = Qnil;
     }
 
   return result;
diff --git a/src/xsmfns.c b/src/xsmfns.c
index fe2dfbaf83e..cb7122202df 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -514,9 +514,11 @@ Do not call this function yourself. */)
          prevent.  Fix this in next version.  */
       Fkill_emacs (Qnil);
 
+#if 0
       /* This will not be reached, but we want kill-emacs-hook to be run.  */
       SmcCloseConnection (smc_conn, 0, 0);
       ice_connection_closed ();
+#endif
     }
 
   return Qnil;