Author: yamakenz
Date: Fri Aug 17 17:00:44 2007
New Revision: 4857
Modified:
trunk/scm/uim-sh.scm
trunk/uim/editline.c
Log:
* uim/editline.c
- (uim_editline_readline, editline_readline): Rename
uim_editline_readline() to editline_readline()
- (uim_plugin_instance_init):
* Follow the renaming
* Rename uim-editline-readline to editline-readline
* scm/uim-sh.scm
- (uim-editline-read, editline-read):
* Rename uim-editline-read to editline-read
* Follow the renaming of uim-editline-readline
- (uim-sh): Follow the renaming
Modified: trunk/scm/uim-sh.scm
==============================================================================
--- trunk/scm/uim-sh.scm (original)
+++ trunk/scm/uim-sh.scm Fri Aug 17 17:00:44 2007
@@ -140,7 +140,7 @@
(cdr args))) ;; drop the command name
(script (safe-car file.args))
(my-read (if (provided? "editline")
- uim-editline-read
+ editline-read
read))
(EX_OK 0)
(EX_SOFTWARE 70))
@@ -189,14 +189,14 @@
%EDITLINE-PARTIAL-EXPR))
(apply read args))))
-(define uim-editline-read
+(define editline-read
(let ((p (open-input-string ""))
(buf ""))
(lambda ()
(let ((expr (%editline-partial-read p)))
(if (or (eof-object? expr)
(eq? expr %EDITLINE-PARTIAL-EXPR))
- (let ((line (uim-editline-readline)))
+ (let ((line (editline-readline)))
(if (eof-object? line)
line
(begin
@@ -204,7 +204,7 @@
(string-append buf line)
line))
(set! p (open-input-string buf))
- (uim-editline-read))))
+ (editline-read))))
(begin
(set! buf "")
expr))))))
Modified: trunk/uim/editline.c
==============================================================================
--- trunk/uim/editline.c (original)
+++ trunk/uim/editline.c Fri Aug 17 17:00:44 2007
@@ -43,7 +43,7 @@
static EditLine *el;
static History *hist;
static HistEvent hev;
-static uim_lisp uim_editline_readline(void);
+static uim_lisp editline_readline(void);
static char *prompt(EditLine *e);
void
@@ -58,7 +58,7 @@
el_set(el, EL_HIST, history, hist);
el_source(el, NULL);
- uim_scm_init_subr_0("uim-editline-readline", uim_editline_readline);
+ uim_scm_init_subr_0("editline-readline", editline_readline);
uim_scm_callf("provide", "s", "editline");
}
@@ -71,7 +71,7 @@
}
static uim_lisp
-uim_editline_readline(void)
+editline_readline(void)
{
const char *line;
int count = 0;
