diff options
| author | Stefan Monnier | 2009-12-01 20:08:20 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2009-12-01 20:08:20 +0000 |
| commit | c767b6650c52356e08893f0c61ee2094281e422f (patch) | |
| tree | a934ab7e2f7a9358de24ec89a61787281ed1288b | |
| parent | f3b757f540fd7290ccd6a94306a915f12c10e3c9 (diff) | |
| download | emacs-c767b6650c52356e08893f0c61ee2094281e422f.tar.gz emacs-c767b6650c52356e08893f0c61ee2094281e422f.zip | |
(vc-print-log-internal): Don't wait for the prcess to
terminate before setting up the major mode.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc.el | 14 |
2 files changed, 11 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83b80072381..b59cfde463b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2009-12-01 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2009-12-01 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * vc.el (vc-print-log-internal): Don't wait for the prcess to | ||
| 4 | terminate before setting up the major mode. | ||
| 5 | |||
| 3 | * pcmpl-unix.el (pcomplete/cd): Complete more than one argument, just | 6 | * pcmpl-unix.el (pcomplete/cd): Complete more than one argument, just |
| 4 | in case. | 7 | in case. |
| 5 | 8 | ||
diff --git a/lisp/vc.el b/lisp/vc.el index a866431a57b..616b9a34dea 100644 --- a/lisp/vc.el +++ b/lisp/vc.el | |||
| @@ -1878,13 +1878,15 @@ Not all VC backends support short logs!") | |||
| 1878 | (setq pl-return (vc-call-backend backend 'print-log files "*vc-change-log*" | 1878 | (setq pl-return (vc-call-backend backend 'print-log files "*vc-change-log*" |
| 1879 | vc-short-log limit)) | 1879 | vc-short-log limit)) |
| 1880 | (pop-to-buffer "*vc-change-log*") | 1880 | (pop-to-buffer "*vc-change-log*") |
| 1881 | (vc-exec-after | 1881 | (let ((inhibit-read-only t)) |
| 1882 | `(let ((inhibit-read-only t) | 1882 | ;; log-view-mode used to be called with inhibit-read-only bound |
| 1883 | (vc-short-log ,vc-short-log)) | 1883 | ;; to t, so let's keep doing it, just in case. |
| 1884 | (vc-call-backend ',backend 'log-view-mode) | 1884 | (vc-call-backend backend 'log-view-mode)) |
| 1885 | (set (make-local-variable 'log-view-vc-backend) ',backend) | 1885 | (set (make-local-variable 'log-view-vc-backend) ',backend) |
| 1886 | (set (make-local-variable 'log-view-vc-fileset) ',files) | 1886 | (set (make-local-variable 'log-view-vc-fileset) ',files) |
| 1887 | 1887 | ||
| 1888 | (vc-exec-after | ||
| 1889 | `(let ((inhibit-read-only t)) | ||
| 1888 | (when (and ,limit (not (eq 'limit-unsupported pl-return))) | 1890 | (when (and ,limit (not (eq 'limit-unsupported pl-return))) |
| 1889 | (goto-char (point-max)) | 1891 | (goto-char (point-max)) |
| 1890 | (widget-create 'push-button | 1892 | (widget-create 'push-button |