* riece-display.el (riece-display-connect-signals)

(riece-update-buffers): Suppress byte-compile
warnings; `save-excursion' defeated by `set-buffer'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3a8bdfd..28517c2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
 2010-09-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 

+       * riece-display.el (riece-display-connect-signals)
+       (riece-update-buffers): Suppress byte-compile
+       warnings; `save-excursion' defeated by `set-buffer'.
+

        * riece-button.el (riece-identity-button-popup-menu)
        (riece-identity-button-click): Suppress byte-compile warnings;
        `save-excursion' defeated by `set-buffer'.
        * riece-button.el (riece-identity-button-popup-menu)
        (riece-identity-button-click): Suppress byte-compile warnings;
        `save-excursion' defeated by `set-buffer'.

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index 5d20012..ecfe598 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -52,15 +52,13 @@ Local to the buffer in `riece-buffer-list'.")
   (riece-connect-signal
    'channel-list-changed
    (lambda (signal handback)
   (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)
        (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
        (run-hooks 'riece-update-buffer-functions)))
    (lambda (signal)
      (and riece-current-channel


@@ -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))
     (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)
          (run-hooks 'riece-update-buffer-functions)))
     (setq buffers (cdr buffers)))
   (run-hooks 'riece-update-indicator-functions)