andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(vc-with-current-file-buffer): New macro.

Browse source 
(vc-arch-file-source-p): Use it to avoid infloop.
This commit is contained in:
Stefan Monnier 2007-03-28 01:19:43 +00:00
parent 4878f1de7c
commit 74cb3d2111
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2007-03-28 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-arch.el (vc-with-current-file-buffer): New macro.
(vc-arch-file-source-p): Use it to avoid infloop.
2007-03-28 David Hansen <david.hansen@gmx.net> (tiny change)
* emacs-lisp/lisp.el (lisp-complete-symbol):

15
lisp/vc-arch.el
View file

@ -109,6 +109,19 @@
(defconst vc-arch-tagline-re "^\\W*arch-tag:[ \t]*\\(.*[^ \t\n]\\)")
(defmacro vc-with-current-file-buffer (file &rest body)
(declare (indent 2) (debug t))
`(let ((-kill-buf- nil)
(-file- ,file))
(with-current-buffer (or (find-buffer-visiting -file-)
(setq -kill-buf- (generate-new-buffer " temp")))
;; Avoid find-file-literally since it can do many undesirable extra
;; things (among which, call us back into an infinite loop).
(if -kill-buf- (insert-file-contents -file-))
(unwind-protect
(progn ,@body)
(if (buffer-live-p -kill-buf-) (kill-buffer -kill-buf-))))))
(defun vc-arch-file-source-p (file)
"Can return nil, `maybe' or a non-nil value.
Only the value `maybe' can be trusted :-(."
@ -122,7 +135,7 @@ Only the value `maybe' can be trusted :-(."
(concat ".arch-ids/" (file-name-nondirectory file) ".id")
(file-name-directory file)))
;; Check the presence of a tagline.
(with-current-buffer (find-file-noselect file)
(vc-with-current-file-buffer file
(save-excursion
(goto-char (point-max))
(or (re-search-backward vc-arch-tagline-re (- (point) 1000) t)