* riece.el (riece-dialogue-mode-map): Bind "N" instead of "\C-n"

[riece] / lisp / riece.el

diff --git a/lisp/riece.el b/lisp/riece.el
index ade5273..3cf1ef3 100644 (file)
--- a/lisp/riece.el
+++ b/lisp/riece.el
@@ -142,14 +142,14 @@ If optional argument SAFE is nil, overwrite previous definitions."
     "\C-tu" riece-command-toggle-user-list-buffer-mode
     "\C-tc" riece-command-toggle-channel-buffer-mode
     "\C-tC" riece-command-toggle-channel-list-buffer-mode
     "\C-tu" riece-command-toggle-user-list-buffer-mode
     "\C-tc" riece-command-toggle-channel-buffer-mode
     "\C-tC" riece-command-toggle-channel-list-buffer-mode

+    "\C-tl" riece-command-change-layout

     "i" riece-command-invite
     "j" riece-command-join
     "\C-k" riece-command-kick
     "l" riece-command-list
     "i" riece-command-invite
     "j" riece-command-join
     "\C-k" riece-command-kick
     "l" riece-command-list

-    "m" riece-dialogue-enter-message

     "M" riece-command-change-mode
     "n" riece-command-change-nickname
     "M" riece-command-change-mode
     "n" riece-command-change-nickname

-    "\C-n" riece-command-names
+    "N" riece-command-names

     "o" other-window
     "O" riece-command-open-server
     "C" riece-command-close-server
     "o" other-window
     "O" riece-command-open-server
     "C" riece-command-close-server


@@ -250,16 +250,30 @@ If optional argument CONFIRM is non-nil, ask which IRC server to connect."
   (if (stringp riece-server)
       (setq riece-server (riece-server-name-to-server riece-server)))
   (riece-create-buffers)
   (if (stringp riece-server)
       (setq riece-server (riece-server-name-to-server riece-server)))
   (riece-create-buffers)

+  (switch-to-buffer riece-command-buffer)

   (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 ()
   (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)

   (if riece-save-variables-are-dirty
       (riece-save-variables-files))
   (if riece-save-variables-are-dirty
       (riece-save-variables-files))

-  (riece-clear-system)
+  (while riece-buffer-list
+    (if (and (get-buffer (car riece-buffer-list))
+            (buffer-live-p (car riece-buffer-list)))
+       (funcall riece-buffer-dispose-function (car riece-buffer-list)))
+    (setq riece-buffer-list (cdr riece-buffer-list)))
+  (setq riece-server nil
+       riece-current-channels nil
+       riece-current-channel nil
+       riece-user-indicator nil
+       riece-long-channel-indicator "None"
+       riece-channel-list-indicator "No channel"
+       riece-away-indicator "-"
+       riece-operator-indicator "-"
+       riece-freeze-indicator "-")
+  (delete-other-windows)

   (run-hooks 'riece-exit-hook))
 
 (defun riece-command-mode ()
   (run-hooks 'riece-exit-hook))
 
 (defun riece-command-mode ()


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

-          riece-short-channel-indicator)))
+          riece-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)
 


@@ -346,20 +360,22 @@ Instead, these commands are available:
           riece-operator-indicator
           riece-freeze-indicator
           " "
           riece-operator-indicator
           riece-freeze-indicator
           " "

-          riece-channel-indicator))))
+          riece-long-channel-indicator))))

 
 (defun riece-channel-list-mode ()
   "Major mode for displaying channel list.
 All normal editing commands are turned off."
   (kill-all-local-variables)
   (buffer-disable-undo)
 
 (defun riece-channel-list-mode ()
   "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
        (riece-mode-line-buffer-identification '("Riece: "))
        truncate-lines t
        buffer-read-only t)
   (setq major-mode 'riece-channel-list-mode
         mode-name "Channels"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification '("Riece: "))
        truncate-lines t
        buffer-read-only t)

+  (make-local-hook 'riece-update-buffer-functions)
+  (add-hook 'riece-update-buffer-functions
+           'riece-update-channel-list-buffer nil t)

   (use-local-map riece-channel-list-mode-map)
   (run-hooks 'riece-channel-list-mode-hook))
 
   (use-local-map riece-channel-list-mode-map)
   (run-hooks 'riece-channel-list-mode-hook))
 


@@ -370,16 +386,18 @@ Instead, these commands are available:
 \\{riece-user-list-mode-map}"
   (kill-all-local-variables)
   (buffer-disable-undo)
 \\{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
        (riece-mode-line-buffer-identification
   (setq major-mode 'riece-user-list-mode
         mode-name "User list"
        mode-line-buffer-identification
        (riece-mode-line-buffer-identification

-        '("Riece: " riece-channel-indicator " "))
+        '("Riece: " riece-long-channel-indicator " "))

        truncate-lines t
        buffer-read-only t)
   (if (boundp 'transient-mark-mode)
       (set (make-local-variable 'transient-mark-mode) t))
        truncate-lines t
        buffer-read-only t)
   (if (boundp 'transient-mark-mode)
       (set (make-local-variable 'transient-mark-mode) t))

+  (make-local-hook 'riece-update-buffer-functions)
+  (add-hook 'riece-update-buffer-functions
+           'riece-update-user-list-buffer nil t)

   (use-local-map riece-user-list-mode-map)
   (run-hooks 'riece-user-list-mode-hook))
 
   (use-local-map riece-user-list-mode-map)
   (run-hooks 'riece-user-list-mode-hook))
 


@@ -454,9 +472,12 @@ Instead, these commands are available:
       (setq queue (cdr queue)))
     (if dependencies
        (error "Circular add-on dependency found"))
       (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")))
     (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)
       (setq addons (cdr addons)))))
 
 (provide 'riece)