upstream

3 files changed, 9 insertions, 19 deletions

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))