* 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/ChangeLog b/lisp/ChangeLog
index 8cac2c5..3a8bdfd 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2010-09-12  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
+       * riece-button.el (riece-identity-button-popup-menu)
+       (riece-identity-button-click): Suppress byte-compile warnings;
+       `save-excursion' defeated by `set-buffer'.
+
        * riece-async.el (riece-async-open-network-stream): Suppress
        byte-compile warnings; `save-excursion' defeated by `set-buffer'.
 

diff --git a/lisp/riece-button.el b/lisp/riece-button.el
index fd6f24e..a04d576 100644 (file)
--- a/lisp/riece-button.el
+++ b/lisp/riece-button.el
@@ -89,8 +89,7 @@ This function is used as a callback for a channel button."
        (point (point))
        window)
     (unwind-protect
-       (save-excursion
-         (set-buffer (riece-event-buffer event))
+       (with-current-buffer (riece-event-buffer event)
          (goto-char (riece-event-point event))
          (widget-button-click event))
       ;; riece-button-switch-to-identity changes window-configuration
@@ -106,8 +105,7 @@ This function is used as a callback for a channel button."
 (defun riece-identity-button-popup-menu (event)
   "Popup the menu for identity buttons."
   (interactive "e")
-  (save-excursion
-    (set-buffer (riece-event-buffer event))
+  (with-current-buffer (riece-event-buffer event)
     (goto-char (riece-event-point event))
     (riece-popup-menu-popup
      (if (riece-channel-p (riece-identity-prefix