Add workaround when compiling with XEmacs 21.5.

[riece] / lisp / riece-display.el

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 96c32ff..ecfe598 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -31,8 +31,6 @@
 (require 'riece-signal)
 (require 'riece-mcat)
 
-(autoload 'derived-mode-class "derived")
-
 (defvar riece-channel-buffer-format "*Channel:%s*"
   "Format of channel message buffer.")
 (defvar riece-channel-buffer-alist nil
@@ -54,15 +52,13 @@ Local to the buffer in `riece-buffer-list'.")
   (riece-connect-signal
    'channel-list-changed
    (lambda (signal handback)
-     (save-excursion
-       (set-buffer riece-channel-list-buffer)
+     (with-current-buffer riece-channel-list-buffer
        (run-hooks 'riece-update-buffer-functions))
      (riece-update-channel-list-indicator)))
   (riece-connect-signal
    'user-list-changed
    (lambda (signal handback)
-     (save-excursion
-       (set-buffer riece-user-list-buffer)
+     (with-current-buffer riece-user-list-buffer
        (run-hooks 'riece-update-buffer-functions)))
    (lambda (signal)
      (and riece-current-channel
@@ -348,15 +344,17 @@ Local to the buffer in `riece-buffer-list'.")
                           (riece-user-get-operator riece-real-nickname))
                      "O"
                    "-")
-                 riece-user-indicator
-                 (riece-format-identity
-                  (riece-make-identity riece-real-nickname riece-server-name)
-                  t))))))
+                 )
+           (if riece-real-nickname
+               (setq riece-user-indicator
+                     (riece-format-identity
+                      (riece-make-identity riece-real-nickname
+                                           riece-server-name)
+                      t)))))))
   (walk-windows
    (lambda (window)
      (with-current-buffer (window-buffer window)
-       (if (eq (derived-mode-class major-mode)
-              'riece-dialogue-mode)
+       (if (riece-derived-mode-p 'riece-dialogue-mode)
           (setq riece-freeze-indicator
                 (if (eq riece-freeze 'own)
                     "f"
@@ -392,8 +390,7 @@ Local to the buffer in `riece-buffer-list'.")
     (setq buffers riece-buffer-list))
   (while buffers
     (if (buffer-live-p (car buffers))
-       (save-excursion
-         (set-buffer (car buffers))
+       (with-current-buffer (car buffers)
          (run-hooks 'riece-update-buffer-functions)))
     (setq buffers (cdr buffers)))
   (run-hooks 'riece-update-indicator-functions)