NOTE: This patch has been committed.
This patch sync's riece to the latest upstream version 2.0.2.
xemacs-packages source patch:
Diff command: cvs -q diff -u
Files affected: xemacs-packages/riece/lisp/test/Makefile.am
xemacs-packages/riece/lisp/url-riece.el xemacs-packages/riece/lisp/riece-version.el
xemacs-packages/riece/lisp/riece-user.el xemacs-packages/riece/lisp/riece-unread.el
xemacs-packages/riece/lisp/riece-server.el xemacs-packages/riece/lisp/riece-options.el
xemacs-packages/riece/lisp/riece-misc.el xemacs-packages/riece/lisp/riece-irc.el
xemacs-packages/riece/lisp/riece-globals.el xemacs-packages/riece/lisp/riece-commands.el
xemacs-packages/riece/lisp/riece-channel.el xemacs-packages/riece/lisp/riece-async.el
xemacs-packages/riece/lisp/riece-alias.el xemacs-packages/riece/lisp/riece-addon.el
xemacs-packages/riece/lisp/riece-addon-modules.el xemacs-packages/riece/lisp/riece-300.el
xemacs-packages/riece/lisp/Makefile.am xemacs-packages/riece/lisp/COMPILE
xemacs-packages/riece/doc/riece-ja.texi xemacs-packages/riece/doc/riece-en.texi
xemacs-packages/riece/doc/HACKING.ja xemacs-packages/riece/doc/HACKING
xemacs-packages/rie!
ce/package-info.in xemacs-packages/riece/configure.ac xemacs-packages/riece/NEWS.ja
xemacs-packages/riece/NEWS xemacs-packages/riece/Makefile xemacs-packages/riece/AUTHORS
xemacs-packages/auctex/CHANGES
Index: xemacs-packages/auctex/CHANGES
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/auctex/CHANGES,v
retrieving revision 1.10
diff -u -r1.10 CHANGES
--- xemacs-packages/auctex/CHANGES 11 Feb 2005 19:02:00 -0000 1.10
+++ xemacs-packages/auctex/CHANGES 20 Nov 2005 07:40:30 -0000
@@ -1,6 +1,3 @@
-Changes and New Features in AUCTeX
-**********************************
-
News in 11.55
=============
Index: xemacs-packages/riece/AUTHORS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/AUTHORS,v
retrieving revision 1.2
diff -u -r1.2 AUTHORS
--- xemacs-packages/riece/AUTHORS 30 Aug 2005 02:34:30 -0000 1.2
+++ xemacs-packages/riece/AUTHORS 20 Nov 2005 07:40:33 -0000
@@ -4,11 +4,13 @@
Riece is mainly written by Daiki Ueno <ueno(a)unixuser.org>.
The development of Riece has started to redesign the Liece IRC client.
-Liece is based on Irchat (version 3.01) which has been distributed
-under GNU General Public License version 1 or later. Liece was mainly
-written by the same author of Riece. Tor Lillqvist <tml(a)iki.fi> is
-the original author of Irchat. See doc/irchat-copyright.el for the
-original copyright statement of Irchat.
+Liece was mainly written by the same author of Riece. Liece is based
+on Irchat (version 3.01) which has been distributed under GNU General
+Public License version 1 or later. Tor Lillqvist <tml(a)iki.fi> is the
+original author of Irchat. The current Riece source code, however,
+doesn't contain any code from Irchat. For the historical reason, the
+original copyright statement of Irchat is filed under
+doc/irchat-copyright.el.
Riece has many code borrowed from other GPL'ed elisp packages such as
Gnus, Emacs-w3m, ECB, and SEMI. I would like to thank the developers
@@ -19,3 +21,5 @@
TAKAHASHI Kaoru <kaoru(a)kaisei.org>
OHASHI Akira <bg66(a)koka-in.org>
Yoichi NAKAYAMA <yoichi(a)geiin.org>
+Masatake YAMATO <jet(a)gyve.org> (riece-yank.el)
+Steve Youngs <steve(a)sxemacs.org> (riece-xfaceb.el)
\ No newline at end of file
Index: xemacs-packages/riece/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/ChangeLog,v
retrieving revision 1.21
diff -u -r1.21 ChangeLog
--- xemacs-packages/riece/ChangeLog 31 Aug 2005 13:15:50 -0000 1.21
+++ xemacs-packages/riece/ChangeLog 20 Nov 2005 07:40:33 -0000
@@ -1,3 +1,13 @@
+2005-11-19 Daiki Ueno <ueno(a)unixuser.org>
+
+ * Riece: Version 2.0.2 released.
+ * configure.ac: Bump up version to 2.0.2.
+
+2005-09-29 Daiki Ueno <ueno(a)unixuser.org>
+
+ * Riece: Version 2.0.1 released.
+ * configure.ac: Bump up version to 2.0.1.
+
2005-08-31 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.20 released.
Index: xemacs-packages/riece/Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- xemacs-packages/riece/Makefile 31 Aug 2005 13:15:50 -0000 1.21
+++ xemacs-packages/riece/Makefile 20 Nov 2005 07:40:33 -0000
@@ -20,37 +20,37 @@
# This XEmacs package contains the riece IRC client package
VERSION = 1.20
-AUTHOR_VERSION = 2.0.0
+AUTHOR_VERSION = 2.0.2
MAINTAINER = Daiki Ueno <ueno(a)unixuser.org>
PACKAGE = riece
PKG_TYPE = regular
-REQUIRES = xemacs-base mail-lib
+REQUIRES = xemacs-base mail-lib bbdb
CATEGORY = standard
include ../../Local.rules.inc
-ELCS = lisp/riece-000.elc lisp/riece-200.elc lisp/riece-300.elc \
- lisp/riece-400.elc lisp/riece-500.elc lisp/riece-addon-modules.elc \
- lisp/riece-addon.elc lisp/riece-alias.elc lisp/riece-async.elc \
- lisp/riece-biff.elc lisp/riece-button.elc lisp/riece-channel.elc \
- lisp/riece-coding.elc lisp/riece-commands.elc lisp/riece-compat.elc \
- lisp/riece-complete.elc lisp/riece-ctcp.elc lisp/riece-ctlseq.elc \
- lisp/riece-debug.elc lisp/riece-display.elc lisp/riece-doctor.elc \
- lisp/riece-eval-ruby.elc lisp/riece-eval.elc lisp/riece-filter.elc \
- lisp/riece-foolproof.elc lisp/riece-globals.elc lisp/riece-google.elc \
- lisp/riece-guess.elc lisp/riece-handle.elc lisp/riece-hangman.elc \
- lisp/riece-highlight.elc lisp/riece-history.elc lisp/riece-icon.elc \
- lisp/riece-identity.elc lisp/riece-ignore.elc lisp/riece-irc.elc \
- lisp/riece-kakasi.elc lisp/riece-keepalive.elc lisp/riece-keyword.elc \
- lisp/riece-layout.elc lisp/riece-log.elc lisp/riece-lsdb.elc \
- lisp/riece-menu.elc lisp/riece-message.elc lisp/riece-mini.elc \
- lisp/riece-misc.elc lisp/riece-mode.elc lisp/riece-naming.elc \
- lisp/riece-options.elc lisp/riece-rdcc.elc lisp/riece-ruby.elc \
- lisp/riece-server.elc lisp/riece-shrink-buffer.elc \
- lisp/riece-signal.elc lisp/riece-toolbar.elc lisp/riece-unread.elc \
- lisp/riece-url.elc lisp/riece-user.elc lisp/riece-version.elc \
- lisp/riece-xemacs.elc lisp/riece-xface.elc lisp/riece-yank.elc \
- lisp/riece.elc
+ELCS = lisp/riece-000.elc lisp/riece-200.elc lisp/riece-300.elc \
+lisp/riece-400.elc lisp/riece-500.elc lisp/riece-addon-modules.elc \
+lisp/riece-addon.elc lisp/riece-alias.elc lisp/riece-async.elc \
+lisp/riece-biff.elc lisp/riece-button.elc lisp/riece-cache.elc \
+lisp/riece-channel.elc lisp/riece-coding.elc lisp/riece-commands.elc \
+lisp/riece-compat.elc lisp/riece-complete.elc lisp/riece-ctcp.elc \
+lisp/riece-ctlseq.elc lisp/riece-debug.elc lisp/riece-develop.elc \
+lisp/riece-display.elc lisp/riece-doctor.elc lisp/riece-eval-ruby.elc \
+lisp/riece-eval.elc lisp/riece-filter.elc lisp/riece-foolproof.elc \
+lisp/riece-globals.elc lisp/riece-google.elc lisp/riece-guess.elc \
+lisp/riece-handle.elc lisp/riece-hangman.elc lisp/riece-highlight.elc \
+lisp/riece-history.elc lisp/riece-icon.elc lisp/riece-identity.elc \
+lisp/riece-ignore.elc lisp/riece-irc.elc lisp/riece-kakasi.elc \
+lisp/riece-keepalive.elc lisp/riece-keyword.elc lisp/riece-layout.elc \
+lisp/riece-log.elc lisp/riece-lsdb.elc lisp/riece-menu.elc \
+lisp/riece-message.elc lisp/riece-mini.elc lisp/riece-misc.elc \
+lisp/riece-mode.elc lisp/riece-naming.elc lisp/riece-options.elc \
+lisp/riece-rdcc.elc lisp/riece-ruby.elc lisp/riece-server.elc \
+lisp/riece-shrink-buffer.elc lisp/riece-signal.elc \
+lisp/riece-toolbar.elc lisp/riece-unread.elc lisp/riece-url.elc \
+lisp/riece-user.elc lisp/riece-version.elc lisp/riece-xemacs.elc \
+lisp/riece-xface.elc lisp/riece-xfaceb.elc lisp/riece-yank.elc
EXTRA_SOURCES = lisp/riece-emacs.el lisp/riece-ndcc.el \
lisp/riece-skk-kakutei.el lisp/url-riece.el
Index: xemacs-packages/riece/NEWS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/NEWS,v
retrieving revision 1.3
diff -u -r1.3 NEWS
--- xemacs-packages/riece/NEWS 30 Aug 2005 02:34:31 -0000 1.3
+++ xemacs-packages/riece/NEWS 20 Nov 2005 07:40:34 -0000
@@ -1,3 +1,19 @@
+* Major changes in 2.0.2
+
+** Fixed C-c l (riece-command-list) behavior. It didn't display
+ channel TOPIC correctly. (ueno)
+
+** Don't alter case of user/channel names when completing user
+ input. (ueno)
+
+* Major changes in 2.0.1
+
+** If there is a message in previously selected channel, Riece 2.0.0
+ doesn't treat it as an unread channel. 2.0.1 fixes it. (ueno)
+
+** New add-on riece-xfaceb.el, which displays X-Face/Colour Face in
+ IRC buffers. (Steve Youngs)
+
* Major changes in 2.0.0
** Support multiple coding-systems on a server.
@@ -538,6 +554,7 @@
* For details of changes, see the file ChangeLog.
Local variables:
+mode: text
mode: outline
paragraph-separate: "[ ]*$"
end:
Index: xemacs-packages/riece/NEWS.ja
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/NEWS.ja,v
retrieving revision 1.2
diff -u -r1.2 NEWS.ja
--- xemacs-packages/riece/NEWS.ja 30 Aug 2005 02:34:31 -0000 1.2
+++ xemacs-packages/riece/NEWS.ja 20 Nov 2005 07:40:34 -0000
@@ -1,3 +1,19 @@
+* Riece 2.0.2 の主な変更点
+
+** C-c l (riece-command-list) で、チャンネルのトピックの代わりに参加者
+ 数が表示されるバグを修正 (ueno)
+
+** ニックネームやチャンネル名の補完候補の表示で大文字小文字を保存する
+ ようにした (ueno)
+
+* Riece 2.0.1 の主な変更点
+
+** 直前に選択していたチャンネルに未読メッセージがある場合に unread マー
+ クが表示されない不具合の修正 (ueno)
+
+** 新規アドオン riece-xfaceb.el を導入。BBDB から X-Face/Face を検索し、
+ ユーザ一覧に表示する (Steve Youngs)
+
* Riece 2.0.0 の主な変更点
** チャンネル毎にエンコーディングを指定できるようにした (ueno)
@@ -537,6 +553,7 @@
* For details of changes, see the file ChangeLog.
Local variables:
+mode: text
mode: outline
paragraph-separate: "[ ]*$"
coding: iso-2022-jp
Index: xemacs-packages/riece/configure.ac
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/configure.ac,v
retrieving revision 1.7
diff -u -r1.7 configure.ac
--- xemacs-packages/riece/configure.ac 30 Aug 2005 02:34:32 -0000 1.7
+++ xemacs-packages/riece/configure.ac 20 Nov 2005 07:40:34 -0000
@@ -1,7 +1,7 @@
AC_INIT
AC_CONFIG_SRCDIR([configure.ac])
AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(riece, 2.0.0)
+AM_INIT_AUTOMAKE(riece, 2.0.2)
AC_CHECK_EMACS
AC_PATH_LISPDIR
Index: xemacs-packages/riece/package-info.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/package-info.in,v
retrieving revision 1.5
diff -u -r1.5 package-info.in
--- xemacs-packages/riece/package-info.in 30 Aug 2005 02:34:32 -0000 1.5
+++ xemacs-packages/riece/package-info.in 20 Nov 2005 07:40:34 -0000
@@ -13,7 +13,7 @@
filename FILENAME
md5sum MD5SUM
size SIZE
- provides (riece-compat riece-xemacs riece-globals riece-options riece-debug
riece-version riece-coding riece-complete riece-addon-modules riece-addon riece-ruby
riece-mode riece-identity riece-channel riece-user riece-misc riece-signal riece-layout
riece-display riece-server riece-naming riece-message riece-filter riece-handle riece-000
riece-200 riece-300 riece-400 riece-500 riece-commands riece-irc riece riece-alias
riece-async riece-biff riece-button riece-ctcp riece-ctlseq riece-doctor riece-eval-ruby
riece-eval riece-foolproof riece-google riece-guess riece-hangman riece-highlight
riece-history riece-icon riece-ignore riece-kakasi riece-keepalive riece-keyword riece-log
riece-lsdb riece-menu riece-mini riece-rdcc riece-shrink-buffer riece-skk-kakutei
riece-toolbar riece-unread riece-url riece-xface riece-yank)
+ provides (riece-compat riece-xemacs riece-globals riece-options riece-debug
riece-version riece-coding riece-complete riece-addon-modules riece-addon riece-ruby
riece-cache riece-mode riece-identity riece-channel riece-user riece-misc riece-signal
riece-layout riece-display riece-server riece-naming riece-message riece-filter
riece-handle riece-000 riece-200 riece-300 riece-400 riece-500 riece-commands riece-irc
riece riece-alias riece-async riece-biff riece-button riece-ctcp riece-ctlseq riece-doctor
riece-eval-ruby riece-eval riece-foolproof riece-google riece-guess riece-hangman
riece-highlight riece-history riece-icon riece-ignore riece-kakasi riece-keepalive
riece-keyword riece-log riece-lsdb riece-menu riece-mini riece-rdcc riece-shrink-buffer
riece-skk-kakutei riece-toolbar riece-unread riece-url riece-xface riece-xfaceb
riece-yank)
requires (REQUIRES)
type regular
))
Index: xemacs-packages/riece/doc/HACKING
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/doc/HACKING,v
retrieving revision 1.1
diff -u -r1.1 HACKING
--- xemacs-packages/riece/doc/HACKING 30 Aug 2005 02:34:39 -0000 1.1
+++ xemacs-packages/riece/doc/HACKING 20 Nov 2005 07:40:34 -0000
@@ -390,6 +390,9 @@
- <module-name>-insinuate
Called on initialization of this module.
+- <module-name>-uninstall (optional)
+ Called on uninstallation of this module.
+
- <module-name>-enable (optional)
Called when this add-on is enabled.
Index: xemacs-packages/riece/doc/HACKING.ja
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/doc/HACKING.ja,v
retrieving revision 1.1
diff -u -r1.1 HACKING.ja
--- xemacs-packages/riece/doc/HACKING.ja 30 Aug 2005 02:34:39 -0000 1.1
+++ xemacs-packages/riece/doc/HACKING.ja 20 Nov 2005 07:40:34 -0000
@@ -364,6 +364,9 @@
- <モジュール名>-insinuate
初期化処理を行います
+- <モジュール名>-uninstall (オプション)
+ アドオンをアンインストールすると呼ばれます
+
- <モジュール名>-enable (オプション)
アドオンの有効にすると呼ばれます
Index: xemacs-packages/riece/doc/riece-en.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/doc/riece-en.texi,v
retrieving revision 1.3
diff -u -r1.3 riece-en.texi
--- xemacs-packages/riece/doc/riece-en.texi 30 Aug 2005 02:34:40 -0000 1.3
+++ xemacs-packages/riece/doc/riece-en.texi 20 Nov 2005 07:40:35 -0000
@@ -3,7 +3,7 @@
@setfilename riece-en.info
@settitle Riece -- An IRC client for Emacsen --
@c %**end of header
-@set VERSION 2.0.0
+@set VERSION 2.0.2
@c @documentlanguage en
@dircategory GNU Emacs Lisp
Index: xemacs-packages/riece/doc/riece-ja.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/doc/riece-ja.texi,v
retrieving revision 1.7
diff -u -r1.7 riece-ja.texi
--- xemacs-packages/riece/doc/riece-ja.texi 30 Aug 2005 02:34:40 -0000 1.7
+++ xemacs-packages/riece/doc/riece-ja.texi 20 Nov 2005 07:40:35 -0000
@@ -3,7 +3,7 @@
@setfilename riece-ja.info
@settitle Riece -- An IRC client for Emacsen --
@c %**end of header
-@set VERSION 2.0.0
+@set VERSION 2.0.2
@c @documentlanguage ja
@dircategory GNU Emacs Lisp
Index: xemacs-packages/riece/lisp/COMPILE
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/COMPILE,v
retrieving revision 1.7
diff -u -r1.7 COMPILE
--- xemacs-packages/riece/lisp/COMPILE 30 Aug 2005 02:34:42 -0000 1.7
+++ xemacs-packages/riece/lisp/COMPILE 20 Nov 2005 07:40:35 -0000
@@ -14,6 +14,7 @@
riece-addon-modules
riece-addon
riece-ruby
+ riece-cache
riece-mode
;; riece-identity -+-> riece-channel
Index: xemacs-packages/riece/lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/ChangeLog,v
retrieving revision 1.8
diff -u -r1.8 ChangeLog
--- xemacs-packages/riece/lisp/ChangeLog 30 Aug 2005 02:34:42 -0000 1.8
+++ xemacs-packages/riece/lisp/ChangeLog 20 Nov 2005 07:40:38 -0000
@@ -1,3 +1,95 @@
+2005-11-19 Daiki Ueno <ueno(a)unixuser.org>
+
+ * Riece: Version 2.0.2 released.
+ * configure.ac: Bump up version to 2.0.2.
+
+2005-11-19 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-alias.el (riece-alias-alternate-separator): Changed from
+ "@" -> "%".
+
+ * test/test-riece-cache.el: New test cases.
+ * test/Makefile.am (EXTRA_DIST): Added test-riece-cache.el.
+
+ * Makefile.am (EXTRA_DIST): Added riece-cache.el.
+
+ * riece-commands.el (riece-command-part-channel): Signal an error
+ if TARGET server has not opened.
+
+ * riece-channel.el: Require 'riece-cache.
+ (riece-find-channel): Increase priority of given channel name in
+ riece-channel-cache.
+ (riece-forget-channel): Remove given channel name from
+ riece-channel-cache.
+ (riece-get-channel): Register given channel name in
+ riece-channel-cache (if it is being added to riece-channel-obarray.)
+ * riece-server.el (riece-reset-process-buffer): Initialize
+ riece-channel-cache.
+ * riece-options.el (riece-channel-cache-max-size): New user
+ option.
+ * riece-misc.el (riece-get-channels-on-server): Get channel names
+ from riece-channel-cache.
+ * riece-globals.el (riece-channel-cache): New variable.
+
+2005-11-18 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-cache.el: Renamed from riece-lru.el.
+
+2005-11-18 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-user.el: Require 'riece-lru.
+ (riece-find-user): Increase priority of given username in
+ riece-user-lru.
+ (riece-forget-user): Remove given username from riece-user-lru.
+ (riece-rename-user): Rename given username in riece-user-lru.
+ (riece-get-user): Register given username in riece-user-lru (if
+ it is being added to riece-user-obarray.)
+ * riece-server.el: Require 'riece-lru.
+ (riece-reset-process-buffer): Initialize riece-user-lru.
+ * riece-options.el (riece-user-lru-max-size): New user option.
+ * riece-misc.el: Require 'riece-lru.
+ (riece-get-users-on-server): Get usernames from riece-user-lru.
+ * riece-globals.el (riece-user-lru): New variable.
+ * COMPILE (riece-modules): Added riece-lru.
+ * riece-lru.el: New file.
+
+ * riece-develop.el: New file.
+
+2005-10-27 Masatake YAMATO <jet(a)gyve.org>
+
+ * url-riece.el (url-irc-riece): Use `server-name'
+ to create an argument for `riece-parse-identity'.
+ `server' was used.
+
+2005-09-29 Daiki Ueno <ueno(a)unixuser.org>
+
+ * Riece: Version 2.0.1 released.
+ * configure.ac: Bump up version to 2.0.1.
+
+2005-09-11 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-addon.el (riece-command-list-addons): Adjust width of 2nd
+ column to the length of the longest add-on name.
+
+2005-09-10 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-alias.el (riece-alias-abbrev-identity-string): Compare car
+ of riece-alias-alist with identities case insensitively.
+
+2005-09-05 Daiki Ueno <ueno(a)unixuser.org>
+
+ * Makefile.am (EXTRA_DIST): Added riece-xfaceb.el.
+ * riece-addon-modules.el (riece-addon-modules): Added riece-xfaceb.
+
+2005-09-03 Steve Youngs <steve(a)sxemacs.org>
+
+ * riece-xfaceb.el: New file. Display X-Face and colour Face
+ images in IRC buffer, getting the image data from BBDB records.
+
+2005-08-31 Daiki Ueno <ueno(a)unixuser.org>
+
+ * riece-unread.el (riece-unread-requires): Require 'riece-history.
+
2005-08-29 Daiki Ueno <ueno(a)unixuser.org>
* Riece: Version 2.0.0 released.
@@ -8,7 +100,7 @@
* test/test-riece-log.el
(test-riece-log-display-message-function): Enable riece-log addon.
- * test/test-riece-ruby.el (lunit-test-case-teardown): Rest
+ * test/test-riece-ruby.el (lunit-test-case-teardown): Reset
riece-ruby-output-handler-alist and riece-ruby-output-queue-alist.
* riece-server.el (riece-server-keyword-map): Abolished
Index: xemacs-packages/riece/lisp/Makefile.am
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- xemacs-packages/riece/lisp/Makefile.am 30 Aug 2005 02:34:42 -0000 1.7
+++ xemacs-packages/riece/lisp/Makefile.am 20 Nov 2005 07:40:38 -0000
@@ -2,7 +2,7 @@
EXTRA_DIST = COMPILE ChangeLog ChangeLog.Liece \
riece-000.el riece-200.el riece-300.el riece-400.el riece-500.el \
- riece-addon-modules.el riece-addon.el riece-channel.el \
+ riece-addon-modules.el riece-addon.el riece-cache.el riece-channel.el \
riece-coding.el riece-commands.el riece-compat.el riece-complete.el \
riece-debug.el riece-display.el riece-emacs.el riece-filter.el \
riece-globals.el riece-handle.el riece-highlight.el riece-identity.el \
@@ -17,7 +17,7 @@
riece-ctlseq.el riece-ignore.el riece-hangman.el riece-biff.el \
riece-kakasi.el riece-foolproof.el riece-yank.el riece-toolbar.el \
riece-eval.el riece-google.el riece-keepalive.el riece-eval-ruby.el \
- riece-shrink-buffer.el url-riece.el \
+ riece-shrink-buffer.el riece-xfaceb.el url-riece.el \
riece-command-previous-channel.xpm riece-command-next-channel.xpm \
riece-submit-bug-report.xpm \
server.rb aproxy.rb
Index: xemacs-packages/riece/lisp/riece-300.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-300.el,v
retrieving revision 1.6
diff -u -r1.6 riece-300.el
--- xemacs-packages/riece/lisp/riece-300.el 30 Aug 2005 02:34:43 -0000 1.6
+++ xemacs-packages/riece/lisp/riece-300.el 20 Nov 2005 07:40:38 -0000
@@ -267,7 +267,7 @@
(setq parameters (riece-split-parameters
(riece-decoded-string-for-identity decoded
channel-identity))
- topic (nth 1 parameters))
+ topic (nth 2 parameters))
(riece-channel-set-topic (riece-get-channel channel) topic)
(riece-insert-info buffer (concat visible " users, topic: " topic
"\n"))
(riece-insert-info
Index: xemacs-packages/riece/lisp/riece-addon-modules.el
===================================================================
RCS file:
/pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-addon-modules.el,v
retrieving revision 1.1
diff -u -r1.1 riece-addon-modules.el
--- xemacs-packages/riece/lisp/riece-addon-modules.el 30 Aug 2005 02:34:43 -0000 1.1
+++ xemacs-packages/riece/lisp/riece-addon-modules.el 20 Nov 2005 07:40:38 -0000
@@ -31,6 +31,7 @@
(riece-unread . "Mark channels where new messages arrived.")
(riece-url . "Collect URL in IRC buffers.")
(riece-xface . "Display X-Face in IRC buffers.")
+ (riece-xfaceb . "Display X-Face & Colour Face images in IRC buffers
\(BBDB\).")
(riece-yank . "Enter the element of kill-ring.")))
(provide 'riece-addon-modules)
Index: xemacs-packages/riece/lisp/riece-addon.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-addon.el,v
retrieving revision 1.3
diff -u -r1.3 riece-addon.el
--- xemacs-packages/riece/lisp/riece-addon.el 30 Aug 2005 02:34:43 -0000 1.3
+++ xemacs-packages/riece/lisp/riece-addon.el 20 Nov 2005 07:40:39 -0000
@@ -321,7 +321,7 @@
buffer-read-only
(pointer riece-addon-dependencies)
module-description-alist
- description point)
+ description point longest)
(while pointer
(setq description (intern-soft (concat (symbol-name (car (car pointer)))
"-description"))
@@ -342,13 +342,20 @@
(setq pointer (cdr pointer)))
(erase-buffer)
(riece-kill-all-overlays)
+ (setq pointer module-description-alist
+ longest "")
+ (while pointer
+ (if (> (length (symbol-name (car (car pointer))))
+ (length longest))
+ (setq longest (symbol-name (car (car pointer)))))
+ (setq pointer (cdr pointer)))
(setq pointer (sort module-description-alist
(lambda (entry1 entry2)
(string-lessp (symbol-name (car entry1))
(symbol-name (car entry2))))))
(while pointer
(setq point (point))
- (insert (format "%c %-15S %s\n"
+ (insert (format (format "%%c %%-%dS %%s\n" (length longest))
(if (not (featurep (car (car pointer))))
?
(if (not (get (car (car pointer))
Index: xemacs-packages/riece/lisp/riece-alias.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-alias.el,v
retrieving revision 1.5
diff -u -r1.5 riece-alias.el
--- xemacs-packages/riece/lisp/riece-alias.el 30 Aug 2005 02:34:43 -0000 1.5
+++ xemacs-packages/riece/lisp/riece-alias.el 20 Nov 2005 07:40:39 -0000
@@ -51,7 +51,7 @@
:type 'boolean
:group 'riece-alias)
-(defcustom riece-alias-alternate-separator "@"
+(defcustom riece-alias-alternate-separator "%"
"A string to separate prefix and server."
:type '(choice (const nil) string)
:group 'riece-alias)
@@ -138,7 +138,7 @@
(setq string (riece-alias-abbrev-alternate-separator string)))
(let ((alist riece-alias-alist))
(while alist
- (if (equal (car (car alist)) string)
+ (if (equal (downcase (car (car alist))) (downcase string))
(setq string (cdr (car alist))
alist nil)
(setq alist (cdr alist)))))
@@ -147,7 +147,7 @@
(defun riece-alias-expand-identity-string (string)
(let ((alist riece-alias-alist))
(while alist
- (if (equal (cdr (car alist)) string)
+ (if (equal (downcase (cdr (car alist))) (downcase string))
(setq string (car (car alist))
alist nil)
(setq alist (cdr alist)))))
Index: xemacs-packages/riece/lisp/riece-async.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-async.el,v
retrieving revision 1.4
diff -u -r1.4 riece-async.el
--- xemacs-packages/riece/lisp/riece-async.el 30 Aug 2005 02:34:43 -0000 1.4
+++ xemacs-packages/riece/lisp/riece-async.el 20 Nov 2005 07:40:39 -0000
@@ -60,7 +60,7 @@
assumed that the file is in the same directory of this file.")
(defvar riece-async-server-program-arguments
- (list "-s" riece-async-buffer-size
+ (list "-s" (number-to-string riece-async-buffer-size)
"-b" riece-async-backup-file)
"Command line arguments passed to `riece-async-server-program'.")
cvs server: xemacs-packages/riece/lisp/riece-cache.el is a new entry, no comparison
available
Index: xemacs-packages/riece/lisp/riece-channel.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-channel.el,v
retrieving revision 1.4
diff -u -r1.4 riece-channel.el
--- xemacs-packages/riece/lisp/riece-channel.el 20 Mar 2005 09:11:20 -0000 1.4
+++ xemacs-packages/riece/lisp/riece-channel.el 20 Nov 2005 07:40:39 -0000
@@ -28,16 +28,19 @@
(require 'riece-globals)
(require 'riece-identity)
(require 'riece-mode)
+(require 'riece-cache)
;;; Channel object:
(defun riece-find-channel (name)
"Get a channel object named NAME from the server buffer."
+ (riece-cache-get riece-channel-cache name)
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
riece-channel-obarray)))
(if symbol
(symbol-value symbol))))
(defun riece-forget-channel (name)
+ (riece-cache-delete riece-channel-cache name)
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
riece-channel-obarray)))
(when symbol
@@ -55,7 +58,10 @@
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
riece-channel-obarray)))
(if symbol
- (symbol-value symbol)
+ (progn
+ (riece-cache-get riece-channel-cache name)
+ (symbol-value symbol))
+ (riece-cache-set riece-channel-cache name name)
(set (intern (riece-identity-canonicalize-prefix name)
riece-channel-obarray)
(riece-make-channel nil nil nil nil nil nil nil)))))
Index: xemacs-packages/riece/lisp/riece-commands.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-commands.el,v
retrieving revision 1.6
diff -u -r1.6 riece-commands.el
--- xemacs-packages/riece/lisp/riece-commands.el 30 Aug 2005 02:34:44 -0000 1.6
+++ xemacs-packages/riece/lisp/riece-commands.el 20 Nov 2005 07:40:40 -0000
@@ -485,6 +485,9 @@
(defun riece-command-part-channel (target message)
(let ((process (riece-server-process (riece-identity-server target))))
+ (unless process
+ (error "%s" (substitute-command-keys
+ "Type \\[riece-command-open-server] to open server.")))
(riece-send-string (if message
(format "PART %s :%s\r\n"
(riece-identity-prefix target)
cvs server: xemacs-packages/riece/lisp/riece-develop.el is a new entry, no comparison
available
Index: xemacs-packages/riece/lisp/riece-globals.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-globals.el,v
retrieving revision 1.7
diff -u -r1.7 riece-globals.el
--- xemacs-packages/riece/lisp/riece-globals.el 30 Aug 2005 02:34:46 -0000 1.7
+++ xemacs-packages/riece/lisp/riece-globals.el 20 Nov 2005 07:40:40 -0000
@@ -131,6 +131,12 @@
(defvar riece-coding-system nil
"Coding system for process I/O.
Local to the server buffers.")
+(defvar riece-channel-cache nil
+ "Cache of channel names.
+Local to the server buffers.")
+(defvar riece-user-cache nil
+ "Cache of usernames.
+Local to the server buffers.")
;;; Variables local to the channel buffers:
(defvar riece-freeze nil
Index: xemacs-packages/riece/lisp/riece-irc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-irc.el,v
retrieving revision 1.3
diff -u -r1.3 riece-irc.el
--- xemacs-packages/riece/lisp/riece-irc.el 30 Aug 2005 02:34:47 -0000 1.3
+++ xemacs-packages/riece/lisp/riece-irc.el 20 Nov 2005 07:40:40 -0000
@@ -69,7 +69,7 @@
(quit
(if (equal server-name "")
(message "Password: Quit")
- (message "Password for %s: " server-name))
+ (message "Password for %s: Quit" server-name))
'quit)))
(setq riece-reconnect-with-password nil)))
(if (eq password 'quit)
Index: xemacs-packages/riece/lisp/riece-misc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-misc.el,v
retrieving revision 1.6
diff -u -r1.6 riece-misc.el
--- xemacs-packages/riece/lisp/riece-misc.el 30 Aug 2005 02:34:48 -0000 1.6
+++ xemacs-packages/riece/lisp/riece-misc.el 20 Nov 2005 07:40:40 -0000
@@ -32,6 +32,7 @@
(require 'riece-server)
(require 'riece-user)
(require 'riece-mode)
+(require 'riece-cache)
(defun riece-get-buffer-create (name &optional init-major-mode)
(let ((buffer (get-buffer name)))
@@ -221,7 +222,7 @@
(setq identities
(cons (riece-make-identity (symbol-name user) server-name)
identities)))
- riece-user-obarray)
+ (riece-cache-hash-obarray riece-user-cache))
identities)))
(defun riece-get-channels-on-server (server-name)
@@ -232,7 +233,7 @@
(setq identities
(cons (riece-make-identity (symbol-name channel) server-name)
identities)))
- riece-channel-obarray)
+ (riece-cache-hash-obarray riece-channel-cache))
identities)))
(defun riece-get-identities-on-server (server-name)
Index: xemacs-packages/riece/lisp/riece-options.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-options.el,v
retrieving revision 1.6
diff -u -r1.6 riece-options.el
--- xemacs-packages/riece/lisp/riece-options.el 30 Aug 2005 02:34:48 -0000 1.6
+++ xemacs-packages/riece/lisp/riece-options.el 20 Nov 2005 07:40:40 -0000
@@ -248,6 +248,16 @@
:type 'function
:group 'riece-server)
+(defcustom riece-user-cache-max-size 512
+ "Maximum size of cache of usernames."
+:type 'integer
+:group 'riece-server)
+
+(defcustom riece-channel-cache-max-size 512
+ "Maximum size of cache of channel names."
+:type 'integer
+:group 'riece-server)
+
(defcustom riece-channel-buffer-mode t
"When non-nil, Riece will display a channel buffer."
:type 'boolean
Index: xemacs-packages/riece/lisp/riece-server.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-server.el,v
retrieving revision 1.7
diff -u -r1.7 riece-server.el
--- xemacs-packages/riece/lisp/riece-server.el 30 Aug 2005 02:34:49 -0000 1.7
+++ xemacs-packages/riece/lisp/riece-server.el 20 Nov 2005 07:40:40 -0000
@@ -29,6 +29,7 @@
(require 'riece-coding) ;riece-default-coding-system
(require 'riece-identity)
(require 'riece-compat)
+(require 'riece-cache)
(eval-and-compile
(defvar riece-server-keyword-map
@@ -196,8 +197,7 @@
(let* ((server-name (if identity
(riece-identity-server identity)
(riece-current-server-name)))
- (process (riece-server-process server-name))
- coding-system)
+ (process (riece-server-process server-name)))
(unless process
(error "%s" (substitute-command-keys
"Type \\[riece-command-open-server] to open server.")))
@@ -271,6 +271,10 @@
(make-local-variable 'riece-channel-obarray)
(setq riece-channel-obarray (make-vector riece-channel-obarray-size 0))
(make-local-variable 'riece-coding-system)
+ (make-local-variable 'riece-channel-cache)
+ (setq riece-channel-cache (riece-make-cache riece-channel-cache-max-size))
+ (make-local-variable 'riece-user-cache)
+ (setq riece-user-cache (riece-make-cache riece-user-cache-max-size))
(buffer-disable-undo)
(erase-buffer)))
Index: xemacs-packages/riece/lisp/riece-unread.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-unread.el,v
retrieving revision 1.6
diff -u -r1.6 riece-unread.el
--- xemacs-packages/riece/lisp/riece-unread.el 30 Aug 2005 02:34:49 -0000 1.6
+++ xemacs-packages/riece/lisp/riece-unread.el 20 Nov 2005 07:40:40 -0000
@@ -128,6 +128,9 @@
(let (requires)
(if (memq 'riece-highlight riece-addons)
(setq requires (cons 'riece-highlight requires)))
+ ;; To override riece-history's channel mark in the channel list buffer.
+ (if (memq 'riece-history riece-addons)
+ (setq requires (cons 'riece-history requires)))
;;; (if (memq 'riece-guess riece-addons)
;;; (setq requires (cons 'riece-guess requires)))
requires))
Index: xemacs-packages/riece/lisp/riece-user.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-user.el,v
retrieving revision 1.3
diff -u -r1.3 riece-user.el
--- xemacs-packages/riece/lisp/riece-user.el 20 Mar 2005 09:11:24 -0000 1.3
+++ xemacs-packages/riece/lisp/riece-user.el 20 Nov 2005 07:40:41 -0000
@@ -25,22 +25,27 @@
(require 'riece-identity)
(require 'riece-mode)
+(require 'riece-cache)
;;; User object:
(defun riece-find-user (name)
"Get a user object named NAME from the server buffer."
+ (riece-cache-get riece-user-cache name)
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
riece-user-obarray)))
- (if symbol
- (symbol-value symbol))))
+ (if symbol
+ (symbol-value symbol))))
(defun riece-forget-user (name)
+ (riece-cache-delete riece-user-cache name)
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix name))))
(when symbol
(makunbound symbol)
(unintern (symbol-name symbol) riece-user-obarray))))
(defun riece-rename-user (old-name new-name)
+ (riece-cache-delete riece-user-cache old-name)
+ (riece-cache-set riece-user-cache new-name new-name)
(unless (equal (riece-identity-canonicalize-prefix old-name)
(riece-identity-canonicalize-prefix new-name))
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix old-name)
@@ -62,7 +67,10 @@
(let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)
riece-user-obarray)))
(if symbol
- (symbol-value symbol)
+ (progn
+ (riece-cache-get riece-user-cache name)
+ (symbol-value symbol))
+ (riece-cache-set riece-user-cache name name)
(set (intern (riece-identity-canonicalize-prefix name)
riece-user-obarray)
(riece-make-user nil nil nil nil nil)))))
Index: xemacs-packages/riece/lisp/riece-version.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-version.el,v
retrieving revision 1.7
diff -u -r1.7 riece-version.el
--- xemacs-packages/riece/lisp/riece-version.el 30 Aug 2005 02:34:50 -0000 1.7
+++ xemacs-packages/riece/lisp/riece-version.el 20 Nov 2005 07:40:41 -0000
@@ -48,7 +48,7 @@
(defconst riece-product-name "Riece")
-(defconst riece-version-number "2.0.0"
+(defconst riece-version-number "2.0.2"
"Version number for this version of Riece.")
(defconst riece-version (format "Riece v%s" riece-version-number)
cvs server: xemacs-packages/riece/lisp/riece-xfaceb.el is a new entry, no comparison
available
Index: xemacs-packages/riece/lisp/url-riece.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/url-riece.el,v
retrieving revision 1.1
diff -u -r1.1 url-riece.el
--- xemacs-packages/riece/lisp/url-riece.el 5 Dec 2004 04:13:02 -0000 1.1
+++ xemacs-packages/riece/lisp/url-riece.el 20 Nov 2005 07:40:41 -0000
@@ -1,4 +1,4 @@
-;;; url-riece --- Adapting `riece' to `url-irc'
+;;; url-riece.el --- Adapting `riece' to `url-irc'
;; Copyright (C) 2004 Masatake YAMATO
;; Author: Masatake YAMATO <jet(a)gyve.org>
@@ -91,7 +91,7 @@
(riece-command-join
(riece-parse-identity (if (string= server-name "")
channel
- (format "%s %s" channel server)))))
+ (format "%s %s" channel server-name)))))
;; Show the windows
(riece)))))
; (url-irc-riece "localhost" nil "#mandara" "jetgx" nil)
Index: xemacs-packages/riece/lisp/test/Makefile.am
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/test/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- xemacs-packages/riece/lisp/test/Makefile.am 30 Aug 2005 02:34:59 -0000 1.3
+++ xemacs-packages/riece/lisp/test/Makefile.am 20 Nov 2005 07:40:41 -0000
@@ -1,4 +1,4 @@
EXTRA_DIST = luna.el lunit.el lunit-report.el \
- test-riece-addon.el test-riece-alias.el \
+ test-riece-addon.el test-riece-alias.el test-riece-cache.el \
test-riece-eval.el test-riece-log.el test-riece-shrink-buffer.el \
test-riece-url.el test-riece-yank.el
--
Daiki Ueno