diff options
| author | Dmitry Gutov | 2013-10-24 05:27:29 +0400 |
|---|---|---|
| committer | Dmitry Gutov | 2013-10-24 05:27:29 +0400 |
| commit | 8297b2cfdd3c0da92cc6625205f4533fcb3b01e9 (patch) | |
| tree | 3f6626a9db754fa796eb9cb5bf5078174a282a8a | |
| parent | 369bbf7198fa5dfdac366f9e5f79b84d9c72f3ee (diff) | |
| download | emacs-8297b2cfdd3c0da92cc6625205f4533fcb3b01e9.tar.gz emacs-8297b2cfdd3c0da92cc6625205f4533fcb3b01e9.zip | |
* lisp/vc/vc.el (vc-print-root-log): Always set `default-directory'
value, whether we could auto-deduce `backend', or not.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc/vc.el | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cc302daa9cf..0e34bc5ef2e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2013-10-24 Dmitry Gutov <dgutov@yandex.ru> | 1 | 2013-10-24 Dmitry Gutov <dgutov@yandex.ru> |
| 2 | 2 | ||
| 3 | * vc/vc.el (vc-print-root-log): Always set `default-directory' | ||
| 4 | value, whether we could auto-deduce `backend', or not. | ||
| 5 | |||
| 3 | * progmodes/ruby-mode.el (ruby-smie-rules): Fix the "curly block | 6 | * progmodes/ruby-mode.el (ruby-smie-rules): Fix the "curly block |
| 4 | with parameters" example. Simplify the "is it block or is it | 7 | with parameters" example. Simplify the "is it block or is it |
| 5 | hash" check, but also make it more thorough. | 8 | hash" check, but also make it more thorough. |
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 585b6d48d45..11cfeb403d4 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el | |||
| @@ -2330,10 +2330,10 @@ When called interactively with a prefix argument, prompt for LIMIT." | |||
| 2330 | (setq rootdir (vc-call-backend backend 'root default-directory)) | 2330 | (setq rootdir (vc-call-backend backend 'root default-directory)) |
| 2331 | (setq rootdir (read-directory-name "Directory for VC root-log: ")) | 2331 | (setq rootdir (read-directory-name "Directory for VC root-log: ")) |
| 2332 | (setq backend (vc-responsible-backend rootdir)) | 2332 | (setq backend (vc-responsible-backend rootdir)) |
| 2333 | (if backend | 2333 | (unless backend |
| 2334 | (setq default-directory rootdir) | 2334 | (error "Directory is not version controlled"))) |
| 2335 | (error "Directory is not version controlled"))) | 2335 | (setq working-revision (vc-working-revision rootdir) |
| 2336 | (setq working-revision (vc-working-revision rootdir)) | 2336 | default-directory rootdir) |
| 2337 | (vc-print-log-internal backend (list rootdir) working-revision nil limit))) | 2337 | (vc-print-log-internal backend (list rootdir) working-revision nil limit))) |
| 2338 | 2338 | ||
| 2339 | ;;;###autoload | 2339 | ;;;###autoload |