diff options
| author | Gerd Moellmann | 2000-01-26 10:32:38 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-01-26 10:32:38 +0000 |
| commit | 4e6473c81edae87dd16137ee4622ee2275b1ea0a (patch) | |
| tree | 2570922c5a51f4a6ed507dc437f857dcccddf659 | |
| parent | d0c037d81d868a35c1c5d0dffefc6324134c7cd3 (diff) | |
| download | emacs-4e6473c81edae87dd16137ee4622ee2275b1ea0a.tar.gz emacs-4e6473c81edae87dd16137ee4622ee2275b1ea0a.zip | |
(vc-version-diff): Make sure file name is expanded.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/vc.el | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 3bee2004566..30dc9eefc86 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2000-01-25 Andre Spiegel <spiegel@gnu.org> | ||
| 2 | |||
| 3 | * vc.el (vc-version-diff): Make sure file name is expanded. | ||
| 4 | |||
| 1 | 2000-01-25 Gerd Moellmann <gerd@gnu.org> | 5 | 2000-01-25 Gerd Moellmann <gerd@gnu.org> |
| 2 | 6 | ||
| 3 | * scroll-bar.el (scroll-bar-timer): Variable removed. | 7 | * scroll-bar.el (scroll-bar-timer): Variable removed. |
diff --git a/lisp/vc.el b/lisp/vc.el index 11503f1928c..e6766996e91 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | 5 | ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
| 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> | 6 | ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> |
| 7 | 7 | ||
| 8 | ;; $Id: vc.el,v 1.257 1999/10/15 15:44:52 monnier Exp $ | 8 | ;; $Id: vc.el,v 1.258 1999/12/02 14:21:08 gerd Exp $ |
| 9 | 9 | ||
| 10 | ;; This file is part of GNU Emacs. | 10 | ;; This file is part of GNU Emacs. |
| 11 | 11 | ||
| @@ -1406,10 +1406,11 @@ and two version designators specifying which versions to compare." | |||
| 1406 | If FILE is a directory, generate diffs between versions for all registered | 1406 | If FILE is a directory, generate diffs between versions for all registered |
| 1407 | files in or below it." | 1407 | files in or below it." |
| 1408 | (interactive | 1408 | (interactive |
| 1409 | (let ((file (read-file-name (if buffer-file-name | 1409 | (let ((file (expand-file-name |
| 1410 | "File or dir to diff: (default visited file) " | 1410 | (read-file-name (if buffer-file-name |
| 1411 | "File or dir to diff: ") | 1411 | "File or dir to diff: (default visited file) " |
| 1412 | default-directory buffer-file-name t)) | 1412 | "File or dir to diff: ") |
| 1413 | default-directory buffer-file-name t))) | ||
| 1413 | (rel1-default nil) (rel2-default nil)) | 1414 | (rel1-default nil) (rel2-default nil)) |
| 1414 | ;; compute default versions based on the file state | 1415 | ;; compute default versions based on the file state |
| 1415 | (cond | 1416 | (cond |