diff options
| author | Andy Wingo <wingo@pobox.com> | 2010-07-09 10:57:51 +0200 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2010-07-09 17:05:25 +0200 |
| commit | adb825b6780b52a19291420c8699900d56de748d (patch) | |
| tree | eda4adb7b200914aacfc125464d4ad93d4a2b429 /guile-readline | |
| parent | ff10e93c3f2524a60791d79046a1363d10c5fe5c (diff) | |
remove use-emacs-interface check from ice-9 readline
* guile-readline/ice-9/readline.scm (activate-readline): Remove check
for use-emacs-interface in guile-user, an interface that was removed.
Diffstat (limited to 'guile-readline')
| -rw-r--r-- | guile-readline/ice-9/readline.scm | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/guile-readline/ice-9/readline.scm b/guile-readline/ice-9/readline.scm index 4766e619e..b7aee9149 100644 --- a/guile-readline/ice-9/readline.scm +++ b/guile-readline/ice-9/readline.scm @@ -1,6 +1,6 @@ ;;;; readline.scm --- support functions for command-line editing ;;;; -;;;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2006, 2009 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 @@ -201,10 +201,7 @@ (set! *readline-completion-function* old-completer))))) (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))))) + (if (isatty? (current-input-port)) (let ((repl-read-hook (lambda () (run-hook before-read-hook)))) (set-current-input-port (readline-port)) (set! repl-reader @@ -213,16 +210,16 @@ (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 (and (pair? reader) (car reader)) - (fluid-ref current-reader) - read))) - (lambda () - (set-readline-prompt! outer-new-input-prompt outer-continuation-prompt) - (set-readline-read-hook! outer-read-hook)))))) + (lambda () + (set-buffered-input-continuation?! (readline-port) #f) + (set-readline-prompt! repl-prompt "... ") + (set-readline-read-hook! repl-read-hook)) + (lambda () ((or (and (pair? reader) (car reader)) + (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)))) (define-public (make-completion-function strings) |