Rename ido-max-prompt-width to ido-max-file-prompt-width for consistency.

[gnu-emacs] / lisp / vc.el

diff --git a/lisp/vc.el b/lisp/vc.el
index 3dafcf2b0ddb8194193ea39a81cf821985e3e716..1176d71b41ac2526a501735adf367fa894841abf 100644 (file)
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
 ;; Keywords: tools
 
-;; $Id: vc.el,v 1.344 2002/10/14 15:13:59 spiegel Exp $
+;; $Id: vc.el,v 1.346 2002/11/03 15:08:29 spiegel Exp $
 
 ;; This file is part of GNU Emacs.
 
@@ -223,9 +223,10 @@
 ;;   Check out revision REV of FILE into the working area.  If EDITABLE
 ;;   is non-nil, FILE should be writable by the user and if locking is
 ;;   used for FILE, a lock should also be set.  If REV is non-nil, that
-;;   is the revision to check out (default is current workfile version);
-;;   if REV is the empty string, that means to check out the head of the
-;;   trunk.  The implementation should pass the value of vc-checkout-switches
+;;   is the revision to check out (default is current workfile version).
+;;   If REV is t, that means to check out the head of the current branch;
+;;   if it is the empty string, check out the head of the trunk.
+;;   The implementation should pass the value of vc-checkout-switches
 ;;   to the backend command.
 ;;
 ;; * revert (file &optional contents-done)
@@ -1194,7 +1195,7 @@ If VERBOSE is non-nil, query the user rather than using default parameters."
        (if (yes-or-no-p (format
                          "%s is not up-to-date.  Get latest version? "
                          (file-name-nondirectory file)))
-           (vc-checkout file (eq (vc-checkout-model file) 'implicit) "")
+           (vc-checkout file (eq (vc-checkout-model file) 'implicit) t)
          (if (and (not (eq (vc-checkout-model file) 'implicit))
                   (yes-or-no-p "Lock this version? "))
              (vc-checkout file t)
@@ -2117,32 +2118,33 @@ There is a special command, `*l', to mark all files currently locked."
   ;; (the column before the date does not end in a digit).
   (set (make-local-variable 'dired-move-to-filename-regexp)
   (let* ((l "\\([A-Za-z]\\|[^\0-\177]\\)")
-        ;; In some locales, month abbreviations are as short as 2 letters,
-        ;; and they can be followed by ".".
-        (month (concat l l "+\\.?"))
-        (s " ")
-        (yyyy "[0-9][0-9][0-9][0-9]")
-        (dd "[ 0-3][0-9]")
-        (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
-        (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
-        (zone "[-+][0-2][0-9][0-5][0-9]")
-        (iso-mm-dd "[01][0-9]-[0-3][0-9]")
-        (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
-        (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
-                     "\\|" yyyy "-" iso-mm-dd "\\)"))
-        (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
-                         s "+"
-                         "\\(" HH:MM "\\|" yyyy "\\)"))
-        (western-comma (concat month s "+" dd "," s "+" yyyy))
-        ;; Japanese MS-Windows ls-lisp has one-digit months, and
-        ;; omits the Kanji characters after month and day-of-month.
-        (mm "[ 0-1]?[0-9]")
-        (japanese
-         (concat mm l "?" s dd l "?" s "+"
-                 "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
+         ;; In some locales, month abbreviations are as short as 2 letters,
+         ;; and they can be followed by ".".
+         (month (concat l l "+\\.?"))
+         (s " ")
+         (yyyy "[0-9][0-9][0-9][0-9]")
+         (dd "[ 0-3][0-9]")
+         (HH:MM "[ 0-2][0-9]:[0-5][0-9]")
+         (seconds "[0-6][0-9]\\([.,][0-9]+\\)?")
+         (zone "[-+][0-2][0-9][0-5][0-9]")
+         (iso-mm-dd "[01][0-9]-[0-3][0-9]")
+         (iso-time (concat HH:MM "\\(:" seconds "\\( ?" zone "\\)?\\)?"))
+         (iso (concat "\\(\\(" yyyy "-\\)?" iso-mm-dd "[ T]" iso-time
+                      "\\|" yyyy "-" iso-mm-dd "\\)"))
+         (western (concat "\\(" month s "+" dd "\\|" dd "\\.?" s month "\\)"
+                          s "+"
+                          "\\(" HH:MM "\\|" yyyy "\\)"))
+         (western-comma (concat month s "+" dd "," s "+" yyyy))
+         ;; Japanese MS-Windows ls-lisp has one-digit months, and
+         ;; omits the Kanji characters after month and day-of-month.
+         (mm "[ 0-1]?[0-9]")
+         (japanese
+          (concat mm l "?" s dd l "?" s "+"
+                  "\\(" HH:MM "\\|" yyyy l "?" "\\)")))
+    ;; the .* below ensures that we find the last match on a line
     (concat ".*" s
-           "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)"
-           s "+")))
+            "\\(" western "\\|" western-comma "\\|" japanese "\\|" iso "\\)"
+            s "+")))
   (and (boundp 'vc-dired-switches)
        vc-dired-switches
        (set (make-local-variable 'dired-actual-switches)