* riece.el (riece-buffer-mode-alist): Add riece-command-buffer.

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index e0746b1..ade5273 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -24,10 +24,6 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-(if (featurep 'xemacs)
-    (require 'riece-xemacs)
-  (require 'riece-emacs))
-

 (require 'riece-filter)
 (require 'riece-display)
 (require 'riece-server)
 (require 'riece-filter)
 (require 'riece-display)
 (require 'riece-server)


@@ -55,8 +51,10 @@
 (put 'riece-others-mode 'derived-mode-parent 'riece-dialogue-mode)
 
 (defvar riece-buffer-mode-alist
 (put 'riece-others-mode 'derived-mode-parent 'riece-dialogue-mode)
 
 (defvar riece-buffer-mode-alist

-  '((riece-dialogue-buffer . riece-dialogue-mode)
+  '((riece-command-buffer . riece-command-mode)
+    (riece-dialogue-buffer . riece-dialogue-mode)

     (riece-others-buffer . riece-others-mode)
     (riece-others-buffer . riece-others-mode)

+    (riece-user-list-buffer . riece-user-list-mode)

     (riece-channel-list-buffer . riece-channel-list-mode)
     (riece-private-buffer . riece-dialogue-mode)
     (riece-wallops-buffer)))
     (riece-channel-list-buffer . riece-channel-list-mode)
     (riece-private-buffer . riece-dialogue-mode)
     (riece-wallops-buffer)))


@@ -197,7 +195,6 @@ If optional argument SAFE is nil, overwrite previous definitions."
   (riece-define-keys riece-channel-list-mode-map
     ">" riece-command-next-channel
     "<" riece-command-previous-channel
   (riece-define-keys riece-channel-list-mode-map
     ">" riece-command-next-channel
     "<" riece-command-previous-channel

-    "u" riece-command-unread-channel

     "o" other-window
     "c" riece-command-select-command-buffer)
 
     "o" other-window
     "c" riece-command-select-command-buffer)
 


@@ -240,35 +237,23 @@ If optional argument SAFE is nil, overwrite previous definitions."
 ;;;###autoload
 (defun riece (&optional confirm)
   "Connect to the IRC server and start chatting.
 ;;;###autoload
 (defun riece (&optional confirm)
   "Connect to the IRC server and start chatting.

-If optional argument CONFIRM is non-nil, ask which IRC server to connect.
-If already connected, just pop up the windows."
+If optional argument CONFIRM is non-nil, ask which IRC server to connect."

   (interactive "P")
   (riece-read-variables-files (if noninteractive
                                  (car command-line-args-left)))
   (riece-insinuate-addons riece-addons)
   (run-hooks 'riece-after-load-startup-hook)
   (if (riece-server-opened)
   (interactive "P")
   (riece-read-variables-files (if noninteractive
                                  (car command-line-args-left)))
   (riece-insinuate-addons riece-addons)
   (run-hooks 'riece-after-load-startup-hook)
   (if (riece-server-opened)

-      (riece-configure-windows)
-    (switch-to-buffer (riece-get-buffer-create riece-command-buffer))
-    (unless (eq major-mode 'riece-command-mode)
-      (riece-command-mode))
-    (if (or confirm (null riece-server))
-       (setq riece-server (completing-read "Server: " riece-server-alist)))
-    (if (stringp riece-server)
-       (setq riece-server (riece-server-name-to-server riece-server)))
-    (riece-open-server riece-server)
-    (riece-create-buffers)
-    (riece-configure-windows)
-    (let ((channel-list riece-startup-channel-list))
-      (while channel-list
-       (if (listp (car channel-list))
-           (riece-command-join (car (car channel-list))
-                               (cadr (car channel-list)))
-         (riece-command-join (car channel-list)))
-       (setq channel-list (cdr channel-list))))
-    (run-hooks 'riece-startup-hook)
-    (message "%s" (substitute-command-keys
-                  "Type \\[describe-mode] for help"))))
+      (error "Already running"))
+  (if (or confirm (null riece-server))
+      (setq riece-server (completing-read "Server: " riece-server-alist)))
+  (if (stringp riece-server)
+      (setq riece-server (riece-server-name-to-server riece-server)))
+  (riece-create-buffers)
+  (riece-redisplay-buffers)
+  (riece-open-server riece-server "")
+  (run-hooks 'riece-startup-hook)
+  (message "%s" (substitute-command-keys "Type \\[describe-mode] for help")))

 
 (defun riece-exit ()
   (setq riece-server nil)
 
 (defun riece-exit ()
   (setq riece-server nil)


@@ -299,7 +284,7 @@ For a list of the generic commands type \\[riece-command-generic] ? RET.
           " "
           riece-user-indicator
           " "
           " "
           riece-user-indicator
           " "

-          riece-current-channel)))
+          riece-short-channel-indicator)))

   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 
   (riece-simplify-mode-line-format)
   (use-local-map riece-command-mode-map)
 


@@ -319,10 +304,8 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-dialogue-mode-map}"
   (kill-all-local-variables)
 Instead, these commands are available:
 \\{riece-dialogue-mode-map}"
   (kill-all-local-variables)

-

   (make-local-variable 'riece-freeze)
   (make-local-variable 'tab-stop-list)
   (make-local-variable 'riece-freeze)
   (make-local-variable 'tab-stop-list)

-

   (setq riece-freeze riece-default-freeze
        riece-away-indicator "-"
        riece-operator-indicator "-"
   (setq riece-freeze riece-default-freeze
        riece-away-indicator "-"
        riece-operator-indicator "-"


@@ -338,7 +321,6 @@ Instead, these commands are available:
           riece-channel-list-indicator " "))
        buffer-read-only t
        tab-stop-list riece-tab-stop-list)
           riece-channel-list-indicator " "))
        buffer-read-only t
        tab-stop-list riece-tab-stop-list)

-  (riece-update-status-indicators)

   (riece-simplify-mode-line-format)
   (use-local-map riece-dialogue-mode-map)
   (buffer-disable-undo)
   (riece-simplify-mode-line-format)
   (use-local-map riece-dialogue-mode-map)
   (buffer-disable-undo)


@@ -370,6 +352,8 @@ Instead, these commands are available:
   "Major mode for displaying channel list.
 All normal editing commands are turned off."
   (kill-all-local-variables)
   "Major mode for displaying channel list.
 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
   (setq major-mode 'riece-channel-list-mode
         mode-name "Channels"
        mode-line-buffer-identification


@@ -385,6 +369,8 @@ All normal editing commands are turned off.
 Instead, these commands are available:
 \\{riece-user-list-mode-map}"
   (kill-all-local-variables)
 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
   (setq major-mode 'riece-user-list-mode
         mode-name "User list"
        mode-line-buffer-identification