Mercurial > emacs
comparison lisp/replace.el @ 83182:4e92102a0172
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-468
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-469
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-222
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Tue, 27 Jul 2004 07:43:21 +0000 |
| parents | feaa69f279aa |
| children | 6cfb1ef9200f c08afac24467 |
comparison
equal
deleted
inserted
replaced
| 83181:159920fd1024 | 83182:4e92102a0172 |
|---|---|
| 730 (prefix-numeric-value argp) | 730 (prefix-numeric-value argp) |
| 731 (if (> 0 (prefix-numeric-value argp)) | 731 (if (> 0 (prefix-numeric-value argp)) |
| 732 #'previous-single-property-change | 732 #'previous-single-property-change |
| 733 #'next-single-property-change) | 733 #'next-single-property-change) |
| 734 "No more matches") | 734 "No more matches") |
| 735 ;; In case the *Occur* buffer is visible in a nonselected window. | |
| 736 (set-window-point (get-buffer-window (current-buffer)) (point)) | |
| 735 (occur-mode-goto-occurrence)) | 737 (occur-mode-goto-occurrence)) |
| 736 | 738 |
| 737 | 739 |
| 738 (defcustom list-matching-lines-default-context-lines 0 | 740 (defcustom list-matching-lines-default-context-lines 0 |
| 739 "*Default number of context lines included around `list-matching-lines' matches. | 741 "*Default number of context lines included around `list-matching-lines' matches. |
| 1007 ;; The complex multi-line display | 1009 ;; The complex multi-line display |
| 1008 ;; style. Generate a list of lines, | 1010 ;; style. Generate a list of lines, |
| 1009 ;; concatenate them all together. | 1011 ;; concatenate them all together. |
| 1010 (apply #'concat | 1012 (apply #'concat |
| 1011 (nconc | 1013 (nconc |
| 1012 (occur-engine-add-prefix (nreverse (cdr (occur-accumulate-lines (- (1+ nlines)) keep-props)))) | 1014 (occur-engine-add-prefix (nreverse (cdr (occur-accumulate-lines (- (1+ (abs nlines))) keep-props)))) |
| 1013 (list out-line) | 1015 (list out-line) |
| 1014 (occur-engine-add-prefix (cdr (occur-accumulate-lines (1+ nlines) keep-props)))))))) | 1016 (if (> nlines 0) |
| 1017 (occur-engine-add-prefix | |
| 1018 (cdr (occur-accumulate-lines (1+ nlines) keep-props))))))))) | |
| 1015 ;; Actually insert the match display data | 1019 ;; Actually insert the match display data |
| 1016 (with-current-buffer out-buf | 1020 (with-current-buffer out-buf |
| 1017 (let ((beg (point)) | 1021 (let ((beg (point)) |
| 1018 (end (progn (insert data) (point)))) | 1022 (end (progn (insert data) (point)))) |
| 1019 (unless (= nlines 0) | 1023 (unless (= nlines 0) |