Changeset 4200 for trunk/lisp/erc/erc-track.el

Timestamp:

04/07/07 15:49:28 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/erc/erc-track.el (modified) (7 diffs)

trunk/lisp/erc/erc-track.el

@@ -1 +1 @@
-;;; erc-track.el --- Track modified channel buffers
-
-
+
+
-
-;; Author: Mario Lang <mlang@delysid.org>
@@ -46 +47 @@
-  "Track active buffers and show activity in the modeline."
-  :group 'erc)
+
+(defcustom erc-track-enable-keybindings 'ask
+  "Whether to enable the ERC track keybindings, namely:
+`C-c C-SPC' and `C-c C-@', which both do the same thing.
+
+The default is to check to see whether these keys are used
+already: if not, then enable the ERC track minor mode, which
+provides these keys.  Otherwise, do not touch the keys.
+
+This can alternatively be set to either t or nil, which indicate
+respectively always to enable ERC track minor mode or never to
+enable ERC track minor mode.
+
+The reason for using this default value is to both (1) adhere to
+the Emacs development guidelines which say not to touch keys of
+the form C-c C-<something> and also (2) to meet the expectations
+of long-time ERC users, many of whom rely on these keybindings."
+  :group 'erc-track
+  :type '(choice (const :tag "Ask, if used already" ask)
+                 (const :tag "Enable" t)
+                 (const :tag "Disable" nil)))
-
-(defcustom erc-track-visibility t
@@ -52 +74 @@
-visible or invisible.  New messages in invisible buffers are tracked,
-while switching to visible buffers when they are tracked removes them
--mode
+
-
-Possible values are:
@@ -489 +511 @@
-                '("abc" "abcd"))))))
-
+;;; Minor mode
+
+;; Play nice with other IRC clients (and Emacs development rules) by
+;; making this a minor mode
+
+(defvar erc-track-minor-mode-map (make-sparse-keymap)
+  "Keymap for rcirc track minor mode.")
+
+(define-key erc-track-minor-mode-map (kbd "C-c C-@") 'erc-track-switch-buffer)
+(define-key erc-track-minor-mode-map (kbd "C-c C-SPC")
+  'erc-track-switch-buffer)
+
+;;;###autoload
+(define-minor-mode erc-track-minor-mode
+  "Global minor mode for tracking ERC buffers and showing activity in the
+mode line.
+
+This exists for the sole purpose of providing the C-c C-SPC and
+C-c C-@ keybindings.  Make sure that you have enabled the track
+module, otherwise the keybindings will not do anything useful."
+  :init-value nil
+  :lighter ""
+  :keymap erc-track-minor-mode-map
+  :global t
+  :group 'erc-track)
+
+(defun erc-track-minor-mode-maybe ()
+  "Enable `erc-track-minor-mode', depending on `erc-track-enable-keybindings'."
+  (unless (or erc-track-minor-mode
+              ;; don't start the minor mode until we have an ERC
+              ;; process running, because we don't want to prompt the
+              ;; user while starting Emacs
+              (null (erc-buffer-list)))
+    (cond ((eq erc-track-enable-keybindings 'ask)
+           (let ((key (or (and (key-binding (kbd "C-c C-SPC")) "C-SPC")
+                          (and (key-binding (kbd "C-c C-@")) "C-@"))))
+             (if key
+                 (if (y-or-n-p
+                      (concat "The C-c " key " binding is in use;"
+                              " override it for tracking? "))
+                     (progn
+                       (message (concat "Will change it; set"
+                                        " `erc-track-enable-keybindings'"
+                                        " to disable this message"))
+                       (sleep-for 3)
+                       (erc-track-minor-mode 1))
+                   (message (concat "Not changing it; set"
+                                    " `erc-track-enable-keybindings'"
+                                    " to disable this message"))
+                   (sleep-for 3))
+               (erc-track-minor-mode 1))))
+          ((eq erc-track-enable-keybindings t)
+           (erc-track-minor-mode 1))
+          (t nil))))
+
-;;; Module
-
-;;;###autoload (autoload 'erc-track-mode "erc-track" nil t)
-track-modified-channels
+nil
-  "This mode tracks ERC channel buffers with activity."
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-;;; Visibility
@@ -546 +647 @@
-(defun erc-buffer-visible (buffer)
-  "Return non-nil when the buffer is visible."
--mode
+
-      (when erc-buffer-activity; could be nil
-        (and (get-buffer-window buffer erc-track-visibility)
@@ -816 +917 @@
-`erc-track-switch-direction', a negative argument will reverse this."
-  (interactive "p")
-
+
+
+
-    (cond (erc-modified-channels-alist
-           ;; if we're not in erc-mode, set this buffer to return to
@@ -829 +932 @@
-           (switch-to-buffer erc-track-last-non-erc-buffer)))))
-
-;; These bindings are global, because they pop us from any other
-;; buffer to an active ERC buffer!
-
-(global-set-key (kbd "C-c C-@") 'erc-track-switch-buffer)
-(global-set-key (kbd "C-c C-SPC") 'erc-track-switch-buffer)
-
-(provide 'erc-track)
-