aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/pcvs.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/pcvs.el')
-rw-r--r--lisp/pcvs.el17
1 files changed, 10 insertions, 7 deletions
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 21e34fbc7ed..73f7106d0e8 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -764,7 +764,7 @@ before calling the real function `" (symbol-name fun-1) "'.\n")
764 (interactive) 764 (interactive)
765 (cvs-mode! ',fun-1))))) 765 (cvs-mode! ',fun-1)))))
766 766
767 (t (error "unknown style %s in `defun-cvs-mode'" style))))) 767 (t (error "Unknown style %s in `defun-cvs-mode'" style)))))
768 768
769(defun-cvs-mode cvs-mode-kill-process () 769(defun-cvs-mode cvs-mode-kill-process ()
770 "Kill the temporary buffer and associated process." 770 "Kill the temporary buffer and associated process."
@@ -1312,10 +1312,7 @@ If there are any marked tins, and IGNORE-MARKS is nil, return them.
1312Otherwise, if the cursor selects a directory, and IGNORE-CONTENTS is 1312Otherwise, if the cursor selects a directory, and IGNORE-CONTENTS is
1313nil, return all files in it, else return just the directory. 1313nil, return all files in it, else return just the directory.
1314Otherwise return (a list containing) the file the cursor points to, or 1314Otherwise return (a list containing) the file the cursor points to, or
1315an empty list if it doesn't point to a file at all. 1315an empty list if it doesn't point to a file at all."
1316
1317Args: &optional IGNORE-MARKS IGNORE-CONTENTS."
1318
1319 (let ((fis nil)) 1316 (let ((fis nil))
1320 (dolist (fi (if (and (boundp 'cvs-minor-current-files) 1317 (dolist (fi (if (and (boundp 'cvs-minor-current-files)
1321 (consp cvs-minor-current-files)) 1318 (consp cvs-minor-current-files))
@@ -1568,6 +1565,12 @@ See ``cvs-mode-diff'' for more info."
1568 (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) 1565 (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags")))
1569 (cvs-mode-diff-1 (cons "-rHEAD" flags))) 1566 (cvs-mode-diff-1 (cons "-rHEAD" flags)))
1570 1567
1568(defun-cvs-mode (cvs-mode-diff-yesterday . SIMPLE) (flags)
1569 "Diff the selected files against yesterday's head of the current branch.
1570See ``cvs-mode-diff'' for more info."
1571 (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags")))
1572 (cvs-mode-diff-1 (cons "-Dyesterday" flags)))
1573
1571(defun-cvs-mode (cvs-mode-diff-vendor . SIMPLE) (flags) 1574(defun-cvs-mode (cvs-mode-diff-vendor . SIMPLE) (flags)
1572 "Diff the selected files against the head of the vendor branch. 1575 "Diff the selected files against the head of the vendor branch.
1573See ``cvs-mode-diff'' for more info." 1576See ``cvs-mode-diff'' for more info."
@@ -1754,7 +1757,7 @@ Signal an error if there is no backup file."
1754 1757
1755 1758
1756(defun cvs-is-within-p (fis dir) 1759(defun cvs-is-within-p (fis dir)
1757 "Non-nil is buffer is inside one of FIS (in DIR)." 1760 "Non-nil if buffer is inside one of FIS (in DIR)."
1758 (when (stringp buffer-file-name) 1761 (when (stringp buffer-file-name)
1759 (setq buffer-file-name (expand-file-name buffer-file-name)) 1762 (setq buffer-file-name (expand-file-name buffer-file-name))
1760 (let (ret) 1763 (let (ret)
@@ -1774,7 +1777,7 @@ BUF is the buffer to be used for cvs' output.
1774DONT-CHANGE-DISC non-nil indicates that the command will not change the 1777DONT-CHANGE-DISC non-nil indicates that the command will not change the
1775 contents of files. This is only used by the parser. 1778 contents of files. This is only used by the parser.
1776POSTPROC is a list of expressions to be evaluated at the very end (after 1779POSTPROC is a list of expressions to be evaluated at the very end (after
1777 parsing if applicable). It will be prepended with `progn' is necessary." 1780 parsing if applicable). It will be prepended with `progn' if necessary."
1778 (let ((def-dir default-directory)) 1781 (let ((def-dir default-directory))
1779 ;; Save the relevant buffers 1782 ;; Save the relevant buffers
1780 (save-some-buffers nil (lambda () (cvs-is-within-p fis def-dir)))) 1783 (save-some-buffers nil (lambda () (cvs-is-within-p fis def-dir))))