diff options
| author | Miles Bader | 2000-08-19 01:59:21 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-08-19 01:59:21 +0000 |
| commit | 136b4eda878f450163e70dd1ed56980d35d6d742 (patch) | |
| tree | 58b69a85b7c970dc0317d50d84740102b0753d74 | |
| parent | d8d972bf49a45f00663c94b4457966cb3bf4501b (diff) | |
| download | emacs-136b4eda878f450163e70dd1ed56980d35d6d742.tar.gz emacs-136b4eda878f450163e70dd1ed56980d35d6d742.zip | |
(gud-basic-call): Temporarily widen gud comint buffer while checking for
prompt to delete. Use `forward-line 0' instead of beginning-of-line.
(gud-filter): Temporarily widen gud comint buffer while examining output.
| -rw-r--r-- | lisp/ChangeLog | 19 | ||||
| -rw-r--r-- | lisp/gud.el | 41 |
2 files changed, 42 insertions, 18 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 899a5a50406..93a1e633fb3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,22 @@ | |||
| 1 | 2000-08-19 Miles Bader <miles@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp/bytecomp.el (byte-compile-beginning-of-line): | ||
| 4 | Compiler macro removed; beginning-of-line is no longer always | ||
| 5 | equivalent to forward-line, in the presence of fields. | ||
| 6 | |||
| 7 | * comint.el (comint-output-filter): Remove ad-hoc saving of | ||
| 8 | restriction, and just use save-restriction, now that it works | ||
| 9 | correctly. Don't adjust comint-last-input-start to account for | ||
| 10 | our insertion; it shouldn't have moved because we don't use | ||
| 11 | insert-before-markers anymore. Comment out call to | ||
| 12 | `force-mode-line-update'; why is it here? | ||
| 13 | |||
| 14 | * gud.el (gud-basic-call): Temporarily widen gud comint buffer | ||
| 15 | while checking for prompt to delete. Use `forward-line 0' | ||
| 16 | instead of beginning-of-line. | ||
| 17 | (gud-filter): Temporarily widen gud comint buffer while | ||
| 18 | examining output. | ||
| 19 | |||
| 1 | 2000-08-18 Stefan Monnier <monnier@cs.yale.edu> | 20 | 2000-08-18 Stefan Monnier <monnier@cs.yale.edu> |
| 2 | 21 | ||
| 3 | * textmodes/ispell.el (ispell-menu-map-needed): Put back the boundp | 22 | * textmodes/ispell.el (ispell-menu-map-needed): Put back the boundp |
diff --git a/lisp/gud.el b/lisp/gud.el index 688346f1953..13a8a101118 100644 --- a/lisp/gud.el +++ b/lisp/gud.el | |||
| @@ -2184,20 +2184,23 @@ It is saved for when this flag is not set.") | |||
| 2184 | 2184 | ||
| 2185 | (with-current-buffer (process-buffer proc) | 2185 | (with-current-buffer (process-buffer proc) |
| 2186 | ;; If we have been so requested, delete the debugger prompt. | 2186 | ;; If we have been so requested, delete the debugger prompt. |
| 2187 | (if (marker-buffer gud-delete-prompt-marker) | 2187 | (save-restriction |
| 2188 | (progn | 2188 | (widen) |
| 2189 | (delete-region (process-mark proc) gud-delete-prompt-marker) | 2189 | (if (marker-buffer gud-delete-prompt-marker) |
| 2190 | (set-marker gud-delete-prompt-marker nil))) | 2190 | (progn |
| 2191 | ;; Save the process output, checking for source file markers. | 2191 | (delete-region (process-mark proc) |
| 2192 | (setq output (gud-marker-filter string)) | 2192 | gud-delete-prompt-marker) |
| 2193 | ;; Check for a filename-and-line number. | 2193 | (set-marker gud-delete-prompt-marker nil))) |
| 2194 | ;; Don't display the specified file | 2194 | ;; Save the process output, checking for source file markers. |
| 2195 | ;; unless (1) point is at or after the position where output appears | 2195 | (setq output (gud-marker-filter string)) |
| 2196 | ;; and (2) this buffer is on the screen. | 2196 | ;; Check for a filename-and-line number. |
| 2197 | (setq process-window | 2197 | ;; Don't display the specified file |
| 2198 | (and gud-last-frame | 2198 | ;; unless (1) point is at or after the position where output appears |
| 2199 | (>= (point) (process-mark proc)) | 2199 | ;; and (2) this buffer is on the screen. |
| 2200 | (get-buffer-window (current-buffer)))) | 2200 | (setq process-window |
| 2201 | (and gud-last-frame | ||
| 2202 | (>= (point) (process-mark proc)) | ||
| 2203 | (get-buffer-window (current-buffer))))) | ||
| 2201 | 2204 | ||
| 2202 | ;; Let the comint filter do the actual insertion. | 2205 | ;; Let the comint filter do the actual insertion. |
| 2203 | ;; That lets us inherit various comint features. | 2206 | ;; That lets us inherit various comint features. |
| @@ -2382,10 +2385,12 @@ Obeying it means displaying in another window the specified file and line." | |||
| 2382 | ;; Arrange for the current prompt to get deleted. | 2385 | ;; Arrange for the current prompt to get deleted. |
| 2383 | (save-excursion | 2386 | (save-excursion |
| 2384 | (set-buffer gud-comint-buffer) | 2387 | (set-buffer gud-comint-buffer) |
| 2385 | (goto-char (process-mark proc)) | 2388 | (save-restriction |
| 2386 | (beginning-of-line) | 2389 | (widen) |
| 2387 | (if (looking-at comint-prompt-regexp) | 2390 | (goto-char (process-mark proc)) |
| 2388 | (set-marker gud-delete-prompt-marker (point)))) | 2391 | (forward-line 0) |
| 2392 | (if (looking-at comint-prompt-regexp) | ||
| 2393 | (set-marker gud-delete-prompt-marker (point))))) | ||
| 2389 | (process-send-string proc command))) | 2394 | (process-send-string proc command))) |
| 2390 | 2395 | ||
| 2391 | (defun gud-refresh (&optional arg) | 2396 | (defun gud-refresh (&optional arg) |