Merged from miles@gnu.org--gnu-2005 (patch 142-148, 615-628)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-615
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-616
   Add lisp/mh-e/.arch-inventory

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-617
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-618
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-619
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-620
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-621
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-622
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-623
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-624
   Update from CVS: lisp/smerge-mode.el: Add 'tools' to file keywords.

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-625
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-626
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-627
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-628
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-142
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-143
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-144
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-145
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-146
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-147
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-148
   Update from CVS

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

1 files changed, 9 insertions, 7 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 2d79754b4f0..31963f7538c 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1129,11 +1129,17 @@ See also `multi-occur'."
                                     (append
                                      (when prefix-face
                                        `(font-lock-face prefix-face))
-                                     '(occur-prefix t)))
+                                     `(occur-prefix t mouse-face (highlight)
+                                       occur-target ,marker follow-link t
+                                       help-echo "mouse-2: go to this occurrence")))
                              ;; We don't put `mouse-face' on the newline,
                              ;; because that loses.  And don't put it
                              ;; on context lines to reduce flicker.
-                             (propertize curstring 'mouse-face 'highlight)
+                             (propertize curstring 'mouse-face (list 'highlight)
+                                         'occur-target marker
+                                         'follow-link t
+                                         'help-echo
+                                         "mouse-2: go to this occurrence")
                              "\n"))
                            (data
                             (if (= nlines 0)
@@ -1154,11 +1160,7 @@ See also `multi-occur'."
                         (let ((beg (point))
                               (end (progn (insert data) (point))))
                           (unless (= nlines 0)
-                            (insert "-------\n"))
-                          (add-text-properties
-                           beg end
-                           `(occur-target ,marker follow-link t
-                                          help-echo "mouse-2: go to this occurrence")))))
+                            (insert "-------\n")))))
                     (goto-char endpt))
                   (if endpt
                       (progn