[Emacs-diffs] Changes to emacs/lisp/vc.el

[Romain Francoise]

Index: emacs/lisp/vc.el
diff -c emacs/lisp/vc.el:1.398 emacs/lisp/vc.el:1.399
*** emacs/lisp/vc.el:1.398      Sun Sep 18 12:25:02 2005
--- emacs/lisp/vc.el    Sat Sep 24 13:44:00 2005
***************
*** 1707,1713 ****
    (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-directory buffer-file-name t)))
           (rev1-default nil) (rev2-default nil))
--- 1707,1713 ----
    (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-directory buffer-file-name t)))
           (rev1-default nil) (rev2-default nil))
***************
*** 1728,1741 ****
       ;; construct argument list
       (list file
             (read-string (if 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): ")
                        nil nil rev2-default))))
    (if (file-directory-p file)
        ;; recursive directory diff
--- 1728,1741 ----
       ;; construct argument list
       (list file
             (read-string (if 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): ")
                        nil nil rev2-default))))
    (if (file-directory-p file)
        ;; recursive directory diff
***************
*** 1998,2004 ****
        (error "Merge aborted"))))
      (setq first-version
          (read-string (concat "Branch or version to merge from "
!                              "(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)
--- 1998,2004 ----
        (error "Merge aborted"))))
      (setq first-version
          (read-string (concat "Branch or version to merge from "
!                              "(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)
***************
*** 3080,3086 ****
         (bfn buffer-file-name)
           (vc-annotate-version
          (if prefix (read-string
!                     (format "Annotate from version: (default %s) " rev)
                      nil nil rev)
            rev)))
      (if display-mode
--- 3080,3086 ----
         (bfn buffer-file-name)
           (vc-annotate-version
          (if prefix (read-string
!                     (format "Annotate from version (default %s): " rev)
                      nil nil rev)
            rev)))
      (if display-mode
***************
*** 3088,3094 ****
        (if prefix
          (setq vc-annotate-display-mode
                (float (string-to-number
!                       (read-string "Annotate span days: (default 20) "
                                     nil nil "20"))))))
      (setq temp-buffer-name (format "*Annotate %s (rev %s)*"
                                   (buffer-name) vc-annotate-version))
--- 3088,3094 ----
        (if prefix
          (setq vc-annotate-display-mode
                (float (string-to-number
!                       (read-string "Annotate span days (default 20): "
                                     nil nil "20"))))))
      (setq temp-buffer-name (format "*Annotate %s (rev %s)*"
                                   (buffer-name) vc-annotate-version))