Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-18 02:47:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

(occur-engine): Rearrange text properties.

Browse source
This commit is contained in:
Romain Francoise 2005-10-24 06:19:32 +00:00
parent 97c60a3863
commit c7cad90c7e
2 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

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

19
lisp/replace.el
View file

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