From 5b785d2f38ad01331219b9f19e566464bed0e9b5 Mon Sep 17 00:00:00 2001 From: "Jose A. Ortega Ruiz" Date: Wed, 21 Jan 2009 02:46:50 +0100 Subject: [PATCH] FUEL: In word extraction, ask for word name before stack effect. --- extra/fuel/fuel.factor | 8 +++++--- misc/fuel/fuel-refactor.el | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/extra/fuel/fuel.factor b/extra/fuel/fuel.factor index 663a0bb485..fa0831f5f8 100644 --- a/extra/fuel/fuel.factor +++ b/extra/fuel/fuel.factor @@ -177,9 +177,7 @@ PRIVATE> ! Remote connection -: fuel-start-remote-listener ( port/f -- ) - "Starting server. Connect with 'M-x connect-to-factor' in Emacs" - write nl flush number? [ 9000 ] unless* +: fuel-start-server ( port -- ) "tty-server" >>name utf8 >>encoding @@ -188,6 +186,10 @@ PRIVATE> f >>timeout start-server ; +: fuel-start-remote-listener ( port/f -- ) + "Starting server. Connect with 'M-x connect-to-factor' in Emacs" + write nl flush number? [ 9000 ] unless* fuel-start-server ; + : fuel-start-remote-listener* ( -- ) f fuel-start-remote-listener ; MAIN: fuel-start-remote-listener* diff --git a/misc/fuel/fuel-refactor.el b/misc/fuel/fuel-refactor.el index 788033cf88..738d6fff47 100644 --- a/misc/fuel/fuel-refactor.el +++ b/misc/fuel/fuel-refactor.el @@ -103,10 +103,10 @@ (let* ((code (buffer-substring begin end)) (existing (fuel-refactor--reuse-existing code)) (code-str (or existing (fuel--region-to-string begin end))) + (word (or (car existing) (read-string "New word name: "))) (stack-effect (or existing (fuel-stack--infer-effect code-str) - (read-string "Stack effect: "))) - (word (or (car existing) (read-string "New word name: ")))) + (read-string "Stack effect: ")))) (goto-char begin) (delete-region begin end) (insert word)