Catch up with the changes incorporated in XEmacs package.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 34463ec..8512471 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,10 +8,36 @@
        Suggested by "Akinori MUSHA" <knu@iDaemons.org>.
        [cf. <Liece:00075>]
 
+2002-07-13  Daiki Ueno  <daiki@xemacs.org>
+
+       * liece-menu.el (liece-menu-add-url): Always switch to *Commands*
+       buffer.
+       * liece-xemacs.el (liece-fix-menu-path-switch-buffer): Removed old
+       defadvice to easy-menu-add-item.
+ 
+2002-06-08  Adrian Aichner  <adrian@xemacs.org>
+
+       * liece-commands.el (liece-command-nickname): Use
+       truncate-string-to-width instead of non-existent truncate-string.
+       * liece.el (liece-open-server): Ditto.
+
+2002-06-05  Steve Youngs  <youngs@xemacs.org>
+
+       * liece-inlines.el (string-equal-ignore-case): Don't try to use
+       'compare-strings'.
+ 
 2002-05-19  Daiki Ueno  <ueno@unixuser.org>
 
        * liece-xemacs.el (liece-xemacs-modeline-glyph): Check 'xbm.
 
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+       * liece-make.el (config-liece-package-directory):
+       * liece-config.el (PACKAGEDIR):
+       Handle case when dirs is nil.
+
+       * Makefile.lisp (package): Preload advice.
+
 2002-05-12  Daiki Ueno  <ueno@unixuser.org>
 
        * gettext.el (gettext-default-locale): New variable.

diff --git a/lisp/Makefile.lisp b/lisp/Makefile.lisp
index fce2a66..c2593ca 100644 (file)
--- a/lisp/Makefile.lisp
+++ b/lisp/Makefile.lisp
@@ -27,7 +27,7 @@ install: elc
 package:
        $(XEMACS) $(FLAGS) -l ./liece-make.el -f autoload-liece \
                $(PREFIX) $(LISPDIR)
-       $(XEMACS) $(FLAGS) -l ./liece-make.el -f compile-liece-package \
+       $(XEMACS) $(FLAGS) -l ./liece-make.el -l advice -f compile-liece-package \
                $(PACKAGEDIR)
 
 install-package: package

diff --git a/lisp/liece-commands.el b/lisp/liece-commands.el
index 5062929..e6884a9 100644 (file)
--- a/lisp/liece-commands.el
+++ b/lisp/liece-commands.el
@@ -600,7 +600,7 @@ With - as argument, list all channels."
 (defun liece-command-nickname (nick)
   "Set your nickname to NICK."
   (interactive "sEnter your nickname: ")
-  (let ((nickname (truncate-string nick liece-nick-max-length)))
+  (let ((nickname (truncate-string-to-width nick liece-nick-max-length)))
     (if (zerop (length nickname))
        (liece-message (_ "illegal nickname \"%s\"; not changed") nickname)
       (liece-send "NICK %s" nick))))

diff --git a/lisp/liece-config.el b/lisp/liece-config.el
index 336a2e3..13f1995 100644 (file)
--- a/lisp/liece-config.el
+++ b/lisp/liece-config.el
@@ -85,7 +85,7 @@
                          (if last-package-load-path
                              last-packages)))
            dir)
-       (while (not (file-exists-p (setq dir (car dirs))))
+       (while (and dirs (not (file-exists-p (setq dir (car dirs)))))
          (setq dirs (cdr dirs)) )
        dir )))
 

diff --git a/lisp/liece-make.el b/lisp/liece-make.el
index b96100c..2b56ef3 100644 (file)
--- a/lisp/liece-make.el
+++ b/lisp/liece-make.el
@@ -145,8 +145,8 @@
                          (if last-package-load-path
                              last-packages)))
            dir)
-       (while (not (file-exists-p
-                    (setq dir (car dirs))))
+       (while (and dirs (not (file-exists-p
+                              (setq dir (car dirs)))))
          (setq dirs (cdr dirs)))
        (defvar PACKAGEDIR dir)
        (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR)))))

diff --git a/lisp/liece-menu.el b/lisp/liece-menu.el
index 4483f0b..69f04c3 100644 (file)
--- a/lisp/liece-menu.el
+++ b/lisp/liece-menu.el
@@ -248,9 +248,10 @@
 
 (defun liece-menu-add-url (url)
   (when (boundp 'liece-menu-url-menu-map)
-    (easy-menu-add-item
-     liece-menu-url-menu-map nil
-     (vector url (list 'liece-command-browse-url url) t))))
+    (with-current-buffer liece-command-buffer
+      (easy-menu-add-item
+       nil (list (car liece-menu-url-menu))
+       (vector url (list 'liece-command-browse-url url) t)))))
 
 ;;; @ menu callbacks
 ;;;

diff --git a/lisp/liece-xemacs.el b/lisp/liece-xemacs.el
index 8278893..e12aec4 100644 (file)
--- a/lisp/liece-xemacs.el
+++ b/lisp/liece-xemacs.el
@@ -423,15 +423,6 @@ Always two arguments are passed, OBJECT and NICK."
       (let ((filename (match-string 1 (cdr object))))
        (liece-command-dcc-send filename nick))))
 
-(defadvice easy-menu-add-item
-  (around liece-fix-menu-path-switch-buffer activate)
-  "Advice for XEmacs 20.4 or earlier."
-  (save-excursion
-    (set-buffer liece-command-buffer)
-    (add-menu-button
-     (cons (car (ad-get-arg 0)) (ad-get-arg 1))
-     (ad-get-arg 2) (ad-get-arg 3))))
-
 (eval-and-compile
   (setq liece-x-face-insert-function
        (function liece-x-face-insert-with-xemacs))

diff --git a/lisp/liece.el b/lisp/liece.el
index c0e743c..ecb2aeb 100644 (file)
--- a/lisp/liece.el
+++ b/lisp/liece.el
@@ -464,7 +464,7 @@ If optional argument SERVICE is non-nil, open by the service name."
       ;; notify the real nickname to the user.
       (or liece-real-nickname
          (setq liece-real-nickname
-               (truncate-string liece-nickname liece-nick-max-length)))
+               (truncate-string-to-width liece-nickname liece-nick-max-length)))
       (setq liece-nickname-last liece-real-nickname
            liece-nick-accepted 'sent
            liece-after-registration t))))