March 2005 - XEmacs-Patches - XEmacs Mailing List Archives

[PATCH] (RFC) Framework to change dumped defaults on package presence; default mailer to VM if possible. 20 years

Aidan Kehoe

Could I have some commentary on this? I think the mechanism for changing defaults based on packages’ presence is reasonable, but there is a penalty at startup, which makes me consider caching path and file presence information in a file in ~/.xemacs/ and comparing timestamps on startup before re-initialising it on every startup. lisp/ChangeLog addition: 2005-03-20 Aidan Kehoe <kehoea(a)parhasard.net> * menubar-items.el (default-menubar): Add an entry for VM, rename the entry for sendmail-user-agent to better describe it. * packages.el (package-presence-default-tweaks): New. List of libraries and functions to be called with information on their presence at startup. * simple.el (mail-user-agent): Update the docstring and Customize init information to mention VM. * simple.el (packages): Require it. * simple.el (initialize-mua-to-vm-if-available): New. Function that initializes mail-user-agent to 'vm-user-agent if the VM package is available. * simple.el ('vm-user-agent): New. Previously available in the VM package. * startup.el (normal-top-level): Loop through package-presence-default-tweaks, looking for the library specified in the car of each element, and calling the function specified as the second slot of that element with the result of that lookup. man/ChangeLog addition: 2005-03-20 Aidan Kehoe <kehoea(a)parhasard.net> * xemacs/sending.texi (Sending Mail): Describe that we've changed the default to VM, cross reference to its docs. 2005-03-20 Aidan Kehoe <kehoea(a)parhasard.net> * lispref/packaging.texi (Dumped defaults): Describe and cross reference the package-presence-default-tweaks. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: man/xemacs/sending.texi man/lispref/packaging.texi lisp/startup.el lisp/simple.el lisp/packages.el lisp/menubar-items.el Index: lisp/menubar-items.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/menubar-items.el,v retrieving revision 1.46 diff -u -u -r1.46 menubar-items.el --- lisp/menubar-items.el 2005/02/03 05:03:38 1.46 +++ lisp/menubar-items.el 2005/03/20 11:35:57 ＠＠ -886,7 +886,11 ＠＠ :active (boundp 'ps-print-color-p)]) ("%_Internet" ("%_Compose Mail With" - ["Default Emacs Mailer" + ["VM mail package" + (customize-set-variable 'mail-user-agent 'vm-user-agent) + :style radio + :selected (eq mail-user-agent 'vm-user-agent)] + ["Bare-bones Emacs Mailer" (customize-set-variable 'mail-user-agent 'sendmail-user-agent) :style radio :selected (eq mail-user-agent 'sendmail-user-agent)] Index: lisp/packages.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/packages.el,v retrieving revision 1.53 diff -u -u -r1.53 packages.el --- lisp/packages.el 2005/02/03 23:56:53 1.53 +++ lisp/packages.el 2005/03/20 11:35:57 ＠＠ -518,6 +518,19 ＠＠ package-load-path) (reverse *files*))) +(defvar package-presence-default-tweaks nil + "Library names and functions to call with their presence, on startup. +A list of lists, of the form: + + '((\"library-name\" 'function)) + +Before the user's initialization files are loaded, but after the packages +load path has been worked out, XEmacs calls `(locate-library +\"library-name\")', and passes its result to `function', for each element of +`package-presence-default-tweaks'. The intention is that `function' +initializes some, dumped, XEmacs default based on the runtime presence of +some package. ") + (provide 'packages) ;;; packages.el ends here Index: lisp/simple.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/simple.el,v retrieving revision 1.50 diff -u -u -r1.50 simple.el --- lisp/simple.el 2005/02/23 22:25:16 1.50 +++ lisp/simple.el 2005/03/20 11:36:01 ＠＠ -3312,10 +3312,14 ＠＠ outgoing email message. This variable lets you specify which mail-sending package you prefer. -Valid values include: - - `sendmail-user-agent' -- use the default Emacs Mail package. - See Info node `(emacs)Sending Mail'. +Valid values may include: + + `vm-user-agent' -- use Kyle Jones' VM, as documented in the `(vm)' + Info node. Compatible with `sendmail-user-agent' + and can handle attachments and non-ASCII content, + which the former can't. + `sendmail-user-agent' -- use the former preferred, bare-bones, Emacs Mail + package. See Info node `(xemacs)Sending Mail'. `mh-e-user-agent' -- use the Emacs interface to the MH mail system. See Info node `(mh-e)'. `message-user-agent' -- use the Gnus Message package. ＠＠ -3329,7 +3333,10 ＠＠ succeeds. See also `read-mail-command' concerning reading mail." -:type '(radio (function-item :tag "Default Emacs mail" +:type '(radio (function-item :tag "VM mail package" + :format "%t\n" + vm-user-agent) + (function-item :tag "Bare-bones Emacs mail" :format "%t\n" sendmail-user-agent) (function-item :tag "Emacs interface to MH" ＠＠ -3344,6 +3351,19 ＠＠ (function :tag "Other")) :group 'mail) +(require 'packages) + +;; VM's composition package is compatible with sendmail-user-agent, and it +;; supports MIME, so we should prefer it as a default if it's available. +(defun initialize-mua-to-vm-if-available (path) + "If `path' is non-nil, make VM be XEmacs' default `mail-user-agent'. +This should be called from `startup.el' by means of the +`package-presence-default-tweaks' mechanism. " + (when path (setq mail-user-agent 'vm-user-agent))) + +(pushnew '("vm" initialize-mua-to-vm-if-available) + package-presence-default-tweaks) + (defun define-mail-user-agent (symbol composefunc sendfunc &optional abortfunc hookvar) "Define a symbol to identify a mail-sending package for `mail-user-agent'. ＠＠ -3385,6 +3405,12 ＠＠ (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) + +(define-mail-user-agent 'vm-user-agent + (function vm-compose-mail) ; compose function + (function vm-mail-send-and-exit) ; send function + nil ; abort function (kill-buffer) + nil) ; hook variable (mail-send-hook) (defun rfc822-goto-eoh () ;; Go to header delimiter line in a mail message, following RFC822 rules Index: lisp/startup.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/startup.el,v retrieving revision 1.53 diff -u -u -r1.53 startup.el --- lisp/startup.el 2005/01/26 04:56:18 1.53 +++ lisp/startup.el 2005/03/20 11:36:02 ＠＠ -562,6 +562,13 ＠＠ auto-save-list-file-prefix (emacs-pid) (system-name))))) + ;; Some of XEmacs' default settings--initially the mail composition + ;; agent--depend on the presence of a given package at startup. + (require 'packages) + (dolist (lib-presence package-presence-default-tweaks) + (apply (second lib-presence) + (locate-library (car lib-presence)) + nil)) (run-hooks 'emacs-startup-hook) (and term-setup-hook (run-hooks 'term-setup-hook)) Index: man/lispref/packaging.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/packaging.texi,v retrieving revision 1.11 diff -u -u -r1.11 packaging.texi --- man/lispref/packaging.texi 2003/10/10 12:39:34 1.11 +++ man/lispref/packaging.texi 2005/03/20 11:36:03 ＠＠ -61,6 +61,7 ＠＠＠c * Frequently Asked Questions:: Questions and answers from the mailing list. Internals and Package Release Engineering: +* Dumped defaults:: Dumped code can check for packages. * Issues:: ＠end menu ＠＠ -1322,7 +1323,7 ＠＠ directory, then an entry in ＠code{package-name-to-directory} is also necessary, or requires will fail, leading to the problems just described. -＠node Documenting Packages, Issues, Creating Packages, Packaging +＠node Documenting Packages, Dumped defaults, Creating Packages, Packaging ＠comment node-name, next, previous, up ＠cindex documenting packages ＠heading Documenting Packages: ＠＠ -1357,7 +1358,26 ＠＠ Do maintain a detailed ChangeLog. -＠node Issues, , Documenting Packages, Packaging +＠node Dumped defaults, Issues, Documenting Packages, Packaging +＠section Dumped defaults + +Since the best options for many defaults within XEmacs involve packages +that are not necessarily present at runtime, we provide a mechanism for +dumped code to check for packages' presence at startup and to initialize +these defaults as appropriate. + +This is accomplished using ＠code{package-presence-default-tweaks}, +defined in ＠file{lisp/packages.el}. This is a list of lists, with the +first element of each entry the name of a Lisp library to be checked +for, and the second element a function symbol to be called with the +result of ＠code{locate-library} on the Lisp library. These checks are +done after the packages load path is initialized. + +See the documentation for ＠code{package-presence-default-tweaks}, and +the check for the presence of VM and consequent default mailer change in +(a)file{lisp/simple.el}. + +＠node Issues, , Dumped defaults, Packaging ＠section Issues To be completed. Index: man/xemacs/sending.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/sending.texi,v retrieving revision 1.4 diff -u -u -r1.4 sending.texi --- man/xemacs/sending.texi 2001/04/12 18:22:30 1.4 +++ man/xemacs/sending.texi 2005/03/20 11:36:04 ＠＠ -40,6 +40,16 ＠＠＠kbd{C-u C-x m} is another way to switch back to a message in progress: it will search for an existing, unsent mail message buffer and select it. +Starting with version 21.5, the default mail composition package in +XEmacs is VM, which is compatible with `sendmail.el' (the old default, +as described in this document) and has thorough support for attachments +and non-ASCII messages. ＠xref{(vm)}, for the full VM documentation, +should you want information on these features. XEmacs' package system +can mean that VM isn't installed---in that case, `sendmail.el' will +be the fallback. If your mail buffer is called ``*mail*'', then +you probably don't have VM installed; ＠pxref{Packages} for information +on how to install the package. + ＠menu * Format: Mail Format. Format of the mail being composed. * Headers: Mail Headers. Details of allowed mail header fields. cvs server: cannot find modules/ldap/configure -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

3 participants
4 comments

[21.5] cflags broken, proposed fix 20 years

Stephen J. Turnbull

21.5 >>>>> "Ilya" == Ilya N Golubev <gin(a)mo.msk.ru> writes: Ilya> Version: 21.5 after revision 1.237 of `configure.in'. Ilya> Contrary to doc, `--cflags-optimization=' do not work. Its Ilya> value is not added to `＠XE_CFLAGS＠' substitution in Ilya> `config.status'. Thank you for the report. I don't have total confidence in the following patch, so am not committing yet. I would appreciate your test. Note that this patch is to configure.ac, not configure.in, and you will need autoconf 2.59 to create configure. Also, the name of the flag has changed to --with-cflags-optimization, to conform with autoconf. Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v retrieving revision 1.444 diff -u -U0 -r1.444 ChangeLog --- ChangeLog 14 Mar 2005 12:22:16 -0000 1.444 +++ ChangeLog 15 Mar 2005 06:45:32 -0000 ＠＠ -0,0 +1,6 ＠＠ +2005-03-15 Stephen J. Turnbull <stephen(a)xemacs.org> + + * configure.ac (--with-cflags-optimization): + (--with-cflags-debugging): + If the user specifies them, use them, and don't make her beg. + Index: configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.ac,v retrieving revision 1.3 diff -u -r1.3 configure.ac --- configure.ac 14 Mar 2005 12:22:22 -0000 1.3 +++ configure.ac 15 Mar 2005 06:45:39 -0000 ＠＠ -1706,12 +1706,12 ＠＠ else cflags_warning_specified=no; fi -if test "${cflags_optimization-unset}" != unset +if test "${with_cflags_optimization-unset}" != unset then cflags_optimization_specified=yes; else cflags_optimization_specified=no; fi -if test "${cflags_debugging-unset}" != unset +if test "${with_cflags_debugging-unset}" != unset then cflags_debugging_specified=yes; else cflags_debugging_specified=no; fi ＠＠ -2048,11 +2048,11 ＠＠ dnl Calculate optimization flags. These will be off by default in beta dnl versions and on in release versions. -if test -z "$with_optimization" ; then - if test -n "$emacs_is_beta" ; then - with_optimization=no - else +if test -z "$with_optimization"; then + if test -z "$emacs_is_beta" -o "$cflags_optimization_specified" = "yes"; then with_optimization=yes + else + with_optimization=no fi fi -- Institute of Policy and Planning Sciences http://turnbull.sk.tsukuba.ac.jp University of Tsukuba Tennodai 1-1-1 Tsukuba 305-8573 JAPAN Ask not how you can "do" free software business; ask what your business can "do for" free software.

3 participants
3 comments

[COMMIT] changed location of riece-*.xpm files 20 years

Daiki Ueno

