[Guile-commits] GNU Guile branch, master, updated. release_1-9-2-121-ga27173c

[Neil Jerram]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=a27173cf78a03758317dfe5571380ed3347fa242

The branch, master has been updated
       via  a27173cf78a03758317dfe5571380ed3347fa242 (commit)
      from  1505848425bf149f864ea106bce71447f739012d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit a27173cf78a03758317dfe5571380ed3347fa242
Author: Neil Jerram <address@hidden>
Date:   Fri Aug 28 00:29:04 2009 +0100

    Fix GDS utility client startup
    
    * emacs/gds-scheme.el (gds-start-utility-guile): Use buffer-local
      variable gds-client instead of client, as client is actually unbound
      when the process-filter lambda runs.  (i.e. This isn't Scheme code!)

-----------------------------------------------------------------------

Summary of changes:
 emacs/gds-scheme.el |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/emacs/gds-scheme.el b/emacs/gds-scheme.el
index 798b107..bb605c3 100755
--- a/emacs/gds-scheme.el
+++ b/emacs/gds-scheme.el
@@ -206,8 +206,7 @@ Emacs to display an error or trap so that the user can 
debug it."
                               "-q"
                               "--debug"
                               "-c"
-                              code))
-         (client nil))
+                              code)))
     ;; Note that this process can be killed automatically on Emacs
     ;; exit.
     (process-kill-without-query proc)
@@ -217,17 +216,18 @@ Emacs to display an error or trap so that the user can 
debug it."
                           (if (process-buffer proc)
                               (with-current-buffer (process-buffer proc)
                                 (insert string)
-                               (or client
+                               (or gds-client
                                    (save-excursion
                                      (goto-char (point-min))
-                                     (setq client (condition-case nil
-                                                      (read (current-buffer))
-                                                    (error nil)))))))))
+                                     (setq gds-client
+                                           (condition-case nil
+                                               (read (current-buffer))
+                                             (error nil)))))))))
     ;; Accept output from the new process until we have its number.
-    (while (not client)
+    (while (not (with-current-buffer (process-buffer proc) gds-client))
       (accept-process-output proc))
     ;; Return the new process's client number.
-    client))
+    (with-current-buffer (process-buffer proc) gds-client)))
 
 ;;;; Evaluating code.
 


hooks/post-receive
-- 
GNU Guile