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

[Miles Bader]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.35.2.9 emacs/lisp/pcvs.el:1.35.2.10
*** emacs/lisp/pcvs.el:1.35.2.9 Tue Jul  6 10:26:54 2004
--- emacs/lisp/pcvs.el  Mon Oct 25 04:22:23 2004
***************
*** 1925,1930 ****
--- 1925,1942 ----
    (cvs-mode-find-file e 'dont-select))
  
  
+ (defun cvs-mode-view-file (e)
+   "View the file."
+   (interactive (list last-input-event))
+   (cvs-mode-find-file e nil t))
+ 
+ 
+ (defun cvs-mode-view-file-other-window (e)
+   "View the file."
+   (interactive (list last-input-event))
+   (cvs-mode-find-file e t t))
+ 
+ 
  (defun cvs-find-modif (fi)
    (with-temp-buffer
      (call-process cvs-program nil (current-buffer) nil
***************
*** 1935,1941 ****
        1)))
  
  
! (defun cvs-mode-find-file (e &optional other)
    "Select a buffer containing the file.
  With a prefix, opens the buffer in an OTHER window."
    (interactive (list last-input-event current-prefix-arg))
--- 1947,1953 ----
        1)))
  
  
! (defun cvs-mode-find-file (e &optional other view)
    "Select a buffer containing the file.
  With a prefix, opens the buffer in an OTHER window."
    (interactive (list last-input-event current-prefix-arg))
***************
*** 1963,1970 ****
         (let ((buf (if rev (cvs-retrieve-revision fi rev)
                      (find-file-noselect (cvs-fileinfo->full-path fi)))))
           (funcall (cond ((eq other 'dont-select) 'display-buffer)
!                         (other 'switch-to-buffer-other-window)
!                         (t 'switch-to-buffer))
                    buf)
           (when (and cvs-find-file-and-jump (cvs-applicable-p fi 'diff-base))
             (goto-line (cvs-find-modif fi)))
--- 1975,1984 ----
         (let ((buf (if rev (cvs-retrieve-revision fi rev)
                      (find-file-noselect (cvs-fileinfo->full-path fi)))))
           (funcall (cond ((eq other 'dont-select) 'display-buffer)
!                         (other
!                          (if view 'view-buffer-other-window
!                            'switch-to-buffer-other-window))
!                         (t (if view 'view-buffer 'switch-to-buffer)))
                    buf)
           (when (and cvs-find-file-and-jump (cvs-applicable-p fi 'diff-base))
             (goto-line (cvs-find-modif fi)))