[Erc-commit] [commit][emacs22] Added a "Current channel" submenu.

[mwolson]

commit 559d3fb47789e5215a90a33ec3264701da2be684
Author: Diane Murray <address@hidden>
Date:   Thu Jan 11 03:13:43 2007 +0000

    Added a "Current channel" submenu.
    
    * erc-menu.el (erc-menu-definition): Put items specific to
    channels in a "Current channel" submenu.
    git-archimport-id: address@hidden/erc--main--0--patch-87

diff --git a/ChangeLog b/ChangeLog
index 1be6505..a28b428 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-01-11  Diane Murray  <address@hidden>
 
+       * erc-menu.el (erc-menu-definition): Put items specific to
+       channels in a "Current channel" submenu.
+
        * erc-backend.el (321, 323): Display channel list in server buffer
        when not using the channel list module.
 
diff --git a/erc-menu.el b/erc-menu.el
index 466ed23..bc6afc9 100644
--- a/erc-menu.el
+++ b/erc-menu.el
@@ -40,41 +40,43 @@
         (and erc-server-connected (fboundp 'erc-list-channels))]
        ["Join channel..." erc-join-channel erc-server-connected]
        ["Start a query..." erc-cmd-QUERY erc-server-connected]
-       "-"
-       ["List users in channel" erc-channel-names erc-channel-users]
-       ["List channel operators" erc-cmd-OPS erc-channel-users]
        ["Input action..." erc-input-action (erc-default-target)]
-       ["Set topic..." erc-set-topic
-        (and (and (erc-default-target) (not (erc-query-buffer-p)))
-             (or (not (member "t" erc-channel-modes))
-                 (erc-channel-user-op-p (erc-current-nick))))]
-       (list "Channel modes"
-             ["Change mode..." erc-insert-mode-command
-              (erc-channel-user-op-p (erc-current-nick))]
-             ["No external send" (erc-toggle-channel-mode "n")
-              :active (erc-channel-user-op-p (erc-current-nick))
-              :style toggle :selected (member "n" erc-channel-modes)]
-             ["Topic set by channel operator" (erc-toggle-channel-mode "t")
-              :style toggle :selected (member "t" erc-channel-modes)
-              :active (erc-channel-user-op-p (erc-current-nick))]
-             ["Invite only" (erc-toggle-channel-mode "i")
-              :style toggle :selected (member "i" erc-channel-modes)
-              :active (erc-channel-user-op-p (erc-current-nick))]
-             ["Private" (erc-toggle-channel-mode "p")
-              :style toggle :selected (member "p" erc-channel-modes)
-              :active (erc-channel-user-op-p (erc-current-nick))]
-             ["Secret" (erc-toggle-channel-mode "s")
-              :style toggle :selected (member "s" erc-channel-modes)
-              :active (erc-channel-user-op-p (erc-current-nick))]
-             ["Moderated" (erc-toggle-channel-mode "m")
-              :style toggle :selected (member "m" erc-channel-modes)
-              :active (erc-channel-user-op-p (erc-current-nick))]
-             ["Set a limit..." erc-set-channel-limit
-              (erc-channel-user-op-p (erc-current-nick))]
-             ["Set a key..." erc-set-channel-key
-              (erc-channel-user-op-p (erc-current-nick))])
-       ["Leave this channel..." erc-part-from-channel erc-channel-users]
        "-"
+       (list
+        "Current channel"
+        ["List users in channel" erc-channel-names erc-channel-users]
+        ["List channel operators" erc-cmd-OPS erc-channel-users]
+        ["Set topic..." erc-set-topic
+         (and (and (erc-default-target) (not (erc-query-buffer-p)))
+              (or (not (member "t" erc-channel-modes))
+                  (erc-channel-user-op-p (erc-current-nick))))]
+        (list "Channel modes"
+              ["Change mode..." erc-insert-mode-command
+               (erc-channel-user-op-p (erc-current-nick))]
+              ["No external send" (erc-toggle-channel-mode "n")
+               :active (erc-channel-user-op-p (erc-current-nick))
+               :style toggle :selected (member "n" erc-channel-modes)]
+              ["Topic set by channel operator" (erc-toggle-channel-mode "t")
+               :style toggle :selected (member "t" erc-channel-modes)
+               :active (erc-channel-user-op-p (erc-current-nick))]
+              ["Invite only" (erc-toggle-channel-mode "i")
+               :style toggle :selected (member "i" erc-channel-modes)
+               :active (erc-channel-user-op-p (erc-current-nick))]
+              ["Private" (erc-toggle-channel-mode "p")
+               :style toggle :selected (member "p" erc-channel-modes)
+               :active (erc-channel-user-op-p (erc-current-nick))]
+              ["Secret" (erc-toggle-channel-mode "s")
+               :style toggle :selected (member "s" erc-channel-modes)
+               :active (erc-channel-user-op-p (erc-current-nick))]
+              ["Moderated" (erc-toggle-channel-mode "m")
+               :style toggle :selected (member "m" erc-channel-modes)
+               :active (erc-channel-user-op-p (erc-current-nick))]
+              ["Set a limit..." erc-set-channel-limit
+               (erc-channel-user-op-p (erc-current-nick))]
+              ["Set a key..." erc-set-channel-key
+               (erc-channel-user-op-p (erc-current-nick))])
+        ["Leave this channel..." erc-part-from-channel erc-channel-users]
+        "-")
        (list "Pals, fools and other keywords"
              ["Add pal..." erc-add-pal]
              ["Delete pal..." erc-delete-pal]