Mercurial > emacs
comparison lisp/pcvs.el @ 90999:35e3789db058
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 839-842)
- Update from CVS
- Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-240
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 03 Aug 2007 05:27:05 +0000 |
parents | f55f9811f5d7 c17afaa92484 |
children | 424b655804ca |
comparison
equal
deleted
inserted
replaced
90998:539530fa389c | 90999:35e3789db058 |
---|---|
2352 ;; hook into VC | 2352 ;; hook into VC |
2353 ;; | 2353 ;; |
2354 | 2354 |
2355 (add-hook 'vc-post-command-functions 'cvs-vc-command-advice) | 2355 (add-hook 'vc-post-command-functions 'cvs-vc-command-advice) |
2356 | 2356 |
2357 (defun cvs-vc-command-advice (command file flags) | 2357 (defun cvs-vc-command-advice (command files flags) |
2358 (when (and (equal command "cvs") | 2358 (when (and (equal command "cvs") |
2359 (progn | 2359 (progn |
2360 (while (and (stringp (car flags)) | 2360 (while (and (stringp (car flags)) |
2361 (string-match "\\`-" (car flags))) | 2361 (string-match "\\`-" (car flags))) |
2362 (pop flags)) | 2362 (pop flags)) |
2381 (set (make-local-variable 'cvs-buffer) cvs-buf) | 2381 (set (make-local-variable 'cvs-buffer) cvs-buf) |
2382 ;; `cvs -q add file' produces no useful output :-( | 2382 ;; `cvs -q add file' produces no useful output :-( |
2383 (when (and (equal (car flags) "add") | 2383 (when (and (equal (car flags) "add") |
2384 (goto-char (point-min)) | 2384 (goto-char (point-min)) |
2385 (looking-at ".*to add this file permanently\n\\'")) | 2385 (looking-at ".*to add this file permanently\n\\'")) |
2386 (insert "cvs add: scheduling file `" | 2386 (dolist (file (if (listp files) files (list file))) |
2387 (file-name-nondirectory file) | 2387 (insert "cvs add: scheduling file `" |
2388 "' for addition\n")) | 2388 (file-name-nondirectory file) |
2389 "' for addition\n"))) | |
2389 ;; VC never (?) does `cvs -n update' so dcd=nil | 2390 ;; VC never (?) does `cvs -n update' so dcd=nil |
2390 ;; should probably always be the right choice. | 2391 ;; should probably always be the right choice. |
2391 (cvs-parse-process nil subdir)))))))) | 2392 (cvs-parse-process nil subdir)))))))) |
2392 | 2393 |
2393 ;; | 2394 ;; |