Undo.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ea1d6d5..224e06a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,26 +1,9 @@
 2003-08-27  Daiki Ueno  <ueno@unixuser.org>
 
 2003-08-27  Daiki Ueno  <ueno@unixuser.org>
 

-       * riece.el (riece): Initialize riece-channel-history before
-       calling riece-redisplay-buffers.
-
-       * riece-layout.el: Autoload ring-empty-p and ring-ref.
-       (riece-reconfigure-windows-predicate): Check riece-channel-history.
-
-2003-08-27  Daiki Ueno  <ueno@unixuser.org>
-
-       * riece-options.el (riece-channel-history-length): New user option.
-       (riece-connection-timeout): Abolish.
-
-       * riece-globals.el (riece-channel-history): New variable.
-       (riece-last-channel): Abolish.
-
-       * riece-display.el: Autoload ring-insert.
-       (riece-switch-to-channel): Update riece-channel-history.
-       (riece-switch-to-nearest-channel): Ditto.
+       * riece-options.el (riece-connection-timeout): Abolish.

 
        * riece-server.el (riece-clear-system): Abolish.
        * riece.el (riece-exit): Merge riece-clear-system.
 
        * riece-server.el (riece-clear-system): Abolish.
        * riece.el (riece-exit): Merge riece-clear-system.

-       (riece): Initialize riece-channel-history.

 
 2003-08-26  Daiki Ueno  <ueno@unixuser.org>
 
 
 2003-08-26  Daiki Ueno  <ueno@unixuser.org>
 

diff --git a/lisp/riece-display.el b/lisp/riece-display.el
index bb49009..e72fe27 100644 (file)
--- a/lisp/riece-display.el
+++ b/lisp/riece-display.el
@@ -29,8 +29,6 @@
 (require 'riece-misc)
 (require 'riece-layout)
 
 (require 'riece-misc)
 (require 'riece-layout)
 

-(autoload 'ring-insert "ring")
-

 (defvar riece-update-buffer-functions
   '(riece-update-user-list-buffer
     riece-update-channel-list-buffer
 (defvar riece-update-buffer-functions
   '(riece-update-user-list-buffer
     riece-update-channel-list-buffer


@@ -182,8 +180,8 @@
     (current-buffer)))
 
 (defun riece-switch-to-channel (identity)
     (current-buffer)))
 
 (defun riece-switch-to-channel (identity)

-  (ring-insert riece-channel-history riece-current-channel)
-  (setq riece-current-channel identity)
+  (setq riece-last-channel riece-current-channel
+       riece-current-channel identity)

   (run-hooks 'riece-channel-switch-hook))
 
 (defun riece-join-channel (identity)
   (run-hooks 'riece-channel-switch-hook))
 
 (defun riece-join-channel (identity)


@@ -213,8 +211,8 @@
       (setq identity (car pointer)))
     (if identity
        (riece-switch-to-channel identity)
       (setq identity (car pointer)))
     (if identity
        (riece-switch-to-channel identity)

-      (ring-insert riece-channel-history riece-current-channel)
-      (setq riece-current-channel nil))))
+      (setq riece-last-channel riece-current-channel
+           riece-current-channel nil))))

 
 (defun riece-part-channel (identity)
   (let ((pointer (riece-identity-member identity riece-current-channels)))
 
 (defun riece-part-channel (identity)
   (let ((pointer (riece-identity-member identity riece-current-channels)))

diff --git a/lisp/riece-layout.el b/lisp/riece-layout.el
index 8613d5f..0d6ffbd 100644 (file)
--- a/lisp/riece-layout.el
+++ b/lisp/riece-layout.el
@@ -27,9 +27,6 @@
 (require 'riece-globals)
 (require 'riece-misc)
 
 (require 'riece-globals)
 (require 'riece-misc)
 

-(autoload 'ring-empty-p "ring")
-(autoload 'ring-ref "ring")
-

 (defgroup riece-layout nil
   "Manage window layouts"
   :prefix "riece-"
 (defgroup riece-layout nil
   "Manage window layouts"
   :prefix "riece-"


@@ -132,9 +129,7 @@ This function is used by \"default\" layout."
   "Return t, if window reconfiguration is needed.
 This function is used by \"default\" layout."
   ;; The current channel is changed, and some buffers are visible.
   "Return t, if window reconfiguration is needed.
 This function is used by \"default\" layout."
   ;; The current channel is changed, and some buffers are visible.

-  (unless (or (ring-empty-p riece-channel-history)
-             (equal (ring-ref riece-channel-history 0)
-                    riece-current-channel))
+  (unless (equal riece-last-channel riece-current-channel)

     (let ((buffers riece-buffer-list))
       (catch 'found
        (while buffers
     (let ((buffers riece-buffer-list))
       (catch 'found
        (while buffers

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index ba3ca54..da67656 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -243,11 +243,6 @@ way is to put Riece variables on .emacs or file loaded from there."
   :type 'function
   :group 'riece-options)
 
   :type 'function
   :group 'riece-options)
 

-(defcustom riece-channel-history-length 3
-  "Length of riece-channel-history."
-  :type 'integer
-  :group 'riece-options)
-

 (provide 'riece-options)
 
 ;;; riece-options.el ends here
 (provide 'riece-options)
 
 ;;; riece-options.el ends here

diff --git a/lisp/riece.el b/lisp/riece.el
index d328f9b..1dc512a 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -30,8 +30,6 @@
 (require 'riece-compat)
 (require 'riece-commands)
 
 (require 'riece-compat)
 (require 'riece-commands)
 

-(autoload 'make-ring "ring")
-

 (defvar riece-channel-list-mode-map (make-sparse-keymap))
 (defvar riece-user-list-mode-map (make-sparse-keymap))
 
 (defvar riece-channel-list-mode-map (make-sparse-keymap))
 (defvar riece-user-list-mode-map (make-sparse-keymap))
 


@@ -254,7 +252,6 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
       (setq riece-server (riece-server-name-to-server riece-server)))
   (riece-create-buffers)
   (switch-to-buffer riece-command-buffer)
       (setq riece-server (riece-server-name-to-server riece-server)))
   (riece-create-buffers)
   (switch-to-buffer riece-command-buffer)

-  (setq riece-channel-history (make-ring riece-channel-history-length))

   (riece-redisplay-buffers)
   (riece-open-server riece-server "")
   (run-hooks 'riece-startup-hook)
   (riece-redisplay-buffers)
   (riece-open-server riece-server "")
   (run-hooks 'riece-startup-hook)