(occur-accumulate-lines, occur-engine):

Fontify unfontified matching lines in the source buffer
before copying them.
(occur-engine): Don't put mouse-face on context lines.
(occur-next-error): Set point to line beginning/end
before searching for prev/next property to skip multiple
matches on a line (not supported by occur engine).
Remove redundant prefix-numeric-value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f86107456e3c7115ec41a5c74c73fe933bff94e9..5108650871ddca14d485285071536a0dd1e1bfef 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,26 @@
+2004-12-16  Juri Linkov  <juri@jurta.org>
+
+       * help.el (function-called-at-point):
+       * help-fns.el (variable-at-point): As a last resort try striping
+       non-word prefixes and suffixes.
+
+       * descr-text.el (describe-property-list): Don't treat syntax-table
+       specially.  Use describe-text-sexp which inserts [show] button
+       for large objects and handles printing errors.  Sort properties
+       by names in alphabetical order instead of by value sizes.
+       Add `mouse-face' to list of properties for `describe-face' widget.
+       (describe-char): Mask out face-id from 19 bits of character.
+       Print face-id separately.
+
+       * replace.el (occur-accumulate-lines, occur-engine):
+       Fontify unfontified matching lines in the source buffer
+       before copying them.
+       (occur-engine): Don't put mouse-face on context lines.
+       (occur-next-error): Set point to line beginning/end
+       before searching for prev/next property to skip multiple
+       matches on a line (not supported by occur engine).
+       Remove redundant prefix-numeric-value.
+
 2004-12-15  Juri Linkov  <juri@jurta.org>
 
        * replace.el (match): New face.

diff --git a/lisp/replace.el b/lisp/replace.el
index 872e5e290a8bc00e1bdbe04fec2ec099892ccdef..8f81a53bf7e1e5e4a304dbca5af1a7422d20e77e 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -735,16 +735,17 @@ Alternatively, click \\[occur-mode-mouse-goto] on an item to go to it.
 Compatibility function for \\[next-error] invocations."
   (interactive "p")
   ;; we need to run occur-find-match from within the Occur buffer
-  (with-current-buffer 
+  (with-current-buffer
       (if (next-error-buffer-p (current-buffer))
          (current-buffer)
        (next-error-find-buffer nil nil (lambda() (eq major-mode 'occur-mode))))
-    
-    (when reset
-      (goto-char (point-min)))
+
+    (goto-char (cond (reset (point-min))
+                    ((< argp 0) (line-beginning-position))
+                    ((line-end-position))))
     (occur-find-match
-     (abs (prefix-numeric-value argp))
-     (if (> 0 (prefix-numeric-value argp))
+     (abs argp)
+     (if (> 0 argp)
         #'previous-single-property-change
        #'next-single-property-change)
      "No more matches")
@@ -790,18 +791,22 @@ If the value is nil, don't highlight the buffer names specially."
 (defun occur-accumulate-lines (count &optional keep-props)
   (save-excursion
     (let ((forwardp (> count 0))
-         (result nil))
+         result beg end)
       (while (not (or (zerop count)
                      (if forwardp
                          (eobp)
                        (bobp))))
        (setq count (+ count (if forwardp -1 1)))
+       (setq beg (line-beginning-position)
+             end (line-end-position))
+       (if (and keep-props font-lock-mode
+                (text-property-not-all beg end 'fontified t))
+           (font-lock-fontify-region beg end))
        (push
         (funcall (if keep-props
                      #'buffer-substring
                    #'buffer-substring-no-properties)
-         (line-beginning-position)
-         (line-end-position))
+                 beg end)
         result)
        (forward-line (if forwardp 1 -1)))
       (nreverse result))))
@@ -996,14 +1001,17 @@ See also `multi-occur'."
                  (when (setq endpt (re-search-forward regexp nil t))
                    (setq matches (1+ matches)) ;; increment match count
                    (setq matchbeg (match-beginning 0))
-                   (setq begpt (save-excursion
-                                 (goto-char matchbeg)
-                                 (line-beginning-position)))
                    (setq lines (+ lines (1- (count-lines origpt endpt))))
+                   (save-excursion
+                     (goto-char matchbeg)
+                     (setq begpt (line-beginning-position)
+                           endpt (line-end-position)))
                    (setq marker (make-marker))
                    (set-marker marker matchbeg)
-                   (setq curstring (buffer-substring begpt
-                                                     (line-end-position)))
+                   (if (and keep-props font-lock-mode
+                            (text-property-not-all begpt endpt 'fontified t))
+                       (font-lock-fontify-region begpt endpt))
+                   (setq curstring (buffer-substring begpt endpt))
                    ;; Depropertize the string, and maybe
                    ;; highlight the matches
                    (let ((len (length curstring))
@@ -1012,17 +1020,15 @@ See also `multi-occur'."
                        (set-text-properties 0 len nil curstring))
                      (while (and (< start len)
                                  (string-match regexp curstring start))
-                       (add-text-properties (match-beginning 0)
-                                            (match-end 0)
-                                            (append
-                                             `(occur-match t)
-                                             (when match-face
-                                               ;; Use `face' rather than
-                                               ;; `font-lock-face' here
-                                               ;; so as to override faces
-                                               ;; copied from the buffer.
-                                               `(face ,match-face)))
-                                            curstring)
+                       (add-text-properties
+                        (match-beginning 0) (match-end 0)
+                        (append
+                         `(occur-match t)
+                         (when match-face
+                           ;; Use `face' rather than `font-lock-face' here
+                           ;; so as to override faces copied from the buffer.
+                           `(face ,match-face)))
+                        curstring)
                        (setq start (match-end 0))))
                    ;; Generate the string to insert for this match
                    (let* ((out-line
@@ -1033,7 +1039,10 @@ See also `multi-occur'."
                                     (when prefix-face
                                       `(font-lock-face prefix-face))
                                     '(occur-prefix t)))
-                            curstring
+                            ;; 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)
@@ -1057,10 +1066,7 @@ See also `multi-occur'."
                            (insert "-------\n"))
                          (add-text-properties
                           beg end
-                          `(occur-target ,marker help-echo "mouse-2: go to this occurrence"))
-                         ;; We don't put `mouse-face' on the newline,
-                         ;; because that loses.
-                         (add-text-properties beg (1- end) '(mouse-face highlight)))))
+                          `(occur-target ,marker help-echo "mouse-2: go to this occurrence")))))
                    (goto-char endpt))
                  (if endpt
                      (progn