Merge from trunk.

6 files changed, 65 insertions, 16 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 230bd8a6508..64ac50fe8f0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-art.el (gnus-insert-mime-button, gnus-mime-display-alternative):
+        Make button keymap non-sticky after buttons.
+
 2011-08-18  David Engster  <dengste@eml.cc>
 
         * nnmairix.el (nnmairix-request-set-mark)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 28c6aca367c..c6e0180dadc 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5700,7 +5700,8 @@ all parts."
               gnus-callback gnus-mm-display-part
               gnus-part ,gnus-tmp-id
               article-type annotation
-              gnus-data ,handle))
+              gnus-data ,handle
+              rear-nonsticky t))
     (setq e (if (bolp)
                 ;; Exclude a newline.
                 (1- (point))
@@ -6013,7 +6014,8 @@ If displaying \"text/html\" is discouraged \(see
              ,gnus-mouse-face-prop ,gnus-article-mouse-face
              face ,gnus-article-button-face
              gnus-part ,id
-             article-type multipart))
+             article-type multipart
+             rear-nonsticky t))
           (widget-convert-button 'link from (point)
                                  :action 'gnus-widget-press-button
                                  :button-keymap gnus-widget-button-keymap)
@@ -6037,7 +6039,8 @@ If displaying \"text/html\" is discouraged \(see
                ,gnus-mouse-face-prop ,gnus-article-mouse-face
                face ,gnus-article-button-face
                gnus-part ,id
-               gnus-data ,handle))
+               gnus-data ,handle
+               rear-nonsticky t))
             (widget-convert-button 'link from (point)
                                    :action 'gnus-widget-press-button
                                    :button-keymap gnus-widget-button-keymap)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 313298de97e..b82147b97f1 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1119,13 +1119,27 @@ It also eliminates runs of equal strings."
                                        `(display (space :align-to ,column)))
                   nil))))
             (if (not (consp str))
-                (put-text-property (point) (progn (insert str) (point))
+                (put-text-property (point)
+                                   (progn
+                                     (insert (bidi-string-mark-left-to-right
+                                              str))
+                                     (point))
                                    'mouse-face 'highlight)
-              (put-text-property (point) (progn (insert (car str)) (point))
+              (put-text-property (point)
+                                 (progn
+                                   (insert
+                                    (bidi-string-mark-left-to-right
+                                     (car str)))
+                                   (point))
                                  'mouse-face 'highlight)
-              (add-text-properties (point) (progn (insert (cadr str)) (point))
+              (add-text-properties (point)
+                                   (progn
+                                     (insert
+                                      (bidi-string-mark-left-to-right
+                                       (cadr str)))
+                                     (point))
                                    '(mouse-face nil
-                                     face completions-annotations)))
+                                                face completions-annotations)))
             (cond
              ((eq completions-format 'vertical)
               ;; Vertical format
diff --git a/src/ChangeLog b/src/ChangeLog
index 1db99549c60..922a8a33a9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -422,6 +422,17 @@
         (gs_load): Use printmax_t to print the widest integers possible.
         Check for integer overflow when computing image height and width.
 
+2011-08-19  Eli Zaretskii  <eliz@gnu.org>
+
+        * xfaces.c (face_at_buffer_position): Avoid repeated evaluation of
+        face ID by FACE_FROM_ID, and avoid a crash when mouse is moved
+        from an Org mode buffer to a Speedbar frame.
+
+        * xdisp.c (RECORD_MAX_MIN_POS): If the display element comes from
+        a composition, take its buffer position from IT->cmp_it.charpos.
+        Fixes cursor positioning at the beginning of a line that begins
+        with a composed character.
+
 2011-08-18  Eli Zaretskii  <eliz@gnu.org>
 
         * bidi.c (bidi_get_type): If bidi_type_table reports zero as the
diff --git a/src/xdisp.c b/src/xdisp.c
index ea70c916762..86ad523dfdd 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -18384,15 +18384,22 @@ display_line (struct it *it)
 #define RECORD_MAX_MIN_POS(IT)                                  \
   do                                                            \
     {                                                           \
-      if (IT_CHARPOS (*(IT)) < min_pos)                         \
+      int composition_p = (IT)->what == IT_COMPOSITION;         \
+      EMACS_INT current_pos =                                   \
+        composition_p ? (IT)->cmp_it.charpos                    \
+                      : IT_CHARPOS (*(IT));                     \
+      EMACS_INT current_bpos =                                  \
+        composition_p ? CHAR_TO_BYTE (current_pos)              \
+                      : IT_BYTEPOS (*(IT));                     \
+      if (current_pos < min_pos)                                \
         {                                                       \
-          min_pos = IT_CHARPOS (*(IT));                         \
-          min_bpos = IT_BYTEPOS (*(IT));                        \
+          min_pos = current_pos;                                \
+          min_bpos = current_bpos;                              \
         }                                                       \
-      if (IT_CHARPOS (*(IT)) > max_pos)                         \
+      if (current_pos > max_pos)                                \
         {                                                       \
-          max_pos = IT_CHARPOS (*(IT));                         \
-          max_bpos = IT_BYTEPOS (*(IT));                        \
+          max_pos = current_pos;                                \
+          max_bpos = current_bpos;                              \
         }                                                       \
     }                                                           \
   while (0)
diff --git a/src/xfaces.c b/src/xfaces.c
index fee4a6f9d6a..431ca07b8df 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5999,9 +5999,18 @@ face_at_buffer_position (struct window *w, EMACS_INT pos,
 
   *endptr = endpos;
 
-  default_face = FACE_FROM_ID (f, base_face_id >= 0 ? base_face_id
-                               : NILP (Vface_remapping_alist) ? DEFAULT_FACE_ID
-                               : lookup_basic_face (f, DEFAULT_FACE_ID));
+  {
+    int face_id;
+
+    if (base_face_id >= 0)
+      face_id = base_face_id;
+    else if (NILP (Vface_remapping_alist))
+      face_id = DEFAULT_FACE_ID;
+    else
+      face_id = lookup_basic_face (f, DEFAULT_FACE_ID);
+
+    default_face = FACE_FROM_ID (f, face_id);
+  }
 
   /* Optimize common cases where we can use the default face.  */
   if (noverlays == 0