aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/vc/vc-bzr.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01c03c2baf6..27e8bcd0add 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-12-21 Chong Yidong <cyd@gnu.org>
2
3 * vc/vc-bzr.el (vc-bzr-rename-file): Don't pass ~ to Bzr in
4 filename argument.
5
12011-12-20 Martin Rudalics <rudalics@gmx.at> 62011-12-20 Martin Rudalics <rudalics@gmx.at>
2 7
3 * window.el (window-normalize-buffer-to-display): Remove. 8 * window.el (window-normalize-buffer-to-display): Remove.
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index c5c0ce73b3a..508420f026a 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -764,7 +764,10 @@ REV non-nil gets an error."
764 764
765(defun vc-bzr-rename-file (old new) 765(defun vc-bzr-rename-file (old new)
766 "Rename file from OLD to NEW using `bzr mv'." 766 "Rename file from OLD to NEW using `bzr mv'."
767 (vc-bzr-command "mv" nil 0 new old)) 767 (setq old (expand-file-name old))
768 (setq new (expand-file-name new))
769 (vc-bzr-command "mv" nil 0 new old)
770 (message "Renamed %s => %s" old new))
768 771
769(defvar vc-bzr-annotation-table nil 772(defvar vc-bzr-annotation-table nil
770 "Internal use.") 773 "Internal use.")