Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-136
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-137
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-138
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-139
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-140
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-141
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-142
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-143
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-49
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-50
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-51
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-52
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-53
   Update from CVS: Makefile.in (release-*): New targets.

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-54
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-55
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-527

8 files changed, 191 insertions, 79 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 11fe6f910e4..db10f46024b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,48 @@
+2006-03-08  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * window.c: Declare preserve_y as a static global variable.
+        (window_scroll_pixel_based): No longer declare preserve_y;
+        it is global now.
+        (syms_of_window): set preserve_y to -1.
+
+2006-03-08  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * image.c [MAC_OS] (XPutPixel): Set alpha channel bits if pixmap
+        depth is 32.
+         [MAC_OS] (XGetPixel): Strip off alpha channel bits if pixmap
+        depth is 32.
+
+2006-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * xdisp.c (handle_invisible_prop): Don't update it->position with
+        a buffer position if we're in a display string.
+
+2006-03-06  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * macterm.h (MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH)
+        (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH): New defines.
+
+        * macfns.c (x_default_scroll_bar_color_parameter)
+        (x_set_scroll_bar_foreground, x_set_scroll_bar_background): Remove
+        unnecessary prototypes.
+        (x_set_scroll_bar_default_width): Use
+        MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH.
+        (mac_set_scroll_bar_width): New function.
+        (mac_frame_parm_handlers): Set it as handler for scroll-bar-width.
+
+        * macterm.c (get_control_part_bounds): Fix type of return value.
+        (x_set_toolkit_scroll_bar_thumb, x_scroll_bar_create)
+        (XTset_vertical_scroll_bar) [USE_TOOLKIT_SCROLL_BARS]: Don't show
+        scroll bar if it is not tall enough to display scroll bar thumb.
+        [USE_CARBON_EVENTS] (mac_convert_event_ref)
+        (mac_handle_command_event, mac_handle_window_event)
+        (mac_handle_mouse_event): Check error code of GetEventParameter.
+        (convert_fn_keycode) [MAC_OSX]: Likewise.
+        
+2006-03-05  Andreas Schwab  <schwab@suse.de>
+
+        * xselect.c (x_catch_errors_unwind): Fix missing return value.
+
 2006-03-02  Kim F. Storm  <storm@cua.dk>
 
         * frame.h (struct frame): New member n_tool_bar_rows.
diff --git a/src/image.c b/src/image.c
index 3587515f840..ba78a835ef3 100644
--- a/src/image.c
+++ b/src/image.c
@@ -194,7 +194,7 @@ XPutPixel (ximage, x, y, pixel)
       char *base_addr = GetPixBaseAddr (pixmap);
       short row_bytes = GetPixRowBytes (pixmap);
 
-      ((unsigned long *) (base_addr + y * row_bytes))[x] = pixel;
+      ((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel;
     }
   else if (depth == 1)
     {
@@ -238,7 +238,7 @@ XGetPixel (ximage, x, y)
       char *base_addr = GetPixBaseAddr (pixmap);
       short row_bytes = GetPixRowBytes (pixmap);
 
-      return ((unsigned long *) (base_addr + y * row_bytes))[x];
+      return ((unsigned long *) (base_addr + y * row_bytes))[x] & 0x00ffffff;
     }
   else if (depth == 1)
     {
diff --git a/src/macfns.c b/src/macfns.c
index 617167dfc46..92a78a7319b 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -210,15 +210,6 @@ void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
 void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
-void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object,
-                                      Lisp_Object));
-void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object,
-                                      Lisp_Object));
-static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *,
-                                                             Lisp_Object,
-                                                             Lisp_Object,
-                                                             char *, char *,
-                                                             int));
 
 extern void mac_get_window_bounds P_ ((struct frame *, Rect *, Rect *));
 
@@ -1897,7 +1888,7 @@ x_set_scroll_bar_default_width (f)
   int wid = FRAME_COLUMN_WIDTH (f);
 
 #ifdef MAC_OSX
-  FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = 16;  /* Aqua scroll bars.  */
+  FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH;
   FRAME_CONFIG_SCROLL_BAR_COLS (f) = (FRAME_CONFIG_SCROLL_BAR_WIDTH (f) +
                                       wid - 1) / wid;
 #else /* not MAC_OSX */
@@ -1911,6 +1902,24 @@ x_set_scroll_bar_default_width (f)
 #endif /* not MAC_OSX */
 }
 
