From: ueno Date: Thu, 22 May 2003 09:11:26 +0000 (+0000) Subject: Synch with the trunk. X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9cb8ab100649483f3202ab747a42d1103624b71;p=elisp%2Fliece.git Synch with the trunk. --- diff --git a/AUTHORS b/AUTHORS index 071acdb..d785654 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,8 +1,6 @@ --*- mode: text; left-margin: 2; fill-column: 70; -*- +Liece is mainly written by Daiki Ueno . - Liece is mainly written by Daiki Ueno . +This package based on Irchat (version 3.01) which has been +distributed under GPL1 or later. - This package based on Irchat (version 3.01) which has been - distributed under GPL1 or later. - - Original author of Irchat is Tor Lillqvist +Original author of Irchat is Tor Lillqvist . diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b5e3a77..b4b5ae9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -8,6 +8,38 @@ * liece-channel.el (liece-channel-list-redisplay-buffer): Search a channel correctly. +2003-04-17 Daiki Ueno + + * liece-channel.el: Require 'liece-misc when compiling. + (liece-channel-equal): Define as function. + (liece-channel-buffer-create): Define as function. + (liece-channel-switch-to-last): Define before it is used. + * liece-ctcp.el: Require 'liece-misc when compiling. + * liece-message.el: Require 'liece-misc when compiling. + * liece-misc.el: Move some macros to the beginning of the file. + * liece-nick.el: Require 'liece-inlines when compiling. + (liece-nick-equal): Define as function. + (liece-nick-buffer-create): Define as function. + +2003-03-26 Steve Youngs + + * liece-channel.el (liece-channel-p): Don't wrap the string-match + in a 'eval-when-compile' to avoid a void variable error. + (liece-channel-modeless-p): Ditto. + +2003-03-09 Ben Wing + + * Makefile.lisp: + * Makefile.lisp (autoload): New. + Separate autoload building from elc building. + + * liece-make.el (install-update-package-files): + Use new `batch-update-directory-autoloads' if available. + +2002-12-08 Ville Skyttä + + * Makefile.lisp (all): Not a double-colon any more. + 2002-10-11 Yoichi NAKAYAMA * liece-emacs.el: Require pces to avoid compile error. diff --git a/lisp/Makefile.lisp b/lisp/Makefile.lisp index 5372840..5db6cb1 100644 --- a/lisp/Makefile.lisp +++ b/lisp/Makefile.lisp @@ -12,7 +12,7 @@ VERSION_SPECIFIC_LISPDIR ?= NONE GOMI = liece-setup.el *.elc -all:: elc +all: elc elc: $(EMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \ diff --git a/lisp/liece-channel.el b/lisp/liece-channel.el index fa46f09..40f1a25 100644 --- a/lisp/liece-channel.el +++ b/lisp/liece-channel.el @@ -30,6 +30,7 @@ ;;; Code: (eval-when-compile (require 'liece-inlines)) +(eval-when-compile (require 'liece-misc)) (eval-when-compile (require 'liece-clfns)) @@ -51,18 +52,13 @@ (liece-command-join chnl)))) (defun liece-channel-p (chnl) - (string-match - (eval-when-compile - (concat "^" liece-channel-regexp)) - chnl)) + (string-match (concat "^" liece-channel-regexp) chnl)) (defun liece-channel-modeless-p (chnl) - (string-match - (eval-when-compile - (concat "^" liece-channel-modeless-regexp)) - chnl)) + (string-match (concat "^" liece-channel-modeless-regexp) chnl)) -(defalias 'liece-channel-equal 'string-equal-ignore-case) +(defun liece-channel-equal (c1 c2) + (string-equal-ignore-case c1 c2)) (defun liece-channel-member (chnl chnls) "Return non-nil if CHNL is member of CHNLS." @@ -288,10 +284,10 @@ Otherwise they are removed from the channel." (setq liece-channel-buffer-mode (not liece-channel-buffer-mode))) (liece-configure-windows)) -(defmacro liece-channel-buffer-create (chnl) +(defun liece-channel-buffer-create (chnl) "Create channel buffer of CHNL." - `(with-current-buffer - (liece-get-buffer-create (format liece-channel-buffer-format ,chnl)) + (with-current-buffer + (liece-get-buffer-create (format liece-channel-buffer-format chnl)) (let (buffer-read-only) (liece-insert-info (current-buffer) (concat (funcall liece-format-time-function @@ -299,7 +295,7 @@ Otherwise they are removed from the channel." " Created.\n"))) (unless (eq major-mode 'liece-channel-mode) (liece-channel-mode)) - (set-alist 'liece-channel-buffer-alist ,chnl (current-buffer)) + (set-alist 'liece-channel-buffer-alist chnl (current-buffer)) (current-buffer))) (defun liece-channel-join-internal (item chnls &optional hints) @@ -344,6 +340,12 @@ If NOSW is non-nil do not switch to newly created channel." liece-nick-buffer nbuf)) (liece-channel-change))) +(defmacro liece-channel-switch-to-last (chnls) + `(let ((chnl (liece-channel-last ,chnls))) + (if chnl + (liece-switch-to-channel chnl)) + (liece-channel-change))) + (defun liece-channel-part-internal (item chnls &optional hints) (if hints (mapcar @@ -372,12 +374,6 @@ If NOSW is non-nil do not switch to newly created channel." (defun liece-channel-last (chnls) (car (last chnls))) -(defun liece-channel-switch-to-last (chnls) - (let ((chnl (liece-channel-last chnls))) - (if chnl - (liece-switch-to-channel chnl)) - (liece-channel-change))) - (defun liece-channel-change () (let ((chnls (if (eq liece-command-buffer-mode 'chat) liece-current-chat-partners diff --git a/lisp/liece-ctcp.el b/lisp/liece-ctcp.el index 61fe151..1f0d730 100644 --- a/lisp/liece-ctcp.el +++ b/lisp/liece-ctcp.el @@ -30,6 +30,7 @@ ;;; Code: (eval-when-compile (require 'liece-inlines)) +(eval-when-compile (require 'liece-misc)) (require 'liece-handler) diff --git a/lisp/liece-dcc.el b/lisp/liece-dcc.el index ba20d6f..fabcda7 100644 --- a/lisp/liece-dcc.el +++ b/lisp/liece-dcc.el @@ -32,7 +32,8 @@ (eval-when-compile (require 'liece-intl) (require 'liece-inlines) - (require 'liece-channel)) + (require 'liece-channel) + (require 'liece-misc)) (eval-when-compile (require 'queue-m)) diff --git a/lisp/liece-emacs.el b/lisp/liece-emacs.el index 8d8e058..a4cf38f 100644 --- a/lisp/liece-emacs.el +++ b/lisp/liece-emacs.el @@ -30,7 +30,8 @@ (eval-when-compile (require 'liece-compat) - (require 'liece-vars)) + (require 'liece-vars) + (require 'liece-misc)) (eval-when-compile (ignore-errors (require 'image))) diff --git a/lisp/liece-make.el b/lisp/liece-make.el index 2b56ef3..2a69ced 100644 --- a/lisp/liece-make.el +++ b/lisp/liece-make.el @@ -126,9 +126,14 @@ (princ (format "Wrote %s\n" (expand-file-name "custom-load.elc" dir)))) (t - (setq autoload-package-name package) - (add-to-list 'command-line-args-left dir) - (batch-update-directory) + (if (fboundp 'batch-update-directory-autoloads) + (progn + (setq command-line-args-left + (cons package (cons dir command-line-args-left))) + (batch-update-directory-autoloads)) + (setq autoload-package-name package) + (add-to-list 'command-line-args-left dir) + (batch-update-directory)) (add-to-list 'command-line-args-left dir) (Custom-make-dependencies) diff --git a/lisp/liece-message.el b/lisp/liece-message.el index de35c33..88501a9 100644 --- a/lisp/liece-message.el +++ b/lisp/liece-message.el @@ -28,6 +28,8 @@ ;;; Code: +(eval-when-compile (require 'liece-misc)) + (defgroup liece-message nil "Messages" :tag "Message" diff --git a/lisp/liece-misc.el b/lisp/liece-misc.el index cf2f3e1..8491d11 100644 --- a/lisp/liece-misc.el +++ b/lisp/liece-misc.el @@ -164,8 +164,8 @@ liece-freeze-indicator (if liece-freeze "F" "-")) (force-mode-line-update))) -(defmacro liece-frozen (buffer) - (list 'with-current-buffer buffer 'liece-freeze)) +(defun liece-frozen (buffer) + (with-current-buffer buffer liece-freeze)) (defun liece-own-freeze (buffer &optional arg) (with-current-buffer buffer @@ -173,8 +173,8 @@ liece-own-freeze-indicator (if liece-own-freeze "M" "-")) (force-mode-line-update))) -(defmacro liece-own-frozen (buffer) - (list 'with-current-buffer buffer 'liece-own-freeze)) +(defun liece-own-frozen (buffer) + (with-current-buffer buffer liece-own-freeze)) (defun liece-ignore-this-p (nick user-at-host) ;; Remove entries which are expired. diff --git a/lisp/liece-nick.el b/lisp/liece-nick.el index a3dc14c..af68c9d 100644 --- a/lisp/liece-nick.el +++ b/lisp/liece-nick.el @@ -29,11 +29,14 @@ ;;; Code: +(eval-when-compile (require 'liece-inlines)) + (require 'liece-hilit) (defalias 'liece-nick-set-operator 'liece-channel-set-operator) (defalias 'liece-nick-set-voice 'liece-channel-set-voice) -(defalias 'liece-nick-equal 'string-equal-ignore-case) +(defun liece-nick-equal (n1 n2) + (string-equal-ignore-case n1 n2)) (defun liece-nick-member (nick nicks) "Return non-nil if NICK is member of NICKS." @@ -185,12 +188,12 @@ Otherwise they are removed from the user." (setq liece-nick-buffer-mode (not liece-nick-buffer-mode))) (liece-configure-windows)) -(defmacro liece-nick-buffer-create (chnl) - `(with-current-buffer - (liece-get-buffer-create (format liece-nick-buffer-format ,chnl)) +(defun liece-nick-buffer-create (chnl) + (with-current-buffer + (liece-get-buffer-create (format liece-nick-buffer-format chnl)) (unless (eq major-mode 'liece-nick-mode) (liece-nick-mode)) - (set-alist 'liece-nick-buffer-alist ,chnl (current-buffer)) + (set-alist 'liece-nick-buffer-alist chnl (current-buffer)) (current-buffer))) (defun liece-change-nick-of-1 (old new nicks)