diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-05-23 19:31:02 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-05-23 19:31:02 +0000 |
| commit | 8a769de647ddb0780a5fdb475fd945d205c6ddcb (patch) | |
| tree | 14a2640ba9813d3a3957d84f6c3c81c9cd6e34a4 /lisp/pcvs.el | |
| parent | 319830ce91ac9b99ce9a3781abe9f6c3d67ce24b (diff) | |
| download | emacs-8a769de647ddb0780a5fdb475fd945d205c6ddcb.tar.gz | |
(cvs-temp-buffer): Kill running process in displayed buffers.
(cvs-make-cvs-buffer): Fix up format of the header.
Diffstat (limited to 'lisp/pcvs.el')
| -rw-r--r-- | lisp/pcvs.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el index a15ecc5ccb8..1fd4d90d60b 100644 --- a/lisp/pcvs.el +++ b/lisp/pcvs.el @@ -369,7 +369,14 @@ from the current buffer." (let ((proc (get-buffer-process buf))) (when (and (not normal) (processp proc) (memq (process-status proc) '(run stop))) - (error "Can not run two cvs processes simultaneously"))) + (if cmd + ;; When CMD is specified, the buffer is normally shown to the + ;; user, so interrupting the process is not harmful. + ;; Use `delete-process' rather than `kill-process' otherwise + ;; the pending output of the process will still get inserted + ;; after we erase the buffer. + (delete-process proc) + (error "Can not run two cvs processes simultaneously")))) (if (not name) (kill-local-variable 'other-window-scroll-buffer) ;; Strangely, if no window is created, `display-buffer' ends up @@ -454,7 +461,8 @@ If non-nil, NEW means to create a new buffer no matter what." (concat "\nTag : " (substring tag 1))) ((string-match "\\`D" tag) (concat "\nDate : " (substring tag 1))) - (""))))) + ("\n")))) + "\n") (setq buffer-read-only t) (cvs-mode) (set (make-local-variable 'list-buffers-directory) buffer-name) |