Mercurial > emacs
diff lisp/vc.el @ 83383:2a679c81f552
Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-551
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-552
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-553
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-554
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-555
Remove CVS keywords from newsticker files
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-556
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-557
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-558
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-559
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-560
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-561
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-562
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-563
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-565
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-566
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-567
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-568
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-569
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-570
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-571
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-573
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-574
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-575
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-576
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-577
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-118
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-119
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-120
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-121
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-122
Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-123
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-124
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-125
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-126
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-127
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-128
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-129
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-130
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-131
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-132
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-423
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Sun, 09 Oct 2005 20:00:17 +0000 |
| parents | de684325b343 96187e7edd1b |
| children | b31326248cf6 |
line wrap: on
line diff
--- a/lisp/vc.el Mon Sep 19 21:25:51 2005 +0000 +++ b/lisp/vc.el Sun Oct 09 20:00:17 2005 +0000 @@ -1707,7 +1707,7 @@ (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)) @@ -1728,14 +1728,14 @@ ;; 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 @@ -1998,7 +1998,7 @@ (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) @@ -2333,10 +2333,10 @@ (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 "") @@ -2727,7 +2727,7 @@ (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)) @@ -3080,7 +3080,7 @@ (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 @@ -3088,7 +3088,7 @@ (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))