upstream

7 files changed, 40 insertions, 23 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index c2f7e3cb0d2..31752a2bc2a 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-22  Juri Linkov  <juri@jurta.org>
+
+        * compilation.txt: Add more samples of output and non-output
+        switches (bug#9319).
+
 2011-08-19  Chong Yidong  <cyd@stupidchicken.com>
 
         * themes/dichromacy-theme.el:
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 888c1f94c33..eeb09b1712c 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -546,9 +546,20 @@ checking whether to build shared libraries... yes
 checking whether -lc should be explicitly linked in... (cached) no
 checking For GLIB - version >= 2.0.0... yes (version 2.1.0)
 checking FONTCONFIG_CFLAGS...
-g++ -o foo.o foo.cc
-tool1 -output=foo foo.x
-tool2 --outfile foo foo.y
+tool -o foo.o foo.c
+tool -o=foo.o foo.c
+tool -output foo.o foo.c
+tool -output=foo.o foo.c
+tool -outfile foo.o foo.c
+tool -outfile=foo.o foo.c
+tool --output foo.o foo.c
+tool --output=foo.o foo.c
+tool --outfile foo.o foo.c
+tool --outfile=foo.o foo.c
+tool -omega foo.c foo2.c
+tool -output-html-file foo.c foo2.c
+tool --omega foo.c foo2.c
+tool --output-html-file foo.c foo2.c
 
 Compilation started at Wed Jul 20 12:20:10
 Compilation interrupt at Wed Jul 20 12:20:10
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bfcbaa27b6f..4c7306174d6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2011-08-22  Juri Linkov  <juri@jurta.org>
 
+        * progmodes/compile.el (compilation-mode-font-lock-keywords):
+        Revert regexp that highlights output switches to its old
+        pre-2010-10-28 value and remove one `?' from it (bug#9319).
+
         * progmodes/grep.el (grep-process-setup): Use `buffer-modified-p'
         to check for empty output (bug#9226).
 
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index b82147b97f1..313298de97e 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1119,27 +1119,13 @@ It also eliminates runs of equal strings."
                                        `(display (space :align-to ,column)))
                   nil))))
             (if (not (consp str))
-                (put-text-property (point)
-                                   (progn
-                                     (insert (bidi-string-mark-left-to-right
-                                              str))
-                                     (point))
+                (put-text-property (point) (progn (insert str) (point))
                                    'mouse-face 'highlight)
-              (put-text-property (point)
-                                 (progn
-                                   (insert
-                                    (bidi-string-mark-left-to-right
-                                     (car str)))
-                                   (point))
+              (put-text-property (point) (progn (insert (car str)) (point))
                                  'mouse-face 'highlight)
-              (add-text-properties (point)
-                                   (progn
-                                     (insert
-                                      (bidi-string-mark-left-to-right
-                                       (cadr str)))
-                                     (point))
+              (add-text-properties (point) (progn (insert (cadr str)) (point))
                                    '(mouse-face nil
-                                                face completions-annotations)))
+                                     face completions-annotations)))
             (cond
              ((eq completions-format 'vertical)
               ;; Vertical format
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 2fb0ac879b2..79fec080d57 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -523,7 +523,7 @@ you may also want to change `compilation-page-delimiter'.")
      ;; Command output lines.  Recognize `make[n]:' lines too.
      ("^\\([[:alnum:]_/.+-]+\\)\\(\\[\\([0-9]+\\)\\]\\)?[ \t]*:"
       (1 font-lock-function-name-face) (3 compilation-line-face nil t))
-     (" -\\(?:o[= ]?\\|-\\(?:outfile\\|output\\)[= ]\\)\\(\\S +\\)" . 1)
+     (" --?o\\(?:utfile\\|utput\\)?[= ]\\(\\S +\\)" . 1)
      ("^Compilation \\(finished\\).*"
       (0 '(face nil compilation-message nil help-echo nil mouse-face nil) t)
       (1 compilation-info-face))
diff --git a/src/ChangeLog b/src/ChangeLog
index 243a39af45d..e3cf7546962 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-22  Eli Zaretskii  <eliz@gnu.org>
+
+        * xdisp.c (BUFFER_POS_REACHED_P): If this is a composition,
+        consider it a hit if to_charpos is anywhere in the range of the
+        composed buffer positions.
+
 2011-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.c (gif_load): Don't assume that each subimage has the same
diff --git a/src/xdisp.c b/src/xdisp.c
index 2cd1bb9bfdb..5ce8cbf8d9b 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7753,7 +7753,12 @@ move_it_in_display_line_to (struct it *it,
   ((op & MOVE_TO_POS) != 0                                      \
    && BUFFERP (it->object)                                      \
    && (IT_CHARPOS (*it) == to_charpos                           \
-       || (!it->bidi_p && IT_CHARPOS (*it) > to_charpos))       \
+       || (!it->bidi_p && IT_CHARPOS (*it) > to_charpos)        \
+       || (it->what == IT_COMPOSITION                           \
+           && ((IT_CHARPOS (*it) > to_charpos                   \
+                && to_charpos >= it->cmp_it.charpos)            \
+               || (IT_CHARPOS (*it) < to_charpos                \
+                   && to_charpos <= it->cmp_it.charpos))))      \
    && (it->method == GET_FROM_BUFFER                            \
        || (it->method == GET_FROM_DISPLAY_VECTOR                \
            && it->dpvec + it->current.dpvec_index + 1 >= it->dpend)))