[Emacs-diffs] Changes to emacs/lisp/replace.el

[Romain Francoise]

Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.225 emacs/lisp/replace.el:1.226
*** emacs/lisp/replace.el:1.225 Thu Oct 20 16:53:10 2005
--- emacs/lisp/replace.el       Mon Oct 24 06:19:32 2005
***************
*** 1125,1139 ****
                    (let* ((out-line
                            (concat
                             ;; Using 7 digits aligns tabs properly.
!                            (apply #'propertize (format "%7d:" lines)
                                    (append
                                     (when prefix-face
                                       `(font-lock-face prefix-face))
!                                    '(occur-prefix t)))
                             ;; 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)
                             "\n"))
                           (data
                            (if (= nlines 0)
--- 1125,1146 ----
                    (let* ((out-line
                            (concat
                             ;; Using 7 digits aligns tabs properly.
!                            (apply #'propertize (format "%7d" lines)
                                    (append
                                     (when prefix-face
                                       `(font-lock-face prefix-face))
!                                    `(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
!                                        'occur-target marker
!                                        'follow-link t
!                                        'help-echo
!                                        "mouse-2: go to this occurrence")
                             "\n"))
                           (data
                            (if (= nlines 0)
***************
*** 1154,1164 ****
                        (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")))))
                    (goto-char endpt))
                  (if endpt
                      (progn
--- 1161,1167 ----
                        (let ((beg (point))
                              (end (progn (insert data) (point))))
                          (unless (= nlines 0)
!                           (insert "-------\n")))))
                    (goto-char endpt))
                  (if endpt
                      (progn