+void
+mac_set_scroll_bar_width (f, arg, oldval)
+     struct frame *f;
+     Lisp_Object arg, oldval;
+{
+#ifdef MAC_OSX
+  if (INTEGERP (arg) && XINT (arg) > 0)
+    {
+      if (XINT (arg) < (MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH
+                        + MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH) / 2)
+        XSETINT (arg, MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH);
+      else
+        XSETINT (arg, MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH);
+    }
+#endif
+  x_set_scroll_bar_width (f, arg, oldval);
+}
+
 
 /* Subroutines of creating a frame.  */
 
@@ -4373,7 +4382,7 @@ frame_parm_handler mac_frame_parm_handlers[] =
   x_set_menu_bar_lines,
   x_set_mouse_color,
   x_explicitly_set_name,
-  x_set_scroll_bar_width,
+  mac_set_scroll_bar_width,
   x_set_title,
   x_set_unsplittable,
   x_set_vertical_scroll_bars,
diff --git a/src/macterm.c b/src/macterm.c
index af9079e919b..7f682515f43 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -4265,8 +4265,8 @@ static OSStatus set_scroll_bar_timer P_ ((EventTimerInterval));
 static int control_part_code_to_scroll_bar_part P_ ((ControlPartCode));
 static void construct_scroll_bar_click P_ ((struct scroll_bar *, int,
                                             struct input_event *));
-static OSErr get_control_part_bounds P_ ((ControlHandle, ControlPartCode,
-                                          Rect *));
+static OSStatus get_control_part_bounds P_ ((ControlHandle, ControlPartCode,
+                                             Rect *));
 static void x_scroll_bar_handle_press P_ ((struct scroll_bar *,
                                            ControlPartCode,
                                            struct input_event *));
@@ -4387,7 +4387,7 @@ construct_scroll_bar_click (bar, part, bufp)
   bufp->modifiers = 0;
 }
 
-static OSErr
+static OSStatus
 get_control_part_bounds (ch, part_code, rect)
      ControlHandle ch;
      ControlPartCode part_code;
@@ -4531,7 +4531,10 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
   ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
   int value, viewsize, maximum;
 
