From: Miles Bader <miles@gnu.org>
Date: Mon, 13 Mar 2006 10:10:09 +0000 (+0000)
Subject: Revision: emacs@sv.gnu.org/emacs--devo--0--patch-156
X-Git-Tag: emacs-pretest-22.0.90~3622
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e8f10ddbda866838f77444a2d79efbba6122c918;p=emacs.git

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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55a2b90e085..9d669b77e8e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+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>
 
 	* net/rcirc.el (rcirc-nick-abbrevs): Variable removed.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 9d4f91fe17a..19fc89f4293 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -50,6 +50,7 @@
   "Simple IRC client."
   :version "22.1"
   :prefix "rcirc-"
+  :link '(custom-manual "(rcirc)")
   :group 'applications)
 
 (defcustom rcirc-server "irc.freenode.net"
@@ -872,7 +873,7 @@ Create the buffer if it doesn't exist."
 (defun rcirc-multiline-edit-submit ()
   "Send the text in buffer back to parent buffer."
   (interactive)
-  (assert (and (eq major-mode 'rcirc-multiline-edit-mode)))
+  (assert (eq major-mode 'rcirc-multiline-edit-mode))
   (assert rcirc-parent-buffer)
   (untabify (point-min) (point-max))
   (let ((text (buffer-substring (point-min) (point-max)))
@@ -888,7 +889,7 @@ Create the buffer if it doesn't exist."
 (defun rcirc-multiline-edit-cancel ()
   "Cancel the multiline edit."
   (interactive)
-  (assert (and (eq major-mode 'rcirc-multiline-edit-mode)))
+  (assert (eq major-mode 'rcirc-multiline-edit-mode))
   (kill-buffer (current-buffer))
   (set-window-configuration rcirc-window-configuration))
 
@@ -1077,7 +1078,7 @@ record activity."
 	      (set-marker text-start
 			  (or (next-single-property-change fill-start 
 							   'rcirc-text)
-			      (point-max)))
+			      rcirc-prompt-end-marker))
 	      ;; squeeze spaces out of text before rcirc-text
 	      (fill-region fill-start (1- text-start))
 
@@ -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-SPC") 'rcirc-next-active-buffer)
 
-;;; FIXME: the code to insert `rcirc-activity-string' into
-;;; `global-mode-string' isn't called when the mode is activated by
-;;; customize.  I don't know how to set that up.
+;;;###autoload
 (define-minor-mode rcirc-track-minor-mode
   "Global minor mode for tracking activity in rcirc buffers."
   :init-value nil
@@ -1346,7 +1345,7 @@ activity.  Only run if the buffer is not visible and
   (setq rcirc-activity-string
 	(if (not rcirc-activity)
 	       ""
-	  (concat " ["
+	  (concat "-["
 		  (mapconcat
 		   (lambda (b)
 		     (let ((s (rcirc-short-buffer-name b)))
@@ -1355,7 +1354,7 @@ activity.  Only run if the buffer is not visible and
 			     s
 			   (rcirc-facify s 'rcirc-mode-line-nick)))))
 		   rcirc-activity ",")
-		  "]"))))
+		  "]-"))))
 
 (defun rcirc-short-buffer-name (buffer)
   "Return a short name for BUFFER to use in the modeline indicator."