NOTE: This patch has been committed. Put *.xpm files into etc/riece/. xemacs-packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/riece/lisp/riece-toolbar.el xemacs-packages/riece/Makefile Index: xemacs-packages/riece/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/ChangeLog,v retrieving revision 1.16 diff -u -F^( -u -r1.16 ChangeLog --- xemacs-packages/riece/ChangeLog 20 Mar 2005 11:33:14 -0000 1.16 +++ xemacs-packages/riece/ChangeLog 20 Mar 2005 22:31:20 -0000 ＠＠ -1,3 +1,7 ＠＠ +2005-03-20 Daiki Ueno <ueno(a)unixuser.org> + + * Makefile (DATA_DEST): Put *.xpm files into etc/riece/. + 2005-03-20 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.18 released. Index: xemacs-packages/riece/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/Makefile,v retrieving revision 1.17 diff -u -F^( -u -r1.17 Makefile --- xemacs-packages/riece/Makefile 20 Mar 2005 11:33:14 -0000 1.17 +++ xemacs-packages/riece/Makefile 20 Mar 2005 22:31:20 -0000 ＠＠ -62,6 +62,7 ＠＠ PRELOADS = -eval $"push \"./lisp\" load-path"$ -DATA_1_FILES = $(wildcard lisp/*.xpm) +DATA_FILES = $(wildcard lisp/*.xpm) +DATA_DEST = $(PACKAGE) include ../../XEmacs.rules Index: xemacs-packages/riece/lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/ChangeLog,v retrieving revision 1.6 diff -u -F^( -u -r1.6 ChangeLog --- xemacs-packages/riece/lisp/ChangeLog 20 Mar 2005 09:11:20 -0000 1.6 +++ xemacs-packages/riece/lisp/ChangeLog 20 Mar 2005 22:31:21 -0000 ＠＠ -1,3 +1,8 ＠＠ +2005-03-20 Daiki Ueno <ueno(a)unixuser.org> + + * riece-toolbar.el [XEmacs] (riece-make-toolbar-from-menu): + Pick up toolbar icons from etc/riece/. + 2005-03-06 Daiki Ueno <ueno(a)unixuser.org> * Riece: Version 1.0.8 released. Index: xemacs-packages/riece/lisp/riece-toolbar.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-toolbar.el,v retrieving revision 1.1 diff -u -F^( -u -r1.1 riece-toolbar.el --- xemacs-packages/riece/lisp/riece-toolbar.el 20 Mar 2005 09:11:24 -0000 1.1 +++ xemacs-packages/riece/lisp/riece-toolbar.el 20 Mar 2005 22:31:21 -0000 ＠＠ -62,10 +62,14 ＠＠ (if (featurep 'xemacs) (let ((pointer items) toolbar file - menu-item) + menu-item + (riece-data-directory (locate-data-directory "riece"))) (while pointer (setq file (locate-file (symbol-name (car pointer)) - load-path + (if riece-data-directory + (cons riece-data-directory + load-path) + load-path) '(".xpm" ".pbm" ".xbm")) menu-item (riece-toolbar-find-menu-item (car pointer))) (if (and file (file-exists-p file)) -- Daiki Ueno

1 participants
0 comments

[PATCH COMMIT] Tramp 2.0.48 sync 20 years

Michael Albinus

Hello, I've committed the following Tramp patch to CVS. It upgrades Tramp from 2.0.47 to 2.0.48. Best regards, Michael.

1 participants
0 comments

[PATCH] Prefer XEmacs as X11 application class and as default frame name 20 years

Aidan Kehoe

The potential for conflict with GNU Emacs’ X resources has been annoying for a long time, and the default frame name being “emacs” meant window managers have tended to show it quite a bit--I think we should be more pro-active about the primary name the application is known as, and X resources and window manager appearance is part of that. etc/ChangeLog addition: 2005-03-20 Aidan Kehoe <kehoea(a)parhasard.net> * sample.Xresources: Emacs -> XEmacs as the default application class. man/ChangeLog addition: 2005-03-20 Aidan Kehoe <kehoea(a)parhasard.net> * xemacs/custom.texi (X Resources): * xemacs/custom.texi (Geometry Resources): * xemacs/custom.texi (Iconic Resources): * xemacs/custom.texi (Resource List): * xemacs/custom.texi (Face Resources): * xemacs/custom.texi (Menubar Resources): Emacs -> XEmacs as the default application class, describe that we now use XEmacs as the application class and as the default frame name, and that the old behaviour can be temporarily restored by setting the BRANDING_IS_FOR_THE_INSECURE environment variable. src/ChangeLog addition: 2005-03-20 Aidan Kehoe <kehoea(a)parhasard.net> * device-x.c (x_init_device): Default the application class to XEmacs, unless the BRANDING_IS_FOR_THE_INSECURE environment variable is set. * device-x.c (vars_of_device_x): Update the docstring for Vx_emacs_application_class. * frame.c (Fmake_frame): Initialise Vdefault_frame_name at runtime, preferring "XEmacs", but using "emacs" if the BRANDING_IS_FOR_THE_INSECURE environment variable is set. * frame.c (vars_of_frame): Update the docstring for Vdefault_frame_name. XEmacs Trunk source patch: Diff command: cvs -q diff -u Files affected: src/frame.c src/device-x.c man/xemacs/custom.texi etc/sample.Xresources Index: etc/sample.Xresources =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/sample.Xresources,v retrieving revision 1.2 diff -u -u -r1.2 sample.Xresources --- etc/sample.Xresources 2003/06/30 09:12:28 1.2 +++ etc/sample.Xresources 2005/03/20 16:50:17 ＠＠ -27,66 +27,66 ＠＠ ! one of "black" or "white" on monochrome systems. ! ! The valid color names on your system can be found by looking in the file -! `rgb.txt', usually found in /usr/lib/X11/ or /usr/openwin/lib/X11/. +! `rgb.txt', usually found in /usr/X11R6/lib/X11/ or /usr/openwin/lib/X11/. ! Set the foreground and background colors of the `default' face. ! The default face colors are the base for most of the other faces' ! colors. The default background is gray80, and the default foreground ! is black. -Emacs.default.attributeBackground: gray80 -Emacs.default.attributeForeground: black +XEmacs.default.attributeBackground: gray80 +XEmacs.default.attributeForeground: black ! Set the modeline colors. -Emacs.modeline*attributeForeground: Black -Emacs.modeline*attributeBackground: Gray75 +XEmacs.modeline*attributeForeground: Black +XEmacs.modeline*attributeBackground: Gray75 ! Set the color of the text cursor. -Emacs.text-cursor*attributeBackground: Red3 +XEmacs.text-cursor*attributeBackground: Red3 ! If you want to set the color of the mouse pointer, do this: -! Emacs.pointer*attributeForeground: Black +! XEmacs.pointer*attributeForeground: Black ! If you want to set the background of the mouse pointer, do this: -! Emacs.pointer*attributeBackground: White +! XEmacs.pointer*attributeBackground: White ! Note that by default, the pointer foreground and background are the same ! as the default face. ! Set the menubar colors. This overrides the default foreground and ! background colors specified above. -Emacs*menubar*Foreground: Gray30 -Emacs*menubar*Background: Gray75 +XEmacs*menubar*Foreground: Gray30 +XEmacs*menubar*Background: Gray75 ! This is for buttons in the menubar. ! Yellow would be better, but that would map to white on monochrome. -Emacs*menubar.buttonForeground: Blue -Emacs*XlwMenu.selectColor: ForestGreen -Emacs*XmToggleButton.selectColor: ForestGreen +XEmacs*menubar.buttonForeground: Blue +XEmacs*XlwMenu.selectColor: ForestGreen +XEmacs*XmToggleButton.selectColor: ForestGreen ! Specify the colors of popup menus. -Emacs*popup*Foreground: Black -Emacs*popup*Background: Gray75 +XEmacs*popup*Foreground: Black +XEmacs*popup*Background: Gray75 ! Specify the colors of the various sub-widgets of the dialog boxes. -Emacs*dialog*Foreground: Black +XEmacs*dialog*Foreground: Black ! #A5C0C1 is a shade of blue -Emacs*dialog*Background: #A5C0C1 +XEmacs*dialog*Background: #A5C0C1 ! The following three are for Motif dialog boxes ... -Emacs*dialog*XmTextField*Background: WhiteSmoke -Emacs*dialog*XmText*Background: WhiteSmoke -Emacs*dialog*XmList*Background: WhiteSmoke +XEmacs*dialog*XmTextField*Background: WhiteSmoke +XEmacs*dialog*XmText*Background: WhiteSmoke +XEmacs*dialog*XmList*Background: WhiteSmoke ! While this one is for Athena dialog boxes. -Emacs*dialog*Command*Background: WhiteSmoke +XEmacs*dialog*Command*Background: WhiteSmoke ! Athena dialog boxes are sometimes built with the Xaw3d ! variant of the Athena toolkit. ! XEmacs being nice to 8bit displays, it defaults to: -Emacs*dialog*Command*beNiceToColormap: true +XEmacs*dialog*Command*beNiceToColormap: true ! If you are shocked by the ugliness of the 3d rendition, ! you may want to set (even on 8bit displays) the above to false. ! Xlw Scrollbar colors -Emacs*XlwScrollBar.Foreground: Gray30 -Emacs*XlwScrollBar.Background: Gray75 -Emacs*XmScrollBar.Foreground: Gray30 -Emacs*XmScrollBar.Background: Gray75 +XEmacs*XlwScrollBar.Foreground: Gray30 +XEmacs*XlwScrollBar.Background: Gray75 +XEmacs*XmScrollBar.Foreground: Gray30 +XEmacs*XmScrollBar.Background: Gray75 ! ! The Lucid Scrollbar supports two added resources, SliderStyle is either ＠＠ -95,8 +95,8 ＠＠ ! either "opposite" (default) or "same". Opposite puts the arrows at opposite ! of the scrollbar, same puts both arrows at the same end, like the Amiga. ! -! Emacs*XlwScrollBar.SliderStyle: dimple -! Emacs*XlwScrollBar.ArrowPosition: opposite +! XEmacs*XlwScrollBar.SliderStyle: dimple +! XEmacs*XlwScrollBar.ArrowPosition: opposite ! ＠＠ -107,53 +107,53 ＠＠ ! ! To change the heights and widths of the toolbars: ! -! Emacs.topToolBarHeight: 37 -! Emacs.bottomToolBarHeight: 0 -! Emacs.leftToolBarWidth: 0 -! Emacs.rightToolBarWidth: 0 - -Emacs*topToolBarShadowColor: Gray90 -Emacs*bottomToolBarShadowColor: Gray40 -Emacs*backgroundToolBarColor: Gray75 -Emacs*toolBarShadowThickness: 2 +! XEmacs.topToolBarHeight: 37 +! XEmacs.bottomToolBarHeight: 0 +! XEmacs.leftToolBarWidth: 0 +! XEmacs.rightToolBarWidth: 0 + +XEmacs*topToolBarShadowColor: Gray90 +XEmacs*bottomToolBarShadowColor: Gray40 +XEmacs*backgroundToolBarColor: Gray75 +XEmacs*toolBarShadowThickness: 2 ! If you want to turn off vertical scrollbars, or change the default ! pixel width of the vertical scrollbars, do it like this (0 width ! means no vertical scrollbars): ! -! Emacs.scrollBarWidth: 0 +! XEmacs.scrollBarWidth: 0 ! ! To change it for a particular frame, do this: ! -! Emacs*FRAME-NAME.scrollBarWidth: 0 +! XEmacs*FRAME-NAME.scrollBarWidth: 0 ! If you want to turn off horizontal scrollbars, or change the default ! pixel height of the horizontal scrollbars, do it like this (0 height ! means no horizontal scrollbars): ! -! Emacs.scrollBarHeight: 0 +! XEmacs.scrollBarHeight: 0 ! ! To change it for a particular frame, do this: ! -! Emacs*FRAME-NAME.scrollBarHeight: 0 +! XEmacs*FRAME-NAME.scrollBarHeight: 0 ! To dynamically change the labels used for menubar buttons... ! -! Emacs*XlwMenu.resourceLabels: True -! Emacs*XlwMenu.newFrame.labelString: Open Another Window +! XEmacs*XlwMenu.resourceLabels: True +! XEmacs*XlwMenu.newFrame.labelString: Open Another Window ! To have the Motif scrollbars on the left instead of the right, do this: ! -! Emacs*scrollBarPlacement: BOTTOM_LEFT +! XEmacs*scrollBarPlacement: BOTTOM_LEFT ! ! To have the Athena scrollbars on the right, use `BOTTOM_RIGHT' instead ! To have Motif scrollbars act more like Xt scrollbars... ! -! Emacs*XmScrollBar.translations: #override \n\ +! XEmacs*XmScrollBar.translations: #override \n\ ! <Btn1Down>: PageDownOrRight(0) \n\ ! <Btn3Down>: PageUpOrLeft(0) ＠＠ -179,22 +179,22 ＠＠ ! by lisp code which tries a number of different possibilities in order ! of preference. If you wish to override it, use this: ! -! Emacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +! XEmacs.default.attributeFont: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! If you choose a font which does not have an italic version, you can specify ! some other font to use for it here: ! -! Emacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-* +! XEmacs.italic.attributeFont: -*-courier-medium-o-*-*-*-120-*-*-*-*-iso8859-* ! ! If you choose a font which does not have a bold-italic version, ! you can specify some other font to use for it here: ! -! Emacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-* +! XEmacs.bold-italic.attributeFont: -*-courier-bold-o-*-*-*-120-*-*-*-*-iso8859-* ! ! And here is how you would set the background color of the `highlight' face, ! but only on the screen named `debugger': ! -! Emacs*debugger.highlight.attributeBackground: PaleTurquoise +! XEmacs*debugger.highlight.attributeBackground: PaleTurquoise ! ! See the NEWS file (C-h n) for a more complete description of the resource ! syntax of faces. ＠＠ -230,29 +230,29 ＠＠ ! (Motif uses `fontList' while most other things use `font' - if you don't ! know why you probably don't want to.) ! -Emacs*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* -Emacs*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* -Emacs*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* -Emacs*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*XmDialogShell*FontList: -*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*XmTextField*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*XmText*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* +XEmacs*XmList*FontList: -*-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-* ! Font in the Athena dialog boxes. ! I think 14-point looks nicer than 12-point. ! Some people use 12-point anyway because you get more text, but ! there's no purpose at all in doing this for dialog boxes. -Emacs*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* +XEmacs*Dialog*Font: -*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-* ! Dialog box translations. ! ======================= ! This accelerator binds <return> in a dialog box to <activate> on button1 -Emacs*dialog*button1.accelerators:#override\ +XEmacs*dialog*button1.accelerators:#override\ <KeyPress>Return: ArmAndActivate()\n\ <KeyPress>KP_Enter: ArmAndActivate()\n\ Ctrl<KeyPress>m: ArmAndActivate()\n ! Translations to make the TextField widget behave more like XEmacs -Emacs*XmTextField.translations: #override\n\ +XEmacs*XmTextField.translations: #override\n\ !<Key>osfBackSpace: delete-previous-character()\n\ !<Key>osfDelete: delete-previous-character()\n\ !Ctrl<Key>h: delete-previous-character()\n\ ＠＠ -280,7 +280,7 ＠＠ ! ArmAndActivate() for buttons that appear in dialog boxes. This is ! not 100% Motif compliant but the benefits far outweight the ! compliancy problem. -Emacs*dialog*XmPushButton.translations:#override\n\ +XEmacs*dialog*XmPushButton.translations:#override\n\ <Btn1Down>: Arm()\n\ <Btn1Down>,<Btn1Up>: Activate()\ Disarm()\n\ ＠＠ -301,7 +301,7 ＠＠ ! ximStyles is a (whitespace or comma-separated) list of XIMStyles in ! order of user's preference. ! Choose a subset of the following styles or reorder to taste -Emacs*ximStyles: XIMPreeditPosition|XIMStatusArea\ +XEmacs*ximStyles: XIMPreeditPosition|XIMStatusArea\ XIMPreeditPosition|XIMStatusNothing\ XIMPreeditPosition|XIMStatusNone\ XIMPreeditNothing|XIMStatusArea\ ＠＠ -312,8 +312,8 ＠＠ XIMPreeditNone|XIMStatusNone ! XIM Preedit and Status foreground and background -Emacs*EmacsFrame.ximForeground: black -Emacs*EmacsFrame.ximBackground: white +XEmacs*EmacsFrame.ximForeground: black +XEmacs*EmacsFrame.ximBackground: white ! XIM fontset (defaults to system fontset default) -! Emacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-* +! XEmacs*EmacsFrame.FontSet: -dt-interface user-medium-r-normal-s*-*-*-*-*-*-*-*-* Index: man/xemacs/custom.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/custom.texi,v retrieving revision 1.18 diff -u -u -r1.18 custom.texi --- man/xemacs/custom.texi 2003/10/10 12:39:45 1.18 +++ man/xemacs/custom.texi 2005/03/20 16:50:20 ＠＠ -2145,42 +2145,53 ＠＠＠cindex X resources ＠findex x-create-frame -Historically, XEmacs has used the X resource application class ＠samp{Emacs} +Historically, XEmacs used the X resource application class ＠samp{Emacs} for its resources. Unfortunately, GNU Emacs uses the same application class, and resources are not compatible between the two Emacsen. This -sharing of the application class often leads to trouble if you want to +sharing of the application class often led to trouble if you wanted to run both variants. -Starting with XEmacs 21, XEmacs uses the class ＠samp{XEmacs} if it finds -any XEmacs resources in the resource database when the X connection is -initialized. Otherwise, it will use the class ＠samp{Emacs} for -backwards compatibility. The variable ＠code{x-emacs-application-class} -may be consulted to determine the application class being used. - -The examples in this section assume the application class is ＠samp{Emacs}. - -The Emacs resources are generally set per-frame. Each Emacs frame can have -its own name or the same name as another, depending on the name passed to the -＠code{make-frame} function. +XEmacs now uses the X resource application class ＠samp{XEmacs}. +Versions since 21.5.21 do this unconditionally, but previous versions +checked the X resource database for resources starting in ＠samp{XEmacs}, +and if none were found, they used ＠samp{Emacs}, for greater backward +compatibility. Currently, we advise moving your X resources to using +the ＠samp{XEmacs} class, but if, in the short term, you want to stay +with the old behavior, you can start XEmacs with the environment +variable ＠b{BRANDING_IS_FOR_THE_INSECURE} set to some value; this will +restore the pre-21.5.21 behavior. + +The examples in this section assume the application class is +＠samp{XEmacs}. From Lisp, you can examine the +＠code{x-emacs-application-class} variable to determine which is being +used in the running application. + +XEmacs' resources are generally set per-frame. Each XEmacs frame can +have its own name or the same name as another, depending on the name +passed to the ＠code{make-frame} function. Up until 21.5.21, the default +frame name was ＠samp{emacs}; since then, it has been ＠samp{XEmacs}, but +in the short term the old default can be restored by the +＠b{BRANDING_IS_FOR_THE_INSECURE} environment variable mentioned +above. See the docstring for the Lisp variable `default-frame-name'. You can specify resources for all frames with the syntax: ＠example -Emacs*parameter: value +XEmacs*parameter: value ＠end example ＠noindent or ＠example -Emacs*EmacsFrame.parameter:value +XEmacs*EmacsFrame.parameter:value ＠end example ＠noindent You can specify resources for a particular frame with the syntax: ＠example -Emacs*FRAME-NAME.parameter: value +XEmacs*FRAME-NAME.parameter: value ＠end example ＠noindent ＠＠ -2196,58 +2207,58 ＠＠＠node Geometry Resources ＠subsection Geometry Resources -To make the default size of all Emacs frames be 80 columns by 55 lines, +To make the default size of all XEmacs frames be 80 columns by 55 lines, do this: ＠example -Emacs*EmacsFrame.geometry: 80x55 +XEmacs*EmacsFrame.geometry: 80x55 ＠end example ＠noindent To set the geometry of a particular frame named ＠samp{fred}, do this: ＠example -Emacs*fred.geometry: 80x55 +XEmacs*fred.geometry: 80x55 ＠end example ＠noindent Important! Do not use the following syntax: ＠example -Emacs*geometry: 80x55 +XEmacs*geometry: 80x55 ＠end example ＠noindent You should never use ＠code{*geometry} with any X application. It does -not say "make the geometry of Emacs be 80 columns by 55 lines." It -really says, "make Emacs and all subwindows thereof be 80x55 in whatever +not say "make the geometry of XEmacs be 80 columns by 55 lines." It +really says, "make XEmacs and all subwindows thereof be 80x55 in whatever units they care to measure in." In particular, that is both telling the -Emacs text pane to be 80x55 in characters, and telling the menubar pane +XEmacs text pane to be 80x55 in characters, and telling the menubar pane to be 80x55 pixels, which is surely not what you want. As a special case, this geometry specification also works (and sets the -default size of all Emacs frames to 80 columns by 55 lines): +default size of all XEmacs frames to 80 columns by 55 lines): ＠example -Emacs.geometry: 80x55 +XEmacs.geometry: 80x55 ＠end example ＠noindent since that is the syntax used with most other applications (since most -other applications have only one top-level window, unlike Emacs). In +other applications have only one top-level window, unlike XEmacs). In general, however, the top-level shell (the unmapped ApplicationShell -widget named ＠samp{Emacs} that is the parent of the shell widgets that +widget named ＠samp{XEmacs} that is the parent of the shell widgets that actually manage the individual frames) does not have any interesting resources on it, and you should set the resources on the frames instead. The ＠code{-geometry} command-line argument sets only the geometry of the -initial frame created by Emacs. +initial frame created by XEmacs. A more complete explanation of geometry-handling is ＠itemize ＠bullet ＠item -The ＠code{-geometry} command-line option sets the ＠code{Emacs.geometry} +The ＠code{-geometry} command-line option sets the ＠code{XEmacs.geometry} resource, that is, the geometry of the ApplicationShell. ＠item ＠＠ -2261,7 +2272,7 ＠＠＠item For the first frame created, the position of the frame is taken from the -ApplicationShell (＠code{Emacs.geometry}) if it is specified, otherwise +ApplicationShell (＠code{XEmacs.geometry}) if it is specified, otherwise from the geometry of the frame. ＠item ＠＠ -2277,15 +2288,15 ＠＠＠subsection Iconic Resources Analogous to ＠code{-geometry}, the ＠code{-iconic} command-line option -sets the iconic flag of the ApplicationShell (＠code{Emacs.iconic}) and +sets the iconic flag of the ApplicationShell (＠code{XEmacs.iconic}) and always applies to the first frame created regardless of its name. However, it is possible to set the iconic flag on particular frames (by -name) by using the ＠code{Emacs*FRAME-NAME.iconic} resource. +name) by using the ＠code{XEmacs*FRAME-NAME.iconic} resource. ＠node Resource List ＠subsection Resource List -Emacs frames accept the following resources: +XEmacs frames accept the following resources: ＠table ＠asis ＠item ＠code{geometry} (class ＠code{Geometry}): string ＠＠ -2382,7 +2393,7 ＠＠ such as a modem connection. ＠end table -Emacs devices accept the following resources: +XEmacs devices accept the following resources: ＠table ＠asis ＠item ＠code{textPointer} (class ＠code{Cursor}): cursor-name ＠＠ -2425,14 +2436,14 ＠＠ The attributes of faces are also per-frame. They can be specified as: ＠example -Emacs.FACE_NAME.parameter: value +XEmacs.FACE_NAME.parameter: value ＠end example ＠noindent or ＠example -Emacs*FRAME_NAME.FACE_NAME.parameter: value +XEmacs*FRAME_NAME.FACE_NAME.parameter: value ＠end example ＠noindent ＠＠ -2447,7 +2458,7 ＠＠ The foreground and background colors of this face. ＠item ＠code{attributeBackgroundPixmap} (class ＠code{AttributeBackgroundPixmap}): file-name -The name of an ＠sc{xbm} file (or ＠sc{xpm} file, if your version of Emacs +The name of an ＠sc{xbm} file (or ＠sc{xpm} file, if your version of XEmacs supports ＠sc{xpm}), to use as a background stipple. ＠item ＠code{attributeUnderline} (class ＠code{AttributeUnderline}): boolean ＠＠ -2456,8 +2467,8 ＠＠ All text is displayed in some face, defaulting to the face named ＠code{default}. To set the font of normal text, use -(a)code{Emacs*default.attributeFont}. To set it in the frame named -＠code{fred}, use ＠code{Emacs*fred.default.attributeFont}. +(a)code{XEmacs*default.attributeFont}. To set it in the frame named +＠code{fred}, use ＠code{XEmacs*fred.default.attributeFont}. These are the names of the predefined faces: ＠＠ -2466,15 +2477,15 ＠＠ Everything inherits from this. ＠item bold -If this is not specified in the resource database, Emacs tries to find a +If this is not specified in the resource database, XEmacs tries to find a bold version of the font of the default face. ＠item italic -If this is not specified in the resource database, Emacs tries to find +If this is not specified in the resource database, XEmacs tries to find an italic version of the font of the default face. ＠item bold-italic -If this is not specified in the resource database, Emacs tries to find a +If this is not specified in the resource database, XEmacs tries to find a bold-italic version of the font of the default face. ＠item modeline ＠＠ -2569,11 +2580,11 ＠＠ colors: It uses whatever resources are appropriate to the type of widget which is used to implement it. -If Emacs was compiled to use only the Lucid Motif-lookalike menu widgets, +If XEmacs was compiled to use only the Lucid Motif-lookalike menu widgets, then one way to specify the font of the menubar would be ＠example -Emacs*menubar*font: *-courier-medium-r-*-*-*-120-*-*-*-*-*-* +XEmacs*menubar*font: *-courier-medium-r-*-*-*-120-*-*-*-*-*-* ＠end example If both the Lucid Motif-lookalike menu widgets and X Font Sets are ＠＠ -2593,7 +2604,7 ＠＠ If the Motif library is being used, then one would have to use ＠example -Emacs*menubar*fontList: *-courier-medium-r-*-*-*-120-*-*-*-*-*-* +XEmacs*menubar*fontList: *-courier-medium-r-*-*-*-120-*-*-*-*-*-* ＠end example because the Motif library uses the ＠code{fontList} resource name instead cvs server: cannot find modules/ldap/configure Index: src/device-x.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-x.c,v retrieving revision 1.61 diff -u -u -r1.61 device-x.c --- src/device-x.c 2005/02/03 16:30:35 1.61 +++ src/device-x.c 2005/03/20 16:50:21 ＠＠ -614,14 +614,22 ＠＠ LISP_STRING_TO_EXTERNAL (Vx_emacs_application_class, app_class, Qctext); else { - app_class = (NILP (Vx_emacs_application_class) && - have_xemacs_resources_in_xrdb (dpy)) + if (egetenv ("BRANDING_IS_FOR_THE_INSECURE")) + { + app_class = (NILP (Vx_emacs_application_class) && + have_xemacs_resources_in_xrdb (dpy)) #ifdef INFODOCK - ? "InfoDock" + ? "InfoDock" #else - ? "XEmacs" + ? "XEmacs" #endif -: "Emacs"; + : "Emacs"; + } + else + { + app_class = "XEmacs"; + } + /* need to update Vx_emacs_application_class: */ Vx_emacs_application_class = build_string (app_class); } ＠＠ -2096,14 +2104,14 ＠＠ this variable may only be changed before emacs is dumped, or by setting it in the file lisp/term/x-win.el. -If this variable is nil before the connection to the X server is first -initialized (which it is by default), the X resource database will be -consulted and the value will be set according to whether any resources -are found for the application class `XEmacs'. If the user has set any -resources for the XEmacs application class, the XEmacs process will use -the application class `XEmacs'. Otherwise, the XEmacs process will use -the application class `Emacs' which is backwards compatible to previous -XEmacs versions but may conflict with resources intended for GNU Emacs. +If this variable is nil on startup, the application uses `XEmacs'. Versions +previous to 21.5.21 examined the resource database and used `XEmacs' if any +resources beginning with that string existed, and `Emacs' otherwise, for +greated backward compatibility. However, this has always tended to conflict +with GNU Emacs, so this behavior is deprecated--in the short term, you can +restore it in a post-21.5.21 XEmacs by setting the +BRANDING_IS_FOR_THE_INSECURE environment variable to some value, but in the +medium and long term, you should migrate your X resources. */ ); Vx_emacs_application_class = Qnil; Index: src/frame.c =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame.c,v retrieving revision 1.68 diff -u -u -r1.68 frame.c --- src/frame.c 2005/02/03 16:30:36 1.68 +++ src/frame.c 2005/03/20 16:50:24 ＠＠ -37,6 +37,7 ＠＠ #include "glyphs.h" #include "gutter.h" #include "menubar.h" +#include "process.h" /* for egetenv */ #include "redisplay.h" #include "scrollbar.h" #include "toolbar.h" ＠＠ -492,10 +493,28 ＠＠ CHECK_STRING (name); frame_name_is_defaulted = 0; } - else if (STRINGP (Vdefault_frame_name)) - name = Vdefault_frame_name; - else - name = build_string ("emacs"); + else if (!initialized) + { + /* We leave Vdefault_frame_name alone here so that it'll remain Qnil + in the dumped executable, and we can choose it at runtime. */ + name = build_string("XEmacs"); + } + else if (NILP (Vdefault_frame_name)) + { + if (egetenv ("BRANDING_IS_FOR_THE_INSECURE")) + { + Vdefault_frame_name = build_string ("emacs"); + } + else + { + Vdefault_frame_name = build_string ("XEmacs"); + } + } + + if (NILP(name) && STRINGP(Vdefault_frame_name)) + { + name = Vdefault_frame_name; + } if (!NILP (Fstring_match (make_string ((const Ibyte *) "\\.", 2), name, Qnil, Qnil))) ＠＠ -3815,12 +3834,13 ＠＠ This can be overridden by arguments to `make-frame'. This must be a string. This is used primarily for picking up X resources, and is *not* the title of the frame. (See `frame-title-format'.) + +Previous to 21.5.21, this defaulted to `emacs'; since that release, it has +defaulted to `XEmacs'. In the short term you can restore the old default by +setting the environment variable BRANDING_IS_FOR_THE_INSECURE to some value +before starting XEmacs, but this is deprecated. */ ); -#ifndef INFODOCK - Vdefault_frame_name = build_string ("emacs"); -#else - Vdefault_frame_name = build_string ("InfoDock"); -#endif + Vdefault_frame_name = Qnil; DEFVAR_LISP ("default-frame-plist", &Vdefault_frame_plist /* Plist of default values for frame creation, other than the first one. -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

2 participants
1 comments

[CVSROOT] Show C function in log diffs 20 years

Steve Youngs

Being able to see what function a hunk is from can be very handy. BTW, Mike, I love these new CVS commit mails! :-) xemacs-CVSROOT patch: ChangeLog files diff command: cvs -q diff -U 0 Files affected: ChangeLog Source files diff command: cvs -q diff -uN Files affected: log_accum Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/CVSROOT/ChangeLog,v retrieving revision 1.136 diff -u -U0 -r1.136 ChangeLog --- ChangeLog 4 Jan 2005 15:53:22 -0000 1.136 +++ ChangeLog 29 Jan 2005 02:40:44 -0000 ＠＠ -0,0 +1,5 ＠＠ +2005-01-29 Steve Youngs <steve(a)sxemacs.org> + + * log_accum: Add `-p' to $difftype to show the C function a hunk + is from. + Index: log_accum =================================================================== RCS file: /pack/xemacscvs/CVSROOT/log_accum,v retrieving revision 1.57 diff -u -u -r1.57 log_accum --- log_accum 27 Jan 2005 17:17:46 -0000 1.57 +++ log_accum 29 Jan 2005 02:40:34 -0000 ＠＠ -63,7 +63,7 ＠＠ #$EMULATE_LOCAL_MAIL_USER="cvshome.org"; # Set this to '-c' for context diffs; defaults to '-u' for unidiff format. -$difftype = '-uN'; +$difftype = '-uNp'; ############################################################ # -- |---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---| | In space, | | No one can hear you rip a stinky | |------------------------------------<steve(a)sxemacs.org>---|

2 participants
1 comments

[COMMIT] Fix the last sync of riece 20 years

Daiki Ueno

NOTE: This patch has been committed. Removed files from ELCS which couldn't be compiled with XEmacs. xemacs-packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/riece/Makefile Index: xemacs-packages/riece/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/Makefile,v retrieving revision 1.15 diff -u -F^( -u -r1.15 Makefile --- xemacs-packages/riece/Makefile 20 Mar 2005 09:11:09 -0000 1.15 +++ xemacs-packages/riece/Makefile 20 Mar 2005 09:27:31 -0000 ＠＠ -29,27 +29,27 ＠＠ 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.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-emacs.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-ndcc.elc \ - lisp/riece-options.elc lisp/riece-rdcc.elc lisp/riece-server.elc \ - lisp/riece-signal.elc lisp/riece-skk-kakutei.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.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.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-server.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 EXTRA_SOURCES = lisp/riece-emacs.el lisp/riece-skk-kakutei.el lisp/url-riece.el AUTOLOAD_PATH = lisp -- Daiki Ueno

1 participants
0 comments

[PATCH] Saner MIME character set defaults in Gnus. 20 years

Aidan Kehoe

This incorporates an upstream change I made to Gnus--cf. http://quimby.gnus.org/cgi-bin/cvsweb.cgi/gnus/lisp/mm-util.el.diff?r1=6.... , http://tinyurl.com/46rzs , together with a non-nil default for mm-coding-system-priorities, which is an ordered list of preferred MIME character sets for a message. xemacs-packages/gnus/ChangeLog addition: 2005-02-27 Aidan Kehoe <kehoea(a)parhasard.net> * lisp/mm-util.el (mm-coding-system-priorities): Give it a non-nil default value even when we're not in Japan, containing the UTF-8 character set if that's available. * lisp/mm-util.el (mm-xemacs-find-mime-charset-1): New. * lisp/mm-util.el (mm-xemacs-find-mime-charset): New. * lisp/mm-util.el (mm-find-mime-charset-region): Incorporate upstream XEmacs-specific changes, use latin-unity to work out which MIME character set is appropriate. These two changes eliminate the "needs to be split into N charset parts. Really post?" bug on the default configuration. XEmacs Packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/gnus/lisp/mm-util.el Index: xemacs-packages/gnus/lisp/mm-util.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/gnus/lisp/mm-util.el,v retrieving revision 1.5 diff -u -u -r1.5 mm-util.el --- xemacs-packages/gnus/lisp/mm-util.el 2004/09/28 02:21:14 1.5 +++ xemacs-packages/gnus/lisp/mm-util.el 2005/02/27 16:18:47 ＠＠ -304,7 +304,11 ＠＠ (cond ((string= lang "Japanese") ;; Japanese users may prefer iso-2022-jp to shift-jis. '(iso-2022-jp iso-2022-jp-2 japanese-shift-jis - iso-latin-1 utf-8))))) + iso-latin-1 utf-8)) + ((find-coding-system 'utf-8) + '(iso-8859-1 iso-8859-2 iso-8859-15 utf-8)) + (t + '(iso-8859-1 iso-8859-2 iso-8859-15 iso-2022-jp))))) "Preferred coding systems for encoding outgoing messages. More than one suitable coding system may be found for some text. ＠＠ -539,6 +543,83 ＠＠ (> (length (memq a priorities)) (length (memq b priorities))))) +(eval-when-compile + (autoload 'latin-unity-massage-name "latin-unity") + (autoload 'latin-unity-maybe-remap "latin-unity") + (autoload 'latin-unity-representations-feasible-region "latin-unity") + (autoload 'latin-unity-representations-present-region "latin-unity") + (defvar latin-unity-coding-systems) + (defvar latin-unity-ucs-list)) + +(defun mm-xemacs-find-mime-charset-1 (begin end) + "Determine which MIME charset to use to send region as message. +This uses the XEmacs-specific latin-unity package to better handle the +case where identical characters from diverse ISO-8859-? character sets +can be encoded using a single one of the corresponding coding systems. + +It treats `mm-coding-system-priorities' as the list of preferred +coding systems; a useful example setting for this list in Western +Europe would be '(iso-8859-1 iso-8859-15 utf-8), which would default +to the very standard Latin 1 coding system, and only move to coding +systems that are less supported as is necessary to encode the +characters that exist in the buffer. + +Latin Unity doesn't know about those non-ASCII Roman characters that +are available in various East Asian character sets. As such, its +behavior if you have a JIS 0212 LATIN SMALL LETTER A WITH ACUTE in a +buffer and it can otherwise be encoded as Latin 1, won't be ideal. +But this is very much a corner case, so don't worry about it." + (let ((systems mm-coding-system-priorities) csets psets curset) + + ;; Load the Latin Unity library, if available. + (when (and (not (featurep 'latin-unity)) (locate-library "latin-unity")) + (require 'latin-unity)) + + ;; Now, can we use it? + (if (featurep 'latin-unity) + (progn + (setq csets (latin-unity-representations-feasible-region begin end) + psets (latin-unity-representations-present-region begin end)) + + (catch 'done + + ;; Pass back the first coding system in the preferred list + ;; that can encode the whole region. + (dolist (curset systems) + (setq curset (latin-unity-massage-name 'buffer-default curset)) + + ;; If the coding system is a universal coding system, then + ;; it can certainly encode all the characters in the region. + (if (memq curset latin-unity-ucs-list) + (throw 'done (list curset))) + + ;; If a coding system isn't universal, and isn't in + ;; the list that latin unity knows about, we can't + ;; decide whether to use it here. Leave that until later + ;; in `mm-find-mime-charset-region' function, whence we + ;; have been called. + (unless (memq curset latin-unity-coding-systems) + (throw 'done nil)) + + ;; Right, we know about this coding system, and it may + ;; conceivably be able to encode all the characters in + ;; the region. + (if (latin-unity-maybe-remap begin end curset csets psets t) + (throw 'done (list curset)))) + + ;; Can't encode using anything from the + ;; `mm-coding-system-priorities' list. + ;; Leave `mm-find-mime-charset' to do most of the work. + nil)) + + ;; Right, latin unity isn't available; let `mm-find-charset-region' + ;; take its default action, which equally applies to GNU Emacs. + nil))) + +(defmacro mm-xemacs-find-mime-charset (begin end) + (when (featurep 'xemacs) + `(mm-xemacs-find-mime-charset-1 ,begin ,end))) + (defun mm-find-mime-charset-region (b e &optional hack-charsets) "Return the MIME charsets needed to encode the region between B and E. nil means ASCII, a single-element list represents an appropriate MIME ＠＠ -580,8 +661,12 ＠＠ (setq systems nil charsets (list cs)))))) charsets)) - ;; Otherwise we're not multibyte, we're XEmacs, or a single - ;; coding system won't cover it. + ;; If we're XEmacs, and some coding system is appropriate, + ;; mm-xemacs-find-mime-charset will return an appropriate list. + ;; Otherwise, we'll get nil, and the next setq will get invoked. + (setq charsets (mm-xemacs-find-mime-charset b e)) + + ;; We're not multibyte, or a single coding system won't cover it. (setq charsets (mm-delete-duplicates (mapcar 'mm-mime-charset -- “I, for instance, am gung-ho about open source because my family is being held hostage in Rob Malda’s basement. But who fact-checks me, or Enderle, when we say something in public? No-one!” -- Danny O’Brien

3 participants
15 comments

[COMMIT] Sync riece with upstream version 1.0.8 20 years

Daiki Ueno

NOTE: This patch has been committed. xemacs-packages source patch: Diff command: cvs -q diff -u Files affected: xemacs-packages/riece/lisp/test/lunit.el xemacs-packages/riece/lisp/test/Makefile.am xemacs-packages/riece/lisp/riece.el xemacs-packages/riece/lisp/riece-xemacs.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-signal.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-message.el xemacs-packages/riece/lisp/riece-menu.el xemacs-packages/riece/lisp/riece-log.el xemacs-packages/riece/lisp/riece-layout.el xemacs-packages/riece/lisp/riece-keyword.el xemacs-packages/riece/lisp/riece-irc.el xemacs-packages/riece/lisp/riece-handle.el xemacs-packages/riece/lisp/riece-globals.el xemacs-packages/riece/lisp/riece-foolproof.el xemacs-packages/riece/lisp/riece-filter.el xemacs-packages/riece/lisp/riece-emacs.el xemacs-packages/riece/lisp/riece-display! .el xemacs-packages/riece/lisp/riece-ctcp.el xemacs-packages/riece/lisp/riece-compat.el xemacs-packages/riece/lisp/riece-commands.el xemacs-packages/riece/lisp/riece-channel.el xemacs-packages/riece/lisp/riece-button.el xemacs-packages/riece/lisp/riece-biff.el xemacs-packages/riece/lisp/riece-alias.el xemacs-packages/riece/lisp/riece-addon.el xemacs-packages/riece/lisp/riece-400.el xemacs-packages/riece/lisp/riece-300.el xemacs-packages/riece/lisp/riece-000.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/irchat-copyright.el xemacs-packages/riece/package-info.in xemacs-packages/riece/configure.ac xemacs-packages/riece/acinclude.m4 xemacs-packages/riece/README xemacs-packages/riece/NEWS xemacs-packages/riece/Makefile.am xemacs-packages/riece/Makefile Index: xemacs-packages/riece/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/ChangeLog,v retrieving revision 1.14 diff -u -F^( -u -r1.14 ChangeLog --- xemacs-packages/riece/ChangeLog 7 Dec 2004 21:48:46 -0000 1.14 +++ xemacs-packages/riece/ChangeLog 20 Mar 2005 09:09:56 -0000 ＠＠ -1,3 +1,17 ＠＠ +2005-03-06 Daiki Ueno <ueno(a)unixuser.org> + + * Riece: Version 1.0.8 released. + * configure.ac: Bump up version to 1.0.8. + +2005-02-05 Daiki Ueno <ueno(a)unixuser.org> + + * Riece: Version 1.0.7 released. + * configure.ac: Bump up version to 1.0.7. + +2004-12-07 Daiki Ueno <ueno(a)unixuser.org> + + * README.ja: New file. + 2004-12-07 Norbert Koch <viteno(a)xemacs.org> * Makefile (VERSION): XEmacs package 1.17 released. Index: xemacs-packages/riece/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/Makefile,v retrieving revision 1.14 diff -u -F^( -u -r1.14 Makefile --- xemacs-packages/riece/Makefile 7 Dec 2004 21:48:46 -0000 1.14 +++ xemacs-packages/riece/Makefile 20 Mar 2005 09:09:56 -0000 ＠＠ -20,7 +20,7 ＠＠ # This XEmacs package contains the riece IRC client package VERSION = 1.17 -AUTHOR_VERSION = 1.0.6 +AUTHOR_VERSION = 1.0.8 MAINTAINER = Daiki Ueno <ueno(a)unixuser.org> PACKAGE = riece PKG_TYPE = regular ＠＠ -29,24 +29,27 ＠＠ include ../../Local.rules.inc -ELCS = lisp/riece-compat.elc lisp/riece-xemacs.elc lisp/riece-globals.elc \ - lisp/riece-options.elc lisp/riece-version.elc lisp/riece-coding.elc \ - lisp/riece-complete.elc lisp/riece-addon.elc lisp/riece-mode.elc \ - lisp/riece-identity.elc lisp/riece-channel.elc lisp/riece-user.elc \ - lisp/riece-misc.elc lisp/riece-signal.elc lisp/riece-layout.elc \ - lisp/riece-display.elc lisp/riece-server.elc lisp/riece-naming.elc \ - lisp/riece-message.elc lisp/riece-filter.elc lisp/riece-handle.elc \ - lisp/riece-000.elc lisp/riece-200.elc lisp/riece-300.elc \ - lisp/riece-400.elc lisp/riece-500.elc lisp/riece-commands.elc \ - lisp/riece-irc.elc lisp/riece.elc lisp/riece-ctcp.elc \ - lisp/riece-highlight.elc lisp/riece-log.elc lisp/riece-mini.elc \ - lisp/riece-rdcc.elc lisp/riece-url.elc lisp/riece-unread.elc \ - lisp/riece-doctor.elc lisp/riece-alias.elc lisp/riece-foolproof.elc \ - lisp/riece-guess.elc lisp/riece-history.elc lisp/riece-button.elc \ - lisp/riece-keyword.elc lisp/riece-menu.elc lisp/riece-icon.elc \ - lisp/riece-async.elc lisp/riece-lsdb.elc lisp/riece-xface.elc \ - lisp/riece-ctlseq.elc lisp/riece-ignore.elc lisp/riece-hangman.elc \ - lisp/riece-biff.elc lisp/riece-kakasi.elc lisp/riece-yank.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.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-emacs.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-ndcc.elc \ + lisp/riece-options.elc lisp/riece-rdcc.elc lisp/riece-server.elc \ + lisp/riece-signal.elc lisp/riece-skk-kakutei.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 EXTRA_SOURCES = lisp/riece-emacs.el lisp/riece-skk-kakutei.el lisp/url-riece.el AUTOLOAD_PATH = lisp ＠＠ -58,5 +61,7 ＠＠ endif PRELOADS = -eval $"push \"./lisp\" load-path"$ + +DATA_1_FILES = $(wildcard lisp/*.xpm) include ../../XEmacs.rules Index: xemacs-packages/riece/Makefile.am =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/Makefile.am,v retrieving revision 1.2 diff -u -F^( -u -r1.2 Makefile.am --- xemacs-packages/riece/Makefile.am 5 Sep 2004 09:04:14 -0000 1.2 +++ xemacs-packages/riece/Makefile.am 20 Mar 2005 09:09:56 -0000 ＠＠ -1,5 +1,5 ＠＠ SUBDIRS = lisp doc -EXTRA_DIST = INSTALL-CVS +EXTRA_DIST = INSTALL-CVS README.ja NEWS.ja AUTOMAKE_OPTIONS = no-dependencies if XEMACS Index: xemacs-packages/riece/NEWS =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/NEWS,v retrieving revision 1.1.1.1 diff -u -F^( -u -r1.1.1.1 NEWS --- xemacs-packages/riece/NEWS 25 Oct 2003 09:25:38 -0000 1.1.1.1 +++ xemacs-packages/riece/NEWS 20 Mar 2005 09:09:56 -0000 ＠＠ -0,0 +1,492 ＠＠ +* Major changes in 1.0.8 + +** Mitigate file locking scheme of riece-log. (ueno) + +** Format idle seconds in human readable form. (ueno) + +** Separate riece-obarray into riece-channel-obarray and + riece-user-obarray. (kaoru) + +** Fixed bugs caused by mishandling of channel names (which should be + case insensitive.) (ueno) + +** Support SXEmacs version names. (Steve Youngs) + +** Support CTCP TIME. (Steve Youngs) + +** Ignore directories under ~/.riece/addons. (kaoru) + +** Fixed wrong-number-of-arguments error on riece-command-part. (yoichi) + +** Fixed a bug which assumes existence of ~/.riece/addons when + startup. (ueno) + +* Major changes in 1.0.7 + +** New add-on riece-toolbar. (ueno) + riece-toolbar displays icons on toolbar. Currently not all the + icons are included. + +** New add-on riece-keepalive. (ueno) + riece-keepalive spontaneously sends a PING message to server to + keep an IRC connection. + +** New add-on riece-google. (bg66) + riece-google searches on Google and sends the result to the channel. + +** New add-on riece-eval. (bg66) + riece-eval evaluates elisp expression and sends the result to the channel. + +** Some add-ons are enabled by default. (ueno) + riece-log, riece-alias, riece-ctlseq, and riece-keyword are now + enabled by default. + +** New command riece-command-suspend-resume. (ueno) + riece-command-suspend-resume saves or restores the current window + configuration. + +** Preserve cursor position when clicking button widget. (ueno) + +** Decorate modeline indicator with faces. (ueno) + +** Count users in NAMES reply. (ueno) + +** New user option riece-part-message. (ueno) + +** Add-ons located in riece-addon-directory are automatically enabled. (ueno) + +** Default value of riece-buffer-dispose-function is now kill-buffer. (ueno) + +** Backtrace when encountered an error in process-filter. (ueno) + +** Ask channel key to user when it is required. (ueno) + +** Automatic buffer shrinking is now disabled by default. (ueno) + +** New directory structure for riece-log. (ueno) + +** Fixed a bug in user-renamed signal-filter. (kaoru) + +** Fixed a bug in riece-command-enable-addon and + riece-command-disable-addon. (yoichi) + +* Major changes in 1.0.6 + +** Bundle url-riece, a backend of url-irc which comes with the recent + GNU Emacs. (Yamato-san) + +** New user option riece-url-regexp-alist to allow users to define + mapping from arbitrary strings (such as "Bug#12345") to URL. (This + feature is a backport from Liece) (ueno) + +** New modeline indicator which represents user's channel operator + status in the current channel. (ueno, thanks to k-to) + +** Remove multiple lines at a time when shrinking channel buffers. + Number of lines to be removed is controlled by + riece-shrink-buffer-remove-lines option. (ueno, thanks to ysjj) + +** riece-alias-alist now works again. (ueno) + +** Fixed a bug in flow control for sending long messages, introduced + in 1.0.4. (ueno) + +** New command riece-submit-bug-report to generate a template for good + problem report. (ueno) + +** Accept radical IRC proxy programs which break with tradition of the + original IRC server implementation. (ueno, thanks to k-to san) + +** New key bind C-c # <number> to switch channel by number. (ueno, + thanks to ysjj) + +** If a prefix-argument is given, riece-yank sends message as a NOTICE. (bg66) + +* Major changes in 1.0.5 + +** Added some test cases. (ueno) + +** Alternate separator string for channel names. (ueno) + In case riece-alias-alternate-separator set to "＠", rewriting will + be done as follows: + + "#riece" -> "#riece" + "#riece localhost" -> "#riece＠localhost" + "#ch＠nnel" -> "#ch＠＠nnel" + "#ch＠nnel localhost" -> "#ch＠＠nnel＠localhost" + +** Fixed interop bug in DCC. (ueno) + +** New add-on riece-yank to send strings from kill-ring. (by Yamato-san) + +** English translation of texinfo document is included. (ueno) + +* Major changes in 1.0.4 + +** Do "flow control" to avoid flooding. (ueno) + +** Automatically open servers when joining channels at startup. Users + can now omit riece-startup-server-list settings. (ueno) + +** riece-mini provides a command to browse recent messages. (bg66) + +* Major changes in 1.0.3 + +NOTE: This release includes some fixes to long standing bugs in essential features. I recommend to upgrade from the older versions. + +** Remove nonexistent users from user list. (Thanks to Yamashita-san) + +** Improved line truncation customizability. Users can now control it + by simply setting truncate-lines on each buffer. (Thanks to + Yamashita-san) + +** Added new user option riece-window-center-line to control buffer + scrolling behavior. + +** Fixed completion bug in command buffer. (Thanks to Yamashita-san) + +** Remove chat partner from channel list when he/she resigned from + IRC. (Thanks to Morimoto-san) + +** Exit immediately after an error occurred in connecting to the + default IRC server. (Thanks to k-to san) + +* Major changes in 1.0.2 + +** Fixed problem hiding menubar menus when riece-url is enabled. + +** Split IRC protocol interface from the core modules. + +** Fixed minor bugs. + +* Major changes in 1.0.1 + +** Arranged background colors of modeline faces (for XEmacs) + +** When changing channel modes, do not prepend ":" to MODE message + (Thanks to Yamada-san) + +** Added riece-foolproof add-on which prevents miss posting to + channels (by Takahashi-san) + +** Arranged the order of modeline elements on channel buffers (by + Takahashi-san) + +** Changed open/close bracket for displaying own notices (by Takahashi-san) + +** Don't register signal-slot functions duplicatedly. + +** New user command riece-command-beginning-of-buffer bound to C-c Home. + +** For frozen channels, preserve cursor position of channel buffers + while zapping between other channels. + +** Follow the change in emacs-cvs, check the return value of + current-word (by Nakayama-san) + +** Fixed random number generation logic for riece-hangman (by Takahashi-san) + +** Signal "No text to send" error if user types C-c p on an empty line. + +** New user option riece-startup-ignored-user-list: which can be used + to set up riece-ignored-user-list in ~/.riece/init.el. + +** Allow sending/receiving files whose names contain whitespaces. + +* Major changes in 1.0.0 + +** New UI for enabling/disabling add-ons (to enter this mode, C-c ^) + +** Fixed bug that a user couldn't quit password input with C-g. + +** New add-on "riece-hangman" which allows channel members to play hangman(6). + +** Display error message on C-c q when no IRC process are running. + +** New add-on "riece-ignore" which allows to ignore messages from + particular users. + +** Accept nicknames consisting more than 9 letters. + +** Avoid duplicate initialization of add-ons. + +** New add-on "riece-biff" which displays biff mark ("[R]") on + mode-line. (by Ohashi-san) + +** New add-on "riece-kakasi" which converts Japanese to roman string. + +** Fixed prompt strings to indicate the current action more + precisely. (suggested by Yamashita-san) + +* Major changes in 0.2.2 + +** Interpret control sequences used in IRC such as ^B, ^V, ^_, etc. + This feature is implemented as an add-on called riece-ctlseq. + +** Fixed bug that private messages were not treated as unread. + +** Buffer "freeze" status can be toggled in each buffer respectively. + (use C-t C-f) + +** Use canonicalized channel names to locate directories where log + files are stored. (by Ohashi-san) + +* Major changes in 0.2.0 + +** Introduced "signal-slot" (as in Qt, GTK+) mechanism to routing + display events. + +** When a user requests NAMES, insert nicknames into the channel buffer. + +** Fixed bug in riece-lsdb. (by Nakayama-san) + +* Major changes in 0.1.8 + +** Added riece-lsdb add-on which cooperates with LSDB. +** Added riece-xface add-on which displays X-Faces in user list buffer. + +** Fixed bug that channel names were treated case sensitively. + +** Handle messages from other clients which use the same IRC proxy. + (by Takahashi-san) + +* Major changes in 0.1.7 + +** Added riece-async add-on which provides safe connection to an IRC + server via local proxy which responds to PING requests while Emacs + is busy or suspended. + +** Fixed changing user away status bug when riece-away-message is set. + (Thanks to Fujimura-san) + +** Remove side effects on standard-syntax-table when loading. + (Thanks to Hori-san) + +** Can join channels on several servers at startup by setting + riece-startup-server-list as well as riece-startup-channel-list. + +** New user option `riece-log-coding-system' to specify default coding + system used for log files. + +** New user option `riece-keyword-notify-functions' called when + someone spoke a message including the specified keyword. Please use + it instead of `riece-notify-keyword-functions'(very confusing + name!). + +** riece-log-flashback also restores faces and buttons. + +** riece-{unread,mini} ignores NOTICE and CTCP ACTION messages. + +* Major changes in 0.1.6 + +** Fixed running problems on Emacs 20.7. + +** Fixed compilation failure on XEmacs 21.1. + +** Allow riece-rdcc to receive large files without memory consumption. + +** Check channel modes when joinning if riece-gather-channel-modes == t. + +** Fixed run-idle-timer usage to shrink channel buffers. + +** Fixed buffer scrolling behavior when switching channels. + +** Allow to specify qualified channel names in + riece-log-directory-map. (by Ohashi-san) + +* Major changes in 0.1.5 + +** Added 6 new window layouts. + +** Automatically save/restore the current window layout. + +** Added riece-icon add-on which decorates buffers with icons. + +** Speedup in redrawing the user list buffer. + +** Improve usability of CTCP ACTION (Thanks to knu-san) + +** Fixed bug in riece-rdcc which causes freeze on DCC SEND. + +** When riece server was opened, Do riece-command-configure-windows + instead of signaling. (Thanks to Ohashi-san) + +** Fixed bug in C-c o (riece-command-set-operators) and C-c v + (riece-command-set-speakers). + +** Shrink buffers when they exceeds riece-max-buffer-size. + +* Major changes in 0.1.4 + +** Bind "N" instead of "\C-n" to riece-command-names in channel + buffers. (thanks to Takahashi-san) + +** Fixed bug causing an error when the user typed C-c C-t a + (riece-command-toggle-away). (thanks to Maeda-san) + +** Don't redisplay buffers when the current selected window doesn't + display Riece buffers. + +** Don't reuse buffers created by different programs. Genereate new + buffer in such case. + +** Fixed bug which doesn't allow to join a channel whose name is + beginning with "!!". + +** When riece-keyword is effective, don't check if the message from + myself contains given keywords. + +** Signal an error when the user issues a command which assumes the + current channel though the current channel is not available. + +** Added riece-menu add-on which adds a menu entry in the menubar. + +* Major changes in 0.1.3 + +** Treat channel names in PRIVMSG/NOTICE messages case-insensitively. + +** When riece-history is effective, mark the last visited channel with "+". + +** Added riece-button add-on which decorates buffers with buttons and + define some popup-menus. + +** Added riece-keyword add-on which notifies the user when the arrived + message contains given keywords. + + If you are using XEmacs and want to be notified of keywords with + sound, add the following lines to your ~/.riece/init.el: + + (load-default-sounds) + (setq riece-keywords '("foo" "bar")) + (add-hook 'riece-notify-keyword-functions + (lambda (keyword) (play-sound 'cuckoo))) + +* Major changes in 0.1.2 + +** Fixed bug when joinning a channel using a key. + +** Revive riece-startup-channel-list. + +** New user option riece-rdcc-save-directory is added. + +** Fixed unable to interrupt password input. + +** Fixed bug in the INVITE handler. + +** Prompt a channel name when the user joins the invited channel. + +** Fixed bug that occasionally kept riece-channel-list-indicator not + up to date. + +* Major changes in 0.1.1 + +** Load some add-ons by default. + +** Fixed bug with riece-default-channel-binding not working. + +** Mark the current channel with "*" in *Channels* buffer. + +** If riece-debug is turned off, don't report connection status when exiting. + +** New add-on: riece-history manages channel switching history. + +** New add-on: riece-guess offers the next channel user may want to check. + + Tips: + + If you have the following lines in ~/.riece/init.el: + + (setq riece-guess-channel-try-functions + '(riece-guess-channel-from-unread + riece-guess-channel-from-history)) + + By hitting `C-c g' repeatedly, you can check channels in the + following order: + + 1. Channels where there is unread message. + 2. Channels where you have visited recently. + 3. The rest. + +* Major changes in 0.1.0 + +** Use vectors to represent channels and users. + +** Improve process management: + -- Server names are now embedded in process names. + -- Integrate scattered connection management code into riece-server.el. + -- Force disconnect if the server does not respond after sending QUIT. + +** New add-on: riece-doctor.el allows to pretended to be a doctor. + +** Window configuration can be easily switched by hitting C-c t l. + +** New add-on: riece-skk-kakutei.el avoids ▽ being included in + spoken text, when you are using SKK. (by Takahashi-san) + +** New predefined layout which emulates "top" window-style as in Liece. + (by Takahashi-san) + +* Major changes in 0.0.4 + +** Added riece-mini add-on which allows conversation through a + minibuffer (by Ohashi-san). + +** Added log collector add-on (riece-log) (by Ohashi-san). + +** riece-command-next-channel (C-c >) and + riece-command-previous-channel (C-c <) now follow the channel list + circularly (by Nakayama-san). + +** When riece-unread is enabled, you can quickly check the unread + channels by hitting C-c C-u (by Ohashi-san). + +** Display of status indicators obeys some IRC messages. + +** Replaced ptexinfmt.el with the version which does not depend on + APEL (Thanks to Yamaoka-san). + +* Major changes in 0.0.3 + +** Fix bug connecting to two servers which require passwords (Thanks + to Nakayama-san) + +** Fix inconsistency when changing case of letters in nickname + +** Catch all errors occured in handler hooks + +** Support DCC file transfer (riece-ndcc.el, riece-rdcc.el) + +** Add "mark unread channels" add-on (riece-unread.el) + +** Add Japanese texinfo manual (I'll translate it in the future) + +* Major changes in 0.0.2 + +** Don't use APEL functions (pop, push) + +** "depcomp" was missing in the previous archive (sorry!) + +** Fix bug building on Windows environment (Thanks to Ohashi-san) + +** Fix inconsistency when changing nickname + +** Fix bug on C-c C-t u (M-x riece-command-toggle-user-list-mode) + +** Provide add-on mechanism + +** Partial support for CTCP + +** Make font-lock related module (riece-highlight) add-on + +** Revive URL collector (formerly liece-url) as add-on + +* Major changes in 0.0.1 + +** Initial release. + +* For details of changes, see the file ChangeLog. + +Local variables: +mode: outline +paragraph-separate: "[ ]*$" +end: cvs server: xemacs-packages/riece/NEWS.ja is a new entry, no comparison available Index: xemacs-packages/riece/README =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/README,v retrieving revision 1.1.1.1 diff -u -F^( -u -r1.1.1.1 README --- xemacs-packages/riece/README 25 Oct 2003 09:25:38 -0000 1.1.1.1 +++ xemacs-packages/riece/README 20 Mar 2005 09:09:56 -0000 ＠＠ -1,7 +1,6 ＠＠ * What's this? -Riece is an IRC client for Emacs. The development has started to -redesign the Liece IRC client. +Riece is an IRC client for Emacs. Riece provides the following features: ＠＠ -12,7 +11,7 ＠＠ - Setup is easy. Automatically save/restore the configuration. - Riece uses separate windows to display users, channels, and dialogues. The user can select the window layout. -- Step-by-step instructions (currently written in Japanese) are included. +- Step-by-step instructions (in info format) are included. - Mostly compliant with RFC 2812. * Directory tree cvs server: xemacs-packages/riece/README.ja is a new entry, no comparison available Index: xemacs-packages/riece/acinclude.m4 =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/acinclude.m4,v retrieving revision 1.1.1.1 diff -u -F^( -u -r1.1.1.1 acinclude.m4 --- xemacs-packages/riece/acinclude.m4 25 Oct 2003 09:25:38 -0000 1.1.1.1 +++ xemacs-packages/riece/acinclude.m4 20 Mar 2005 09:09:56 -0000 ＠＠ -1,11 +1,11 ＠＠ -AC_DEFUN(AC_DEFINE_GNUS_PRODUCT_NAME, +AC_DEFUN([AC_DEFINE_GNUS_PRODUCT_NAME], [echo $ac_n "defining gnus product name... $ac_c" AC_CACHE_VAL(EMACS_cv_GNUS_PRODUCT_NAME,[EMACS_cv_GNUS_PRODUCT_NAME=$1]) GNUS_PRODUCT_NAME=${EMACS_cv_GNUS_PRODUCT_NAME} AC_MSG_RESULT(${GNUS_PRODUCT_NAME}) AC_SUBST(GNUS_PRODUCT_NAME)]) -AC_DEFUN(AC_CHECK_EMACS, +AC_DEFUN([AC_CHECK_EMACS], [dnl Check for Emacsen. dnl Apparently, if you run a shell window in Emacs, it sets the EMACS ＠＠ -35,7 +35,7 ＠＠ AC_SUBST(EMACS) AC_SUBST(XEMACS)]) -AC_DEFUN(AC_EMACS_LISP, [ +AC_DEFUN([AC_EMACS_LISP], [ elisp="$2" if test -z "$3"; then AC_MSG_CHECKING(for $1) ＠＠ -55,7 +55,7 ＠＠ fi ]) -AC_DEFUN(AC_CHECK_EMACS_FLAVOR, +AC_DEFUN([AC_CHECK_EMACS_FLAVOR], [AC_MSG_CHECKING([what a flavor does $EMACS have]) dnl Ignore cache. ＠＠ -76,7 +76,7 ＠＠ esac AC_MSG_RESULT($EMACS_cv_SYS_flavor)]) -AC_DEFUN(AC_PATH_LISPDIR, [ +AC_DEFUN([AC_PATH_LISPDIR], [ AC_CHECK_EMACS_FLAVOR if test "$prefix" = NONE; then AC_MSG_CHECKING([prefix for your Emacs]) ＠＠ -113,7 +113,7 ＠＠ AC_SUBST(lispdir) ]) -AC_DEFUN(AC_PATH_ETCDIR, [ +AC_DEFUN([AC_PATH_ETCDIR], [ AC_ARG_WITH(etcdir,[ --with-etcdir=DIR Where to install etc files], etcdir=${withval}) AC_MSG_CHECKING([where etc files should go]) if test -z "$etcdir"; then ＠＠ -128,7 +128,7 ＠＠ dnl Check whether a function exists in a library dnl All '_' characters in the first argument are converted to '-' dnl -AC_DEFUN(AC_EMACS_CHECK_LIB, [ +AC_DEFUN([AC_EMACS_CHECK_LIB], [ if test -z "$3"; then AC_MSG_CHECKING(for $2 in $1) fi ＠＠ -150,7 +150,7 ＠＠ dnl dnl Perform sanity checking and try to locate the W3 package dnl -AC_DEFUN(AC_CHECK_W3, [ +AC_DEFUN([AC_CHECK_W3], [ AC_MSG_CHECKING(for acceptable W3 version) dnl Ignore cache. ＠＠ -184,7 +184,7 ＠＠ dnl dnl Perform sanity checking and try to locate the W3 package dnl -AC_DEFUN(AC_CHECK_URL, [ +AC_DEFUN([AC_CHECK_URL], [ AC_MSG_CHECKING(for acceptable URL version) dnl Ignore cache. ＠＠ -220,7 +220,7 ＠＠ dnl Bitstream Courier. dnl -AC_DEFUN(GNUS_CHECK_FONTS, [ +AC_DEFUN([GNUS_CHECK_FONTS], [ test "$LATEX" = t && LATEX= test "$LATEX" || AC_PATH_PROGS(LATEX, latex, no) AC_MSG_CHECKING(for available fonts) ＠＠ -305,7 +305,7 ＠＠ AC_SUBST(USE_FONTS) ]) -AC_DEFUN(AC_EXAMINE_PACKAGEDIR, +AC_DEFUN([AC_EXAMINE_PACKAGEDIR], [dnl Examine PACKAGEDIR. AC_EMACS_LISP(PACKAGEDIR, (let (package-dir)\ ＠＠ -323,7 +323,7 ＠＠ (or package-dir \"\")), "noecho")]) -AC_DEFUN(AC_PATH_PACKAGEDIR, +AC_DEFUN([AC_PATH_PACKAGEDIR], [dnl Check for PACKAGEDIR. if test ${EMACS_FLAVOR} = xemacs; then AC_MSG_CHECKING([where the XEmacs package is]) ＠＠ -345,7 +345,7 ＠＠ fi AC_SUBST(PACKAGEDIR)]) -AC_DEFUN(AC_ADD_LOAD_PATH, +AC_DEFUN([AC_ADD_LOAD_PATH], [dnl Check for additional load path. AC_ARG_WITH(addpath, [ --with-addpath=PATH search Emacs-Lisp libraries with PATH Index: xemacs-packages/riece/configure.ac =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/configure.ac,v retrieving revision 1.5 diff -u -F^( -u -r1.5 configure.ac --- xemacs-packages/riece/configure.ac 5 Dec 2004 04:12:51 -0000 1.5 +++ xemacs-packages/riece/configure.ac 20 Mar 2005 09:09:56 -0000 ＠＠ -1,10 +1,7 ＠＠ -AC_INIT(configure.ac) -AC_PREREQ(2.50) -AM_INIT_AUTOMAKE(riece, 1.0.6) - -AC_ISC_POSIX -AC_PROG_INSTALL -AC_PROG_MAKE_SET +AC_INIT +AC_CONFIG_SRCDIR([configure.ac]) +AC_PREREQ(2.59) +AM_INIT_AUTOMAKE(riece, 1.0.8) AC_CHECK_EMACS AC_PATH_LISPDIR ＠＠ -12,7 +9,8 ＠＠ AM_CONDITIONAL(XEMACS, test ${EMACS_FLAVOR} = xemacs) -AC_OUTPUT(Makefile \ +AC_CONFIG_FILES([Makefile lisp/Makefile lisp/test/Makefile -doc/Makefile) +doc/Makefile]) +AC_OUTPUT Index: xemacs-packages/riece/package-info.in =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/package-info.in,v retrieving revision 1.3 diff -u -F^( -u -r1.3 package-info.in --- xemacs-packages/riece/package-info.in 5 Dec 2004 04:12:51 -0000 1.3 +++ xemacs-packages/riece/package-info.in 20 Mar 2005 09:09:56 -0000 ＠＠ -13,7 +13,7 ＠＠ (riece filename FILENAME md5sum MD5SUM size SIZE - provides (riece-compat riece-xemacs riece-globals riece-options riece-version riece-coding riece-complete riece-addon 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-ctcp riece-highlight riece-log riece-mini riece-rdcc riece-url riece-unread riece-doctor riece-alias riece-foolproof riece-guess riece-history riece-button riece-keyword riece-menu riece-icon riece-async riece-lsdb riece-xface riece-ctlseq riece-ignore riece-hangman riece-biff riece-kakasi riece-yank) + provides (riece-compat riece-xemacs riece-globals riece-options riece-debug riece-version riece-coding riece-complete riece-addon 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-ctcp riece-highlight riece-log riece-mini riece-rdcc riece-url riece-unread riece-doctor riece-alias riece-skk-kakutei riece-foolproof riece-guess riece-history riece-button riece-keyword riece-menu riece-icon riece-async riece-lsdb riece-xface riece-ctlseq riece-ignore riece-hangman riece-biff riece-kakasi riece-yank riece-toolbar riece-eval riece-google riece-keepalive) requires (REQUIRES) type regular )) Index: xemacs-packages/riece/doc/irchat-copyright.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/doc/irchat-copyright.el,v retrieving revision 1.4 diff -u -F^( -u -r1.4 irchat-copyright.el --- xemacs-packages/riece/doc/irchat-copyright.el 5 Dec 2004 04:12:56 -0000 1.4 +++ xemacs-packages/riece/doc/irchat-copyright.el 20 Mar 2005 09:09:56 -0000 ＠＠ -1,9 +1,9 ＠＠ ;;; -*- emacs-lisp -*- ;;; -;;; $Id: irchat-copyright.el,v 1.4 2004/12/05 04:12:56 daiki Exp $ +;;; $Id: irchat-copyright.el,v 1.1 2003/10/22 20:07:07 ueno Exp $ ;;; (defvar irchat-copyright " - $Id: irchat-copyright.el,v 1.4 2004/12/05 04:12:56 daiki Exp $ + $Id: irchat-copyright.el,v 1.1 2003/10/22 20:07:07 ueno Exp $ Internet Relay CHAT interface for GNU Emacs Copyright (C) 1989 Tor Lillqvist ＠＠ -49,9 +49,6 ＠＠ (defvar irchat-copyright " ;;; ;;; $Log: irchat-copyright.el,v $ -;;; Revision 1.4 2004/12/05 04:12:56 daiki -;;; Sync riece with upstream version 1.0.6 -;;; ;;; Revision 1.1 2003/10/22 20:07:07 ueno ;;; (EXTRA_DIST) Add irchat-copyright.el. ;;; 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.1 diff -u -F^( -u -r1.1 riece-en.texi --- xemacs-packages/riece/doc/riece-en.texi 5 Dec 2004 04:12:57 -0000 1.1 +++ xemacs-packages/riece/doc/riece-en.texi 20 Mar 2005 09:09:56 -0000 ＠＠ -3,7 +3,7 ＠＠＠setfilename riece-en.info ＠settitle Riece -- An IRC client for Emacsen -- ＠c %**end of header -＠set VERSION 1.0.6 +＠set VERSION 1.0.8 ＠c ＠documentlanguage en ＠dircategory GNU Emacs Lisp ＠＠ -14,7 +14,7 ＠＠＠ifinfo This file describes Riece. -Copyright (C) 2003,2004 Daiki Ueno. +Copyright (C) 2003,2004,2005 Daiki Ueno. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or ＠＠ -33,7 +33,7 ＠＠＠page ＠vskip 0pt plus 1filll -Copyright ＠copyright{} 2003 Daiki Ueno. +Copyright ＠copyright{} 2003,2004,2005 Daiki Ueno. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or ＠＠ -67,8 +67,7 ＠＠ has been unmaintainable for a long time), while providing a user interface (mostly) compatible with Liece. -For now it does not have rich functions as an IRC client, but there are -noteworthy improvements as compared with Liece: +There are noteworthy improvements as compared with Liece: ＠itemize ＠bullet ＠item ＠＠ -95,8 +94,6 ＠＠＠itemize ＠bullet ＠item http://www.nongnu.org/riece/ -＠item http://wiliki.designflaw.org/index.cgi?Riece&l=jp -＠item http://www.unixuser.org/~ueno/liece/ ＠end itemize ＠node Getting started, Basic usage, Overview, Top ＠＠ -135,7 +132,7 ＠＠ commands instead of the above: ＠example -./configure --with-xemacs[=xemacs-21.4.15] +./configure --with-xemacs[=xemacs-21.4.17] make package make install-package ＠end example ＠＠ -260,7 +257,7 ＠＠ (by default, it is located at ＠file{~/.r put on the left side of the modeline like: ＠example -Riece: --- ueno #Liece [n] +Riece: --- ueno #Riece [n] ＠end example In this case, ＠samp{---} are indicators. From left to right their 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.5 diff -u -F^( -u -r1.5 riece-ja.texi --- xemacs-packages/riece/doc/riece-ja.texi 5 Dec 2004 04:12:57 -0000 1.5 +++ xemacs-packages/riece/doc/riece-ja.texi 20 Mar 2005 09:09:56 -0000 ＠＠ -3,7 +3,7 ＠＠＠setfilename riece-ja.info ＠settitle Riece -- An IRC client for Emacsen -- ＠c %**end of header -＠set VERSION 1.0.6 +＠set VERSION 1.0.8 ＠c ＠documentlanguage ja ＠dircategory GNU Emacs Lisp ＠＠ -14,7 +14,7 ＠＠＠ifinfo This file describes Riece. -Copyright (C) 2003,2004 Daiki Ueno. +Copyright (C) 2003,2004,2005 Daiki Ueno. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or ＠＠ -33,7 +33,7 ＠＠＠page ＠vskip 0pt plus 1filll -Copyright ＠copyright{} 2003 Daiki Ueno. +Copyright ＠copyright{} 2003,2004,2005 Daiki Ueno. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or ＠＠ -70,15 +70,15 ＠＠書き直したものです。ユーザインターフェースの大部分は Liece のものを踏襲しています。 -現在のところ IRC クライアントとしての機能は十分ではありませんが、Liece -にはない特長がいくつかあります。以下にそれらの一部を挙げます。 +Riece には Liece にはない特長がいくつかあります。 +以下にそれらの一部を挙げます。＠itemize ＠bullet ＠item 複数の IRC サーバに同時に接続可能＠item アドオンにより機能の追加や取り外しが可能＠item 他の elisp パッケージに依存しないため、インストールが簡単＠item 設定が簡単で、前回起動時の設定を記録・復元する仕組みを提供 -＠item 段階的な操作説明書(現在は日本語のみ)が附属 +＠item 段階的な操作説明書が附属＠item 最新の IRC のクライアントプロトコル (RFC2812) に準拠＠end itemize ＠＠ -86,8 +86,6 ＠＠＠itemize ＠bullet ＠item http://www.nongnu.org/riece/ -＠item http://wiliki.designflaw.org/index.cgi?Riece&l=jp -＠item http://www.unixuser.org/~ueno/liece/ ＠end itemize ＠node Getting started, Basic usage, Overview, Top ＠＠ -126,7 +124,7 ＠＠ XEmacs のパッケージとしてインストールする場合には以下のようにします。＠example -./configure --with-xemacs[=xemacs-21.4.15] +./configure --with-xemacs[=xemacs-21.4.17] make package make install-package ＠end example ＠＠ -249,7 +247,7 ＠＠ (autoload 'riece "riece" "Start Riece" t 自分の現在の状態を示す印が表示されます。＠example -Riece: --- ueno #Liece [n] +Riece: --- ueno #Riece [n] ＠end example ここで、＠samp{---} の部分には左から順に以下の意味があります。＠＠ -410,7 +408,7 ＠＠ (完全に禁止していれば＠samp{F}! 千�m 宣矮�� 襠 ╂竢粤�蜈竇�闕轣鈔�濶鍄) でチャンネルに参加します。ここで、チャンネル名の後に空白で区切ってサーバ名を続けます。空白を入力するには、 -＠kbd{C-q} を使います。たとえば、サーバ＠samp{irc6} 上の＠samp{#Liece} に参加するには＠kbd{C-c j #Liece C-q SPC irc6} とタイプすることになります。 +＠kbd{C-q} を使います。たとえば、サーバ＠samp{irc6} 上の＠samp{#Riece} に参加するには＠kbd{C-c j #Riece C-q SPC irc6} とタイプすることになります。＠end enumerate チャンネルに入らずにコマンドを送るには、＠kbd{C-c M} ＠＠ -560,12 +558,21 ＠＠ (Emacs 21.3 の make-network-proces 日本語の通らない端末で、日本語をローマ字で表示＠item riece-yank ＠kbd{C-c y} で kill-ring から文字列を送信 +＠item riece-toolbar +ツールバーを表示 +＠item riece-eval +入力された文字列を lisp オブジェクトとして評価 +＠item riece-google +キーワードを Google で検索 +＠item riece-keepalive +IRC サーバとの接続を保持＠end table これらのうち、＠samp{riece-highlight} と＠samp{riece-ctcp}、＠samp{riece-url}、＠samp{riece-unread}、＠samp{riece-guess}、＠samp{riece-history}、＠samp{riece-button}、＠samp{riece-menu}、 -＠samp{riece-ignore} はデフォルトで組み込まれています。 +＠samp{riece-ignore}、＠samp{riece-log}、＠samp{riece-alias}、 +＠samp{riece-ctlseq}、＠samp{riece-keyword} はデフォルトで組み込まれています。アドオンを組み込むには＠code{riece-addons} を設定します。たとえば＠samp{riece-alias} を組み込む場合には、(a)file{~/.riece/init.el} に以下のよ＠＠ -669,10 +676,10 ＠＠ (add-to-list 'riece-addons 'riece-skk-ka ＠example (setq riece-default-channel-binding - '("#Liece" "#emacsen" nil "#debianjp")) + '("#Riece" "#emacsen" nil "#debianjp")) ＠end example -1: #Liece, 2: #emacsen, 4: #debianjp のように割当てられます。nil はデフォ +1: #Riece, 2: #emacsen, 4: #debianjp のように割当てられます。nil はデフォルトでは自動割当ての対象にならないこと意味し、新たなチャンネルに参加した場合、そのチャンネルが 3 番目のチャンネルとして扱われます。＠＠ -684,7 +691,7 ＠＠ (setq riece-default-channel-binding ＠example (setq riece-startup-channel-list - '(("#secret" "password") "#Liece")) + '(("#secret" "password") "#Riece")) ＠end example 複数のサーバ上のチャンネルに参加するには、 Index: xemacs-packages/riece/lisp/COMPILE =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/COMPILE,v retrieving revision 1.5 diff -u -F^( -u -r1.5 COMPILE --- xemacs-packages/riece/lisp/COMPILE 5 Dec 2004 04:12:59 -0000 1.5 +++ xemacs-packages/riece/lisp/COMPILE 20 Mar 2005 09:09:56 -0000 ＠＠ -7,6 +7,7 ＠＠ (defvar riece-modules 'riece-emacs) '(riece-globals riece-options + riece-debug riece-version riece-coding riece-complete ＠＠ -71,18 +72,43 ＠＠ (defvar riece-modules riece-hangman riece-biff riece-kakasi - riece-yank)))) + riece-yank + riece-toolbar + riece-eval + riece-google + riece-keepalive)))) + +(defvar riece-icons + '(riece-command-quit + riece-command-join + riece-command-part + riece-command-previous-channel + riece-command-next-channel + riece-command-change-layout + riece-submit-bug-report)) (defun riece-compile-modules (modules) - (let ((load-path (cons nil load-path))) + (let ((load-path (cons nil load-path)) + error-modules) (while modules (let ((source (expand-file-name (concat (symbol-name (car modules)) ".el")))) (if (file-newer-than-file-p source (concat source "c")) (condition-case error (byte-compile-file source) - (error)))) - (setq modules (cdr modules))))) + (error + (setq error-modules (cons (car modules) error-modules)))))) + (setq modules (cdr modules))) + (if error-modules + (princ (concat "\n\ + WARNING: --------------------------------------------------------- + WARNING: Couldn't compile following modules: + WARNING: + WARNING: " (mapconcat #'symbol-name error-modules ", ") "\n\ + WARNING: + WARNING: You should probably stop here, try \"make distclean\" to clear + WARNING: the last build, and then reconfigure. + WARNING: ---------------------------------------------------------\n\n"))))) (defun riece-install-modules (modules dest just-print) (unless (or just-print (file-exists-p dest)) ＠＠ -104,6 +130,19 ＠＠ (defun riece-install-modules (modules de name))))) (setq modules (cdr modules)))) +(defun riece-install-icons (icons dest just-print) + (unless (or just-print (file-exists-p dest)) + (make-directory dest t)) + (while icons + (let ((name (symbol-name (car icons)))) + (when (file-exists-p (expand-file-name (concat name ".xpm"))) + (princ (format "%s.xpm -> %s\n" name dest)) + (unless just-print + (copy-file (expand-file-name (concat name ".xpm")) + (expand-file-name (concat name ".xpm") dest) + t t)))) + (setq icons (cdr icons)))) + (defun riece-install-just-print-p () (let ((flag (getenv "MAKEFLAGS")) case-fold-search) ＠＠ -117,6 +156,10 ＠＠ (defun riece-install () (riece-install-modules riece-modules (expand-file-name "riece" (car command-line-args-left)) + (riece-install-just-print-p)) + (riece-install-icons + riece-icons + (expand-file-name "riece" (car command-line-args-left)) (riece-install-just-print-p))) (defun riece-compile-package () ＠＠ -135,13 +178,18 ＠＠ (defun riece-install-package () '(auto-autoloads custom-load)) (expand-file-name "riece" (expand-file-name "lisp" (car command-line-args-left))) + (riece-install-just-print-p)) + (riece-install-icons + riece-icons + (expand-file-name "riece" + (expand-file-name "lisp" (car command-line-args-left))) (riece-install-just-print-p))) (defun riece-test () (let ((load-path (cons (expand-file-name "test") (cons nil load-path))) (files (directory-files "test" t "^test-.*\\.el$")) suite) - (require 'lunit) + (require 'lunit-report) (setq suite (lunit-make-test-suite)) (while files (when (file-regular-p (car files)) Index: xemacs-packages/riece/lisp/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/ChangeLog,v retrieving revision 1.5 diff -u -F^( -u -r1.5 ChangeLog --- xemacs-packages/riece/lisp/ChangeLog 5 Dec 2004 04:12:59 -0000 1.5 +++ xemacs-packages/riece/lisp/ChangeLog 20 Mar 2005 09:09:57 -0000 ＠＠ -1,3 +1,456 ＠＠ +2005-03-06 Daiki Ueno <ueno(a)unixuser.org> + + * Riece: Version 1.0.8 released. + * riece-version.el (riece-version-number): Bump up to 1.0.8. + +2005-03-06 Daiki Ueno <ueno(a)unixuser.org> + + * COMPILE (riece-compile-modules): Print summary. + +2005-03-05 Daiki Ueno <ueno(a)unixuser.org> + + * riece-version.el: Bind emacs-program-version. + * riece-debug.el: Require 'riece-options for riece-debug. + + * riece-log.el (riece-log-insinuate): Use user-uid instead of + user-login-name and escape system-name for riece-log-lock-file. + +2005-03-02 Daiki Ueno <ueno(a)unixuser.org> + + * riece-log.el (riece-log-lock-file): Define with defvar. + (riece-log-display-message-function): Use riece-log-lock-file as + LOCKNAME of write-region. + (riece-log-insinuate): Generate name for riece-log-lock-file. + +2005-02-27 Daiki Ueno <ueno(a)unixuser.org> + + * riece-300.el (riece-handle-317-message): Format idle seconds in + human readable form. + (riece-handle-301-message): Don't use riece-user-regexp. + (riece-handle-311-message): Ditto. + (riece-handle-312-message): Ditto. + (riece-handle-317-message): Ditto. + (riece-handle-319-message): Ditto. + + * riece-ctcp.el (riece-handle-ctcp-action-request): Prepend target. + (riece-command-ctcp-action): Ditto. + +2005-02-25 TAKAHASHI Kaoru <kaoru(a)kaisei.org> + + * riece-globals.el (riece-obarray-size, riece-obarray): Abolish. + (riece-channel-obarray-size, riece-user-obarray-size) + (riece-channel-obaary, riece-user-obarray): New variables. + * riece-user.el (riece-find-user, riece-forget-user) + (riece-rename-user, riece-get-user): Use `riece-user-obarray' + instead of `riece-user-obarray'. + * riece-channel.el (riece-find-channel, riece-forget-channel) + (riece-get-channel): Use `riece-channel-obarray' instead of + `riece-obarray'. + * riece-misc.el (riece-get-identities-on-server): Ditto. + * riece-server.el (riece-reset-process-buffer): Ditto. + +2005-02-24 Daiki Ueno <ueno(a)unixuser.org> + + * riece-unread.el (riece-unread-after-switch-to-channel-function): + Clear riece-unread-channels case insensitively. + + * riece-300.el (riece-handle-353-message): Use + riece-identity-assoc to pick an entry from + riece-353-message-alist. + (riece-handle-366-message): Ditto. + Reported by Steve Youngs <steve(a)sxemacs.org>. + +2005-02-19 Daiki Ueno <ueno(a)unixuser.org> + + * riece-debug.el (riece-funcall-ignore-errors): New function. + * riece-signal.el (riece-emit-signal): Use riece-funcall-ignore-errors. + * riece-filter.el (riece-handle-numeric-reply): Use + riece-funcall-ignore-errors. + (riece-handle-message): Ditto. + * riece-ctcp.el (riece-handle-ctcp-request): Use + riece-funcall-ignore-errors. + +2005-02-18 Steve Youngs <steve(a)sxemacs.org> + + * riece-ctcp.el (riece-handle-ctcp-time-request): New. + (riece-handle-ctcp-time-response): New. + (riece-command-ctcp-time): New. + (riece-ctcp-enable): Add `riece-command-ctcp-time'. + (riece-ctcp-disable): Ditto. + + * riece-layout.el (riece-layout-alist): Minor doc string fix -- + escape a couple of parens. + + * riece-version.el: defvar sxemacs-codename at compile time. + (riece-extended-version): Simplify the XEmacs section, add support + for SXEmacs. + +2005-02-17 TAKAHASHI Kaoru <kaoru(a)kaisei.org> + + * riece-addon.el (riece-resolve-addons): Fixed + avoid add directory to addons condition. + +2005-02-10 TAKAHASHI Kaoru <kaoru(a)kaisei.org> + + * riece-addon.el (riece-resolve-addons): Don't add directory to + addons. + +2005-02-09 Yoichi NAKAYAMA <yoichi(a)geiin.org> + + * riece-commands.el (riece-command-part): Fix argument. + +2005-02-07 Daiki Ueno <ueno(a)unixuser.org> + + * riece-filter.el (riece-filter): Simplified. + + * riece-addon.el (riece-resolve-addons): Check the existence of + riece-addon-directory. + +2005-02-06 Daiki Ueno <ueno(a)unixuser.org> + + * riece-filter.el (riece-filter): Modified regexp. + +2005-02-05 Daiki Ueno <ueno(a)unixuser.org> + + * riece.el (riece-exit): Clear riece-window-configuration frame + parameter. + * riece-commands.el (riece-command-suspend-resume): Don't attempt + to restore window-configuration if the cdr of + riece-window-configuration frame parameter is nil. + + * riece-filter.el (riece-chomp-string): New function. + (riece-filter): Use it. + +2005-02-05 Daiki Ueno <ueno(a)unixuser.org> + + * Riece: Version 1.0.7 released. + * riece-version.el (riece-version-number): Bump up to 1.0.7. + +2005-02-05 Daiki Ueno <ueno(a)unixuser.org> + + * riece-keyword.el (riece-keyword-face): Change defface spec for tty. + + * riece-toolbar.el (riece-toolbar-description): New constant. + + * riece-keepalive.el: Require 'riece-options. + (riece-keepalive-ping-repeat): Define with defcustom. + (riece-keepalive-description): New constant. + + * riece.el (riece-dialogue-mode-map): Bind + riece-command-suspend-resume. + * riece-commands.el (riece-command-suspend-resume): New command. + + * riece-options.el (riece-addons): Enable riece-keyword by default. + + * riece-button.el (riece-identity-button-popup-menu): Changed + interactivbe spect "＠e" -> "e". + (riece-identity-button-click): New function. + (riece-make-identity-button-map): Bind riece-identity-button-click. + +2005-02-04 Daiki Ueno <ueno(a)unixuser.org> + + * riece-options.el (riece-part-message): New user option. + (riece-addons): Enable riece-alias and riece-ctlseq by default. + (riece-max-buffer-size): Change the default value to nil. + + * riece-commands.el (riece-command-part): Use riece-part-message. + +2005-02-04 OHASHI Akira <bg66(a)koka-in.org> + + * riece-eval.el (riece-eval-form): New function. + (riece-eval-display-message-function): Use it. + +2005-02-04 Daiki Ueno <ueno(a)unixuser.org> + + * riece-000.el (riece-handle-001-message): Use + riece-command-join-channel to join startup channels. + + * riece-filter.el (riece-filter): Accept lines which end with LF. + + * riece-300.el (riece-353-message-alist): Renamed from riece-353-users. + (riece-handle-353-message): Don't parse the reply. + (riece-handle-366-message): Parse 353 replies here; count users. + + * riece-log.el (riece-log-enable): Add debug message. + + * riece-keepalive.el: New add-on. + * COMPILE (riece-modules): Add riece-keepalive. + * Makefile.am (EXTRA_DIST): Add riece-keepalive.el. + +2005-02-04 OHASHI Akira <bg66(a)koka-in.org> + + * riece-biff.el (riece-biff-functions): Abolish. + (riece-biff-after-display-message-function): Follow the change above. + +2005-02-04 Daiki Ueno <ueno(a)unixuser.org> + + * riece-server.el (riece-close-server-process): Switch to process + buffer when running riece-after-close-hook. + + * COMPILE (riece-icons): Add all symbols from riece-toolbar-items. + + * Makefile.am (EXTRA_DIST): Add riece-command-previous-channel.xpm, + riece-command-next-channel.xpm, and riece-submit-bug-report.xpm. + + * riece-menu.el (riece-menu-items): Add "Submit Bug Report". + + * riece-toolbar.el (riece-toolbar-items): Add riece-submit-bug-report. + + * riece-compat.el (riece-read-passwd): Changed default value. + + * riece-400.el (riece-handle-475-message): Don't bind inhibit-quit + when reading channel key. + + * riece-irc.el (riece-irc-open-server): Don't bind inhibit-quit + when reading password. + + * riece-compat.el (riece-read-passwd): Bind inhibit-quit. + + * riece-commands.el (riece-command-join): Abolished prefix-arg + (channel key). + + * riece-options.el (riece-buffer-dispose-function): Changed the + default value from bury-buffer to kill-buffer. + * riece-log.el (riece-log-lock-directory): New user option. + (riece-log-enable): Create lock directory. + (riece-log-disable): Remove lock directory. + + * riece-addon.el (riece-resolve-addons): Don't use FILES-ONLY + argument of directory-files. + +2005-02-04 OHASHI Akira <bg66(a)koka-in.org> + + * riece-google.el (riece-google-default-lang): Change value. + (riece-google-display-message-function): Follow the change above. + +2005-02-03 OHASHI Akira <bg66(a)koka-in.org> + + * riece-google.el: New add-on. + * COMPILE (riece-modules): Add riece-google. + * Makefile.am (EXTRA_DIST): Add riece-google.el. + +2005-02-03 Daiki Ueno <ueno(a)unixuser.org> + + * riece-400.el (riece-handle-475-message): New handler; query + channel key. + +2005-02-03 Daiki Ueno <ueno(a)unixuser.org> + + * riece-addon.el (riece-resolve-addon-dependencies): Rename from + riece-resolve-addon. + (riece-resolve-addon): Append add-ons under riece-addon-directory. + +2005-02-02 TAKAHASHI Kaoru <kaoru(a)kaisei.org> + + * riece-message.el (riece-display-message): When filter-function + return nil, escape from while loop. + +2005-02-02 Daiki Ueno <ueno(a)unixuser.org> + + * riece-debug.el (riece-debug-standard-output-buffer): Use + riece-temp-buffer. + * riece.el: Add riece-temp-buffer. + * riece-globals.el (riece-temp-buffer): New variable. + +2005-02-02 Daiki Ueno <ueno(a)unixuser.org> + + * riece-signal.el (riece-emit-signal): Use riece-ignore-errors. + + * riece-filter.el (riece-handle-numeric-reply): Use + riece-ignore-errors. + (riece-handle-message): Ditto. + + * riece-ctcp.el (riece-handle-ctcp-request): Use + riece-ignore-errors. + (riece-handle-ctcp-response): Ditto. + + * riece-debug.el: New file. + * COMPILE (riece-modules): Add riece-debug. + * Makefile.am (EXTRA_DIST): Add riece-debug.el. + +2005-02-02 OHASHI Akira <bg66(a)koka-in.org> + + * riece-eval.el (riece-eval-regexp): Fix regexp. + (riece-eval-display-message-function): Follow the change above. + +2005-02-02 Daiki Ueno <ueno(a)unixuser.org> + + * riece-server.el (riece-close-server-process): Run + riece-after-close-hook. + + * riece-log.el (riece-log-insert): Bind file-name-coding-system + and default-file-name-coding-system to nil. + +2005-02-01 OHASHI Akira <bg66(a)koka-in.org> + + * riece-eval.el: New add-on. + * COMPILE (riece-modules): Add riece-eval. + * Makefile.am (EXTRA_DIST): Add riece-eval.el. + +2005-01-30 TAKAHASHI Kaoru <kaoru(a)kaisei.org> + + * riece-display.el (riece-display-connect-signals): Check nick or + channel, before call `riece-channel-get-users'. + +2004-12-15 Yoichi NAKAYAMA <yoichi(a)geiin.org> + + * riece-addon.el (riece-command-enable-addon): Fixed. + (riece-command-disable-addon): Ditto. + +2004-12-14 Daiki Ueno <ueno(a)unixuser.org> + + * riece-alias.el (riece-alias-abbrev-identity-string): Return a + copy of a string since text properties will be set on it. + (riece-alias-expand-identity-string): Ditto. + + * riece-emacs.el (riece-normalize-modeline-string): Don't + concatenate elements in modeline string. + +2004-12-13 Daiki Ueno <ueno(a)unixuser.org> + + * riece-display.el (riece-update-channel-list-indicator): + Normalize modeline indicator. + + * riece-xemacs.el (riece-normalize-modeline-string): New alias. + * riece-emacs.el (riece-normalize-modeline-string): New function. + (riece-normalize-modeline-string-1): New function. + +2004-12-13 Daiki Ueno <ueno(a)unixuser.org> + + * test/Makefile.am (EXTRA_DIST): Add test-riece.el. + * test/test-riece.el: New test cases. + + * riece.el (riece-shrink-buffer): Fixed bug. + + * riece-options.el (riece-username): Changed the default value to + user-full-name. + +2004-12-12 Daiki Ueno <ueno(a)unixuser.org> + + * riece-command-previous-channel.xpm: New file. + * riece-command-next-channel.xpm: New file. + + * COMPILE (riece-icons): New variable. + (riece-install-icons): New function. + (riece-install): Install icons. + (riece-install-package): Ditto. + +2004-12-12 Daiki Ueno <ueno(a)unixuser.org> + + * riece-options.el (riece-addons): Add riece-toolbar. + + * riece-log.el (riece-log-flashback): Fixed regexp. + + * riece-menu.el (riece-menu-items): Add "Next Channel" and + "Previous Channel". + + * riece-toolbar.el: Support XEmacs. + (riece-toolbar-items): Renamed from + riece-toolbar-item-list. + (riece-tool-bar-local-item-from-menu): Abolished. + (riece-toolbar-find-menu-item): New function. + (riece-make-toolbar-from-menu): New function. + (riece-set-toolbar): New function. + (riece-toolbar-insinuate-in-command-buffer): Use them. + +2004-12-11 Daiki Ueno <ueno(a)unixuser.org> + + * riece-toolbar.el: New add-on. + * COMPILE (riece-modules): Add riece-toolbar. + * Makefile.am (EXTRA_DIST): Add riece-toolbar.el. + +2004-12-10 Daiki Ueno <ueno(a)unixuser.org> + + * test/test-riece-log.el + (test-riece-log-display-message-function): "yes" -> "true". + + * test/Makefile.am (EXTRA_DIST): Add lunit-report.el and + test-riece-log.el. + +2004-12-10 Daiki Ueno <ueno(a)unixuser.org> + + * riece.el (riece-shrink-buffer): Shrink buffer based on chars + instead of lines. + + * riece-options.el (riece-shrink-buffer-remove-chars): New user option. + (riece-shrink-buffer-remove-lines): Abolish. + +2004-12-08 Daiki Ueno <ueno(a)unixuser.org> + + * test/test-riece-log.el (test-riece-log-delete-directory): + Suppress file-name encoding. + + * riece-log.el (riece-log-get-directory): Fixed bug in + riece-log-directory-map handling. + + * test/test-riece-log.el + (test-riece-log-display-message-function): New test case. + +2004-12-08 Daiki Ueno <ueno(a)unixuser.org> + + * riece-log.el (riece-log-flashback): Fixed custom spec. + (riece-log-date-face): New face. + (riece-log-insert): Don't append date string to the end of log + lines if they arrived today. + (riece-log-flashback): Insert "Recent messages ...:"; call + riece-after-insert-functions. + + * riece-handle.el (riece-handle-part-message): Call riece-naming + assert-part after inserting changes in channel buffers. + * riece-display.el (riece-part-channel): Call + riece-buffer-dispose-function on parted channel buffer. + +2004-12-08 Daiki Ueno <ueno(a)unixuser.org> + + * riece-log.el (riece-log-display-message-function): Suppress + further file-name encoding. + +2004-12-07 Daiki Ueno <ueno(a)unixuser.org> + + * test/lunit-report.el: New file split from lunit.el. + + * riece-options.el (riece-addons): Add 'riece-log. + + * test/test-riece-log.el (lunit-test-case-setup): #riece -> =23riece. + + * riece-log.el (riece-log-insert): Renamed from + riece-log-flashback-1; simplified. + (riece-log-get-files): Check existence of directory. + (riece-log-get-directory): New implementation. + [cf. <Liece:00396>] + +2004-12-07 TAKAHASHI Kaoru <kaoru(a)kaisei.org> + + * riece-foolproof.el (riece-foolproof-command-send-message-function): + Check invisible text. + +2004-12-07 Daiki Ueno <ueno(a)unixuser.org> + + * test/test-riece-log.el (test-riece-log-encode-file-name): New + test case. + (test-riece-log-encode-file-name-mule): New test case. + (test-riece-log-decode-file-name): New test case. + (test-riece-log-decode-file-name-mule): New test case. + + * riece-log.el (riece-log-file-name-coding-system): New user option. + (riece-log-encode-file-name): New function. + (riece-log-decode-file-name): New function. + +2004-12-06 Daiki Ueno <ueno(a)unixuser.org> + + * test/test-riece-log.el: New test cases. + + * riece-log.el: Collect logs across dates. + (riece-log-get-files): New function. + (riece-log-flashback-1): New function. + (riece-log-flashback): Use it. + +2004-12-05 Daiki Ueno <ueno(a)unixuser.org> + + * riece-message.el (riece-display-message-1): Call + riece-after-display-message-functions in riece-message-buffer. + [cf. <Liece:00391>] + 2004-12-05 Daiki Ueno <ueno(a)unixuser.org> * Riece: Version 1.0.6 released. Index: xemacs-packages/riece/lisp/Makefile.am =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/Makefile.am,v retrieving revision 1.5 diff -u -F^( -u -r1.5 Makefile.am --- xemacs-packages/riece/lisp/Makefile.am 5 Dec 2004 04:12:59 -0000 1.5 +++ xemacs-packages/riece/lisp/Makefile.am 20 Mar 2005 09:09:57 -0000 ＠＠ -3,19 +3,22 ＠＠ EXTRA_DIST = COMPILE ChangeLog ChangeLog.Liece \ riece-000.el riece-200.el riece-300.el riece-400.el riece-500.el \ riece-addon.el riece-channel.el riece-coding.el riece-commands.el \ - riece-compat.el riece-complete.el riece-display.el riece-emacs.el \ - riece-filter.el riece-globals.el riece-handle.el riece-highlight.el \ - riece-identity.el riece-message.el riece-misc.el riece-mode.el \ - riece-naming.el riece-options.el riece-server.el riece-signal.el \ - riece-user.el riece-version.el riece-xemacs.el riece-irc.el riece.el \ - riece-ctcp.el riece-url.el riece-unread.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 riece-message.el riece-misc.el \ + riece-mode.el riece-naming.el riece-options.el riece-server.el \ + riece-signal.el riece-user.el riece-version.el riece-xemacs.el \ + riece-irc.el riece.el riece-ctcp.el riece-url.el riece-unread.el \ riece-ndcc.el riece-rdcc.el riece-log.el riece-mini.el \ riece-doctor.el riece-alias.el riece-layout.el riece-skk-kakutei.el \ riece-guess.el riece-history.el riece-button.el riece-keyword.el \ riece-menu.el riece-icon.el riece-async.el riece-lsdb.el \ riece-xface.el riece-ctlseq.el riece-ignore.el riece-hangman.el \ riece-biff.el riece-kakasi.el riece-foolproof.el riece-yank.el \ - url-riece.el + riece-toolbar.el riece-eval.el riece-google.el riece-keepalive.el \ + url-riece.el \ + riece-command-previous-channel.xpm riece-command-next-channel.xpm \ + riece-submit-bug-report.xpm CLEANFILES = auto-autoloads.el custom-load.el *.elc FLAGS ?= -batch -q -no-site-file Index: xemacs-packages/riece/lisp/riece-000.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-000.el,v retrieving revision 1.3 diff -u -F^( -u -r1.3 riece-000.el --- xemacs-packages/riece/lisp/riece-000.el 5 Sep 2004 09:04:19 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-000.el 20 Mar 2005 09:09:57 -0000 ＠＠ -60,7 +60,7 ＠＠ (defun riece-handle-001-message (prefix (if (equal (riece-identity-server (setq identity (riece-parse-identity (car entry)))) riece-server-name) - (riece-command-join identity (nth 1 entry))) + (riece-command-join-channel identity (nth 1 entry))) (setq channel-list (cdr channel-list)))) (run-hooks 'riece-after-login-hook)) 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.4 diff -u -F^( -u -r1.4 riece-300.el --- xemacs-packages/riece/lisp/riece-300.el 5 Dec 2004 04:12:59 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-300.el 20 Mar 2005 09:09:57 -0000 ＠＠ -93,7 +93,7 ＠＠ (defun riece-handle-303-message (prefix "\n"))) (defun riece-handle-301-message (prefix number name string) - (if (string-match (concat "^\$" riece-user-regexp "\$ :?") string) + (if (string-match (concat "^\$[^ ]+\$ :?") string) (let ((user (match-string 1 string)) (message (substring string (match-end 0)))) (riece-user-toggle-away user t) ＠＠ -127,8 +127,7 ＠＠ (defun riece-handle-306-message (prefix (defun riece-handle-311-message (prefix number name string) (if (string-match - (concat "^\$" riece-user-regexp - "\$ \$[^ ]+\$ \$[^ ]+\$ \\* :?") + (concat "^\$[^ ]+\$ \$[^ ]+\$ \$[^ ]+\$ \\* :?") string) (let ((user (match-string 1 string)) (name (substring string (match-end 0))) ＠＠ -148,7 +147,7 ＠＠ (defun riece-handle-311-message (prefix (defun riece-handle-312-message (prefix number name string) (if (string-match - (concat "^\$" riece-user-regexp "\$ \$[^ ]+\$ :?") + (concat "^\$[^ ]+\$ \$[^ ]+\$ :?") string) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) ＠＠ -174,23 +173,35 ＠＠ (defun riece-handle-313-message (prefix (defun riece-handle-317-message (prefix number name string) (if (string-match - (concat "^\$" riece-user-regexp "\$ \$[0-9]+\$ ") + (concat "^\$[^ ]+\$ \$[0-9]+\$ ") string) - (let ((user (match-string 1 string)) - (idle (match-string 2 string))) + (let* ((user (match-string 1 string)) + (seconds (string-to-number (match-string 2 string))) + (units (list (cons (/ seconds 60 60 24) "days") + (cons (mod (/ seconds 60 60) 24) "hours") + (cons (mod (/ seconds 60) 60) "minutes") + (cons (mod seconds 60) "seconds")))) (riece-insert-info (list riece-dialogue-buffer riece-others-buffer) (concat (riece-concat-server-name - (format "%s is %s seconds idle" + (format "%s is %s idle" (riece-format-identity (riece-make-identity user riece-server-name) t) - idle)) + (mapconcat #'identity + (delq nil + (mapcar + (lambda (unit) + (if (/= (car unit) 0) + (format "%d %s" + (car unit) (cdr unit)))) + units)) + " "))) "\n"))))) (defun riece-handle-319-message (prefix number name string) - (if (string-match (concat "^\$" riece-user-regexp "\$ :?") string) + (if (string-match (concat "^\$[^ ]+\$ :?") string) (let ((user (match-string 1 string)) (channels (mapconcat ＠＠ -229,45 +240,20 ＠＠ (defun riece-handle-351-message (prefix (substring string (match-end 0)))) "\n")))) -(defvar riece-353-users nil) +(defvar riece-353-message-alist nil) (defun riece-handle-353-message (prefix number name string) "RPL_NAMREPLY \"[=\*＠] <channel> :[[＠|+]<nick> [[＠|+]<nick> [...]]]\"." + (make-local-variable 'riece-353-message-alist) (if (string-match "^[=\*＠] *\$[^ ]+\$ +:?" string) - (let ((channel (match-string 1 string)) - (start 0) - user) - (make-local-variable 'riece-353-users) - (setq string (substring string (match-end 0))) - (while (string-match - (concat "\$[＠+]\$?\$" riece-user-regexp "\$ *") - string start) - (put-text-property (match-beginning 2) (match-end 2) - 'riece-identity - (riece-make-identity (match-string 2 string) - riece-server-name) - string) - (setq start (match-end 0) - user (if (match-beginning 1) - (if (eq (aref string (match-beginning 1)) ?＠) - (list (match-string 2 string) ?o) - (if (eq (aref string (match-beginning 1)) ?+) - (list (match-string 2 string) ?v))) - (list (match-string 2 string))) - riece-353-users (cons user riece-353-users))) - (let* ((channel-identity (riece-make-identity channel - riece-server-name)) - (buffer (riece-channel-buffer channel-identity))) - (riece-insert-info buffer (concat "Users: " string "\n")) - (riece-insert-info - (if (and riece-channel-buffer-mode - (not (eq buffer riece-channel-buffer))) - (list riece-dialogue-buffer riece-others-buffer) - riece-dialogue-buffer) - (concat - (riece-concat-server-name - (format "Users on %s: %s" - (riece-format-identity channel-identity t) string)) - "\n")))))) + (let* ((channel (match-string 1 string)) + (entry (riece-identity-assoc channel riece-353-message-alist t))) + (if entry + (setcdr entry + (concat (cdr entry) + (substring string (match-end 0)))) + (setq riece-353-message-alist + (cons (cons channel (substring string (match-end 0))) + riece-353-message-alist)))))) (defun riece-handle-322-message (prefix number name string) (if (string-match "^\$[^ ]+\$ \$[0-9]+\$ :?" string) ＠＠ -435,10 +421,50 ＠＠ (defun riece-handle-323-message (prefix (defun riece-handle-366-message (prefix number name string) "RPL_ENDOFNAMES \"<channel> :End of NAMES list\"" (if (string-match "^\$[^ ]+\$ " string) - (let ((channel (match-string 1 string))) - (riece-naming-assert-channel-users (nreverse riece-353-users) - channel))) - (setq riece-353-users nil)) + (let* ((channel (match-string 1 string)) + (channel-identity (riece-make-identity channel + riece-server-name)) + (buffer (riece-channel-buffer channel-identity)) + (entry (riece-identity-assoc channel riece-353-message-alist t)) + (string (cdr entry)) + (start 0) + users) + (if entry + (setq riece-353-message-alist + (delq entry riece-353-message-alist))) + (while (string-match + (concat "\$[＠+]\$?\$" riece-user-regexp "\$ *") + string start) + (put-text-property (match-beginning 2) (match-end 2) + 'riece-identity + (riece-make-identity (match-string 2 string) + riece-server-name) + string) + (setq start (match-end 0) + users (cons (if (match-beginning 1) + (if (eq (aref string (match-beginning 1)) ?＠) + (list (match-string 2 string) ?o) + (if (eq (aref string (match-beginning 1)) ?+) + (list (match-string 2 string) ?v))) + (list (match-string 2 string))) + users))) + (setq users (nreverse users)) + (riece-naming-assert-channel-users users channel) + (riece-insert-info + buffer + (concat (format "%d users: " (length users)) string "\n")) + (riece-insert-info + (if (and riece-channel-buffer-mode + (not (eq buffer riece-channel-buffer))) + (list riece-dialogue-buffer riece-others-buffer) + riece-dialogue-buffer) + (concat + (riece-concat-server-name + (concat (format "%d users on %s: " + (length users) + (riece-format-identity channel-identity t)) + string)) + "\n"))))) (provide 'riece-300) Index: xemacs-packages/riece/lisp/riece-400.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-400.el,v retrieving revision 1.2 diff -u -F^( -u -r1.2 riece-400.el --- xemacs-packages/riece/lisp/riece-400.el 5 Sep 2004 09:04:19 -0000 1.2 +++ xemacs-packages/riece/lisp/riece-400.el 20 Mar 2005 09:09:57 -0000 ＠＠ -63,6 +63,26 ＠＠ (defun riece-handle-464-message (prefix (message "Password incorrect from %s." prefix) (setq riece-reconnect-with-password t)) +(defun riece-handle-475-message (prefix number name string) + "ERR_BADCHANNELKEY \"<channel> :Cannot join channel (+k)\"." + (let* ((parameters (riece-split-parameters string)) + (channel-identity (riece-make-identity (car parameters) + riece-server-name)) + key) + (message "%s: %s" (car parameters) (nth 1 parameters)) + (setq key + (condition-case nil + (let (inhibit-quit) + (riece-read-passwd + (format "Key for %s: " + (riece-format-identity channel-identity t)))) + (quit + (message "Key for %s: Quit" + (riece-format-identity channel-identity t)) + 'quit))) + (unless (eq key 'quit) + (riece-command-join-channel channel-identity key)))) + (provide 'riece-400) ;;; riece-400.el ends here 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.1 diff -u -F^( -u -r1.1 riece-addon.el --- xemacs-packages/riece/lisp/riece-addon.el 5 Sep 2004 09:04:19 -0000 1.1 +++ xemacs-packages/riece/lisp/riece-addon.el 20 Mar 2005 09:09:57 -0000 ＠＠ -144,7 +144,7 ＠＠ (defun riece-load-and-build-addon-depend (setq addons (cdr addons))) dependencies)) -(defun riece-resolve-addons (addons) +(defun riece-resolve-addon-dependencies (addons) (let ((pointer addons) dependencies queue) ;; Uniquify, first. ＠＠ -179,6 +179,18 ＠＠ (defun riece-resolve-addons (addons) (error "Circular add-on dependency found")) (nreverse addons))) +(defun riece-resolve-addons (addons) + (riece-resolve-addon-dependencies + (if (file-directory-p riece-addon-directory) + (append addons + (mapcar + (lambda (name) + (unless (file-directory-p + (expand-file-name name riece-addon-directory)) + (intern (file-name-sans-extension name)))) + (directory-files riece-addon-directory nil "\\`[^.]" t))) + addons))) + (defun riece-insinuate-addon (addon &optional verbose) (require addon) ;implicit dependency (funcall (intern (concat (symbol-name addon) "-insinuate"))) ＠＠ -288,18 +300,18 ＠＠ (defun riece-command-enable-addon (addon (list (or (if (eq major-mode 'riece-addon-list-mode) (get-text-property (point) 'riece-addon)) - (completing-read "Add-on: " - (mapcar (lambda (addon) - (list (symbol-name addon))) - riece-addons) - (lambda (pointer) - (let ((enabled - (intern-soft (concat (symbol-name - (car pointer)) - "-enabled")))) - (and enabled - (null (symbol-value enabled))))) - t)))) + (intern-soft + (completing-read "Add-on: " + (mapcar (lambda (addon) + (list (symbol-name addon))) + riece-addons) + (lambda (pointer) + (let ((enabled + (intern-soft (concat (car pointer) + "-enabled")))) + (and enabled + (null (symbol-value enabled))))) + t))))) (riece-enable-addon addon t) (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled")))) (if (and (eq major-mode 'riece-addon-list-mode) ＠＠ -319,18 +331,18 ＠＠ (defun riece-command-disable-addon (addo (list (or (if (eq major-mode 'riece-addon-list-mode) (get-text-property (point) 'riece-addon)) - (completing-read "Add-on: " - (mapcar (lambda (addon) - (list (symbol-name addon))) - riece-addons) - (lambda (pointer) - (let ((enabled - (intern-soft (concat (symbol-name - (car pointer)) - "-enabled")))) - (and enabled - (symbol-value enabled)))) - t)))) + (intern-soft + (completing-read "Add-on: " + (mapcar (lambda (addon) + (list (symbol-name addon))) + riece-addons) + (lambda (pointer) + (let ((enabled + (intern-soft (concat (car pointer) + "-enabled")))) + (and enabled + (symbol-value enabled)))) + t))))) (riece-disable-addon addon t) (let ((enabled (intern-soft (concat (symbol-name addon) "-enabled")))) (if (and (eq major-mode 'riece-addon-list-mode) 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.3 diff -u -F^( -u -r1.3 riece-alias.el --- xemacs-packages/riece/lisp/riece-alias.el 5 Dec 2004 04:12:59 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-alias.el 20 Mar 2005 09:09:57 -0000 ＠＠ -143,7 +143,7 ＠＠ (defun riece-alias-abbrev-identity-strin (setq string (cdr (car alist)) alist nil) (setq alist (cdr alist))))) - string) + (copy-sequence string)) (defun riece-alias-expand-identity-string (string) (let ((alist riece-alias-alist)) ＠＠ -156,7 +156,7 ＠＠ (defun riece-alias-expand-identity-strin (setq string (riece-alias-expand-alternate-separator string))) (if riece-alias-enable-percent-hack (setq string (riece-alias-expand-percent-hack string))) - string) + (copy-sequence string)) (defun riece-alias-insinuate () ) Index: xemacs-packages/riece/lisp/riece-biff.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-biff.el,v retrieving revision 1.2 diff -u -F^( -u -r1.2 riece-biff.el --- xemacs-packages/riece/lisp/riece-biff.el 5 Dec 2004 04:12:59 -0000 1.2 +++ xemacs-packages/riece/lisp/riece-biff.el 20 Mar 2005 09:09:57 -0000 ＠＠ -49,11 +49,6 ＠＠ (defcustom riece-biff-biff-mode-string " :type 'string :group 'riece-biff) -(defcustom riece-biff-functions nil - "*Functions for processing new arrival messages." -:type 'function -:group 'riece-biff) - (defvar riece-biff-mode-string 'riece-biff-default-mode-string) (defvar riece-biff-enabled nil) ＠＠ -70,8 +65,7 ＠＠ (defun riece-biff-after-display-message- (when (or (null riece-biff-check-channels) (member (riece-format-identity (riece-message-target message)) riece-biff-check-channels)) - (setq riece-biff-mode-string 'riece-biff-biff-mode-string) - (run-hook-with-args 'riece-biff-functions message)))) + (setq riece-biff-mode-string 'riece-biff-biff-mode-string)))) (defun riece-biff-clear (&optional dummy) (when riece-biff-enabled Index: xemacs-packages/riece/lisp/riece-button.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-button.el,v retrieving revision 1.3 diff -u -F^( -u -r1.3 riece-button.el --- xemacs-packages/riece/lisp/riece-button.el 5 Sep 2004 09:04:19 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-button.el 20 Mar 2005 09:09:57 -0000 ＠＠ -83,9 +83,30 ＠＠ (defun riece-button-switch-to-identity ( (message "%s" (substitute-command-keys "Type \\[riece-command-join] to join the channel"))))) +(defun riece-identity-button-click (event) + "Call widget-button-click and select the last selected window." + (interactive "e") ;widget-button-click has + ;interactive spec "＠e" + (let ((buffer (current-buffer)) + (point (point)) + window) + (unwind-protect + (save-excursion + (set-buffer (riece-event-buffer event)) + (goto-char (riece-event-point event)) + (widget-button-click event)) + ;; riece-button-switch-to-identity changes window-configuration + ;; so we must select the last selected window by _buffer_. + (if (setq window (get-buffer-window buffer)) + (progn + (select-window window) + (set-window-point window point)) + (if riece-debug + (message "buffer %s not visible" (buffer-name buffer))))))) + (defun riece-identity-button-popup-menu (event) "Popup the menu for identity buttons." - (interactive "＠e") + (interactive "e") (save-excursion (set-buffer (riece-event-buffer event)) (goto-char (riece-event-point event)) ＠＠ -179,6 +200,7 ＠＠ (defun riece-user-button-finger () (defun riece-make-identity-button-map () (let ((map (make-sparse-keymap))) (set-keymap-parent map (current-local-map)) + (define-key map [down-mouse-2] 'riece-identity-button-click) (define-key map [down-mouse-3] 'riece-identity-button-popup-menu) map)) 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.3 diff -u -F^( -u -r1.3 riece-channel.el --- xemacs-packages/riece/lisp/riece-channel.el 5 Sep 2004 09:04:19 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-channel.el 20 Mar 2005 09:09:57 -0000 ＠＠ -33,16 +33,16 ＠＠ (require 'riece-mode) (defun riece-find-channel (name) "Get a channel object named NAME from the server buffer." (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name) - riece-obarray))) + riece-channel-obarray))) (if symbol (symbol-value symbol)))) (defun riece-forget-channel (name) (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name) - riece-obarray))) + riece-channel-obarray))) (when symbol (makunbound symbol) - (unintern (symbol-name symbol) riece-obarray)))) + (unintern (symbol-name symbol) riece-channel-obarray)))) (defun riece-make-channel (users topic modes banned invited uninvited key) "Make an instance of channel object. ＠＠ -53,11 +53,11 ＠＠ (defun riece-make-channel (users topic m (defun riece-get-channel (name) (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name) - riece-obarray))) + riece-channel-obarray))) (if symbol (symbol-value symbol) (set (intern (riece-identity-canonicalize-prefix name) - riece-obarray) + riece-channel-obarray) (riece-make-channel nil nil nil nil nil nil nil))))) (defun riece-channel-users (channel) cvs server: xemacs-packages/riece/lisp/riece-command-next-channel.xpm is a new entry, no comparison available cvs server: xemacs-packages/riece/lisp/riece-command-previous-channel.xpm is a new entry, no comparison available 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.4 diff -u -F^( -u -r1.4 riece-commands.el --- xemacs-packages/riece/lisp/riece-commands.el 5 Sep 2004 09:04:19 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-commands.el 20 Mar 2005 09:09:57 -0000 ＠＠ -112,8 +112,23 ＠＠ (defun riece-command-select-command-buff (defun riece-command-configure-windows () (interactive) + "Reconfigure windows with the current layout." (riece-redisplay-buffers t)) +(defun riece-command-suspend-resume () + (interactive) + "Save or restore the current window configuration." + (let ((entry (assq 'riece-window-configuration (frame-parameters)))) + (modify-frame-parameters (selected-frame) + (list (cons 'riece-window-configuration + (current-window-configuration)))) + (if (cdr entry) + (set-window-configuration (cdr entry)) + (delete-other-windows)) + (message + (substitute-command-keys + "\\[riece-command-suspend-resume] to get back the last windows")))) + (defun riece-command-change-layout (name) "Select a layout-name from all current available layouts and change the layout to the selected layout-name." ＠＠ -435,32 +450,25 ＠＠ (defun riece-command-join-partner (targe (riece-join-channel target) (riece-switch-to-channel target)))) -(defun riece-command-join (target &optional key) +(defun riece-command-join (target) (interactive - (let* ((completion-ignore-case t) - (target - (if riece-join-channel-candidate - (let ((default (riece-format-identity - riece-join-channel-candidate))) - (riece-completing-read-identity - (format "Join channel/user (default %s): " default) - (riece-get-identities-on-server (riece-current-server-name)) - nil nil nil nil default)) - (riece-completing-read-identity - "Join channel/user: " - (riece-get-identities-on-server (riece-current-server-name))))) - key) - (if (and current-prefix-arg - (riece-channel-p (riece-identity-prefix target))) - (setq key - (riece-read-passwd (format "Key for %s: " - (riece-format-identity target))))) - (list target key))) + (let ((completion-ignore-case t)) + (list + (if riece-join-channel-candidate + (let ((default (riece-format-identity + riece-join-channel-candidate))) + (riece-completing-read-identity + (format "Join channel/user (default %s): " default) + (riece-get-identities-on-server (riece-current-server-name)) + nil nil nil nil default)) + (riece-completing-read-identity + "Join channel/user: " + (riece-get-identities-on-server (riece-current-server-name))))))) (let ((pointer (riece-identity-member target riece-current-channels))) (if pointer (riece-command-switch-to-channel (car pointer)) (if (riece-channel-p (riece-identity-prefix target)) - (riece-command-join-channel target key) + (riece-command-join-channel target nil) (riece-command-join-partner target))))) (defun riece-command-part-channel (target message) ＠＠ -484,10 +492,10 ＠＠ (defun riece-command-part (target &optio (riece-format-identity riece-current-channel)) riece-current-channels nil nil nil nil (riece-format-identity riece-current-channel))) - message) - (if (and current-prefix-arg - (riece-channel-p (riece-identity-prefix target))) - (setq message (read-string "Message: "))) + (message + (if current-prefix-arg + (read-string "Message: ") + riece-part-message))) (list target message)))) (if (riece-identity-member target riece-current-channels) (if (riece-channel-p (riece-identity-prefix target)) ＠＠ -616,7 +624,7 ＠＠ (defun riece-command-quit (&optional arg (let ((message (if arg (read-string "Message: ") - riece-quit-message)) + riece-quit-message)) (alist riece-server-process-alist)) (while alist (riece-quit-server-process (cdr (car alist)) message) Index: xemacs-packages/riece/lisp/riece-compat.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-compat.el,v retrieving revision 1.2 diff -u -F^( -u -r1.2 riece-compat.el --- xemacs-packages/riece/lisp/riece-compat.el 27 Dec 2003 15:41:10 -0000 1.2 +++ xemacs-packages/riece/lisp/riece-compat.el 20 Mar 2005 09:09:57 -0000 ＠＠ -48,15 +48,9 ＠＠ (defun riece-line-end-position () (end-of-line) (point))) -(defvar riece-read-passwd nil) +(autoload 'read-passwd "passwd") +(defvar riece-read-passwd #'read-passwd) (defun riece-read-passwd (prompt) - (if (not riece-read-passwd) - (if (functionp 'read-passwd) - (setq riece-read-passwd 'read-passwd) - (if (load "passwd" t) - (setq riece-read-passwd 'read-passwd) - (autoload 'ange-ftp-read-passwd "ange-ftp") - (setq riece-read-passwd 'ange-ftp-read-passwd)))) (funcall riece-read-passwd prompt)) (if (string-match "0\\{0\\}" "") Index: xemacs-packages/riece/lisp/riece-ctcp.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-ctcp.el,v retrieving revision 1.4 diff -u -F^( -u -r1.4 riece-ctcp.el --- xemacs-packages/riece/lisp/riece-ctcp.el 5 Sep 2004 09:04:19 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-ctcp.el 20 Mar 2005 09:09:57 -0000 ＠＠ -28,6 +28,7 ＠＠ (require 'riece-version) (require 'riece-misc) (require 'riece-highlight) (require 'riece-display) +(require 'riece-debug) (defface riece-ctcp-action-face '((((class color) ＠＠ -72,27 +73,16 ＠＠ (defun riece-handle-ctcp-request (prefix (after-hook (intern (concat "riece-ctcp-after-" request "-request-hook")))) - (unless (condition-case error - (run-hook-with-args-until-success - hook prefix (car targets) message) - (error - (if riece-debug - (message "Error in `%S': %S" hook error)) - nil)) + (unless (riece-ignore-errors (symbol-name hook) + (run-hook-with-args-until-success + hook prefix (car targets) message)) (if function - (condition-case error - (funcall function prefix (car targets) message) - (error - (if riece-debug - (message "Error in `%S': %S" - function error)))))) - (condition-case error + (riece-funcall-ignore-errors (symbol-name function) + function prefix (car targets) + message)) + (riece-ignore-errors (symbol-name after-hook) (run-hook-with-args-until-success - after-hook prefix (car targets) message) - (error - (if riece-debug - (message "Error in `%S': %S" - after-hook error))))) + after-hook prefix (car targets) message)))) t))))) (defun riece-handle-ctcp-version-request (prefix target string) ＠＠ -180,15 +170,49 ＠＠ (defun riece-handle-ctcp-action-request (riece-channel-buffer (riece-make-identity target riece-server-name)))) (user (riece-prefix-nickname prefix))) - (riece-insert buffer (concat riece-ctcp-action-prefix user " " string + (riece-insert buffer (concat riece-ctcp-action-prefix + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + " " string "\n")) (riece-insert (if (and riece-channel-buffer-mode (not (eq buffer riece-channel-buffer))) (list riece-dialogue-buffer riece-others-buffer) riece-dialogue-buffer) - (concat (riece-concat-server-name (concat riece-ctcp-action-prefix user - " " string)) "\n")))) + (concat (riece-concat-server-name + (concat riece-ctcp-action-prefix + (riece-format-identity + (riece-make-identity target riece-server-name) + t) + ": " + (riece-format-identity + (riece-make-identity user riece-server-name) + t) + " " string)) "\n")))) + +(defun riece-handle-ctcp-time-request (prefix target string) + (let* ((target-identity (riece-make-identity target riece-server-name)) + (buffer (if (riece-channel-p target) + (riece-channel-buffer target-identity))) + (user (riece-prefix-nickname prefix)) + (time (format-time-string "%c"))) + (riece-send-string + (format "NOTICE %s :\1TIME %s\1\r\n" user time)) + (riece-insert-change buffer (format "CTCP TIME from %s\n" user)) + (riece-insert-change + (if (and riece-channel-buffer-mode + (not (eq buffer riece-channel-buffer))) + (list riece-dialogue-buffer riece-others-buffer) + riece-dialogue-buffer) + (concat + (riece-concat-server-name + (format "CTCP TIME from %s (%s) to %s" + user + (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) + (riece-format-identity target-identity t))) + "\n")))) (defun riece-handle-ctcp-response (prefix string) (when (and riece-ctcp-enabled prefix string ＠＠ -207,27 +231,16 ＠＠ (defun riece-handle-ctcp-response (prefi (after-hook (intern (concat "riece-ctcp-after-" response "-response-hook")))) - (unless (condition-case error - (run-hook-with-args-until-success - hook prefix (car targets) message) - (error - (if riece-debug - (message "Error in `%S': %S" hook error)) - nil)) + (unless (riece-ignore-errors (symbol-name hook) + (run-hook-with-args-until-success + hook prefix (car targets) message)) (if function - (condition-case error - (funcall function prefix (car targets) message) - (error - (if riece-debug - (message "Error in `%S': %S" - function error)))))) - (condition-case error + (riece-funcall-ignore-errors + (symbol-name function) + function prefix (car targets) message)) + (riece-ignore-errors (symbol-name after-hook) (run-hook-with-args-until-success - after-hook prefix (car targets) message) - (error - (if riece-debug - (message "Error in `%S': %S" - after-hook error))))) + after-hook prefix (car targets) message)))) t))))) (defun riece-handle-ctcp-version-response (prefix target string) ＠＠ -266,6 +279,17 ＠＠ (defun riece-handle-ctcp-clientinfo-resp string)) "\n"))) +(defun riece-handle-ctcp-time-response (prefix target string) + (riece-insert-change + (list riece-dialogue-buffer riece-others-buffer) + (concat + (riece-concat-server-name + (format "CTCP TIME for %s (%s) = %s" + (riece-prefix-nickname prefix) + (riece-strip-user-at-host (riece-prefix-user-at-host prefix)) + string)) + "\n"))) + (defun riece-command-ctcp-version (target) (interactive (list (riece-completing-read-identity ＠＠ -326,10 +350,18 ＠＠ (defun riece-command-ctcp-action (target (riece-with-server-buffer (riece-identity-server target) (riece-concat-server-name (concat riece-ctcp-action-prefix - (riece-identity-prefix (riece-current-nickname)) " " action - " (in " (riece-format-identity target t) ")"))) + (riece-format-identity target t) ": " + (riece-identity-prefix (riece-current-nickname)) " " action))) "\n")))) +(defun riece-command-ctcp-time (target) + (interactive + (list (riece-completing-read-identity + "Channel/User: " + (riece-get-identities-on-server (riece-current-server-name))))) + (riece-send-string (format "PRIVMSG %s :\1TIME\1\r\n" + (riece-identity-prefix target)))) + (defun riece-ctcp-requires () (if (memq 'riece-highlight riece-addons) '(riece-highlight))) ＠＠ -350,6 +382,7 ＠＠ (defun riece-ctcp-enable () (define-key riece-dialogue-mode-map "\C-cp" 'riece-command-ctcp-ping) (define-key riece-dialogue-mode-map "\C-ca" 'riece-command-ctcp-action) (define-key riece-dialogue-mode-map "\C-cc" 'riece-command-ctcp-clientinfo) + (define-key riece-dialogue-mode-map "\C-ct" 'riece-command-ctcp-time) (setq riece-ctcp-enabled t)) (defun riece-ctcp-disable () ＠＠ -357,6 +390,7 ＠＠ (defun riece-ctcp-disable () (define-key riece-dialogue-mode-map "\C-cp" nil) (define-key riece-dialogue-mode-map "\C-ca" nil) (define-key riece-dialogue-mode-map "\C-cc" nil) + (define-key riece-dialogue-mode-map "\C-ct" nil) (setq riece-ctcp-enabled nil)) (provide 'riece-ctcp) cvs server: xemacs-packages/riece/lisp/riece-debug.el is a new entry, no comparison available Index: xemacs-packages/riece/lisp/riece-display.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-display.el,v retrieving revision 1.4 diff -u -F^( -u -r1.4 riece-display.el --- xemacs-packages/riece/lisp/riece-display.el 5 Dec 2004 04:13:00 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-display.el 20 Mar 2005 09:09:57 -0000 ＠＠ -125,11 +125,13 ＠＠ (defun riece-display-connect-signals () (riece-identity-server riece-current-channel)) (riece-with-server-buffer (riece-identity-server riece-current-channel) - (riece-identity-assoc - (riece-identity-prefix (nth 1 (riece-signal-args signal))) - (riece-channel-get-users (riece-identity-prefix - riece-current-channel)) - t))))) + (when (riece-channel-p (riece-identity-prefix + riece-current-channel)) + (riece-identity-assoc + (riece-identity-prefix (nth 1 (riece-signal-args signal))) + (riece-channel-get-users (riece-identity-prefix + riece-current-channel)) + t)))))) (riece-connect-signal 'user-renamed (lambda (signal handback) ＠＠ -325,7 +327,9 ＠＠ (defun riece-update-channel-list-indicat (while pointer (if (cdr pointer) (setcdr pointer (cons "," (cdr pointer)))) - (setq pointer (cdr (cdr pointer))))) + (setq pointer (cdr (cdr pointer)))) + (setq riece-channel-list-indicator + (riece-normalize-modeline-string riece-channel-list-indicator))) (setq riece-channel-list-indicator "No channel"))) (defun riece-update-status-indicators () ＠＠ -474,7 +478,8 ＠＠ (defun riece-part-channel (identity) (if pointer (setcar pointer nil)) (if (riece-identity-equal identity riece-current-channel) - (riece-switch-to-nearest-channel pointer)))) + (riece-switch-to-nearest-channel pointer)) + (funcall riece-buffer-dispose-function (riece-channel-buffer identity)))) (defun riece-redisplay-buffers (&optional force) (riece-update-buffers) Index: xemacs-packages/riece/lisp/riece-emacs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-emacs.el,v retrieving revision 1.5 diff -u -F^( -u -r1.5 riece-emacs.el --- xemacs-packages/riece/lisp/riece-emacs.el 5 Dec 2004 04:13:00 -0000 1.5 +++ xemacs-packages/riece/lisp/riece-emacs.el 20 Mar 2005 09:09:57 -0000 ＠＠ -95,6 +95,19 ＠＠ (defun riece-propertize-modeline-string (add-text-properties 0 (length string) properties string) string) +(defun riece-normalize-modeline-string-1 (string) + (if string + (if (listp (car string)) + (cons (car (car string)) (riece-normalize-modeline-string-1 + (append (cdr (car string)) (cdr string)))) + (cons (car string) (riece-normalize-modeline-string-1 + (cdr string)))))) + +(defun riece-normalize-modeline-string (string) + (if (listp string) + (list (apply #'concat (riece-normalize-modeline-string-1 string))) + string)) + (defun riece-put-text-property-nonsticky (start end prop value &optional object) (add-text-properties start end cvs server: xemacs-packages/riece/lisp/riece-eval.el is a new entry, no comparison available Index: xemacs-packages/riece/lisp/riece-filter.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-filter.el,v retrieving revision 1.3 diff -u -F^( -u -r1.3 riece-filter.el --- xemacs-packages/riece/lisp/riece-filter.el 5 Sep 2004 09:04:19 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-filter.el 20 Mar 2005 09:09:57 -0000 ＠＠ -28,6 +28,7 ＠＠ (require 'riece-handle) (require 'riece-misc) (require 'riece-server) ;riece-close-server (require 'riece-identity) +(require 'riece-debug) (defun riece-handle-numeric-reply (prefix number name string) (let ((base-number (* (/ number 100) 100)) ＠＠ -40,12 +41,9 ＠＠ (defun riece-handle-numeric-reply (prefi (format "riece-handle-default-%03d-message" base-number)))) (if (and function (symbol-function function)) - (condition-case error - (funcall function prefix number name - (riece-decode-coding-string string)) - (error - (if riece-debug - (message "Error in `%S': %S" function error))))))) + (riece-funcall-ignore-errors (symbol-name function) + function prefix number name + (riece-decode-coding-string string))))) (defun riece-handle-message (prefix message string) (if (and prefix ＠＠ -58,56 +56,50 ＠＠ (defun riece-handle-message (prefix mess (let ((function (intern-soft (concat "riece-handle-" message "-message"))) (hook (intern (concat "riece-" message "-hook"))) (after-hook (intern (concat "riece-after-" message "-hook")))) - (unless (condition-case error - (run-hook-with-args-until-success hook prefix string) - (error - (if riece-debug - (message "Error in `%S': %S" hook error)) - nil)) + (unless (riece-ignore-errors (symbol-name hook) + (run-hook-with-args-until-success hook prefix string)) (if function - (condition-case error - (funcall function prefix string) - (error - (if riece-debug - (message "Error in `%S': %S" function error))))) - (condition-case error - (run-hook-with-args-until-success after-hook prefix string) - (error - (if riece-debug - (message "Error in `%S': %S" after-hook error))))))) + (riece-funcall-ignore-errors (symbol-name function) + function prefix string)) + (riece-ignore-errors (symbol-name after-hook) + (run-hook-with-args-until-success after-hook prefix string))))) + +(defsubst riece-chomp-string (string) + (if (string-match "\r\\'" string) + (substring string 0 (match-beginning 0)) + string)) (defun riece-filter (process input) (save-excursion (set-buffer (process-buffer process)) - (goto-char riece-read-point) - (unless riece-debug - (delete-region (riece-line-beginning-position) (point-min)) - (setq riece-read-point (point))) + (goto-char (point-max)) (insert input) - (goto-char (prog1 riece-read-point - (setq riece-read-point (point)))) + (goto-char riece-read-point) (beginning-of-line) (while (and (not (eobp)) - (looking-at ".*\r\n")) ;the input line is not finished + (looking-at ".*\n")) ;the input line is not finished (save-excursion (if (looking-at - ":\$[^ ]+\$ +\$[0-5][0-9][0-9]\$ +\$[^ ]+\$ +\$.*\$\r\n") + ":\$[^ ]+\$ +\$[0-5][0-9][0-9]\$ +\$[^ ]+\$ +\$.*\$") (riece-handle-numeric-reply (match-string 1) ;prefix (string-to-number (match-string 2)) ;number (match-string 3) ;name - (match-string 4)) ;reply string - (if (looking-at "\$:\\([^ ]+\$ +\\)?\$[^ ]+\$ +\$.*\$\r\n") + (riece-chomp-string (match-string 4))) ;reply string + (if (looking-at "\$:\\([^ ]+\$ +\\)?\$[^ ]+\$ +\$.*\$") (riece-handle-message (match-string 2) ;optional prefix (match-string 3) ;command - (match-string 4)) ;params & trailing + (riece-chomp-string (match-string 4))) ;params & trailing (if riece-debug (message "Weird message from server: %s" (buffer-substring (point) (progn (end-of-line) (point)))))))) - (forward-line)))) + (forward-line)) + (unless riece-debug + (delete-region (point-min) (point))) + (setq riece-read-point (point)))) (eval-when-compile (autoload 'riece-exit "riece")) Index: xemacs-packages/riece/lisp/riece-foolproof.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-foolproof.el,v retrieving revision 1.1 diff -u -F^( -u -r1.1 riece-foolproof.el --- xemacs-packages/riece/lisp/riece-foolproof.el 5 Sep 2004 09:04:19 -0000 1.1 +++ xemacs-packages/riece/lisp/riece-foolproof.el 20 Mar 2005 09:09:57 -0000 ＠＠ -51,6 +51,13 ＠＠ (defun riece-foolproof-command-send-mess riece-current-channel)) (error "Channel %s is not displayed" (riece-identity-prefix riece-current-channel))) + (when (text-property-not-all + (riece-line-beginning-position) (riece-line-end-position) + 'invisible nil) + (error "Invisible text included: %s" + (buffer-substring-no-properties + (riece-line-beginning-position) + (riece-line-end-position)))) (when executing-kbd-macro (error "%s" "Forbidden to run keyboard macro")))) 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.5 diff -u -F^( -u -r1.5 riece-globals.el --- xemacs-packages/riece/lisp/riece-globals.el 5 Dec 2004 04:13:00 -0000 1.5 +++ xemacs-packages/riece/lisp/riece-globals.el 20 Mar 2005 09:09:58 -0000 ＠＠ -65,8 +65,11 ＠＠ (defvar riece-polling 0 (defvar riece-reconnect-with-password nil "If non-nil, attempt to reconnect with password.") -(defvar riece-obarray-size 1327 - "The size of obarray used by riece on channelname and username space.") +(defvar riece-user-obarray-size 1327 + "The size of obarray used by riece on username space.") + +(defvar riece-channel-obarray-size 103 + "The size of obarray used by riece on channelname space.") ;;; Variables local to the server buffers: (defvar riece-server-name nil ＠＠ -117,8 +120,11 ＠＠ (defvar riece-send-size nil (defvar riece-last-send-time nil "Timestamp of the last send. Local to the server buffers.") -(defvar riece-obarray nil - "Namespace of the IRC world. +(defvar riece-user-obarray nil + "USER namespace of the IRC world. +Local to the server buffers.") +(defvar riece-channel-obarray nil + "Channel namespace of the IRC world. Local to the server buffers.") (defvar riece-coding-system nil "Coding system for process I/O. ＠＠ -172,9 +178,10 ＠＠ (defvar riece-channel-list-buffer nil "Buffer for channel list.") (defvar riece-user-list-buffer nil "Buffer for user list.") - (defvar riece-channel-buffer nil "Buffer for messages arrived in the current channel.") +(defvar riece-temp-buffer nil + "Buffer for temporally use.") (defvar riece-buffer-list nil) (defvar riece-overriding-server-name nil) cvs server: xemacs-packages/riece/lisp/riece-google.el is a new entry, no comparison available Index: xemacs-packages/riece/lisp/riece-handle.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-handle.el,v retrieving revision 1.4 diff -u -F^( -u -r1.4 riece-handle.el --- xemacs-packages/riece/lisp/riece-handle.el 5 Sep 2004 09:04:19 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-handle.el 20 Mar 2005 09:09:58 -0000 ＠＠ -161,7 +161,6 ＠＠ (defun riece-handle-part-message (prefix (message (nth 1 parameters)) (user-identity (riece-make-identity user riece-server-name))) (while channels - (riece-naming-assert-part user (car channels)) (let* ((channel-identity (riece-make-identity (car channels) riece-server-name)) (buffer (riece-channel-buffer channel-identity))) ＠＠ -187,6 +186,7 ＠＠ (defun riece-handle-part-message (prefix (riece-format-identity channel-identity t)) message)) "\n"))) + (riece-naming-assert-part user (car channels)) (setq channels (cdr channels))))) (defun riece-handle-kick-message (prefix string) 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.1 diff -u -F^( -u -r1.1 riece-irc.el --- xemacs-packages/riece/lisp/riece-irc.el 5 Sep 2004 09:04:19 -0000 1.1 +++ xemacs-packages/riece/lisp/riece-irc.el 20 Mar 2005 09:09:58 -0000 ＠＠ -69,8 +69,7 ＠＠ (defun riece-irc-open-server (server ser (quit (if (equal server-name "") (message "Password: Quit") - (message (format "Password for %s: Quit" - server-name))) + (message "Password for %s: " server-name)) 'quit))) (setq riece-reconnect-with-password nil))) (if (eq password 'quit) cvs server: xemacs-packages/riece/lisp/riece-keepalive.el is a new entry, no comparison available Index: xemacs-packages/riece/lisp/riece-keyword.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-keyword.el,v retrieving revision 1.4 diff -u -F^( -u -r1.4 riece-keyword.el --- xemacs-packages/riece/lisp/riece-keyword.el 5 Sep 2004 09:04:19 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-keyword.el 20 Mar 2005 09:09:58 -0000 ＠＠ -61,7 +61,7 ＠＠ (defface riece-keyword-face '((((class color)) (:foreground "red" :underline t)) (t - ())) + (:underline t))) "Face used for highlightening matching keyword." :group 'riece-highlight-faces) (defvar riece-keyword-face 'riece-keyword-face) Index: xemacs-packages/riece/lisp/riece-layout.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-layout.el,v retrieving revision 1.3 diff -u -F^( -u -r1.3 riece-layout.el --- xemacs-packages/riece/lisp/riece-layout.el 5 Sep 2004 09:04:19 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-layout.el 20 Mar 2005 09:09:58 -0000 ＠＠ -49,8 +49,8 ＠＠ (defcustom riece-layout-alist "An alist mapping the names to layout functions. An element of this alist is either in the following forms: -(NAME CONFIGURE-FUNCTION [PARAMETERS]) -(NAME1 . NAME2) +$NAME CONFIGURE-FUNCTION [PARAMETERS]$ +$NAME1 . NAME2$ In the first form, NAME is a string which specifies the layout setting, and CONFIGURE-FUNCTION is a function which does window Index: xemacs-packages/riece/lisp/riece-log.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-log.el,v retrieving revision 1.5 diff -u -F^( -u -r1.5 riece-log.el --- xemacs-packages/riece/lisp/riece-log.el 5 Dec 2004 04:13:00 -0000 1.5 +++ xemacs-packages/riece/lisp/riece-log.el 20 Mar 2005 09:09:58 -0000 ＠＠ -1,7 +1,9 ＠＠ ;;; riece-log.el --- saving irc logs add-on ;; Copyright (C) 2003 OHASHI Akira +;; Copyright (C) 2004 Daiki Ueno ;; Author: OHASHI Akira <bg66(a)koka-in.org> +;; Daiki Ueno <ueno(a)unixuser.org> ;; Keywords: IRC, riece ;; This file is part of Riece. ＠＠ -53,7 +55,8 ＠＠ (defcustom riece-log-flashback 10 "*If non-nil, irc messages flash back from log files. If integer, flash back only this line numbers. t means all lines." :type '(choice (integer :tag "line numbers") - (boolean :tag "flash back or not")) + (const t :tag "of the day") + (const nil :tag "no flashback")) :group 'riece-log) (defcustom riece-log-coding-system nil ＠＠ -61,11 +64,35 ＠＠ (defcustom riece-log-coding-system nil :type 'symbol :group 'riece-log) +(defcustom riece-log-file-name-coding-system + (if (boundp 'file-name-coding-system) + file-name-coding-system) + "*Coding system used for filenames of log files." +:type 'symbol +:group 'riece-log) + (defcustom riece-log-open-directory-function 'find-file "*Function for opening a directory." :type 'function :group 'riece-log) +(defface riece-log-date-face + '((((class color) + (background dark)) + (:foreground "Gray70")) + (((class color) + (background light)) + (:foreground "DimGray")) + (t + (:bold t))) + "Face used for displaying \"(YYYY/MM/dd)\" extent." +:group 'riece-highlight-faces) +(defvar riece-log-date-face 'riece-log-date-face) + +(defvar riece-log-lock-file nil + "Lock file for riece-log. +It is created if there is at least one instance of Emacs running riece-log.") + (defvar riece-log-enabled nil) (defconst riece-log-description ＠＠ -74,65 +101,144 ＠＠ (defconst riece-log-description (defun riece-log-display-message-function (message) (if riece-log-enabled (let ((file (riece-log-get-file (riece-message-target message))) - (coding-system-for-write riece-log-coding-system)) + (coding-system-for-write riece-log-coding-system) + file-name-coding-system + default-file-name-coding-system) (unless (file-directory-p (file-name-directory file)) (make-directory (file-name-directory file) t)) (write-region (concat (format-time-string "%H:%M") " " (riece-format-message message)) - nil file t 0)))) + nil file t 0 + riece-log-lock-file)))) (defun riece-log-get-file (identity) (expand-file-name - (concat (format-time-string "%Y%m%d") ".log") + (concat (format-time-string "%Y%m%d") ".txt") (riece-log-get-directory identity))) +(defun riece-log-get-files (identity) + (let ((directory (riece-log-get-directory identity))) + (if (file-directory-p directory) + (nreverse (sort (directory-files directory t + (concat "^" + (riece-make-interval-regexp "[0-9]" 8) + "\\.txt$") + t) + #'string-lessp))))) + (defun riece-log-get-directory (identity) - (let ((channel (riece-identity-canonicalize-prefix - (riece-identity-prefix identity))) + (let ((prefix (riece-identity-canonicalize-prefix + (riece-identity-prefix identity))) (server (riece-identity-server identity)) - (map (assoc (riece-format-identity identity) riece-log-directory-map)) - name) - (cond (map (setq name (cdr map))) - ((string-match riece-strict-channel-regexp channel) - (let ((suffix (match-string 2 channel))) - (setq name (substring channel (match-end 1) (match-beginning 2))) - (when (and (stringp suffix) - (string-match "^:\\*\\.\$.*\$" suffix)) - (setq name (concat name "-" (match-string 1 suffix)))))) - (t (setq name "priv"))) - (if server - (expand-file-name name (expand-file-name server riece-log-directory)) - (expand-file-name name riece-log-directory)))) + (map (assoc (riece-format-identity identity) riece-log-directory-map))) + (if map + (expand-file-name (cdr map) riece-log-directory) + (expand-file-name (riece-log-encode-file-name prefix) + (expand-file-name + (concat "." (riece-log-encode-file-name server)) + riece-log-directory))))) + +(defun riece-log-encode-file-name (file-name) + (if riece-log-file-name-coding-system + (setq file-name + (encode-coding-string file-name + riece-log-file-name-coding-system))) + (let ((index 0) + c) + (while (string-match "[^-0-9A-Za-z_\x80-\xFF]" file-name index) + (setq c (aref file-name (match-beginning 0))) + (if (eq c ?=) + (setq file-name (replace-match "==" nil t file-name) + index (1+ (match-end 0))) + (setq file-name (replace-match (format "=%02X" c) nil t file-name) + index (+ 2 (match-end 0))))) + file-name)) + +(defun riece-log-decode-file-name (file-name) + (let ((index 0)) + (while (string-match "==\\|=\$[0-7][0-9A-F]\$" file-name index) + (setq file-name (replace-match + (if (eq (aref file-name (1- (match-end 0))) ?=) + "=" + (char-to-string + (car (read-from-string + (concat "?\\x" (match-string 1 file-name)))))) + nil t file-name) + index (1+ (match-beginning 0)))) + file-name) + (if riece-log-file-name-coding-system + (setq file-name + (decode-coding-string file-name + riece-log-file-name-coding-system))) + file-name) + +(defun riece-log-insert (identity lines) + "Insert logs for IDENTITY at most LINES. +If LINES is t, insert today's logs entirely." + (if (eq lines t) + (let* (file-name-coding-system + default-file-name-coding-system + (file (riece-log-get-file identity))) + (if (file-exists-p file) + (insert-file-contents file))) + (let* (file-name-coding-system + default-file-name-coding-system + (files (riece-log-get-files identity)) + (lines (- lines)) + name date point) + (while (and (< lines 0) files) + (if (and (file-exists-p (car files)) + (string-match (concat (riece-make-interval-regexp "[0-9]" 8) + "\\.txt$") + (setq name (file-name-nondirectory + (car files))))) + (save-restriction + (narrow-to-region (point) (point)) + (insert-file-contents (car files)) + (goto-char (point-max)) + (setq lines (forward-line lines)) + (delete-region (point-min) (point)) + (unless (equal name (format-time-string "%Y%m%d.txt")) + (setq date (concat " (" (substring name 0 4) "/" + (substring name 4 6) "/" + (substring name 6 8) ")")) + (while (not (eobp)) + (end-of-line) + (setq point (point)) + (insert date) + (put-text-property point (point) + 'riece-overlay-face 'riece-log-date-face) + (forward-line)) + (goto-char (point-min))))) + (setq files (cdr files)))))) (defun riece-log-flashback (identity) (when riece-log-flashback - (let ((file (riece-log-get-file identity))) - (when (file-exists-p file) - (let (string) - (with-temp-buffer - (insert-file-contents file) - (if (not (integerp riece-log-flashback)) - (goto-char (point-min)) - (goto-char (point-max)) - (forward-line (- riece-log-flashback))) - (setq string (buffer-substring (point) (point-max)))) - (let (buffer-read-only) - (goto-char (point-max)) - (insert string) - (goto-char (point-min)) - (while (re-search-forward - "^[0-9][0-9]:[0-9][0-9] [<>]\$[^<>]+\$[<>] " nil t) - (put-text-property (match-beginning 1) (match-end 1) - 'riece-identity - (riece-make-identity - (riece-match-string-no-properties 1) - (riece-identity-server identity)))) - (when (and (memq 'riece-button riece-addons) - riece-button-enabled) - (riece-button-update-buffer)) - (goto-char (point-max)) - (set-window-point (get-buffer-window (current-buffer)) - (point)))))))) + (riece-insert-info (current-buffer) + (if (eq riece-log-flashback t) + "Recent messages of the day:\n" + (format "Recent messages up to %d lines:\n" + riece-log-flashback))) + (let (buffer-read-only + (point (goto-char (point-max)))) + (insert (with-temp-buffer + (riece-log-insert identity riece-log-flashback) + (buffer-string))) + (goto-char point) + (while (re-search-forward + (concat "^" riece-time-prefix-regexp + "\$<[^>]+>\\|>[^<]+<\\|([^)]+)\\|{[^}]+}\\|=[^=]+=\$") + nil t) + (put-text-property (1+ (match-beginning 1)) (1- (match-end 1)) + 'riece-identity + (riece-make-identity + (buffer-substring (1+ (match-beginning 1)) + (1- (match-end 1))) + (riece-identity-server identity)))) + (run-hook-with-args 'riece-after-insert-functions + point (goto-char (point-max))) + (set-window-point (get-buffer-window (current-buffer)) + (point))))) (defun riece-log-open-directory (&optional channel) (interactive) ＠＠ -147,6 +253,13 ＠＠ (defun riece-log-requires () '(riece-button))) (defun riece-log-insinuate () + (make-directory riece-log-directory t) + (setq riece-log-lock-file + (expand-file-name (format "!%s-%d-%d" + (riece-log-encode-file-name (system-name)) + (user-uid) + (emacs-pid)) + riece-log-directory)) ;; FIXME: Use `riece-after-insert-functions' for trapping change, ;; notice, wallops and so on. But must add argument. (add-hook 'riece-after-display-message-functions Index: xemacs-packages/riece/lisp/riece-menu.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-menu.el,v retrieving revision 1.2 diff -u -F^( -u -r1.2 riece-menu.el --- xemacs-packages/riece/lisp/riece-menu.el 5 Sep 2004 09:04:19 -0000 1.2 +++ xemacs-packages/riece/lisp/riece-menu.el 20 Mar 2005 09:09:58 -0000 ＠＠ -38,6 +38,7 ＠＠ (require 'riece-server) (defvar riece-menu-items `("Riece" ["Version" riece-version t] + ["Submit Bug Report" riece-submit-bug-report t] "----" ("Change Window Layout..." :filter riece-menu-create-layouts-menu) ["Toggle Freeze Channel Buffer" ＠＠ -60,6 +61,9 ＠＠ (defvar riece-menu-items ["Set Channel Topic" riece-command-topic riece-current-channel] ["Kick User" riece-command-kick riece-current-channel] ["Invite User" riece-command-invite riece-current-channel] + "----" + ["Next Channel" riece-command-next-channel riece-current-channels] + ["Previous Channel" riece-command-previous-channel riece-current-channels] "----" ("Channels" :filter riece-menu-create-channels-menu) ("Servers" :filter riece-menu-create-servers-menu)) Index: xemacs-packages/riece/lisp/riece-message.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-message.el,v retrieving revision 1.3 diff -u -F^( -u -r1.3 riece-message.el --- xemacs-packages/riece/lisp/riece-message.el 5 Sep 2004 09:04:19 -0000 1.3 +++ xemacs-packages/riece/lisp/riece-message.el 20 Mar 2005 09:09:58 -0000 ＠＠ -114,7 +114,7 ＠＠ (defun riece-message-buffer (message) (riece-message-target message)))) (unless (riece-identity-member target riece-current-channels) (riece-join-channel target) - ;; If you are not joined any channel, + ;; If you are not joined to any channel, ;; switch to the target immediately. (unless riece-current-channel (riece-switch-to-channel target))) ＠＠ -174,13 +174,14 ＠＠ (defun riece-display-message-1 (message) (setq parent-buffers (riece-message-parent-buffers message buffer)) (riece-insert buffer (riece-format-message message)) (riece-insert parent-buffers (riece-format-message message t)) - (run-hook-with-args 'riece-after-display-message-functions message))) + (with-current-buffer buffer + (run-hook-with-args 'riece-after-display-message-functions message)))) (defun riece-display-message (message) "Display MESSAGE object." (let ((functions riece-message-filter-functions)) (setq message (copy-sequence message)) - (while functions + (while (and functions message) (setq message (funcall (car functions) message) functions (cdr functions))) (if message 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.4 diff -u -F^( -u -r1.4 riece-misc.el --- xemacs-packages/riece/lisp/riece-misc.el 5 Dec 2004 04:13:01 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-misc.el 20 Mar 2005 09:09:58 -0000 ＠＠ -223,11 +223,17 ＠＠ (defun riece-get-identities-on-server (s (riece-with-server-buffer server-name (let (identities) (mapatoms - (lambda (atom) + (lambda (channel) (setq identities - (cons (riece-make-identity (symbol-name atom) server-name) + (cons (riece-make-identity (symbol-name channel) server-name) identities))) - riece-obarray) + riece-channel-obarray) + (mapatoms + (lambda (user) + (setq identities + (cons (riece-make-identity (symbol-name user) server-name) + identities))) + riece-user-obarray) identities))) (defun riece-check-channel-commands-are-usable (&optional channel) 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.4 diff -u -F^( -u -r1.4 riece-options.el --- xemacs-packages/riece/lisp/riece-options.el 5 Dec 2004 04:13:01 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-options.el 20 Mar 2005 09:09:58 -0000 ＠＠ -114,7 +114,12 ＠＠ (defcustom riece-addons '(riece-highligh riece-button riece-menu riece-icon - riece-ignore) + riece-ignore + riece-log + riece-toolbar + riece-alias + riece-ctlseq + riece-keyword) "Add-ons insinuated into Riece." :type '(repeat symbol) :group 'riece-options) ＠＠ -194,8 +199,7 ＠＠ (defcustom riece-default-password (geten (const :tag "No" nil)) :group 'riece-server) -(defcustom riece-username (or (getenv "IRCNAME") - (user-real-login-name)) +(defcustom riece-username nil "Your user name." :type 'string :group 'riece-server) ＠＠ -269,6 +273,12 ＠＠ (defcustom riece-quit-message (riece-ext :type '(string :tag "Quit message") :group 'riece-options) +(defcustom riece-part-message nil + "Default part message." +:type '(choice (const :tag "No message" nil) + (string :tag "Part message")) +:group 'riece-options) + (defcustom riece-away-message "Gone" "Default away message." :type '(string :tag "Away message") ＠＠ -279,7 +289,7 ＠＠ (defcustom riece-gather-channel-modes ni :type 'boolean :group 'riece-options) -(defcustom riece-buffer-dispose-function #'bury-buffer +(defcustom riece-buffer-dispose-function #'kill-buffer "Function called after the buffer was disposed." :type 'function :group 'riece-options) ＠＠ -289,15 +299,15 ＠＠ (defcustom riece-shrink-buffer-idle-time :type 'integer :group 'riece-options) -(defcustom riece-shrink-buffer-remove-lines 10 - "Number of lines removed when shrinking channel buffers." -:type 'integer -:group 'riece-options) - -(defcustom riece-max-buffer-size 65535 +(defcustom riece-max-buffer-size nil "Maximum size of channel buffers." :type '(radio (integer :tag "Number of characters") (const nil)) +:group 'riece-options) + +(defcustom riece-shrink-buffer-remove-chars (/ riece-max-send-size 2) + "Number of chars removed when shrinking channel buffers." +:type 'integer :group 'riece-options) (defcustom riece-format-time-function #'current-time-string 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.5 diff -u -F^( -u -r1.5 riece-server.el --- xemacs-packages/riece/lisp/riece-server.el 5 Dec 2004 04:13:01 -0000 1.5 +++ xemacs-packages/riece/lisp/riece-server.el 20 Mar 2005 09:09:58 -0000 ＠＠ -259,13 +259,17 ＠＠ (defun riece-reset-process-buffer (proce (setq riece-send-size 0) (make-local-variable 'riece-last-send-time) (setq riece-last-send-time '(0 0 0)) - (make-local-variable 'riece-obarray) - (setq riece-obarray (make-vector riece-obarray-size 0)) + (make-local-variable 'riece-user-obarray) + (setq riece-user-obarray (make-vector riece-user-obarray-size 0)) + (make-local-variable 'riece-channel-obarray) + (setq riece-channel-obarray (make-vector riece-channel-obarray-size 0)) (make-local-variable 'riece-coding-system) (buffer-disable-undo) (erase-buffer))) (defun riece-close-server-process (process) + (with-current-buffer (process-buffer process) + (run-hooks 'riece-after-close-hook)) (kill-buffer (process-buffer process)) (setq riece-server-process-alist (delq (rassq process riece-server-process-alist) Index: xemacs-packages/riece/lisp/riece-signal.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-signal.el,v retrieving revision 1.2 diff -u -F^( -u -r1.2 riece-signal.el --- xemacs-packages/riece/lisp/riece-signal.el 5 Sep 2004 09:04:19 -0000 1.2 +++ xemacs-packages/riece/lisp/riece-signal.el 20 Mar 2005 09:09:58 -0000 ＠＠ -30,6 +30,7 ＠＠ ;;; Code: (require 'riece-options) +(require 'riece-debug) (defvar riece-signal-slot-obarray (make-vector 31 0)) ＠＠ -103,22 +104,16 ＠＠ (defun riece-emit-signal (signal-name &r (setq signal (riece-make-signal signal-name args) slots (symbol-value symbol)) (while slots - (condition-case error - (if (or (null (riece-slot-filter (car slots))) - (condition-case error - (funcall (riece-slot-filter (car slots)) signal) - (error - (if riece-debug - (message - "Error in signal filter for \"%S\": %S" - signal-name error))) - nil)) - (funcall (riece-slot-function (car slots)) - signal (riece-slot-handback (car slots)))) - (error - (if riece-debug - (message "Error in slot function for \"%S\": %S" - signal-name error)))) + (if (or (null (riece-slot-filter (car slots))) + (riece-funcall-ignore-errors (format "signal filter for \"%S\"" + signal-name) + (riece-slot-filter (car slots)) + signal)) + (riece-funcall-ignore-errors (format "slot function for \"%S\"" + signal-name) + (riece-slot-function (car slots)) + signal + (riece-slot-handback (car slots)))) (setq slots (cdr slots)))))) (provide 'riece-signal) cvs server: xemacs-packages/riece/lisp/riece-submit-bug-report.xpm is a new entry, no comparison available cvs server: xemacs-packages/riece/lisp/riece-toolbar.el is a new entry, no comparison available 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.4 diff -u -F^( -u -r1.4 riece-unread.el --- xemacs-packages/riece/lisp/riece-unread.el 5 Sep 2004 09:04:19 -0000 1.4 +++ xemacs-packages/riece/lisp/riece-unread.el 20 Mar 2005 09:09:58 -0000 ＠＠ -88,8 +88,9 ＠＠ (defun riece-unread-after-display-messag (defun riece-unread-after-switch-to-channel-function (last) (if riece-unread-enabled (setq riece-unread-channels - (delete riece-current-channel - riece-unread-channels)))) + (delq (car (riece-identity-member riece-current-channel + riece-unread-channels)) + riece-unread-channels)))) (defun riece-unread-format-identity-for-channel-list-buffer (index identity) (if (and riece-unread-enabled 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.2 diff -u -F^( -u -r1.2 riece-user.el --- xemacs-packages/riece/lisp/riece-user.el 5 May 2004 01:37:25 -0000 1.2 +++ xemacs-packages/riece/lisp/riece-user.el 20 Mar 2005 09:09:58 -0000 ＠＠ -30,7 +30,7 ＠＠ (require 'riece-mode) (defun riece-find-user (name) "Get a user object named NAME from the server buffer." (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name) - riece-obarray))) + riece-user-obarray))) (if symbol (symbol-value symbol)))) ＠＠ -38,19 +38,19 ＠＠ (defun riece-forget-user (name) (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name)))) (when symbol (makunbound symbol) - (unintern (symbol-name symbol) riece-obarray)))) + (unintern (symbol-name symbol) riece-user-obarray)))) (defun riece-rename-user (old-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) - riece-obarray))) + riece-user-obarray))) (when symbol (set (intern (riece-identity-canonicalize-prefix new-name) - riece-obarray) + riece-user-obarray) (symbol-value symbol)) (makunbound symbol) - (unintern (symbol-name symbol) riece-obarray))))) + (unintern (symbol-name symbol) riece-user-obarray))))) (defun riece-make-user (channels user-at-host modes away operator) "Make an instance of user object. ＠＠ -60,11 +60,11 ＠＠ (defun riece-make-user (channels user-at (defun riece-get-user (name) (let ((symbol (intern-soft (riece-identity-canonicalize-prefix name) - riece-obarray))) + riece-user-obarray))) (if symbol (symbol-value symbol) (set (intern (riece-identity-canonicalize-prefix name) - riece-obarray) + riece-user-obarray) (riece-make-user nil nil nil nil nil))))) (defun riece-user-channels (user) 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.5 diff -u -F^( -u -r1.5 riece-version.el --- xemacs-packages/riece/lisp/riece-version.el 5 Dec 2004 04:13:01 -0000 1.5 +++ xemacs-packages/riece/lisp/riece-version.el 20 Mar 2005 09:09:58 -0000 ＠＠ -48,14 +48,16 ＠＠ (defcustom riece-user-agent 'emacs-riece (defconst riece-product-name "Riece") -(defconst riece-version-number "1.0.6" +(defconst riece-version-number "1.0.8" "Version number for this version of Riece.") (defconst riece-version (format "Riece v%s" riece-version-number) "Version string for this version of Riece.") (eval-when-compile - (defvar xemacs-codename)) + (defvar emacs-program-version) + (defvar xemacs-codename) + (defvar sxemacs-codename)) (defun riece-extended-version () "Stringified Riece version and Emacs version. ＠＠ -79,22 +81,20 ＠＠ (defun riece-extended-version () (if system-v (concat " (" system-v ")") ""))) - ((string-match - "\$[A-Z]*[Mm][Aa][Cc][Ss]\$[^(]*\$\\((beta.*)\\|'\$\\)?" - emacs-version) - (concat - (match-string 1 emacs-version) - (format "/%d.%d" emacs-major-version emacs-minor-version) - (if (match-beginning 3) - (match-string 3 emacs-version) - "") - (if (boundp 'xemacs-codename) - (concat - " (" xemacs-codename - (if system-v - (concat ", " system-v ")") - ")")) - ""))) + ((featurep 'sxemacs) + (concat "SXEmacs/" emacs-program-version + (when system-v + (concat " (" + (when sxemacs-codename + (concat sxemacs-codename ", ")) + system-v ")")))) + ((featurep 'xemacs) + (concat "XEmacs/" emacs-program-version + (when system-v + (concat " (" + (when xemacs-codename + (concat xemacs-codename ", ")) + system-v ")")))) (t emacs-version)))) (if (stringp riece-user-agent) riece-user-agent Index: xemacs-packages/riece/lisp/riece-xemacs.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece-xemacs.el,v retrieving revision 1.6 diff -u -F^( -u -r1.6 riece-xemacs.el --- xemacs-packages/riece/lisp/riece-xemacs.el 5 Dec 2004 04:13:01 -0000 1.6 +++ xemacs-packages/riece/lisp/riece-xemacs.el 20 Mar 2005 09:09:58 -0000 ＠＠ -122,6 +122,8 ＠＠ (defun riece-propertize-modeline-string (set-extent-properties extent properties) (cons extent string))) +(defalias 'riece-normalize-modeline-string 'identity) + (defalias 'riece-facep 'find-face) (defun riece-put-text-property-nonsticky (start end prop value Index: xemacs-packages/riece/lisp/riece.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/riece.el,v retrieving revision 1.5 diff -u -F^( -u -r1.5 riece.el --- xemacs-packages/riece/lisp/riece.el 5 Dec 2004 04:13:02 -0000 1.5 +++ xemacs-packages/riece/lisp/riece.el 20 Mar 2005 09:09:58 -0000 ＠＠ -58,7 +58,8 ＠＠ (defvar riece-buffer-alist (riece-dialogue-buffer "*Dialogue*" riece-dialogue-mode) (riece-others-buffer "*Others*" riece-others-mode) (riece-channel-list-buffer "*Channels*" riece-channel-list-mode) - (riece-user-list-buffer " *Users*" riece-user-list-mode))) + (riece-user-list-buffer " *Users*" riece-user-list-mode) + (riece-temp-buffer " *Temp*"))) (defvar riece-shrink-buffer-idle-timer nil "Timer object to periodically shrink channel buffers.") ＠＠ -184,7 +185,8 ＠＠ (when t "r" riece-command-configure-windows "x" riece-command-copy-region "t" riece-command-topic - "w" riece-command-who) + "w" riece-command-who + "z" riece-command-suspend-resume) (riece-define-keys riece-command-mode-map "\r" riece-command-enter-message ＠＠ -275,6 +277,9 ＠＠ (defun riece (&optional confirm) (run-hooks 'riece-after-load-startup-hook) (if (riece-server-opened) (riece-command-configure-windows) + (modify-frame-parameters (selected-frame) + (list (cons 'riece-window-configuration + (current-window-configuration)))) (unless riece-addons-insinuated (setq riece-addons (riece-resolve-addons riece-addons)) (let ((pointer riece-addons)) ＠＠ -337,15 +342,15 ＠＠ (defun riece-shrink-buffer (buffer) (while (> (buffer-size) riece-max-buffer-size) (let* ((inhibit-read-only t) buffer-read-only - (start (point)) - (end (progn (beginning-of-line - (1+ riece-shrink-buffer-remove-lines)) - (point))) - (overlays (riece-overlays-in start end))) + (end (progn + (goto-char riece-shrink-buffer-remove-chars) + (beginning-of-line 2) + (point))) + (overlays (riece-overlays-in (point-min) end))) (while overlays (riece-delete-overlay (car overlays)) (setq overlays (cdr overlays))) - (delete-region start end))))) + (delete-region (point-min) end))))) (defun riece-exit () (if riece-save-variables-are-dirty ＠＠ -370,6 +375,8 ＠＠ (defun riece-exit () riece-operator-indicator "-" riece-channel-status-indicator "-" riece-freeze-indicator "-") + (modify-frame-parameters (selected-frame) + (list (list 'riece-window-configuration))) (delete-other-windows) (run-hooks 'riece-exit-hook)) 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.1 diff -u -F^( -u -r1.1 Makefile.am --- xemacs-packages/riece/lisp/test/Makefile.am 5 Dec 2004 04:13:06 -0000 1.1 +++ xemacs-packages/riece/lisp/test/Makefile.am 20 Mar 2005 09:09:58 -0000 ＠＠ -1,3 +1,4 ＠＠ -EXTRA_DIST = luna.el lunit.el \ - test-riece-addon.el test-riece-alias.el test-riece-url.el \ - test-riece-yank.el \ No newline at end of file +EXTRA_DIST = luna.el lunit.el lunit-report.el \ + test-riece.el test-riece-addon.el test-riece-alias.el \ + test-riece-eval.el test-riece-log.el test-riece-url.el \ + test-riece-yank.el cvs server: xemacs-packages/riece/lisp/test/lunit-report.el is a new entry, no comparison available Index: xemacs-packages/riece/lisp/test/lunit.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/riece/lisp/test/lunit.el,v retrieving revision 1.1 diff -u -F^( -u -r1.1 lunit.el --- xemacs-packages/riece/lisp/test/lunit.el 5 Dec 2004 04:13:06 -0000 1.1 +++ xemacs-packages/riece/lisp/test/lunit.el 20 Mar 2005 09:09:58 -0000 ＠＠ -292,133 +292,6 ＠＠ (defun lunit (test) (length failures) (length errors)))))) -;; stolen (and renamed) from time-date.el. -(defun lunit-time-since (time) - "Return the time elapsed since TIME." - (let* ((current (current-time)) - (rest (when (< (nth 1 current) (nth 1 time)) - (expt 2 16)))) - (list (- (+ (car current) (if rest -1 0)) (car time)) - (- (+ (or rest 0) (nth 1 current)) (nth 1 time)) - (- (nth 2 current) (nth 2 time))))) - -(eval-and-compile - (luna-define-class lunit-test-reporter (lunit-test-listener) - (buffer - start-time)) - - (luna-define-internal-accessors 'lunit-test-reporter)) - -(defun lunit-escape-quote (string) - (let ((index 0)) - (while (string-match "\"" string index) - (setq string (replace-match """ nil t string) - index (+ 5 index))) - string)) - -(luna-define-method lunit-test-listener-error ((reporter lunit-test-reporter) - case error) - (save-excursion - (set-buffer (lunit-test-reporter-buffer-internal reporter)) - (insert (format "\ - <error message=\"%s\" type=\"error\"/> -" - (lunit-escape-quote (pp-to-string error)))))) - -(luna-define-method lunit-test-listener-failure ((reporter lunit-test-reporter) - case failure) - (save-excursion - (set-buffer (lunit-test-reporter-buffer-internal reporter)) - (insert (format "\ - <failure message=\"%s\" type=\"failure\"/> -" - (lunit-escape-quote (pp-to-string failure)))))) - -(luna-define-method lunit-test-listener-start ((reporter lunit-test-reporter) - case) - (save-excursion - (set-buffer (lunit-test-reporter-buffer-internal reporter)) - (goto-char (point-max)) - (narrow-to-region (point) (point)) - (insert (format "\ - <testcase name=\"%s\" classname=\"%s\"> -" - (lunit-test-name-internal case) - (luna-class-name case))) - (lunit-test-reporter-set-start-time-internal reporter (current-time)))) - -(luna-define-method lunit-test-listener-end ((reporter lunit-test-reporter) - case) - (let ((elapsed - (lunit-time-since - (lunit-test-reporter-start-time-internal reporter)))) - (save-excursion - (set-buffer (lunit-test-reporter-buffer-internal reporter)) - - (insert "\ - </testcase> -") - (goto-char (point-min)) - (looking-at " *<testcase\\>") - (goto-char (match-end 0)) - (insert (format " time=\"%.03f\" " - (+ (nth 1 elapsed) - (/ (nth 2 elapsed) 1000000.0)))) - (widen)))) - -(defun lunit-report (test file) - "Run TEST and output result as XML." - (let* ((printer - (luna-make-entity 'lunit-test-printer)) - (result - (lunit-make-test-result printer)) - (buffer (find-file-noselect file)) - start-time) - (save-excursion - (set-buffer buffer) - (erase-buffer)) - (lunit-test-result-add-listener - result - (luna-make-entity 'lunit-test-reporter :buffer buffer)) - (setq start-time (current-time)) - (lunit-test-run test result) - (let ((assert-count - (lunit-test-result-assert-count-internal result)) - (failures - (lunit-test-result-failures-internal result)) - (errors - (lunit-test-result-errors-internal result)) - - (elapsed (lunit-time-since start-time))) - (princ (format "%d runs, %d assertions, %d failures, %d errors\n" - (lunit-test-number-of-tests test) - assert-count - (length failures) - (length errors))) - (save-excursion - (set-buffer buffer) - (goto-char (point-min)) - (insert (format "\ -<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<testsuites> - <testsuite name=\"\" tests=\"%d\" failures=\"%d\" \ -errors=\"%d\" time =\"%.03f\"> - <properties> - <property name=\"emacs-version\" value=\"%s\"/> - </properties> -" - (lunit-test-number-of-tests test) - (length failures) - (length errors) - (+ (nth 1 elapsed) - (/ (nth 2 elapsed) 1000000.0)) - (lunit-escape-quote (emacs-version)))) - (goto-char (point-max)) - (insert "\ - </testsuite> -</testsuites>") - (save-buffer))))) - (defvar imenu-create-index-function) (defun lunit-create-index-function () (require 'imenu) cvs server: xemacs-packages/riece/lisp/test/test-riece-eval.el is a new entry, no comparison available cvs server: xemacs-packages/riece/lisp/test/test-riece-log.el is a new entry, no comparison available cvs server: xemacs-packages/riece/lisp/test/test-riece.el is a new entry, no comparison available -- Daiki Ueno

1 participants
0 comments

[C] xemacsweb: Develop/packages.content to link to Package Release Announcements 20 years

Adrian Aichner

COMMIT Suggestions, patches, commits to make package release information more widely known are welcome. This should be a start. Adrian xemacsweb ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: Develop/ChangeLog Index: Develop/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/ChangeLog,v retrieving revision 1.98 diff -u -U0 -r1.98 ChangeLog --- Develop/ChangeLog 9 Mar 2005 21:24:56 -0000 1.98 +++ Develop/ChangeLog 18 Mar 2005 20:05:49 -0000 ＠＠ -0,0 +1,4 ＠＠ +2005-03-18 Adrian Aichner <adrian(a)xemacs.org> + + * packages.content: Link to Package Release Announcements. + xemacsweb source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: Develop/packages.content Index: Develop/packages.content =================================================================== RCS file: /pack/xemacscvs/XEmacs/xemacsweb/Develop/packages.content,v retrieving revision 1.33 diff -u -w -r1.33 packages.content --- Develop/packages.content 9 Mar 2005 21:24:56 -0000 1.33 +++ Develop/packages.content 18 Mar 2005 20:04:19 -0000 ＠＠ -22,6 +22,13 ＠＠ + Please consult the <a href="">Packages</a> + section in the <a href="">XEmacs Release Notice Archive</a>. + + + The packages are currently divided into 2 categories, <a href="#standard">Standard</a>, and <a href="#mule">MULE (MUlti Lingual Emacs)</a>. -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/

1 participants
0 comments

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

XEmacs-Patches March 2005