-  if (whole == 0 || XINT (bar->track_height) == 0)
+  if (XINT (bar->track_height) == 0)
+    return;
+
+  if (whole == 0)
     value = 0, viewsize = 1, maximum = 0;
   else
     {
@@ -4542,10 +4545,9 @@ x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
 
   BLOCK_INPUT;
 
-  if (IsControlVisible (ch)
-      && (GetControlViewSize (ch) != viewsize
-          || GetControl32BitValue (ch) != value
-          || GetControl32BitMaximum (ch) != maximum))
+  if (GetControlViewSize (ch) != viewsize
+      || GetControl32BitValue (ch) != value
+      || GetControl32BitMaximum (ch) != maximum)
     {
       /* Temporarily hide the scroll bar to avoid multiple redraws.  */
       SetControlVisibility (ch, false, false);
@@ -4592,7 +4594,12 @@ x_scroll_bar_create (w, top, left, width, height, disp_top, disp_height)
   r.bottom = disp_top + disp_height;
 
 #if TARGET_API_MAC_CARBON
-  ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", width < disp_height,
+  ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p",
+#if USE_TOOLKIT_SCROLL_BARS
+                   false,
+#else
+                   width < disp_height,
+#endif
                    0, 0, 0, kControlScrollBarProc, (long) bar);
 #else
   ch = NewControl (FRAME_MAC_WINDOW (f), &r, "\p", width < disp_height,
@@ -4762,6 +4769,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
   /* Adjustments according to Inside Macintosh to make it look nice */
   disp_top = top;
   disp_height = height;
+#ifdef MAC_OS8
   if (disp_top == 0)
     {
       disp_top = -1;
@@ -4775,6 +4783,7 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 
   if (sb_left + sb_width == FRAME_PIXEL_WIDTH (f))
     sb_left++;
+#endif
 
   /* Does the scroll bar exist yet?  */
   if (NILP (w->vertical_scroll_bar))
@@ -4810,8 +4819,10 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
           MoveControl (ch, sb_left + VERTICAL_SCROLL_BAR_WIDTH_TRIM, disp_top);
           SizeControl (ch, sb_width - VERTICAL_SCROLL_BAR_WIDTH_TRIM * 2,
                        disp_height);
+#ifndef USE_TOOLKIT_SCROLL_BARS
           if (sb_width < disp_height)
             ShowControl (ch);
+#endif
 
           /* Remember new settings.  */
           XSETINT (bar->left, sb_left);
@@ -4829,30 +4840,41 @@ XTset_vertical_scroll_bar (w, portion, whole, position)
 
 #ifdef USE_TOOLKIT_SCROLL_BARS
   if (NILP (bar->track_top))
-    {
-      ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
-      Rect r0, r1;
+    if (sb_width >= disp_height)
+      {
+        XSETINT (bar->track_top, 0);
+        XSETINT (bar->track_height, 0);
+      }
+    else
+      {
+        ControlHandle ch = SCROLL_BAR_CONTROL_HANDLE (bar);
+        Rect r0, r1;
 
-      BLOCK_INPUT;
+        BLOCK_INPUT;
 
-      SetControl32BitMinimum (ch, 0);
-      SetControl32BitMaximum (ch, 1);
-      SetControlViewSize (ch, 1);
+        SetControl32BitMinimum (ch, 0);
+        SetControl32BitMaximum (ch, 1);
+        SetControlViewSize (ch, 1);
 
-      /* Move the scroll bar thumb to the top.  */
-      SetControl32BitValue (ch, 0);
-      get_control_part_bounds (ch, kControlIndicatorPart, &r0);
+        /* Move the scroll bar thumb to the top.  */
+        SetControl32BitValue (ch, 0);
+        get_control_part_bounds (ch, kControlIndicatorPart, &r0);
 
-      /* Move the scroll bar thumb to the bottom.  */
-      SetControl32BitValue (ch, 1);
-      get_control_part_bounds (ch, kControlIndicatorPart, &r1);
+        /* Move the scroll bar thumb to the bottom.  */
+        SetControl32BitValue (ch, 1);
+        get_control_part_bounds (ch, kControlIndicatorPart, &r1);
 
-      UnionRect (&r0, &r1, &r0);
-      XSETINT (bar->track_top, r0.top);
-      XSETINT (bar->track_height, r0.bottom - r0.top);
+        UnionRect (&r0, &r1, &r0);
+        XSETINT (bar->track_top, r0.top);
+        XSETINT (bar->track_height, r0.bottom - r0.top);
 
-      UNBLOCK_INPUT;
-    }
+        /* Don't show the scroll bar if its height is not enough to
+           display the scroll bar thumb.  */
+        if (r0.bottom - r0.top > 0)
+          ShowControl (ch);
+
+        UNBLOCK_INPUT;
+      }
 
   x_set_toolkit_scroll_bar_thumb (bar, portion, position, whole);
 #else /* not USE_TOOLKIT_SCROLL_BARS */
@@ -8387,6 +8409,7 @@ mac_get_mouse_btn (EventRef ref)
    XTread_socket loop).  */
 static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec)
 {
+  OSStatus err;
   Boolean result = ConvertEventRefToEventRecord (eventRef, eventRec);
 
   if (result)
@@ -8420,13 +8443,19 @@ static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec)
             unsigned char char_codes;
             UInt32 key_code;
 
-            eventRec->what = keyDown;
-            GetEventParameter (eventRef, kEventParamKeyMacCharCodes, typeChar,
-                               NULL, sizeof (char), NULL, &char_codes);
-            GetEventParameter (eventRef, kEventParamKeyCode, typeUInt32,
-                               NULL, sizeof (UInt32), NULL, &key_code);
-            eventRec->message = char_codes | ((key_code & 0xff) << 8);
-            result = 1;
+            err = GetEventParameter (eventRef, kEventParamKeyMacCharCodes,
+                                     typeChar, NULL, sizeof (char),
+                                     NULL, &char_codes);
+            if (err == noErr)
+              err = GetEventParameter (eventRef, kEventParamKeyCode,
+                                       typeUInt32, NULL, sizeof (UInt32),
+                                       NULL, &key_code);
+            if (err == noErr)
+              {
+                eventRec->what = keyDown;
+                eventRec->message = char_codes | ((key_code & 0xff) << 8);
+                result = 1;
+              }
           }
           break;
 
