Commit 58ce5535 authored by Thien-Thi Nguyen's avatar Thien-Thi Nguyen
Browse files

(vc-process-filter): Inhibit undo

info collection around call to insert.
(vc-setup-buffer): Likewise for call to erase-buffer.
(vc-do-command): Likewise for call to process-file.
parent 63fbb644
2006-06-05 Thien-Thi Nguyen <ttn@gnu.org>
* vc.el (vc-process-filter): Inhibit undo
info collection around call to insert.
(vc-setup-buffer): Likewise for call to erase-buffer.
(vc-do-command): Likewise for call to process-file.
2006-06-05 Nick Roberts <nickrob@snap.net.nz> 2006-06-05 Nick Roberts <nickrob@snap.net.nz>
   
* progmodes/gud.el (gud-menu-map): Use a conditional help echo * progmodes/gud.el (gud-menu-map): Use a conditional help echo
......
...@@ -894,10 +894,12 @@ However, before executing BODY, find FILE, and after BODY, save buffer." ...@@ -894,10 +894,12 @@ However, before executing BODY, find FILE, and after BODY, save buffer."
(defun vc-process-filter (p s) (defun vc-process-filter (p s)
"An alternative output filter for async process P. "An alternative output filter for async process P.
The only difference with the default filter is to insert S after markers." One difference with the default filter is that this inserts S after markers.
Another is that undo information is not kept."
(with-current-buffer (process-buffer p) (with-current-buffer (process-buffer p)
(save-excursion (save-excursion
(let ((inhibit-read-only t)) (let ((buffer-undo-list t)
(inhibit-read-only t))
(goto-char (process-mark p)) (goto-char (process-mark p))
(insert s) (insert s)
(set-marker (process-mark p) (point)))))) (set-marker (process-mark p) (point))))))
...@@ -914,7 +916,8 @@ BUF defaults to \"*vc*\", can be a string and will be created if necessary." ...@@ -914,7 +916,8 @@ BUF defaults to \"*vc*\", can be a string and will be created if necessary."
(set (make-local-variable 'vc-parent-buffer-name) (set (make-local-variable 'vc-parent-buffer-name)
(concat " from " (buffer-name camefrom))) (concat " from " (buffer-name camefrom)))
(setq default-directory olddir) (setq default-directory olddir)
(let ((inhibit-read-only t)) (let ((buffer-undo-list t)
(inhibit-read-only t))
(erase-buffer)))) (erase-buffer))))
(defun vc-exec-after (code) (defun vc-exec-after (code)
...@@ -1003,7 +1006,8 @@ that is inserted into the command line before the filename." ...@@ -1003,7 +1006,8 @@ that is inserted into the command line before the filename."
(vc-exec-after (vc-exec-after
`(unless (active-minibuffer-window) `(unless (active-minibuffer-window)
(message "Running %s in the background... done" ',command)))) (message "Running %s in the background... done" ',command))))
(setq status (apply 'process-file command nil t nil squeezed)) (let ((buffer-undo-list t))
(setq status (apply 'process-file command nil t nil squeezed)))
(when (and (not (eq t okstatus)) (when (and (not (eq t okstatus))
(or (not (integerp status)) (or (not (integerp status))
(and okstatus (< okstatus status)))) (and okstatus (< okstatus status))))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment