HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(pc-select-selection-keys-only, pc-selection-mode): Fix spellings in docstrings.
[bpt/emacs.git]
/
lisp
/
cvs-status.el
diff --git
a/lisp/cvs-status.el
b/lisp/cvs-status.el
index
96b1f1e
..
c8bd1e7
100644
(file)
--- a/
lisp/cvs-status.el
+++ b/
lisp/cvs-status.el
@@
-1,6
+1,6
@@
;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
-;; Copyright (C) 1999, 2000,
03, 2004
Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000,
2003, 2004, 2005
Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs cvs status tree tools
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs cvs status tree tools
@@
-32,6
+32,7
@@
(eval-when-compile (require 'cl))
(require 'pcvs-util)
(eval-when-compile (require 'cl))
(require 'pcvs-util)
+(eval-when-compile (require 'pcvs))
;;;
;;;
@@
-48,7
+49,8
@@
("\M-n" . cvs-status-next)
("\M-p" . cvs-status-prev)
("t" . cvs-status-cvstrees)
("\M-n" . cvs-status-next)
("\M-p" . cvs-status-prev)
("t" . cvs-status-cvstrees)
- ("T" . cvs-status-trees))
+ ("T" . cvs-status-trees)
+ (">" . cvs-mode-checkout))
"CVS-Status' keymap."
:group 'cvs-status
:inherit 'cvs-mode-map)
"CVS-Status' keymap."
:group 'cvs-status
:inherit 'cvs-mode-map)
@@
-71,8
+73,8
@@
(defconst cvs-status-font-lock-keywords
`((,cvs-status-entry-leader-re
(defconst cvs-status-font-lock-keywords
`((,cvs-status-entry-leader-re
- (1 'cvs-filename
-face
)
- (2 'cvs-need-action
-face
))
+ (1 'cvs-filename)
+ (2 'cvs-need-action))
(,cvs-status-tags-leader-re
(,cvs-status-rev-re
(save-excursion (re-search-forward "^\n" nil 'move) (point))
(,cvs-status-tags-leader-re
(,cvs-status-rev-re
(save-excursion (re-search-forward "^\n" nil 'move) (point))
@@
-87,7
+89,7
@@
(defconst cvs-status-font-lock-defaults
'(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
(defconst cvs-status-font-lock-defaults
'(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
-
+(defvar cvs-minor-wrap-function)
(put 'cvs-status-mode 'mode-class 'special)
;;;###autoload
(define-derived-mode cvs-status-mode fundamental-mode "CVS-Status"
(put 'cvs-status-mode 'mode-class 'special)
;;;###autoload
(define-derived-mode cvs-status-mode fundamental-mode "CVS-Status"
@@
-106,7
+108,8
@@
(let* ((file (match-string 1))
(cvsdir (and (re-search-backward cvs-status-dir-re nil t)
(match-string 1)))
(let* ((file (match-string 1))
(cvsdir (and (re-search-backward cvs-status-dir-re nil t)
(match-string 1)))
- (pcldir (and (re-search-backward cvs-pcl-cvs-dirchange-re nil t)
+ (pcldir (and (if (boundp 'cvs-pcl-cvs-dirchange-re)
+ (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
(match-string 1)))
(dir ""))
(let ((default-directory ""))
(match-string 1)))
(dir ""))
(let ((default-directory ""))
@@
-277,10
+280,10
@@
BEWARE: because of stability issues, this is not a symetric operation."
(cvs-tree-merge (cdr tree1) (cdr tree2))))))
((> l1 l2)
(cvs-tree-merge
(cvs-tree-merge (cdr tree1) (cdr tree2))))))
((> l1 l2)
(cvs-tree-merge
- (list (cons (cvs-tag-make (
cvs-
butlast vl1)) tree1)) tree2))
+ (list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2))
((< l1 l2)
(cvs-tree-merge
((< l1 l2)
(cvs-tree-merge
- tree1 (list (cons (cvs-tag-make (
cvs-
butlast vl2)) tree2)))))))))
+ tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2)))))))))
(defun cvs-tag-make-tag (tag)
(let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
(defun cvs-tag-make-tag (tag)
(let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
@@
-293,7
+296,7
@@
BEWARE: because of stability issues, this is not a symetric operation."
(lambda (tag)
(let ((tag (cvs-tag-make-tag tag)))
(list (if (not (eq (cvs-tag->type tag) 'branch)) tag
(lambda (tag)
(let ((tag (cvs-tag-make-tag tag)))
(list (if (not (eq (cvs-tag->type tag) 'branch)) tag
- (list (cvs-tag-make (
cvs-
butlast (cvs-tag->vlist tag)))
+ (list (cvs-tag-make (butlast (cvs-tag->vlist tag)))
tag)))))
tags)))
(while (cdr tags)
tag)))))
tags)))
(while (cdr tags)
@@
-535,5
+538,5
@@
Optional prefix ARG chooses between two representations."
(provide 'cvs-status)
(provide 'cvs-status)
-;;
;
arch-tag: db8b5094-d02a-473e-a476-544e89ff5ad0
+;; arch-tag: db8b5094-d02a-473e-a476-544e89ff5ad0
;;; cvs-status.el ends here
;;; cvs-status.el ends here