From 9c9ded5e91582d9d46fbe33c925b5a98d5ffea60 Mon Sep 17 00:00:00 2001 From: ueno Date: Sat, 22 May 2004 20:27:41 +0000 Subject: [PATCH] * riece-message.el (riece-format-message): Don't append server-name if the 2nd arg is not specified. * riece-hangman.el (riece-hangman-word): Fixed regexp. --- lisp/ChangeLog | 7 +++++++ lisp/riece-hangman.el | 2 +- lisp/riece-message.el | 9 ++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9ba9eca..eab7ece 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,12 @@ 2004-05-22 Daiki Ueno + * riece-message.el (riece-format-message): Don't append + server-name if the 2nd arg is not specified. + + * riece-hangman.el (riece-hangman-word): Fixed regexp. + +2004-05-22 Daiki Ueno + * riece-xface.el: Support enable/disable. (riece-xface-enabled): New flag. (riece-xface-description): New variable. diff --git a/lisp/riece-hangman.el b/lisp/riece-hangman.el index cb7dd1f..54f6349 100644 --- a/lisp/riece-hangman.el +++ b/lisp/riece-hangman.el @@ -103,7 +103,7 @@ The wordlist is read from `riece-hangman-words-file'." (buffer-disable-undo) (insert-file-contents riece-hangman-words-file) (let ((case-fold-search nil)) - (delete-non-matching-lines "^[a-z][a-z][a-z][a-z][a-z][a-z]")))) + (delete-non-matching-lines "^[a-z][a-z][a-z][a-z][a-z][a-z]+")))) (save-excursion (set-buffer riece-hangman-words-buffer) (goto-char (% (1+ (random)) (buffer-size))) diff --git a/lisp/riece-message.el b/lisp/riece-message.el index 63dadfe..6bbd35f 100644 --- a/lisp/riece-message.el +++ b/lisp/riece-message.el @@ -154,9 +154,12 @@ Normally they are *Dialogue* and/or *Others*." (server-name (riece-identity-server (riece-message-speaker message)))) (riece-with-server-buffer (riece-current-server-name) (concat - (riece-concat-server-name - (concat open-bracket name close-bracket - " " (riece-message-text message))) + (if global + (riece-concat-server-name + (concat open-bracket name close-bracket + " " (riece-message-text message))) + (concat open-bracket name close-bracket + " " (riece-message-text message))) "\n")))) (defun riece-display-message-1 (message) -- 1.7.10.4