Revert "Fix toggle-freeze behavior when the channel buffer window is selected."

This reverts commit fd183f0668247cad752130c1ca1d3d6ac3bb6bc4.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 82b8e2c..787c608 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,3 @@
-2010-12-14  Daiki Ueno  <ueno@unixuser.org>
-
-       * riece-misc.el (riece-insert): Make sure to save current point,
-       when the currently selected buffer is frozen.
-

 2010-12-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * COMPILE (riece-update-mcat): Fix "Wrong number of arguments"
 2010-12-11  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * COMPILE (riece-update-mcat): Fix "Wrong number of arguments"

diff --git a/lisp/riece-misc.el b/lisp/riece-misc.el
index 8995ccb..2aa1286 100644 (file)
--- a/lisp/riece-misc.el
+++ b/lisp/riece-misc.el
@@ -69,15 +69,11 @@
     (with-current-buffer (car buffers)
       (let ((inhibit-read-only t)
            buffer-read-only
     (with-current-buffer (car buffers)
       (let ((inhibit-read-only t)
            buffer-read-only

-           start
+           (start (goto-char (point-max)))

            window
            point)
            window
            point)

-       ;; Save the current for the case when (car buffers) is the
-       ;; currently selected buffer.
-       (save-excursion
-         (setq start (goto-char (point-max)))
-         (insert (format-time-string "%H:%M") " " string)
-         (setq point (point)))
+       (insert (format-time-string "%H:%M") " " string)
+       (setq point (point))

        (if (and (not (riece-frozen (current-buffer)))
                 (setq window (get-buffer-window (current-buffer)))
                 (not (pos-visible-in-window-p point window)))
        (if (and (not (riece-frozen (current-buffer)))
                 (setq window (get-buffer-window (current-buffer)))
                 (not (pos-visible-in-window-p point window)))