[librep: 5/5] Merge branch 'teika'



commit 1a36ce0a8cfab70e1be9317dc1d916b8c9395028
Merge: 45f6396 235d76d
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Tue Jan 5 10:44:54 2010 +0100

    Merge branch 'teika'
    
    Conflicts:
    	ChangeLog

 ChangeLog                               |   63 ++++++++++++++++++++++++
 TODO                                    |    6 +-
 intl/l10nflist.c                        |    4 +-
 lisp/rep/data.jl                        |    8 ++--
 lisp/rep/data/trie.jl                   |    6 +-
 lisp/rep/io/file-handlers/remote/ftp.jl |   16 +++---
 lisp/rep/io/file-handlers/remote/rcp.jl |    4 +-
 lisp/rep/io/file-handlers/remote/rep.jl |   14 +++---
 lisp/rep/io/file-handlers/tar.jl        |   10 ++--
 lisp/rep/lang/doc.jl                    |    4 +-
 lisp/rep/lang/interpreter.jl            |   18 ++++----
 lisp/rep/module-system.jl               |    6 +-
 lisp/rep/threads/condition-variable.jl  |    2 +-
 lisp/rep/threads/message-port.jl        |    2 +-
 lisp/rep/util/date.jl                   |    2 +-
 lisp/rep/util/repl.jl                   |    4 +-
 lisp/rep/vm/compiler.jl                 |    4 +-
 lisp/rep/vm/compiler/basic.jl           |    8 ++--
 lisp/rep/vm/compiler/bindings.jl        |    4 +-
 lisp/rep/vm/compiler/modules.jl         |    6 +-
 lisp/rep/vm/compiler/rep.jl             |    7 +--
 lisp/rep/vm/compiler/utils.jl           |   12 ++--
 lisp/rep/www/cgi-get.jl                 |    2 +-
 lisp/rep/www/quote-url.jl               |    2 +-
 man/interface.texi                      |    5 ++
 man/lang.texi                           |   81 ++++++++++++++----------------
 man/news.texi                           |   16 ++++++
 src/bytecodes.h                         |    6 +-
 src/continuations.c                     |   12 ++--
 src/datums.c                            |    6 +-
 src/ffi.c                               |    2 +-
 src/files.c                             |   18 ++++----
 src/find.c                              |    6 +-
 src/fluids.c                            |    6 +-
 src/gettext.c                           |    2 +-
 src/lisp.c                              |    4 +-
 src/lispmach.c                          |    4 +-
 src/lispmach.h                          |    4 +-
 src/numbers.c                           |   12 ++--
 src/readline.c                          |    2 +-
 src/record-profile.c                    |    8 ++--
 src/rep-remote.c                        |    6 +-
 src/rep-xgettext.jl                     |    2 +-
 src/rep_gh.h                            |    2 +-
 src/rep_lisp.h                          |   44 ++++++++--------
 src/rep_regexp.h                        |    2 +-
 src/repgdbm.c                           |    2 +-
 src/repint.h                            |   12 ++--
 src/repsdbm.c                           |    2 +-
 src/safemach.c                          |    4 +-
 src/sockets.c                           |   16 +++---
 src/structures.c                        |   14 +++---
 src/symbols.c                           |    8 ++--
 src/tables.c                            |    8 ++--
 src/timers.c                            |    8 ++--
 src/unix_files.c                        |    6 +-
 src/unix_main.c                         |   10 ++--
 src/unix_processes.c                    |    2 +-
 src/values.c                            |   20 ++++----
 59 files changed, 325 insertions(+), 251 deletions(-)
---
diff --cc ChangeLog
index b3ae15e,8a6e094..efdc626
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,66 +1,74 @@@
+ 2010-01-05  Teika Kazura <teika lavabit com>
+ 	* TODO
+ 	* intl/l10nflist.c
+ 	* lisp/rep/data.jl
+ 	* lisp/rep/data/trie.jl
+ 	* lisp/rep/io/file-handlers/remote/ftp.jl
+ 	* lisp/rep/io/file-handlers/remote/rcp.jl
+ 	* lisp/rep/io/file-handlers/remote/rep.jl
+ 	* lisp/rep/io/file-handlers/tar.jl
+ 	* lisp/rep/lang/doc.jl
+ 	* lisp/rep/lang/interpreter.jl
+ 	* lisp/rep/module-system.jl
+ 	* lisp/rep/threads/condition-variable.jl
+ 	* lisp/rep/threads/message-port.jl
+ 	* lisp/rep/util/date.jl
+ 	* lisp/rep/util/repl.jl
+ 	* lisp/rep/vm/compiler.jl
+ 	* lisp/rep/vm/compiler/basic.jl
+ 	* lisp/rep/vm/compiler/bindings.jl
+ 	* lisp/rep/vm/compiler/modules.jl
+ 	* lisp/rep/vm/compiler/rep.jl
+ 	* lisp/rep/vm/compiler/utils.jl
+ 	* lisp/rep/www/cgi-get.jl
+ 	* lisp/rep/www/quote-url.jl
+ 	* src/bytecodes.h
+ 	* src/continuations.c
+ 	* src/datums.c
+ 	* src/ffi.c
+ 	* src/files.c
+ 	* src/find.c
+ 	* src/fluids.c
+ 	* src/gettext.c
+ 	* src/lisp.c
+ 	* src/lispmach.c
+ 	* src/lispmach.h
+ 	* src/numbers.c
+ 	* src/readline.c
+ 	* src/record-profile.c
+ 	* src/rep-remote.c
+ 	* src/rep-xgettext.jl
+ 	* src/rep_gh.h
+ 	* src/rep_lisp.h
+ 	* src/rep_regexp.h
+ 	* src/repgdbm.c
+ 	* src/repint.h
+ 	* src/repsdbm.c
+ 	* src/safemach.c
+ 	* src/sockets.c
+ 	* src/structures.c
+ 	* src/symbols.c
+ 	* src/tables.c
+ 	* src/timers.c
+ 	* src/unix_files.c
+ 	* src/unix_main.c
+ 	* src/unix_processes.c
+ 	* src/values.c: Deleted ctrl-l
+ 
+ 	* man/interface.texi
+ 	* man/lang.texi: Minor doc improvements.
+ 
+ 	* lisp/rep/vm/compiler/rep.jl
+ 	* man/news.texi: Bugfix in byte compiler of lost docstring. See git log for the details.
+ 
 +2010-01-04  Christopher Bratusek <zanghar freenet de>
 +	* debian/librep9.symbols
 +	* src/repint.h
 +	* src/repint_subrs.h
 +	* src/files.c
 +	* src/unix_files.c
 +	* src/librep.sym: added file-uid-p and file-gid-p
 +
  2010-01-03  Christopher Bratusek <zanghar freenet de>
  	* debian/rules: don't remove config.{guess,sub} on rules/clean
  



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]