[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/replace.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/replace.el [lexbind] |
Date: |
Wed, 08 Dec 2004 19:17:22 -0500 |
Index: emacs/lisp/replace.el
diff -c emacs/lisp/replace.el:1.148.2.16 emacs/lisp/replace.el:1.148.2.17
*** emacs/lisp/replace.el:1.148.2.16 Thu Sep 16 00:12:21 2004
--- emacs/lisp/replace.el Wed Dec 8 23:36:20 2004
***************
*** 92,98 ****
(format "%s: " string))
nil nil nil
query-replace-from-history-variable
! nil t))))
(if (and (zerop (length from)) lastto lastfrom)
(cons lastfrom
(query-replace-compile-replacement lastto regexp-flag))
--- 92,98 ----
(format "%s: " string))
nil nil nil
query-replace-from-history-variable
! nil t t))))
(if (and (zerop (length from)) lastto lastfrom)
(cons lastfrom
(query-replace-compile-replacement lastto regexp-flag))
***************
*** 156,162 ****
(read-from-minibuffer
(format "%s %s with: " string (query-replace-descr from))
nil nil nil
! query-replace-to-history-variable from t))
regexp-flag))
(defun query-replace-read-args (string regexp-flag &optional noerror)
--- 156,162 ----
(read-from-minibuffer
(format "%s %s with: " string (query-replace-descr from))
nil nil nil
! query-replace-to-history-variable from t t))
regexp-flag))
(defun query-replace-read-args (string regexp-flag &optional noerror)
***************
*** 734,751 ****
"Move to the Nth (default 1) next match in an Occur mode buffer.
Compatibility function for \\[next-error] invocations."
(interactive "p")
! (when reset
! (occur-find-match 0 #'next-single-property-change "No first match"))
! (occur-find-match
! (prefix-numeric-value argp)
! (if (> 0 (prefix-numeric-value argp))
! #'previous-single-property-change
! #'next-single-property-change)
! "No more matches")
! ;; In case the *Occur* buffer is visible in a nonselected window.
! (set-window-point (get-buffer-window (current-buffer)) (point))
! (occur-mode-goto-occurrence))
!
(defcustom list-matching-lines-default-context-lines 0
"*Default number of context lines included around `list-matching-lines'
matches.
--- 734,756 ----
"Move to the Nth (default 1) next match in an Occur mode buffer.
Compatibility function for \\[next-error] invocations."
(interactive "p")
! ;; we need to run occur-find-match from within the Occur 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)))
! (occur-find-match
! (abs (prefix-numeric-value argp))
! (if (> 0 (prefix-numeric-value argp))
! #'previous-single-property-change
! #'next-single-property-change)
! "No more matches")
! ;; In case the *Occur* buffer is visible in a nonselected window.
! (set-window-point (get-buffer-window (current-buffer)) (point))
! (occur-mode-goto-occurrence)))
(defcustom list-matching-lines-default-context-lines 0
"*Default number of context lines included around `list-matching-lines'
matches.
***************
*** 768,774 ****
:type 'face
:group 'matching)
! (defun occur-accumulate-lines (count &optional no-props)
(save-excursion
(let ((forwardp (> count 0))
(result nil))
--- 773,779 ----
:type 'face
:group 'matching)
! (defun occur-accumulate-lines (count &optional keep-props)
(save-excursion
(let ((forwardp (> count 0))
(result nil))
***************
*** 778,786 ****
(bobp))))
(setq count (+ count (if forwardp -1 1)))
(push
! (funcall (if no-props
! #'buffer-substring-no-properties
! #'buffer-substring)
(line-beginning-position)
(line-end-position))
result)
--- 783,791 ----
(bobp))))
(setq count (+ count (if forwardp -1 1)))
(push
! (funcall (if keep-props
! #'buffer-substring
! #'buffer-substring-no-properties)
(line-beginning-position)
(line-end-position))
result)
***************
*** 915,921 ****
(and case-fold-search
(isearch-no-upper-case-p regexp t))
list-matching-lines-buffer-name-face
! nil list-matching-lines-face nil)))
(let* ((bufcount (length active-bufs))
(diff (- (length bufs) bufcount)))
(message "Searched %d buffer%s%s; %s match%s for `%s'"
--- 920,926 ----
(and case-fold-search
(isearch-no-upper-case-p regexp t))
list-matching-lines-buffer-name-face
! nil list-matching-lines-face t)))
(let* ((bufcount (length active-bufs))
(diff (- (length bufs) bufcount)))
(message "Searched %d buffer%s%s; %s match%s for `%s'"
***************
*** 998,1004 ****
(append
`(occur-match t)
(when match-face
! `(font-lock-face ,match-face)))
curstring)
(setq start (match-end 0))))
;; Generate the string to insert for this match
--- 1003,1013 ----
(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/replace.el [lexbind],
Miles Bader <=