mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

remove use-emacs-interface check from ice-9 readline

Browse source 
* guile-readline/ice-9/readline.scm (activate-readline): Remove check
  for use-emacs-interface in guile-user, an interface that was removed.
This commit is contained in:
Andy Wingo 2010-07-09 10:57:51 +02:00
parent ff10e93c3f
commit adb825b678
1 changed files with 12 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

27
guile-readline/ice-9/readline.scm
View file

@ -1,6 +1,6 @@
;;;; readline.scm --- support functions for command-line editing ;;;; 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 ;;;; 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 ;;;; it under the terms of the GNU General Public License as published by
@ -201,10 +201,7 @@
(set! *readline-completion-function* old-completer))))) (set! *readline-completion-function* old-completer)))))
(define-public (activate-readline) (define-public (activate-readline)
(if (and (isatty? (current-input-port)) (if (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)))) (let ((repl-read-hook (lambda () (run-hook before-read-hook))))
(set-current-input-port (readline-port)) (set-current-input-port (readline-port))
(set! repl-reader (set! repl-reader
@ -213,16 +210,16 @@
(outer-continuation-prompt continuation-prompt) (outer-continuation-prompt continuation-prompt)
(outer-read-hook read-hook)) (outer-read-hook read-hook))
(dynamic-wind (dynamic-wind
(lambda () (lambda ()
(set-buffered-input-continuation?! (readline-port) #f) (set-buffered-input-continuation?! (readline-port) #f)
(set-readline-prompt! repl-prompt "... ") (set-readline-prompt! repl-prompt "... ")
(set-readline-read-hook! repl-read-hook)) (set-readline-read-hook! repl-read-hook))
(lambda () ((or (and (pair? reader) (car reader)) (lambda () ((or (and (pair? reader) (car reader))
(fluid-ref current-reader) (fluid-ref current-reader)
read))) read)))
(lambda () (lambda ()
(set-readline-prompt! outer-new-input-prompt outer-continuation-prompt) (set-readline-prompt! outer-new-input-prompt outer-continuation-prompt)
(set-readline-read-hook! outer-read-hook)))))) (set-readline-read-hook! outer-read-hook))))))
(set! (using-readline?) #t)))) (set! (using-readline?) #t))))
(define-public (make-completion-function strings) (define-public (make-completion-function strings)