Mercurial > emacs
changeset 66372:abd51aa4052e
(occur-engine): Rearrange text properties.
| author | Romain Francoise <romain@orebokech.com> |
|---|---|
| date | Mon, 24 Oct 2005 06:19:32 +0000 |
| parents | adc5009cfc2a |
| children | a0e9e787944e |
| files | lisp/ChangeLog lisp/replace.el |
| diffstat | 2 files changed, 15 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Oct 24 06:00:50 2005 +0000 +++ b/lisp/ChangeLog Mon Oct 24 06:19:32 2005 +0000 @@ -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
--- a/lisp/replace.el Mon Oct 24 06:00:50 2005 +0000 +++ b/lisp/replace.el Mon Oct 24 06:19:32 2005 +0000 @@ -1125,15 +1125,22 @@ (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 @@ (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