@@ -8442,7 +8471,7 @@ static Boolean mac_convert_event_ref (EventRef eventRef, EventRecord *eventRec)
   if (result)
     {
       /* Need where and when.  */
-      UInt32 mods;
+      UInt32 mods = 0;
 
       GetEventParameter (eventRef, kEventParamMouseLocation, typeQDPoint,
                          NULL, sizeof (Point), NULL, &eventRec->where);
@@ -8852,8 +8881,7 @@ mac_handle_command_event (next_handler, event, data)
      EventRef event;
      void *data;
 {
-  OSStatus result;
-  OSErr err;
+  OSStatus result, err;
   HICommand command;
   Lisp_Object class_key, id_key, binding;
 
@@ -8861,10 +8889,10 @@ mac_handle_command_event (next_handler, event, data)
   if (result != eventNotHandledErr)
     return result;
 
-  GetEventParameter (event, kEventParamDirectObject, typeHICommand, NULL,
-                     sizeof (HICommand), NULL, &command);
+  err = GetEventParameter (event, kEventParamDirectObject, typeHICommand,
+                           NULL, sizeof (HICommand), NULL, &command);
 
-  if (command.commandID == 0)
+  if (err != noErr || command.commandID == 0)
     return eventNotHandledErr;
 
   /* A HICommand event is mapped to an Apple event whose event class
@@ -8918,12 +8946,14 @@ mac_handle_window_event (next_handler, event, data)
      void *data;
 {
   WindowPtr wp;
-  OSStatus result;
+  OSStatus result, err;
   UInt32 attributes;
   XSizeHints *size_hints;
 
-  GetEventParameter (event, kEventParamDirectObject, typeWindowRef,
-                     NULL, sizeof (WindowPtr), NULL, &wp);
+  err = GetEventParameter (event, kEventParamDirectObject, typeWindowRef,
+                           NULL, sizeof (WindowPtr), NULL, &wp);
+  if (err != noErr)
+    return eventNotHandledErr;
 
   switch (GetEventKind (event))
     {
@@ -8940,8 +8970,11 @@ mac_handle_window_event (next_handler, event, data)
       if (result != eventNotHandledErr)
         return result;
 
-      GetEventParameter (event, kEventParamAttributes, typeUInt32,
-                         NULL, sizeof (UInt32), NULL, &attributes);
+      err = GetEventParameter (event, kEventParamAttributes, typeUInt32,
+                               NULL, sizeof (UInt32), NULL, &attributes);
+      if (err != noErr)
+        break;
+
       size_hints = FRAME_SIZE_HINTS (mac_window_to_frame (wp));
       if ((attributes & kWindowBoundsChangeUserResize)
           && ((size_hints->flags & (PResizeInc | PBaseSize | PMinSize))
@@ -8950,9 +8983,12 @@ mac_handle_window_event (next_handler, event, data)
           Rect bounds;
           int width, height;
 
-          GetEventParameter (event, kEventParamCurrentBounds,
-                             typeQDRectangle,
-                             NULL, sizeof (Rect), NULL, &bounds);
+          err = GetEventParameter (event, kEventParamCurrentBounds,
+                                   typeQDRectangle, NULL, sizeof (Rect),
+                                   NULL, &bounds);
+          if (err != noErr)
+            break;
+
           width = bounds.right - bounds.left;
           height = bounds.bottom - bounds.top;
 
@@ -9001,7 +9037,7 @@ mac_handle_mouse_event (next_handler, event, data)
      EventRef event;
      void *data;
 {
-  OSStatus result;
+  OSStatus result, err;
 
   switch (GetEventKind (event))
     {
@@ -9017,22 +9053,31 @@ mac_handle_mouse_event (next_handler, event, data)
         if (result != eventNotHandledErr || read_socket_inev == NULL)
           return result;
 
-        GetEventParameter (event, kEventParamWindowRef, typeWindowRef,
-                           NULL, sizeof (WindowRef), NULL, &wp);
+        err = GetEventParameter (event, kEventParamWindowRef, typeWindowRef,
+                                 NULL, sizeof (WindowRef), NULL, &wp);
+        if (err != noErr)
+          break;
+
         f = mac_window_to_frame (wp);
         if (f != mac_focus_frame (&one_mac_display_info))
           break;
 
-        GetEventParameter (event, kEventParamMouseWheelAxis,
-                           typeMouseWheelAxis, NULL,
-                           sizeof (EventMouseWheelAxis), NULL, &axis);
-        if (axis != kEventMouseWheelAxisY)
+        err = GetEventParameter (event, kEventParamMouseWheelAxis,
+                                 typeMouseWheelAxis, NULL,
+                                 sizeof (EventMouseWheelAxis), NULL, &axis);
+        if (err != noErr || axis != kEventMouseWheelAxisY)
           break;
 
-        GetEventParameter (event, kEventParamMouseWheelDelta, typeSInt32,
-                           NULL, sizeof (SInt32), NULL, &delta);
-        GetEventParameter (event, kEventParamMouseLocation, typeQDPoint,
-                           NULL, sizeof (Point), NULL, &point);
+        err = GetEventParameter (event, kEventParamMouseWheelDelta,
+                                 typeSInt32, NULL, sizeof (SInt32),
+                                 NULL, &delta);
+        if (err != noErr)
+          break;
+        err = GetEventParameter (event, kEventParamMouseLocation,
+                                 typeQDPoint, NULL, sizeof (Point),
+                                 NULL, &point);
+        if (err != noErr)
+          break;
         read_socket_inev->kind = WHEEL_EVENT;
         read_socket_inev->code = 0;
         read_socket_inev->modifiers =
@@ -9494,13 +9539,13 @@ convert_fn_keycode (EventRef eventRef, int keyCode, int *newCode)
   Fn modifier. That's why we need the table.
 
   */
-
+  OSStatus err;
   UInt32 mods = 0;
   if (!NILP(Vmac_function_modifier))
     {
-      GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32, NULL,
-                         sizeof (UInt32), NULL, &mods);
-      if (mods & kEventKeyModifierFnMask)
+      err = GetEventParameter (eventRef, kEventParamKeyModifiers, typeUInt32,
+                               NULL, sizeof (UInt32), NULL, &mods);
+      if (err != noErr && mods & kEventKeyModifierFnMask)
         {  *newCode = fn_keycode_to_xkeysym_table [keyCode & 0x7f];
 
           return (*newCode != 0);
diff --git a/src/macterm.h b/src/macterm.h
index 107814ddb3f..42020811e6c 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -516,6 +516,10 @@ struct scroll_bar {
    text from glomming up against the scroll bar */
 #define VERTICAL_SCROLL_BAR_WIDTH_TRIM (0)
 
+/* Variations of possible Aqua scroll bar width.  */
+#define MAC_AQUA_VERTICAL_SCROLL_BAR_WIDTH (15)
+#define MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH (11)
+
 /* Size of hourglass controls */
 #define HOURGLASS_WIDTH 16
 #define HOURGLASS_HEIGHT 16
diff --git a/src/window.c b/src/window.c
index 36050ac649e..bc9a956994a 100644
--- a/src/window.c
+++ b/src/window.c
@@ -217,6 +217,10 @@ Lisp_Object Vscroll_preserve_screen_position;
 
 int window_deletion_count;
 
+/* Used by the function window_scroll_pixel_based */
+
+static int preserve_y;
+
 #if 0 /* This isn't used anywhere.  */
 /* Nonzero means we can split a frame even if it is "unsplittable".  */
 static int inhibit_frame_unsplittable;
@@ -4726,7 +4730,6 @@ window_scroll_pixel_based (window, n, whole, noerror)
   int this_scroll_margin;
   /* True if we fiddled the window vscroll field without really scrolling.   */
   int vscrolled = 0;
-  static int preserve_y = -1;
 
   SET_TEXT_POS_FROM_MARKER (start, w->start);
 
@@ -7024,6 +7027,8 @@ syms_of_window ()
   minibuf_selected_window = Qnil;
   staticpro (&minibuf_selected_window);
 
+  preserve_y = -1;
+
   DEFVAR_LISP ("temp-buffer-show-function", &Vtemp_buffer_show_function,
                doc: /* Non-nil means call as function to display a help buffer.
 The function is called with one argument, the buffer to be displayed.
diff --git a/src/xdisp.c b/src/xdisp.c
index 41c8546aac9..a645efd38a2 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -3649,8 +3649,11 @@ handle_invisible_prop (it)
                  the invisible text.  Otherwise the cursor would be
                  placed _after_ the ellipsis when the point is after the
                  first invisible character.  */
-              it->position.charpos = IT_CHARPOS (*it) - 1;
-              it->position.bytepos = CHAR_TO_BYTE (it->position.charpos);
+              if (!STRINGP (it->object))
+                {
+                  it->position.charpos = IT_CHARPOS (*it) - 1;
+                  it->position.bytepos = CHAR_TO_BYTE (it->position.charpos);
+                }
               setup_for_ellipsis (it, 0);
             }
         }
diff --git a/src/xselect.c b/src/xselect.c
index 6776e732734..5e6ffd806f0 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -627,6 +627,7 @@ x_catch_errors_unwind (dummy)
   BLOCK_INPUT;
   x_uncatch_errors ();
   UNBLOCK_INPUT;
+  return Qnil;
 }