* readline.scm (activate-readline): Look for use-emacs-interface
authorMikael Djurfeldt <djurfeldt@nada.kth.se>
Mon, 21 Oct 2002 11:22:04 +0000 (11:22 +0000)
committerMikael Djurfeldt <djurfeldt@nada.kth.se>
Mon, 21 Oct 2002 11:22:04 +0000 (11:22 +0000)
option in the guile-user module instead of the-root-module.

guile-readline/ChangeLog
guile-readline/readline.scm

index 8f568e2..6584e82 100644 (file)
@@ -1,3 +1,8 @@
+2002-10-21  Mikael Djurfeldt  <mdj@linnaeus>
+
+       * readline.scm (activate-readline): Look for use-emacs-interface
+       option in the guile-user module instead of the-root-module.
+
 2002-04-30  Marius Vollmer  <marius.vollmer@uni-dortmund.de>
 
        * autogen.sh: Invoke plain aclocal instead of guile-aclocal.sh.
dissimilarity index 100%
index cae45e3..e69de29 100644 (file)
@@ -1,217 +0,0 @@
-;;;; readline.scm --- support functions for command-line editing
-;;;;
-;;;;   Copyright (C) 1997, 1999, 2000, 2001 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)
-;;;; any later version.
-;;;; 
-;;;; This program is distributed in the hope that it will be useful,
-;;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;;; GNU General Public License for more details.
-;;;; 
-;;;; You should have received a copy of the GNU General Public License
-;;;; along with this software; see the file COPYING.  If not, write to
-;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-;;;; Boston, MA 02111-1307 USA
-;;;; 
-;;;; Contributed by Daniel Risacher <risacher@worldnet.att.net>.
-;;;; Extensions based upon code by
-;;;; Andrew Archibald <aarchiba@undergrad.math.uwaterloo.ca>.
-
-\f
-
-(define-module (ice-9 readline)
-  :use-module (ice-9 session)
-  :use-module (ice-9 regex)
-  :use-module (ice-9 buffered-input)
-  :no-backtrace)
-
-\f
-
-;;; Dynamically link the glue code for accessing the readline library,
-;;; but only when it isn't already present.
-
-(if (not (provided? 'readline))
-    (load-extension "libguilereadline" "scm_init_readline"))
-
-(if (not (provided? 'readline))
-    (scm-error 'misc-error
-              #f
-              "readline is not provided in this Guile installation"
-              '()
-              '()))
-
-\f
-
-;;; Run-time options
-
-(export
- readline-options
- readline-enable
- readline-disable)
-(export-syntax
- readline-set!)
-
-(define-option-interface
-  (readline-options-interface
-   (readline-options readline-enable readline-disable)
-   (readline-set!)))
-
-\f
-
-;;; MDJ 980513 <djurfeldt@nada.kth.se>:
-;;; There should probably be low-level support instead of this code.
-
-;;; Dirk:FIXME:: If the-readline-port, input-port or output-port are closed,
-;;; guile will enter an endless loop or crash.
-
-(define prompt "")
-(define prompt2 "")
-(define input-port (current-input-port))
-(define output-port (current-output-port))
-(define read-hook #f)
-
-(define (make-readline-port)
-  (make-line-buffered-input-port (lambda (continuation?)
-                                   (let* ((prompt (if continuation?
-                                                      prompt2
-                                                      prompt))
-                                          (str (%readline (if (string? prompt)
-                                                              prompt
-                                                              (prompt))
-                                                          input-port
-                                                          output-port
-                                                          read-hook)))
-                                     (or (eof-object? str)
-                                         (string=? str "")
-                                         (add-history str))
-                                     str))))
-
-;;; We only create one readline port.  There's no point in having
-;;; more, since they would all share the tty and history ---
-;;; everything except the prompt.  And don't forget the
-;;; compile/load/run phase distinctions.  Also, the readline library
-;;; isn't reentrant.
-(define the-readline-port #f)
-
-(define history-variable "GUILE_HISTORY")
-(define history-file (string-append (getenv "HOME") "/.guile_history"))
-
-(define-public readline-port
-  (let ((do (lambda (r/w)
-             (if (memq 'history-file (readline-options-interface))
-                 (r/w (or (getenv history-variable)
-                          history-file))))))
-    (lambda ()
-      (if (not the-readline-port)
-         (begin
-           (do read-history) 
-           (set! the-readline-port (make-readline-port))
-           (add-hook! exit-hook (lambda () 
-                                  (do write-history)
-                                  (clear-history)))))
-      the-readline-port)))
-
-;;; The user might try to use readline in his programs.  It then
-;;; becomes very uncomfortable that the current-input-port is the
-;;; readline port...
-;;;
-;;; Here, we detect this situation and replace it with the
-;;; underlying port.
-;;;
-;;; %readline is the low-level readline procedure.
-
-(define-public (readline . args)
-  (let ((prompt prompt)
-       (inp input-port))
-    (cond ((not (null? args))
-          (set! prompt (car args))
-          (set! args (cdr args))
-          (cond ((not (null? args))
-                 (set! inp (car args))
-                 (set! args (cdr args))))))
-    (apply %readline
-          prompt
-          (if (eq? inp the-readline-port)
-              input-port
-              inp)
-          args)))
-
-(define-public (set-readline-prompt! p . rest)
-  (set! prompt p)
-  (if (not (null? rest))
-      (set! prompt2 (car rest))))
-
-(define-public (set-readline-input-port! p)
-  (cond ((or (not (file-port? p)) (not (input-port? p)))
-        (scm-error 'wrong-type-arg "set-readline-input-port!"
-                   "Not a file input port: ~S" (list p) #f))
-       ((port-closed? p)
-        (scm-error 'misc-error "set-readline-input-port!"
-                   "Port not open: ~S" (list p) #f))
-       (else
-        (set! input-port p))))
-
-(define-public (set-readline-output-port! p)
-  (cond ((or (not (file-port? p)) (not (output-port? p)))
-        (scm-error 'wrong-type-arg "set-readline-input-port!"
-                   "Not a file output port: ~S" (list p) #f))
-       ((port-closed? p)
-        (scm-error 'misc-error "set-readline-output-port!"
-                   "Port not open: ~S" (list p) #f))
-       (else
-        (set! output-port p))))
-
-(define-public (set-readline-read-hook! h)
-  (set! read-hook h))
-
-(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)
-      ))
-
-(define-public (with-readline-completion-function completer thunk)
-  "With @var{completer} as readline completion function, call @var{thunk}."
-  (let ((old-completer *readline-completion-function*))
-    (dynamic-wind
-       (lambda ()
-         (set! *readline-completion-function* completer))
-       thunk
-       (lambda ()
-         (set! *readline-completion-function* old-completer)))))
-
-(define-public (activate-readline)
-  (if (and (isatty? (current-input-port))
-          (not (and (module-defined? the-root-module 'use-emacs-interface)
-                    (module-ref the-root-module 'use-emacs-interface))))
-      (let ((read-hook (lambda () (run-hook before-read-hook))))
-       (set-current-input-port (readline-port))
-       (set! repl-reader
-             (lambda (prompt)
-               (dynamic-wind
-                   (lambda ()
-                      (set-buffered-input-continuation?! (readline-port) #f)
-                     (set-readline-prompt! prompt "... ")
-                     (set-readline-read-hook! read-hook))
-                   (lambda () (read))
-                   (lambda ()
-                     (set-readline-prompt! "" "")
-                     (set-readline-read-hook! #f)))))
-       (set! (using-readline?) #t))))