procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(occur-1): Bind inhibit-read-only so that erase-buffer doesn't barf

Browse source 
on read-only text properties (likewise for add-text-properties in
occur-engine).  Mark buffer as unmodified.
(occur-engine): Don't set buffer-read-only here.
This commit is contained in:
Eli Zaretskii 2005-05-07 13:46:42 +00:00
parent f3c2dbe914
commit 06df7f877b
2 changed files with 34 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/ChangeLog
View file

@ -1,3 +1,11 @@
2005-05-07 Matt Hodges <MPHodges@member.fsf.org> (tiny change)
* replace.el (occur-1): Bind inhibit-read-only so that
erase-buffer doesn't barf on read-only text properties (likewise
for add-text-properties in occur-engine). Mark buffer as
unmodified.
(occur-engine): Don't set buffer-read-only here.
2005-05-06 Stefan Monnier <monnier@iro.umontreal.ca>
* pcvs.el (cvs-mode-commit, cvs-mode-edit-log): Don't fiddle with

52
lisp/replace.el
View file

@ -977,32 +977,33 @@ See also `multi-occur'."
(setq occur-buf (get-buffer-create buf-name))
(with-current-buffer occur-buf
(setq buffer-read-only nil)
(occur-mode)
(erase-buffer)
(let ((count (occur-engine
regexp active-bufs occur-buf
(or nlines list-matching-lines-default-context-lines)
(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'"
bufcount (if (= bufcount 1) "" "s")
(if (zerop diff) "" (format " (%d killed)" diff))
(if (zerop count) "no" (format "%d" count))
(if (= count 1) "" "es")
regexp))
(setq occur-revert-arguments (list regexp nlines bufs)
buffer-read-only t)
(if (> count 0)
(progn
(display-buffer occur-buf)
(setq next-error-last-buffer occur-buf))
(kill-buffer occur-buf)))
(run-hooks 'occur-hook))))
(let ((inhibit-read-only t))
(erase-buffer)
(let ((count (occur-engine
regexp active-bufs occur-buf
(or nlines list-matching-lines-default-context-lines)
(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'"
bufcount (if (= bufcount 1) "" "s")
(if (zerop diff) "" (format " (%d killed)" diff))
(if (zerop count) "no" (format "%d" count))
(if (= count 1) "" "es")
regexp))
(setq occur-revert-arguments (list regexp nlines bufs))
(if (> count 0)
(progn
(display-buffer occur-buf)
(setq next-error-last-buffer occur-buf))
(kill-buffer occur-buf)))
(run-hooks 'occur-hook))
(setq buffer-read-only t)
(set-buffer-modified-p nil))))
(defun occur-engine-add-prefix (lines)
(mapcar
@ -1013,7 +1014,6 @@ See also `multi-occur'."
(defun occur-engine (regexp buffers out-buf nlines case-fold-search
title-face prefix-face match-face keep-props)
(with-current-buffer out-buf
(setq buffer-read-only nil)
(let ((globalcount 0)
(coding nil))
;; Map over all the buffers