2:35 p.m.
User: scop
Date: 05/10/08 15:35:03
Modified: packages/unsupported/scop/vc ChangeLog log-edit.el
vc-mcvs.el vc.el
Log:
Sync vc with upstream.
Revision Changes Path
1.46 +1 -1 XEmacs/packages/unsupported/scop/STATUS
Index: STATUS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/STATUS,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- STATUS 2005/09/11 15:48:14 1.45
+++ STATUS 2005/10/08 13:34:57 1.46
＠＠ -17,5 +17,5 ＠＠ generic-modes: generic.el and generic-x.
- Compiles, seems to work, auto-mode-alist and autoloads need spanking.
vc: vc*.el and a few other related files from GNU Emacs
-- Up to date with GNU Emacs CVS HEAD as of 2005-09-11.
+- Up to date with GNU Emacs CVS HEAD as of 2005-10-08.
- Compiles, something even works.
1.30 +4 -0 XEmacs/packages/unsupported/scop/vc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ChangeLog 2005/09/11 15:48:17 1.29
+++ ChangeLog 2005/10/08 13:35:00 1.30
＠＠ -1,3 +1,7 ＠＠
+2005-10-08 Ville Skyttä <scop(a)xemacs.org>
+
+ * log-edit.el, vc.el, vc-mcvs.el: Sync with upstream.
+
2005-09-11 Ville Skyttä <scop(a)xemacs.org>
* vc.el: Sync with upstream.
1.5 +3 -3 XEmacs/packages/unsupported/scop/vc/log-edit.el
Index: log-edit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/log-edit.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- log-edit.el 2005/08/16 18:38:12 1.4
+++ log-edit.el 2005/10/08 13:35:00 1.5
＠＠ -332,7 +332,7 ＠＠ If BUFFER is non-nil `log-edit' will jum
(set (make-local-variable 'log-edit-initial-files) (log-edit-files))
(when setup (run-hooks 'log-edit-hook))
(goto-char (point-min)) (push-mark (point-max))
- (message (substitute-command-keys
+ (message "%s" (substitute-command-keys
"Press \\[log-edit-done] when you are done editing."))))
(define-derived-mode log-edit-mode text-mode "Log-Edit"
＠＠ -384,7 +384,7 ＠＠ If you want to abort the commit, simply
(equal (log-edit-files) log-edit-initial-files)))
(progn
(log-edit-show-files)
- (not (y-or-n-p "Really commit ? "))))
+ (not (y-or-n-p "Really commit? "))))
(progn (when (not win) (log-edit-hide-buf))
(message "Oh, well! Later maybe?"))
(run-hooks 'log-edit-done-hook)
＠＠ -427,7 +427,7 ＠＠ To select default log text, we:
(interactive)
(if (eq last-command 'log-edit-mode-help)
(describe-function major-mode)
- (message
+ (message "%s"
(substitute-command-keys
"Type `\\[log-edit-done]' to finish commit. Try `\\[describe-function]
log-edit-done' for more help."))))
1.9 +1 -1 XEmacs/packages/unsupported/scop/vc/vc-mcvs.el
Index: vc-mcvs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc-mcvs.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- vc-mcvs.el 2005/08/16 18:38:13 1.8
+++ vc-mcvs.el 2005/10/08 13:35:00 1.9
＠＠ -225,7 +225,7 ＠＠ the Meta-CVS command (in that order)."
;; Make sure the `mcvs add' will not fire up the CVSEDITOR
;; to add a rule for the given file's extension.
(when (and ext (not (assoc ext types)))
- (let ((type (completing-read "Type to use [default]: "
+ (let ((type (completing-read "Type to use (default): "
'("default" "name-only" "keep-old"
"binary" "value-only")
nil t nil nil "default")))
1.18 +12 -12 XEmacs/packages/unsupported/scop/vc/vc.el
Index: vc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/unsupported/scop/vc/vc.el,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- vc.el 2005/09/11 15:48:17 1.17
+++ vc.el 2005/10/08 13:35:00 1.18
＠＠ -1721,7 +1721,7 ＠＠ versions of all registered files in or b
(interactive
(let ((file (expand-file-name
(read-file-name (if buffer-file-name
- "File or dir to diff: (default visited file)
"
+ "File or dir to diff (default visited file):
"
"File or dir to diff: ")
default-directory buffer-file-name t)))
(rev1-default nil) (rev2-default nil))
＠＠ -1742,14 +1742,14 ＠＠ versions of all registered files in or b
;; construct argument list
(list file
(read-string (if rev1-default
- (concat "Older version: (default "
- rev1-default ") ")
+ (concat "Older version (default "
+ rev1-default "): ")
"Older version: ")
nil nil rev1-default)
(read-string (if rev2-default
- (concat "Newer version: (default "
- rev2-default ") ")
- "Newer version (default: current source): ")
+ (concat "Newer version (default "
+ rev2-default "): ")
+ "Newer version (default current source): ")
nil nil rev2-default))))
(if (file-directory-p file)
;; recursive directory diff
＠＠ -2015,7 +2015,7 ＠＠ See Info node `Merging'."
(error "Merge aborted"))))
(setq first-version
(read-string (concat "Branch or version to merge from "
- "(default: news on current branch): ")))
+ "(default news on current branch): ")))
(if (string= first-version "")
(if (not (vc-find-backend-function backend 'merge-news))
(error "Sorry, merging news is not implemented for %s" backend)
＠＠ -2351,10 +2351,10 ＠＠ allowed and simply skipped)."
(format "Updating %s... " (abbreviate-file-name dir))
(format "Retrieving snapshot into %s... "
(abbreviate-file-name dir)))))
- (message msg)
+ (message "%s" msg)
(vc-call-backend (vc-responsible-backend dir)
'retrieve-snapshot dir name update)
- (message (concat msg "done"))))
+ (message "%s" (concat msg "done"))))
(defun vc-default-retrieve-snapshot (backend dir name update)
(if (string= name "")
＠＠ -2746,7 +2746,7 ＠＠ backend to NEW-BACKEND, and unregister F
(error "Deleting files under %s is not supported in VC" backend))
(if (and buf (buffer-modified-p buf))
(error "Please save files before deleting them"))
- (unless (y-or-n-p (format "Really want to delete %s ? "
+ (unless (y-or-n-p (format "Really want to delete %s? "
(file-name-nondirectory file)))
(error "Abort!"))
(unless (or (file-directory-p file) (null make-backup-files))
＠＠ -3099,7 +3099,7 ＠＠ colors. `vc-annotate-background' specifi
(bfn buffer-file-name)
(vc-annotate-version
(if prefix (read-string
- (format "Annotate from version: (default %s) " rev)
+ (format "Annotate from version (default %s): " rev)
nil nil rev)
rev)))
(if display-mode
＠＠ -3107,7 +3107,7 ＠＠ colors. `vc-annotate-background' specifi
(if prefix
(setq vc-annotate-display-mode
(float (string-to-number
- (read-string "Annotate span days: (default 20) "
+ (read-string "Annotate span days (default 20): "
nil nil "20"))))))
(setq temp-buffer-name (format "*Annotate %s (rev %s)*"
(buffer-name) vc-annotate-version))