summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guile-readline/readline.c3
-rw-r--r--guile-readline/readline.h3
-rw-r--r--ice-9/optargs.scm3
-rw-r--r--ice-9/readline.scm153
-rw-r--r--ice-9/regex.scm3
-rw-r--r--ice-9/session.scm3
-rw-r--r--ice-9/syncase.scm3
-rw-r--r--libguile/iselect.h3
-rw-r--r--libguile/regex-posix.c3
-rw-r--r--libguile/regex-posix.h3
10 files changed, 18 insertions, 162 deletions
diff --git a/guile-readline/readline.c b/guile-readline/readline.c
index 5e8e045ca..28bac5418 100644
--- a/guile-readline/readline.c
+++ b/guile-readline/readline.c
@@ -14,7 +14,8 @@
*
* 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
*/
diff --git a/guile-readline/readline.h b/guile-readline/readline.h
index 26463e9ec..1911f66de 100644
--- a/guile-readline/readline.h
+++ b/guile-readline/readline.h
@@ -15,7 +15,8 @@
*
* 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
*/
diff --git a/ice-9/optargs.scm b/ice-9/optargs.scm
index 83951ad19..d9687b47e 100644
--- a/ice-9/optargs.scm
+++ b/ice-9/optargs.scm
@@ -14,7 +14,8 @@
;;;;
;;;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
;;;;
;;;; Contributed by Maciej Stachowiak <mstachow@alum.mit.edu>
diff --git a/ice-9/readline.scm b/ice-9/readline.scm
index a544fec51..e69de29bb 100644
--- a/ice-9/readline.scm
+++ b/ice-9/readline.scm
@@ -1,153 +0,0 @@
-;;;; readline.scm --- support functions for command-line editing
-;;;;
-;;;; Copyright (C) 1997 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, 675 Mass Ave, Cambridge, MA 02139, USA.
-;;;;
-;;;; Contributed by Daniel Risacher <risacher@worldnet.att.net>.
-;;;; Extensions based upon code by
-;;;; Andrew Archibald <aarchiba@undergrad.math.uwaterloo.ca>.
-
-(define-module (ice-9 readline)
- :use-module (ice-9 session)
- :use-module (ice-9 regex))
-
-;;; MDJ 980513 <djurfeldt@nada.kth.se>:
-;;; There should probably be low-level support instead of this code.
-
-(define prompt "")
-(define prompt2 "")
-(define input-port (current-input-port))
-(define output-port (current-output-port))
-(define read-hook #f)
-
-(define (make-readline-port)
- (let ((read-string "")
- (string-index -1))
- (letrec ((get-character
- (lambda ()
- (cond
- ((eof-object? read-string)
- read-string)
- ((>= string-index (string-length read-string))
- (begin
- (set! string-index -1)
- #\nl))
- ((= string-index -1)
- (begin
- (set! read-string
- (%readline (if (string? prompt)
- prompt
- (prompt))
- input-port
- output-port
- read-hook))
- (set! string-index 0)
- (if (not (eof-object? read-string))
- (begin
- (or (string=? read-string "")
- (begin
- (add-history read-string)
- (set! prompt prompt2)))
- (get-character))
- read-string)))
- (else
- (let ((res (string-ref read-string string-index)))
- (set! string-index (+ 1 string-index))
- res))))))
- (make-soft-port
- (vector write-char display #f get-character #f)
- "rw"))))
-
-;;; 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)))))
- 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 orginal readline procedure.
-(if (not (defined? '%readline))
- (begin
- (define-public %readline readline)
- (variable-set! (builtin-variable 'readline)
- (lambda 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)
- (set! input-port p))
-
-(define-public (set-readline-output-port! p)
- (set! output-port p))
-
-(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))))))
-
-(set! *readline-completion-function* apropos-completion-function)
diff --git a/ice-9/regex.scm b/ice-9/regex.scm
index d2f7b309d..e4d9494c3 100644
--- a/ice-9/regex.scm
+++ b/ice-9/regex.scm
@@ -12,7 +12,8 @@
;;;;
;;;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
;;;;
;;;; POSIX regex support functions.
diff --git a/ice-9/session.scm b/ice-9/session.scm
index 6d8e58b5a..e47190f9e 100644
--- a/ice-9/session.scm
+++ b/ice-9/session.scm
@@ -12,7 +12,8 @@
;;;;
;;;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
;;;;
diff --git a/ice-9/syncase.scm b/ice-9/syncase.scm
index d17c28284..a1f5ac775 100644
--- a/ice-9/syncase.scm
+++ b/ice-9/syncase.scm
@@ -12,7 +12,8 @@
;;;;
;;;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;;;; the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+;;;; Boston, MA 02111-1307 USA
;;;;
diff --git a/libguile/iselect.h b/libguile/iselect.h
index 21ebe620c..48f38e970 100644
--- a/libguile/iselect.h
+++ b/libguile/iselect.h
@@ -17,7 +17,8 @@
*
* 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c
index aa507b097..167542fa4 100644
--- a/libguile/regex-posix.c
+++ b/libguile/regex-posix.c
@@ -12,7 +12,8 @@
*
* 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.
diff --git a/libguile/regex-posix.h b/libguile/regex-posix.h
index 76a0d32a6..3290ffcf5 100644
--- a/libguile/regex-posix.h
+++ b/libguile/regex-posix.h
@@ -17,7 +17,8 @@
*
* 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+ * the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+ * Boston, MA 02111-1307 USA
*
* As a special exception, the Free Software Foundation gives permission
* for additional uses of the text contained in its release of GUILE.