Merge from mainline.

1 files changed, 75 insertions, 49 deletions

diff --git a/lisp/replace.el b/lisp/replace.el
index 92edd2e2657..4a8b39dbca7 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1016,18 +1016,7 @@ which means to discard all text properties."
         (setq count (+ count (if forwardp -1 1)))
         (setq beg (line-beginning-position)
               end (line-end-position))
-        (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode)
-                 (text-property-not-all beg end 'fontified t))
-            (if (fboundp 'jit-lock-fontify-now)
-                (jit-lock-fontify-now beg end)))
-        (push
-         (if (and keep-props (not (eq occur-excluded-properties t)))
-             (let ((str (buffer-substring beg end)))
-               (remove-list-of-text-properties
-                0 (length str) occur-excluded-properties str)
-               str)
-           (buffer-substring-no-properties beg end))
-         result)
+        (push (occur-engine-line beg end keep-props) result)
         (forward-line (if forwardp 1 -1)))
       (nreverse result))))
 
@@ -1056,7 +1045,7 @@ invoke `occur'."
 
 (defun occur (regexp &optional nlines)
   "Show all lines in the current buffer containing a match for REGEXP.
-This function can not handle matches that span more than one line.
+If a match spreads across multiple lines, all those lines are shown.
 
 Each line is displayed with NLINES lines before and after, or -NLINES
 before if NLINES is negative.
@@ -1166,12 +1155,15 @@ See also `multi-occur'."
                       (not (eq occur-excluded-properties t)))))
           (let* ((bufcount (length active-bufs))
                  (diff (- (length bufs) bufcount)))
-            (message "Searched %d buffer%s%s; %s match%s for `%s'"
+            (message "Searched %d buffer%s%s; %s match%s%s"
                      bufcount (if (= bufcount 1) "" "s")
                      (if (zerop diff) "" (format " (%d killed)" diff))
                      (if (zerop count) "no" (format "%d" count))
                      (if (= count 1) "" "es")
-                     regexp))
+                     ;; Don't display regexp if with remaining text
+                     ;; it is longer than window-width.
+                     (if (> (+ (length regexp) 42) (window-width))
+                         "" (format " for `%s'" (query-replace-descr regexp)))))
           (setq occur-revert-arguments (list regexp nlines bufs))
           (if (= count 0)
               (kill-buffer occur-buf)
@@ -1218,24 +1210,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 lines (+ lines (1- (count-lines origpt endpt))))
+                    ;; Get beginning of first match line and end of the last.
                     (save-excursion
                       (goto-char matchbeg)
-                      (setq begpt (line-beginning-position)
-                            endpt (line-end-position)))
+                      (setq begpt (line-beginning-position))
+                      (goto-char endpt)
+                      (setq endpt (line-end-position)))
+                    ;; Sum line numbers up to the first match line.
+                    (setq lines (+ lines (count-lines origpt begpt)))
                     (setq marker (make-marker))
                     (set-marker marker matchbeg)
-                    (if (and keep-props
-                             (if (boundp 'jit-lock-mode) jit-lock-mode)
-                             (text-property-not-all begpt endpt 'fontified t))
-                        (if (fboundp 'jit-lock-fontify-now)
-                            (jit-lock-fontify-now begpt endpt)))
-                    (if (and keep-props (not (eq occur-excluded-properties t)))
-                        (progn
-                          (setq curstring (buffer-substring begpt endpt))
-                          (remove-list-of-text-properties
-                           0 (length curstring) occur-excluded-properties curstring))
-                      (setq curstring (buffer-substring-no-properties begpt endpt)))
+                    (setq curstring (occur-engine-line begpt endpt keep-props))
                     ;; Highlight the matches
                     (let ((len (length curstring))
                           (start 0))
@@ -1252,24 +1237,33 @@ See also `multi-occur'."
                          curstring)
                         (setq start (match-end 0))))
                     ;; Generate the string to insert for this match
-                    (let* ((out-line
+                    (let* ((match-prefix
+                            ;; 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"))))
+                           (match-str
+                            ;; 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 (list 'highlight)
+                                        'occur-target marker
+                                        'follow-link t
+                                        'help-echo
+                                        "mouse-2: go to this occurrence"))
+                           (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 (list 'highlight)
-                                         'occur-target marker
-                                         'follow-link t
-                                         'help-echo
-                                         "mouse-2: go to this occurrence")
+                             match-prefix
+                             ;; Add non-numeric prefix to all non-first lines
+                             ;; of multi-line matches.
+                             (replace-regexp-in-string
+                              "\n"
+                              "\n       :"
+                              match-str)
                              ;; Add marker at eol, but no mouse props.
                              (propertize "\n" 'occur-target marker)))
                            (data
@@ -1288,7 +1282,11 @@ See also `multi-occur'."
                     (goto-char endpt))
                   (if endpt
                       (progn
-                        (setq lines (1+ lines))
+                        ;; Sum line numbers between first and last match lines.
+                        (setq lines (+ lines (count-lines begpt endpt)
+                                       ;; Add 1 for empty last match line since
+                                       ;; count-lines returns 1 line less.
+                                       (if (and (bolp) (eolp)) 1 0)))
                         ;; On to the next match...
                         (forward-line 1))
                     (goto-char (point-max))))))
@@ -1298,9 +1296,13 @@ See also `multi-occur'."
                 (goto-char headerpt)
                 (let ((beg (point))
                       end)
-                  (insert (format "%d match%s for \"%s\" in buffer: %s\n"
+                  (insert (format "%d match%s%s in buffer: %s\n"
                                   matches (if (= matches 1) "" "es")
-                                  regexp (buffer-name buf)))
+                                  ;; Don't display regexp for multi-buffer.
+                                  (if (> (length buffers) 1)
+                                      "" (format " for \"%s\""
+                                                 (query-replace-descr regexp)))
+                                  (buffer-name buf)))
                   (setq end (point))
                   (add-text-properties beg end
                                        (append
@@ -1308,6 +1310,18 @@ See also `multi-occur'."
                                           `(font-lock-face ,title-face))
                                         `(occur-title ,buf))))
                 (goto-char (point-min)))))))
+      ;; Display total match count and regexp for multi-buffer.
+      (when (and (not (zerop globalcount)) (> (length buffers) 1))
+        (goto-char (point-min))
+        (let ((beg (point))
+              end)
+          (insert (format "%d match%s total for \"%s\":\n"
+                          globalcount (if (= globalcount 1) "" "es")
+                          (query-replace-descr regexp)))
+          (setq end (point))
+          (add-text-properties beg end (when title-face
+                                         `(font-lock-face ,title-face))))
+        (goto-char (point-min)))
       (if coding
           ;; CODING is buffer-file-coding-system of the first buffer
           ;; that locally binds it.  Let's use it also for the output
@@ -1316,6 +1330,18 @@ See also `multi-occur'."
       ;; Return the number of matches
       globalcount)))
 
+(defun occur-engine-line (beg end &optional keep-props)
+  (if (and keep-props (if (boundp 'jit-lock-mode) jit-lock-mode)
+           (text-property-not-all beg end 'fontified t))
+      (if (fboundp 'jit-lock-fontify-now)
+          (jit-lock-fontify-now beg end)))
+  (if (and keep-props (not (eq occur-excluded-properties t)))
+      (let ((str (buffer-substring beg end)))
+        (remove-list-of-text-properties
+         0 (length str) occur-excluded-properties str)
+        str)
+    (buffer-substring-no-properties beg end)))
+
 ;; Generate context display for occur.
 ;; OUT-LINE is the line where the match is.
 ;; NLINES and KEEP-PROPS are args to occur-engine.