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

[Stefan Monnier]

Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.34 emacs/lisp/pcvs.el:1.35
*** emacs/lisp/pcvs.el:1.34     Wed Apr  3 11:56:36 2002
--- emacs/lisp/pcvs.el  Thu May 16 16:03:52 2002
***************
*** 13,19 ****
  ;;    (Jari Aalto+mail.emacs) address@hidden
  ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/address@hidden
  ;; Keywords: CVS, version control, release management
! ;; Revision: $Id: pcvs.el,v 1.34 2002/04/03 16:56:36 kai Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 13,19 ----
  ;;    (Jari Aalto+mail.emacs) address@hidden
  ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/address@hidden
  ;; Keywords: CVS, version control, release management
! ;; Revision: $Id: pcvs.el,v 1.35 2002/05/16 20:03:52 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 472,478 ****
      ;; Check that dir is under CVS control.
      (unless (file-directory-p dir)
        (error "%s is not a directory" dir))
!     (unless (or noexist (file-directory-p (expand-file-name "CVS" dir)))
        (error "%s does not contain CVS controlled files" dir))
  
      (set-buffer cvsbuf)
--- 472,479 ----
      ;; Check that dir is under CVS control.
      (unless (file-directory-p dir)
        (error "%s is not a directory" dir))
!     (unless (or noexist (file-directory-p (expand-file-name "CVS" dir))
!               (file-expand-wildcards (expand-file-name "*/CVS" dir)))
        (error "%s does not contain CVS controlled files" dir))
  
      (set-buffer cvsbuf)
***************
*** 1377,1383 ****
  ;;;;
  
  (defun-cvs-mode (cvs-mode-insert . NOARGS) (file)
!   "Insert an entry for a specific file."
    (interactive
     (list (read-file-name
          "File to insert: "
--- 1378,1386 ----
  ;;;;
  
  (defun-cvs-mode (cvs-mode-insert . NOARGS) (file)
!   "Insert an entry for a specific file into the current listing.
! This is typically used if the file is up-to-date (or has been added
! outside of PCL-CVS) and one wants to do some operation on it."
    (interactive
     (list (read-file-name
          "File to insert: "
***************
*** 1980,1990 ****
  (defun-cvs-mode cvs-mode-add-change-log-entry-other-window ()
    "Add a ChangeLog entry in the ChangeLog of the current directory."
    (interactive)
!   (let* ((fi (cvs-mode-marked nil nil :one t))
!        (default-directory (cvs-expand-dir-name (cvs-fileinfo->dir fi)))
!        (buffer-file-name (expand-file-name (cvs-fileinfo->file fi))))
!     (kill-local-variable 'change-log-default-name)
!     (add-change-log-entry-other-window)))
  
  ;; interactive commands to set optional flags
  
--- 1983,1993 ----
  (defun-cvs-mode cvs-mode-add-change-log-entry-other-window ()
    "Add a ChangeLog entry in the ChangeLog of the current directory."
    (interactive)
!   (dolist (fi (cvs-mode-marked nil nil))
!     (let ((default-directory (cvs-expand-dir-name (cvs-fileinfo->dir fi)))
!         (buffer-file-name (expand-file-name (cvs-fileinfo->file fi))))
!       (kill-local-variable 'change-log-default-name)
!       (save-excursion (add-change-log-entry-other-window)))))
  
  ;; interactive commands to set optional flags
  
***************
*** 1993,2000 ****
    (interactive
     (list (completing-read
          "Which flag: "
!         (mapcar 'list '("cvs" "diff" "update" "status" "log" "tag" ;"rtag"
!                         "commit" "remove" "undo" "checkout"))
          nil t)))
    (let* ((sym (intern (concat "cvs-" flag "-flags"))))
      (let ((current-prefix-arg '(16)))
--- 1996,2003 ----
    (interactive
     (list (completing-read
          "Which flag: "
!         '("cvs" "diff" "update" "status" "log" "tag" ;"rtag"
!           "commit" "remove" "undo" "checkout")
          nil t)))
    (let* ((sym (intern (concat "cvs-" flag "-flags"))))
      (let ((current-prefix-arg '(16)))