* [PATCH 1/2] clean up two macros in ob-comint
@ 2013-10-28 22:58 Aaron Ecay
2013-10-30 1:53 ` Eric Schulte
0 siblings, 1 reply; 2+ messages in thread
From: Aaron Ecay @ 2013-10-28 22:58 UTC (permalink / raw)
To: emacs-orgmode
* lisp/ob-comint.el (org-babel-comint-with-output,
org-babel-comint-in-buffer): clean up code.
This patch replaces some deeply nested ca/dr calls with ‘nth’, and
replaces a setq/unwind-protect/setq incantation with a simple let
binding. Finally, it also restructures ’org-babel-comint-in-buffer’
to not needlessly save/restore match and excursion data if the buffer
process is not live, and to use with-current-buffer instead of
save-excursion+set-buffer
(info "(elisp) Excursions")
---
lisp/ob-comint.el | 84 ++++++++++++++++++++++++++-----------------------------
1 file changed, 40 insertions(+), 44 deletions(-)
diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
index 8b03e2d..4e2b352 100644
--- a/lisp/ob-comint.el
+++ b/lisp/ob-comint.el
@@ -48,12 +48,12 @@ BUFFER is checked with `org-babel-comint-buffer-livep'. BODY is
executed inside the protection of `save-excursion' and
`save-match-data'."
(declare (indent 1))
- `(save-excursion
+ `(progn
+ (unless (org-babel-comint-buffer-livep ,buffer)
+ (error "Buffer %s does not exist or has no process" ,buffer))
(save-match-data
- (unless (org-babel-comint-buffer-livep ,buffer)
- (error "Buffer %s does not exist or has no process" ,buffer))
- (set-buffer ,buffer)
- ,@body)))
+ (with-current-buffer ,buffer
+ ,@body))))
(def-edebug-spec org-babel-comint-in-buffer (form body))
(defmacro org-babel-comint-with-output (meta &rest body)
@@ -69,46 +69,42 @@ elements are optional.
This macro ensures that the filter is removed in case of an error
or user `keyboard-quit' during execution of body."
(declare (indent 1))
- (let ((buffer (car meta))
- (eoe-indicator (cadr meta))
- (remove-echo (cadr (cdr meta)))
- (full-body (cadr (cdr (cdr meta)))))
+ (let ((buffer (nth 0 meta))
+ (eoe-indicator (nth 1 meta))
+ (remove-echo (nth 2 meta))
+ (full-body (nth 3 meta)))
`(org-babel-comint-in-buffer ,buffer
- (let ((string-buffer "") dangling-text raw)
- ;; setup filter
- (setq comint-output-filter-functions
- (cons (lambda (text) (setq string-buffer (concat string-buffer text)))
- comint-output-filter-functions))
- (unwind-protect
- (progn
- ;; got located, and save dangling text
- (goto-char (process-mark (get-buffer-process (current-buffer))))
- (let ((start (point))
- (end (point-max)))
- (setq dangling-text (buffer-substring start end))
- (delete-region start end))
- ;; pass FULL-BODY to process
- ,@body
- ;; wait for end-of-evaluation indicator
- (while (progn
- (goto-char comint-last-input-end)
- (not (save-excursion
- (and (re-search-forward
- (regexp-quote ,eoe-indicator) nil t)
- (re-search-forward
- comint-prompt-regexp nil t)))))
- (accept-process-output (get-buffer-process (current-buffer)))
- ;; thought the following this would allow async
- ;; background running, but I was wrong...
- ;; (run-with-timer .5 .5 'accept-process-output
- ;; (get-buffer-process (current-buffer)))
- )
- ;; replace cut dangling text
- (goto-char (process-mark (get-buffer-process (current-buffer))))
- (insert dangling-text))
- ;; remove filter
- (setq comint-output-filter-functions
- (cdr comint-output-filter-functions)))
+ (let ((string-buffer "")
+ (comint-output-filter-functions
+ (cons (lambda (text) (setq string-buffer (concat string-buffer text)))
+ comint-output-filter-functions))
+ dangling-text raw)
+ ;; got located, and save dangling text
+ (goto-char (process-mark (get-buffer-process (current-buffer))))
+ (let ((start (point))
+ (end (point-max)))
+ (setq dangling-text (buffer-substring start end))
+ (delete-region start end))
+ ;; pass FULL-BODY to process
+ ,@body
+ ;; wait for end-of-evaluation indicator
+ (while (progn
+ (goto-char comint-last-input-end)
+ (not (save-excursion
+ (and (re-search-forward
+ (regexp-quote ,eoe-indicator) nil t)
+ (re-search-forward
+ comint-prompt-regexp nil t)))))
+ (accept-process-output (get-buffer-process (current-buffer)))
+ ;; thought the following this would allow async
+ ;; background running, but I was wrong...
+ ;; (run-with-timer .5 .5 'accept-process-output
+ ;; (get-buffer-process (current-buffer)))
+ )
+ ;; replace cut dangling text
+ (goto-char (process-mark (get-buffer-process (current-buffer))))
+ (insert dangling-text)
+
;; remove echo'd FULL-BODY from input
(if (and ,remove-echo ,full-body
(string-match
--
1.8.4.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] clean up two macros in ob-comint
2013-10-28 22:58 [PATCH 1/2] clean up two macros in ob-comint Aaron Ecay
@ 2013-10-30 1:53 ` Eric Schulte
0 siblings, 0 replies; 2+ messages in thread
From: Eric Schulte @ 2013-10-30 1:53 UTC (permalink / raw)
To: Aaron Ecay; +Cc: emacs-orgmode
Applied, thanks!
Aaron Ecay <aaronecay@gmail.com> writes:
> * lisp/ob-comint.el (org-babel-comint-with-output,
> org-babel-comint-in-buffer): clean up code.
>
> This patch replaces some deeply nested ca/dr calls with ‘nth’, and
> replaces a setq/unwind-protect/setq incantation with a simple let
> binding. Finally, it also restructures ’org-babel-comint-in-buffer’
> to not needlessly save/restore match and excursion data if the buffer
> process is not live, and to use with-current-buffer instead of
> save-excursion+set-buffer
> (info "(elisp) Excursions")
> ---
> lisp/ob-comint.el | 84 ++++++++++++++++++++++++++-----------------------------
> 1 file changed, 40 insertions(+), 44 deletions(-)
>
> diff --git a/lisp/ob-comint.el b/lisp/ob-comint.el
> index 8b03e2d..4e2b352 100644
> --- a/lisp/ob-comint.el
> +++ b/lisp/ob-comint.el
> @@ -48,12 +48,12 @@ BUFFER is checked with `org-babel-comint-buffer-livep'. BODY is
> executed inside the protection of `save-excursion' and
> `save-match-data'."
> (declare (indent 1))
> - `(save-excursion
> + `(progn
> + (unless (org-babel-comint-buffer-livep ,buffer)
> + (error "Buffer %s does not exist or has no process" ,buffer))
> (save-match-data
> - (unless (org-babel-comint-buffer-livep ,buffer)
> - (error "Buffer %s does not exist or has no process" ,buffer))
> - (set-buffer ,buffer)
> - ,@body)))
> + (with-current-buffer ,buffer
> + ,@body))))
> (def-edebug-spec org-babel-comint-in-buffer (form body))
>
> (defmacro org-babel-comint-with-output (meta &rest body)
> @@ -69,46 +69,42 @@ elements are optional.
> This macro ensures that the filter is removed in case of an error
> or user `keyboard-quit' during execution of body."
> (declare (indent 1))
> - (let ((buffer (car meta))
> - (eoe-indicator (cadr meta))
> - (remove-echo (cadr (cdr meta)))
> - (full-body (cadr (cdr (cdr meta)))))
> + (let ((buffer (nth 0 meta))
> + (eoe-indicator (nth 1 meta))
> + (remove-echo (nth 2 meta))
> + (full-body (nth 3 meta)))
> `(org-babel-comint-in-buffer ,buffer
> - (let ((string-buffer "") dangling-text raw)
> - ;; setup filter
> - (setq comint-output-filter-functions
> - (cons (lambda (text) (setq string-buffer (concat string-buffer text)))
> - comint-output-filter-functions))
> - (unwind-protect
> - (progn
> - ;; got located, and save dangling text
> - (goto-char (process-mark (get-buffer-process (current-buffer))))
> - (let ((start (point))
> - (end (point-max)))
> - (setq dangling-text (buffer-substring start end))
> - (delete-region start end))
> - ;; pass FULL-BODY to process
> - ,@body
> - ;; wait for end-of-evaluation indicator
> - (while (progn
> - (goto-char comint-last-input-end)
> - (not (save-excursion
> - (and (re-search-forward
> - (regexp-quote ,eoe-indicator) nil t)
> - (re-search-forward
> - comint-prompt-regexp nil t)))))
> - (accept-process-output (get-buffer-process (current-buffer)))
> - ;; thought the following this would allow async
> - ;; background running, but I was wrong...
> - ;; (run-with-timer .5 .5 'accept-process-output
> - ;; (get-buffer-process (current-buffer)))
> - )
> - ;; replace cut dangling text
> - (goto-char (process-mark (get-buffer-process (current-buffer))))
> - (insert dangling-text))
> - ;; remove filter
> - (setq comint-output-filter-functions
> - (cdr comint-output-filter-functions)))
> + (let ((string-buffer "")
> + (comint-output-filter-functions
> + (cons (lambda (text) (setq string-buffer (concat string-buffer text)))
> + comint-output-filter-functions))
> + dangling-text raw)
> + ;; got located, and save dangling text
> + (goto-char (process-mark (get-buffer-process (current-buffer))))
> + (let ((start (point))
> + (end (point-max)))
> + (setq dangling-text (buffer-substring start end))
> + (delete-region start end))
> + ;; pass FULL-BODY to process
> + ,@body
> + ;; wait for end-of-evaluation indicator
> + (while (progn
> + (goto-char comint-last-input-end)
> + (not (save-excursion
> + (and (re-search-forward
> + (regexp-quote ,eoe-indicator) nil t)
> + (re-search-forward
> + comint-prompt-regexp nil t)))))
> + (accept-process-output (get-buffer-process (current-buffer)))
> + ;; thought the following this would allow async
> + ;; background running, but I was wrong...
> + ;; (run-with-timer .5 .5 'accept-process-output
> + ;; (get-buffer-process (current-buffer)))
> + )
> + ;; replace cut dangling text
> + (goto-char (process-mark (get-buffer-process (current-buffer))))
> + (insert dangling-text)
> +
> ;; remove echo'd FULL-BODY from input
> (if (and ,remove-echo ,full-body
> (string-match
--
Eric Schulte
https://cs.unm.edu/~eschulte
PGP: 0x614CA05D
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-10-30 1:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-28 22:58 [PATCH 1/2] clean up two macros in ob-comint Aaron Ecay
2013-10-30 1:53 ` Eric Schulte
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).