[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs.el |
Date: |
Mon, 12 May 2003 14:16:45 -0400 |
Index: emacs/lisp/pcvs.el
diff -c emacs/lisp/pcvs.el:1.55 emacs/lisp/pcvs.el:1.56
*** emacs/lisp/pcvs.el:1.55 Mon May 12 13:49:22 2003
--- emacs/lisp/pcvs.el Mon May 12 14:16:43 2003
***************
*** 201,206 ****
--- 201,208 ----
;;;; Mouse bindings and mode motion
;;;;
+ (defvar cvs-minor-current-files)
+
(defun cvs-menu (e)
"Popup the CVS menu."
(interactive "e")
***************
*** 728,734 ****
((eq style 'DOUBLE)
(string-match ".*" docstring)
(let ((line1 (match-string 0 docstring))
- (restdoc (substring docstring (match-end 0)))
(fun-1 (intern (concat (symbol-name fun) "-1"))))
`(progn
(defun ,fun-1 ,args
--- 730,735 ----
***************
*** 1280,1286 ****
(defun cvs-mode-mark-get-modif (cmd)
(if (cvs-ignore-marks-p cmd 'read-only) "/IM" "/FM"))
- (defvar cvs-minor-current-files)
(defun cvs-get-marked (&optional ignore-marks ignore-contents)
"Return a list of all selected fileinfos.
If there are any marked tins, and IGNORE-MARKS is nil, return them.
--- 1281,1286 ----
***************
*** 1424,1429 ****
--- 1424,1430 ----
(match-beginning 0)
(point))))))
+ (defvar cvs-edit-log-revision)
(defun cvs-mode-edit-log (rev &optional text)
"Edit the log message at point.
This is best called from a `log-view-mode' buffer."
***************
*** 1556,1564 ****
(interactive (list (cvs-flags-query 'cvs-diff-flags "diff flags")))
(unless (listp flags) (error "flags should be a list of strings"))
(save-some-buffers)
! (let* ((filter 'diff)
! (marked (cvs-get-marked (cvs-ignore-marks-p "diff")))
! ;;(tins (cvs-filter-applicable filter marked))
(fis (car (cvs-partition 'cvs-fileinfo->backup-file marked))))
(unless (consp fis)
(error "No files with a backup file selected!"))
--- 1557,1563 ----
(interactive (list (cvs-flags-query 'cvs-diff-flags "diff flags")))
(unless (listp flags) (error "flags should be a list of strings"))
(save-some-buffers)
! (let* ((marked (cvs-get-marked (cvs-ignore-marks-p "diff")))
(fis (car (cvs-partition 'cvs-fileinfo->backup-file marked))))
(unless (consp fis)
(error "No files with a backup file selected!"))
***************
*** 1591,1596 ****
--- 1590,1596 ----
;;
(defvar ediff-after-quit-destination-buffer)
+ (defvar ediff-after-quit-hook-internal)
(defvar cvs-transient-buffers)
(defun cvs-ediff-startup-hook ()
(add-hook 'ediff-after-quit-hook-internal
***************
*** 1760,1767 ****
;; (equal (cvs-fileinfo->file (car fis)) ".")
(equal (cvs-fileinfo->dir (car fis)) ""))
(setq fis nil))
! (let* ((cvs-buf (current-buffer))
! (single-dir (or (not (listp cvs-execute-single-dir))
(member cmd cvs-execute-single-dir)))
(parse (member cmd cvs-parse-known-commands))
(args (append cvsargs (list cmd) flags))
--- 1760,1766 ----
;; (equal (cvs-fileinfo->file (car fis)) ".")
(equal (cvs-fileinfo->dir (car fis)) ""))
(setq fis nil))
! (let* ((single-dir (or (not (listp cvs-execute-single-dir))
(member cmd cvs-execute-single-dir)))
(parse (member cmd cvs-parse-known-commands))
(args (append cvsargs (list cmd) flags))
***************
*** 1779,1792 ****
(setq postproc (if (cdr postproc) (cons 'progn postproc) (car postproc)))
(cvs-update-header args fis)
(with-current-buffer buf
- ;;(set (make-local-variable 'cvs-buffer) cvs-buf)
(let ((inhibit-read-only t)) (erase-buffer))
(message "Running cvs %s ..." cmd)
(cvs-run-process args fis postproc single-dir))))
(defun* cvs-mode-do (cmd flags filter
! &key show dont-change-disc parse cvsargs postproc)
"Generic cvs-mode-<foo> function.
Executes `cvs CVSARGS CMD FLAGS' on the selected files.
FILTER is passed to `cvs-applicable-p' to only apply the command to
--- 1778,1790 ----
(setq postproc (if (cdr postproc) (cons 'progn postproc) (car postproc)))
(cvs-update-header args fis)
(with-current-buffer buf
(let ((inhibit-read-only t)) (erase-buffer))
(message "Running cvs %s ..." cmd)
(cvs-run-process args fis postproc single-dir))))
(defun* cvs-mode-do (cmd flags filter
! &key show dont-change-disc cvsargs postproc)
"Generic cvs-mode-<foo> function.
Executes `cvs CVSARGS CMD FLAGS' on the selected files.
FILTER is passed to `cvs-applicable-p' to only apply the command to
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el, Sam Steingold, 2003/05/09
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el, Stefan Monnier, 2003/05/09
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el, Stefan Monnier, 2003/05/12
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el, Stefan Monnier, 2003/05/13
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el, Stefan Monnier, 2003/05/14
- [Emacs-diffs] Changes to emacs/lisp/pcvs.el, Stefan Monnier, 2003/05/23