(occur-engine): Rearrange text properties.

2 files changed, 15 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a76397a03da..9c8cf2aece5 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-24  Romain Francoise  <romain@orebokech.com>
+
+        * replace.el (occur-engine): Rearrange text properties.
+
 2005-10-23  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/debug.el (debugger-make-xrefs): Don't assume
diff --git a/lisp/replace.el b/lisp/replace.el
index 2d79754b4f0..bb72acdf2cf 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1125,15 +1125,22 @@ See also `multi-occur'."
                     (let* ((out-line
                             (concat
                              ;; Using 7 digits aligns tabs properly.
-                             (apply #'propertize (format "%7d:" lines)
+                             (apply #'propertize (format "%7d" lines)
                                     (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 'highlight
+                                         'occur-target marker
+                                         'follow-link t
+                                         'help-echo
+                                         "mouse-2: go to this occurrence")
                              "\n"))
                            (data
                             (if (= nlines 0)
@@ -1154,11 +1161,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