Commit e8f10ddb authored by Miles Bader's avatar Miles Bader
Browse files

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-156

rcirc.el update from Ryan Yeske

2006-03-13  Ryan Yeske  <rcyeske@gmail.com>

   * lisp/net/rcirc.el (rcirc) <defgroup>: Add link to manual.
   (rcirc-print): Mark the start of text at the end of the prompt.
   (rcirc-track-minor-mode): Add autoload cookie.
   (rcirc-update-activity-string): Add space to front of mode-line
   indicator.
parent 54aba1ee
2006-03-13 Ryan Yeske <rcyeske@gmail.com>
* net/rcirc.el (rcirc) <defgroup>: Add link to manual.
(rcirc-print): Mark the start of text at the end of the prompt.
(rcirc-track-minor-mode): Add autoload cookie.
(rcirc-update-activity-string): Add space to front of mode-line
indicator.
2006-03-13 Miles Bader <miles@gnu.org> 2006-03-13 Miles Bader <miles@gnu.org>
   
* net/rcirc.el (rcirc-nick-abbrevs): Variable removed. * net/rcirc.el (rcirc-nick-abbrevs): Variable removed.
......
...@@ -50,6 +50,7 @@ ...@@ -50,6 +50,7 @@
"Simple IRC client." "Simple IRC client."
:version "22.1" :version "22.1"
:prefix "rcirc-" :prefix "rcirc-"
:link '(custom-manual "(rcirc)")
:group 'applications) :group 'applications)
(defcustom rcirc-server "irc.freenode.net" (defcustom rcirc-server "irc.freenode.net"
...@@ -872,7 +873,7 @@ Create the buffer if it doesn't exist." ...@@ -872,7 +873,7 @@ Create the buffer if it doesn't exist."
(defun rcirc-multiline-edit-submit () (defun rcirc-multiline-edit-submit ()
"Send the text in buffer back to parent buffer." "Send the text in buffer back to parent buffer."
(interactive) (interactive)
(assert (and (eq major-mode 'rcirc-multiline-edit-mode))) (assert (eq major-mode 'rcirc-multiline-edit-mode))
(assert rcirc-parent-buffer) (assert rcirc-parent-buffer)
(untabify (point-min) (point-max)) (untabify (point-min) (point-max))
(let ((text (buffer-substring (point-min) (point-max))) (let ((text (buffer-substring (point-min) (point-max)))
...@@ -888,7 +889,7 @@ Create the buffer if it doesn't exist." ...@@ -888,7 +889,7 @@ Create the buffer if it doesn't exist."
(defun rcirc-multiline-edit-cancel () (defun rcirc-multiline-edit-cancel ()
"Cancel the multiline edit." "Cancel the multiline edit."
(interactive) (interactive)
(assert (and (eq major-mode 'rcirc-multiline-edit-mode))) (assert (eq major-mode 'rcirc-multiline-edit-mode))
(kill-buffer (current-buffer)) (kill-buffer (current-buffer))
(set-window-configuration rcirc-window-configuration)) (set-window-configuration rcirc-window-configuration))
...@@ -1077,7 +1078,7 @@ record activity." ...@@ -1077,7 +1078,7 @@ record activity."
(set-marker text-start (set-marker text-start
(or (next-single-property-change fill-start (or (next-single-property-change fill-start
'rcirc-text) 'rcirc-text)
(point-max))) rcirc-prompt-end-marker))
;; squeeze spaces out of text before rcirc-text ;; squeeze spaces out of text before rcirc-text
(fill-region fill-start (1- text-start)) (fill-region fill-start (1- text-start))
...@@ -1242,9 +1243,7 @@ if NICK is also on `rcirc-ignore-list-automatic'." ...@@ -1242,9 +1243,7 @@ if NICK is also on `rcirc-ignore-list-automatic'."
(define-key rcirc-track-minor-mode-map (kbd "C-c C-@") 'rcirc-next-active-buffer) (define-key rcirc-track-minor-mode-map (kbd "C-c C-@") 'rcirc-next-active-buffer)
(define-key rcirc-track-minor-mode-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer) (define-key rcirc-track-minor-mode-map (kbd "C-c C-SPC") 'rcirc-next-active-buffer)
;;; FIXME: the code to insert `rcirc-activity-string' into ;;;###autoload
;;; `global-mode-string' isn't called when the mode is activated by
;;; customize. I don't know how to set that up.
(define-minor-mode rcirc-track-minor-mode (define-minor-mode rcirc-track-minor-mode
"Global minor mode for tracking activity in rcirc buffers." "Global minor mode for tracking activity in rcirc buffers."
:init-value nil :init-value nil
...@@ -1346,7 +1345,7 @@ activity. Only run if the buffer is not visible and ...@@ -1346,7 +1345,7 @@ activity. Only run if the buffer is not visible and
(setq rcirc-activity-string (setq rcirc-activity-string
(if (not rcirc-activity) (if (not rcirc-activity)
"" ""
(concat " [" (concat "-["
(mapconcat (mapconcat
(lambda (b) (lambda (b)
(let ((s (rcirc-short-buffer-name b))) (let ((s (rcirc-short-buffer-name b)))
...@@ -1355,7 +1354,7 @@ activity. Only run if the buffer is not visible and ...@@ -1355,7 +1354,7 @@ activity. Only run if the buffer is not visible and
s s
(rcirc-facify s 'rcirc-mode-line-nick))))) (rcirc-facify s 'rcirc-mode-line-nick)))))
rcirc-activity ",") rcirc-activity ",")
"]")))) "]-"))))
(defun rcirc-short-buffer-name (buffer) (defun rcirc-short-buffer-name (buffer)
"Return a short name for BUFFER to use in the modeline indicator." "Return a short name for BUFFER to use in the modeline indicator."
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment