[Emacs-diffs] Changes to emacs/lisp/pcvs.el

[Stefan Monnier]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.58 emacs/lisp/pcvs.el:1.59
*** emacs/lisp/pcvs.el:1.58     Wed May 14 11:02:05 2003
--- emacs/lisp/pcvs.el  Fri May 23 15:31:02 2003
***************
*** 369,375 ****
      (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 (not name) (kill-local-variable 'other-window-scroll-buffer)
        ;; Strangely, if no window is created, `display-buffer' ends up
--- 369,382 ----
      (let ((proc (get-buffer-process buf)))
        (when (and (not normal) (processp proc)
                 (memq (process-status proc) '(run stop)))
!       (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,460 ****
                       (concat "\nTag        : " (substring tag 1)))
                      ((string-match "\\`D" tag)
                       (concat "\nDate       : " (substring tag 1)))
!                     ("")))))
         (setq buffer-read-only t)
         (cvs-mode)
         (set (make-local-variable 'list-buffers-directory) buffer-name)
--- 461,468 ----
                       (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)