feature/android 273c65f9e90: Update Android port

[Po Lu]

branch: feature/android
commit 273c65f9e90b395e7513b802fd0938a096dec811
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Update Android port
    
    * src/window.h (GCALIGNED_STRUCT): Improve documentation of
    `last_mark'.
    * src/xdisp.c (mark_window_display_accurate_1): Don't set
    `last_mark' to -1 if the mark is inactive.
---
 src/window.h |  2 +-
 src/xdisp.c  | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/window.h b/src/window.h
index 6b151efbe60..5a620c958de 100644
--- a/src/window.h
+++ b/src/window.h
@@ -302,7 +302,7 @@ struct window
 #endif
 
     /* Value of mark in the selected window at the time of the last
-       redisplay.  */
+       redisplay.  -1 if the mark is not valid or active.  */
     ptrdiff_t last_mark;
 
     /* Line number and position of a line somewhere above the top of the
diff --git a/src/xdisp.c b/src/xdisp.c
index d0b0720b005..117df85e97e 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -17468,7 +17468,7 @@ mark_window_display_accurate_1 (struct window *w, bool 
accurate_p)
   struct buffer *b = XBUFFER (w->contents);
 #ifdef HAVE_TEXT_CONVERSION
   ptrdiff_t prev_point, prev_mark;
-#endif
+#endif /* HAVE_TEXT_CONVERSION */
 
   w->last_modified = accurate_p ? BUF_MODIFF (b) : 0;
   w->last_overlay_modified = accurate_p ? BUF_OVERLAY_MODIFF (b) : 0;
@@ -17501,14 +17501,19 @@ mark_window_display_accurate_1 (struct window *w, 
bool accurate_p)
 #ifdef HAVE_TEXT_CONVERSION
       prev_point = w->last_point;
       prev_mark = w->last_mark;
-#endif
+#endif /* HAVE_TEXT_CONVERSION */
 
       if (w == XWINDOW (selected_window))
        w->last_point = BUF_PT (b);
       else
        w->last_point = marker_position (w->pointm);
 
-      if (XMARKER (BVAR (b, mark))->buffer == b)
+      /* w->last_mark is recorded for text conversion purposes.
+         Input methods aren't interested in the value of the mark
+         if it is inactive, so set it to -1 if it's not.  */
+
+      if (XMARKER (BVAR (b, mark))->buffer == b
+         && !NILP (BVAR (b, mark_active)))
        w->last_mark = marker_position (BVAR (b, mark));
       else
        w->last_mark = -1;
@@ -17536,7 +17541,7 @@ mark_window_display_accurate_1 (struct window *w, bool 
accurate_p)
          && FRAME_WINDOW_P (WINDOW_XFRAME (w))
          && w == XWINDOW (WINDOW_XFRAME (w)->selected_window))
        report_point_change (WINDOW_XFRAME (w), w, b);
-#endif
+#endif /* HAVE_TEXT_CONVERSION */
 
       w->window_end_valid = true;
       w->update_mode_line = false;