readline repl-reader falls back to boot-9 definition for other ports

[bpt/guile.git] / guile-readline / ice-9 / readline.scm

diff --git a/guile-readline/ice-9/readline.scm b/guile-readline/ice-9/readline.scm
index c35602f..4879bab 100644 (file)
--- a/guile-readline/ice-9/readline.scm
+++ b/guile-readline/ice-9/readline.scm
@@ -1,10 +1,10 @@
 ;;;; readline.scm --- support functions for command-line editing
 ;;;;
-;;;;   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2006 Free Software Foundation, Inc.
+;;;;   Copyright (C) 1997, 1999, 2000, 2001, 2002, 2006, 2009, 2010 Free Software Foundation, Inc.
 ;;;; 
 ;;;; This program is free software; you can redistribute it and/or modify
 ;;;; it under the terms of the GNU General Public License as published by
-;;;; the Free Software Foundation; either version 2, or (at your option)
+;;;; the Free Software Foundation; either version 3, or (at your option)
 ;;;; any later version.
 ;;;; 
 ;;;; This program is distributed in the hope that it will be useful,
@@ -24,11 +24,15 @@
 \f
 
 (define-module (ice-9 readline)
-  :use-module (ice-9 session)
-  :use-module (ice-9 regex)
-  :use-module (ice-9 buffered-input)
-  :no-backtrace
-  :export (filename-completion-function))
+  #:use-module (ice-9 session)
+  #:use-module (ice-9 regex)
+  #:use-module (ice-9 buffered-input)
+  #:no-backtrace
+  #:export (filename-completion-function
+           add-history
+           read-history
+           write-history
+           clear-history))
 
 \f
 
@@ -169,24 +173,22 @@
 (define-public (set-readline-read-hook! h)
   (set! read-hook h))
 
+(define-public apropos-completion-function
+  (let ((completions '()))
+    (lambda (text cont?)
+      (if (not cont?)
+          (set! completions
+                (map symbol->string
+                     (apropos-internal
+                      (string-append "^" (regexp-quote text))))))
+      (if (null? completions)
+          #f
+          (let ((retval (car completions)))
+            (begin (set! completions (cdr completions))
+                   retval))))))
+
 (if (provided? 'regex)
-    (begin
-      (define-public apropos-completion-function
-       (let ((completions '()))
-         (lambda (text cont?)
-           (if (not cont?)
-               (set! completions
-                     (map symbol->string
-                          (apropos-internal
-                           (string-append "^" (regexp-quote text))))))
-           (if (null? completions)
-               #f
-               (let ((retval (car completions)))
-                 (begin (set! completions (cdr completions))
-                        retval))))))
-
-      (set! *readline-completion-function* apropos-completion-function)
-      ))
+    (set! *readline-completion-function* apropos-completion-function))
 
 (define-public (with-readline-completion-function completer thunk)
   "With @var{completer} as readline completion function, call @var{thunk}."
@@ -198,28 +200,33 @@
        (lambda ()
          (set! *readline-completion-function* old-completer)))))
 
+(define readline-repl-reader
+  (let ((boot-9-repl-reader repl-reader))
+    (lambda* (repl-prompt #:optional (reader (fluid-ref current-reader)))
+      (let ((port (current-input-port)))
+        (if (eq? port (readline-port))
+            (let ((outer-new-input-prompt new-input-prompt)
+                  (outer-continuation-prompt continuation-prompt)
+                  (outer-read-hook read-hook))
+              (dynamic-wind
+                (lambda ()
+                  (set-buffered-input-continuation?! port #f)
+                  (set-readline-prompt! repl-prompt "... ")
+                  (set-readline-read-hook! (lambda ()
+                                             (run-hook before-read-hook))))
+                (lambda () ((or reader read) port))
+                (lambda ()
+                  (set-readline-prompt! outer-new-input-prompt
+                                        outer-continuation-prompt)
+                  (set-readline-read-hook! outer-read-hook))))
+            (boot-9-repl-reader repl-prompt reader))))))
+
 (define-public (activate-readline)
-  (if (and (isatty? (current-input-port))
-          (not (let ((guile-user-module (resolve-module '(guile-user))))
-                 (and (module-defined? guile-user-module 'use-emacs-interface)
-                      (module-ref guile-user-module 'use-emacs-interface)))))
-      (let ((repl-read-hook (lambda () (run-hook before-read-hook))))
-       (set-current-input-port (readline-port))
-       (set! repl-reader
-             (lambda (repl-prompt)
-               (let ((outer-new-input-prompt new-input-prompt)
-                     (outer-continuation-prompt continuation-prompt)
-                     (outer-read-hook read-hook))
-                 (dynamic-wind
-                     (lambda ()
-                       (set-buffered-input-continuation?! (readline-port) #f)
-                       (set-readline-prompt! repl-prompt "... ")
-                       (set-readline-read-hook! repl-read-hook))
-                     (lambda () ((or (fluid-ref current-reader) read)))
-                     (lambda ()
-                       (set-readline-prompt! outer-new-input-prompt outer-continuation-prompt)
-                       (set-readline-read-hook! outer-read-hook))))))
-       (set! (using-readline?) #t))))
+  (if (isatty? (current-input-port))
+      (begin
+        (set-current-input-port (readline-port))
+        (set! repl-reader readline-repl-reader)
+        (set! (using-readline?) #t))))
 
 (define-public (make-completion-function strings)
   "Construct and return a completion function for a list of strings.