Updates/improvements -- riece-xfaceb

[riece] / lisp / riece-display.el

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 96c32ff..fb61458 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -1,4 +1,4 @@
-;;; riece-display.el --- buffer arrangement
+;;; riece-display.el --- buffer arrangement -*- lexical-binding: t -*-
 ;; Copyright (C) 1998-2003 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -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
@@ -53,16 +51,14 @@ Local to the buffer in `riece-buffer-list'.")
 (defun riece-display-connect-signals ()
   (riece-connect-signal
    'channel-list-changed
-   (lambda (signal handback)
-     (save-excursion
-       (set-buffer riece-channel-list-buffer)
+   (lambda (_signal _handback)
+     (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)
+   (lambda (_signal _handback)
+     (with-current-buffer riece-user-list-buffer
        (run-hooks 'riece-update-buffer-functions)))
    (lambda (signal)
      (and riece-current-channel
@@ -70,7 +66,7 @@ Local to the buffer in `riece-buffer-list'.")
                                riece-current-channel))))
   (riece-connect-signal
    'channel-switched
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-status-indicators)
      (riece-update-channel-status-indicator)
      (riece-update-channel-indicator)
@@ -82,7 +78,7 @@ Local to the buffer in `riece-buffer-list'.")
        (riece-redraw-layout))))
   (riece-connect-signal
    'user-joined-channel
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-emit-signal 'user-list-changed riece-current-channel))
    (lambda (signal)
      (and riece-current-channel
@@ -92,7 +88,7 @@ Local to the buffer in `riece-buffer-list'.")
                                     (riece-current-nickname))))))
   (riece-connect-signal
    'user-joined-channel
-   (lambda (signal handback)
+   (lambda (signal _handback)
      (riece-join-channel (nth 1 (riece-signal-args signal)))
      (riece-switch-to-channel (nth 1 (riece-signal-args signal)))
      (setq riece-join-channel-candidate nil))
@@ -101,7 +97,7 @@ Local to the buffer in `riece-buffer-list'.")
                           (riece-current-nickname))))
   (riece-connect-signal
    'user-left-channel
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-emit-signal 'user-list-changed riece-current-channel))
    (lambda (signal)
      (and riece-current-channel
@@ -111,14 +107,14 @@ Local to the buffer in `riece-buffer-list'.")
                                     (riece-current-nickname))))))
   (riece-connect-signal
    'user-left-channel
-   (lambda (signal handback)
+   (lambda (signal _handback)
      (riece-part-channel (nth 1 (riece-signal-args signal))))
    (lambda (signal)
      (riece-identity-equal (car (riece-signal-args signal))
                           (riece-current-nickname))))
   (riece-connect-signal
    'user-renamed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-emit-signal 'user-list-changed riece-current-channel))
    (lambda (signal)
      (and riece-current-channel
@@ -135,7 +131,7 @@ Local to the buffer in `riece-buffer-list'.")
               t))))))
   (riece-connect-signal
    'user-renamed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-status-indicators)
      (riece-update-channel-indicator)
      (force-mode-line-update t))
@@ -144,7 +140,7 @@ Local to the buffer in `riece-buffer-list'.")
                           (riece-current-nickname))))
   (riece-connect-signal
    'user-renamed
-   (lambda (signal handback)
+   (lambda (signal _handback)
      (riece-switch-to-channel (nth 1 (riece-signal-args signal))))
    (lambda (signal)
      (and riece-current-channel
@@ -152,7 +148,7 @@ Local to the buffer in `riece-buffer-list'.")
                                riece-current-channel))))
   (riece-connect-signal
    'user-renamed
-   (lambda (signal handback)
+   (lambda (signal _handback)
      (let* ((old-identity (car (riece-signal-args signal)))
            (new-identity (nth 1 (riece-signal-args signal)))
            (pointer (riece-identity-member old-identity
@@ -169,7 +165,7 @@ Local to the buffer in `riece-buffer-list'.")
                             riece-channel-buffer-alist))))))))
   (riece-connect-signal
    'user-away-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-status-indicators)
      (force-mode-line-update t))
    (lambda (signal)
@@ -177,7 +173,7 @@ Local to the buffer in `riece-buffer-list'.")
                           (riece-current-nickname))))
   (riece-connect-signal
    'user-operator-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-status-indicators)
      (force-mode-line-update t))
    (lambda (signal)
@@ -185,7 +181,7 @@ Local to the buffer in `riece-buffer-list'.")
                           (riece-current-nickname))))
   (riece-connect-signal
    'channel-topic-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-long-channel-indicator)
      (force-mode-line-update t))
    (lambda (signal)
@@ -194,7 +190,7 @@ Local to the buffer in `riece-buffer-list'.")
                                riece-current-channel))))
   (riece-connect-signal
    'channel-modes-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-long-channel-indicator)
      (force-mode-line-update t))
    (lambda (signal)
@@ -203,7 +199,7 @@ Local to the buffer in `riece-buffer-list'.")
                                riece-current-channel))))
   (riece-connect-signal
    'channel-operators-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-channel-status-indicator)
      (riece-emit-signal 'user-list-changed riece-current-channel))
    (lambda (signal)
@@ -212,7 +208,7 @@ Local to the buffer in `riece-buffer-list'.")
                                riece-current-channel))))
   (riece-connect-signal
    'channel-speakers-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-channel-status-indicator)
      (riece-emit-signal 'user-list-changed riece-current-channel))
    (lambda (signal)
@@ -221,7 +217,7 @@ Local to the buffer in `riece-buffer-list'.")
                                riece-current-channel))))
   (riece-connect-signal
    'buffer-freeze-changed
-   (lambda (signal handback)
+   (lambda (_signal _handback)
      (riece-update-status-indicators)
      (force-mode-line-update t))))
 
@@ -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)