Mercurial > emacs
comparison lisp/vc-rcs.el @ 91005:424b655804ca
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 13 Aug 2007 13:48:35 +0000 |
parents | f55f9811f5d7 e5a68f18fcb9 |
children | aaccdab0ee26 |
comparison
equal
deleted
inserted
replaced
91004:f72cf5b2ab11 | 91005:424b655804ca |
---|---|
232 (error "rcsdiff failed")) | 232 (error "rcsdiff failed")) |
233 (if (not vc-rcsdiff-knows-brief) (setq vc-rcsdiff-knows-brief 'yes))) | 233 (if (not vc-rcsdiff-knows-brief) (setq vc-rcsdiff-knows-brief 'yes))) |
234 ;; The workfile is unchanged if rcsdiff found no differences. | 234 ;; The workfile is unchanged if rcsdiff found no differences. |
235 (zerop status))) | 235 (zerop status))) |
236 | 236 |
237 (defun vc-rcs-find-file-not-found-hook () | |
238 (if (yes-or-no-p | |
239 (format "File %s was lost; check out from version control? " | |
240 (file-name-nondirectory buffer-file-name))) | |
241 (save-excursion | |
242 (require 'vc) | |
243 (let ((default-directory (file-name-directory buffer-file-name))) | |
244 (not (vc-error-occurred (vc-checkout buffer-file-name))))))) | |
237 | 245 |
238 ;;; | 246 ;;; |
239 ;;; State-changing functions | 247 ;;; State-changing functions |
240 ;;; | 248 ;;; |
241 | 249 |