* riece-options.el (riece-addons): Add riece-button.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index d328f9b..0e67411 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -30,8 +30,6 @@
 (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))
 
@@ -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-channel-history (make-ring riece-channel-history-length))
   (riece-redisplay-buffers)
   (riece-open-server riece-server "")
   (run-hooks 'riece-startup-hook)
@@ -276,8 +273,7 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
        riece-channel-list-indicator "No channel"
        riece-away-indicator "-"
        riece-operator-indicator "-"
-       riece-freeze-indicator "-"
-       riece-channel-history nil)
+       riece-freeze-indicator "-")
   (delete-other-windows)
   (run-hooks 'riece-exit-hook))
 
@@ -372,7 +368,6 @@ Instead, these commands are available:
 All normal editing commands are turned off."
   (kill-all-local-variables)
   (buffer-disable-undo)
-  (make-local-variable 'riece-redisplay-buffer)
   (setq major-mode 'riece-channel-list-mode
         mode-name "Channels"
        mode-line-buffer-identification
@@ -389,7 +384,6 @@ Instead, these commands are available:
 \\{riece-user-list-mode-map}"
   (kill-all-local-variables)
   (buffer-disable-undo)
-  (make-local-variable 'riece-redisplay-buffer)
   (setq major-mode 'riece-user-list-mode
         mode-name "User list"
        mode-line-buffer-identification
@@ -473,9 +467,12 @@ Instead, these commands are available:
       (setq queue (cdr queue)))
     (if dependencies
        (error "Circular add-on dependency found"))
+    (setq addons (nreverse addons))
     (while addons
       (require (car addons))           ;implicit dependency
       (funcall (intern (concat (symbol-name (car addons)) "-insinuate")))
+      (if riece-debug
+         (message "Add-on %S is loaded" (car addons)))
       (setq addons (cdr addons)))))
 
 (provide 'riece)