# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1139795940 0
# Node ID 6a3bf61d8473c4a06155a55dd2f7e25bd637b5fb
# Parent  cd7acd1f2ba0febf2df2e16e8582ef74d78b7573
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-79

(rcirc-format-response-string): Fix small bugs

diff -r cd7acd1f2ba0 -r 6a3bf61d8473 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Feb 13 01:27:21 2006 +0000
+++ b/lisp/ChangeLog	Mon Feb 13 01:59:00 2006 +0000
@@ -1,3 +1,7 @@
+2006-02-12  Miles Bader  <miles@gnu.org>
+
+	* net/rcirc.el (rcirc-format-response-string): Fix small bugs.
+
 2006-02-13  Mathias Dahl  <mathias.dahl@gmail.com>
 
 	* tumme.el: Removed history section.  If someone needs the it, it
diff -r cd7acd1f2ba0 -r 6a3bf61d8473 lisp/net/rcirc.el
--- a/lisp/net/rcirc.el	Mon Feb 13 01:27:21 2006 +0000
+++ b/lisp/net/rcirc.el	Mon Feb 13 01:59:00 2006 +0000
@@ -929,7 +929,7 @@
   %fp       Following text uses the face `rcirc-server-prefix'
   %fs       Following text uses the face `rcirc-server'
   %f[FACE]  Following text uses the face FACE
-  %f-        Following text uses the default face
+  %f-       Following text uses the default face
   %%        A literal `%' character
 "
   :type '(alist :key-type (choice (string :tag "Type")
@@ -957,59 +957,56 @@
 	(setq chunk (substring chunk 1)))
       (setq repl
 	    (cond ((eq key ?%)
-		   ;; %% -- literal % character	;
+		   ;; %% -- literal % character
 		   "%")
 		  ((eq key ?n)
-		   ;; %n -- nick	;
+		   ;; %n -- nick
 		   (rcirc-facify (concat (rcirc-abbrev-nick sender)
 					 (and target (concat "," target)))
 				 (if (string= sender (rcirc-nick process))
 				     'rcirc-my-nick
 				   'rcirc-other-nick)))
 		  ((eq key ?T)
-		   ;; %T -- timestamp	;
+		   ;; %T -- timestamp
 		   (rcirc-facify
 		    (format-time-string rcirc-time-format (current-time))
 		    'rcirc-timestamp))
 		  ((eq key ?m)
-		   ;; %m -- message text ;
-		   ;; We add the text property `rcirc-text' to identify this ;
-		   ;; as the body text.	;
+		   ;; %m -- message text
+		   ;; We add the text property `rcirc-text' to identify this
+		   ;; as the body text.
 		   (propertize
 		    (rcirc-mangle-text process (rcirc-facify text face))
 		    'rcirc-text text))
 		  ((eq key ?t)
-		   ;; %t -- target	;
+		   ;; %t -- target
 		   (rcirc-facify (or rcirc-target "") face))
 		  ((eq key ?r)
-		   ;; %r -- response	;
+		   ;; %r -- response
 		   (rcirc-facify response face))
 		  ((eq key ?f)
-		   ;; %f -- change face	;
+		   ;; %f -- change face
 		   (setq face-key (aref chunk 0))
+		   (setq chunk (substring chunk 1))
 		   (cond ((eq face-key ?w)
-			  ;; %fw -- warning face ;
+			  ;; %fw -- warning face
 			  (setq face 'font-lock-warning-face))
 			 ((eq face-key ?p)
-			  ;; %fp -- server-prefix face ;
+			  ;; %fp -- server-prefix face
 			  (setq face 'rcirc-server-prefix))
 			 ((eq face-key ?s)
-			  ;; %fs -- warning face ;
+			  ;; %fs -- warning face
 			  (setq face 'rcirc-server))
 			 ((eq face-key ?-)
-			  ;; %fs -- warning face ;
+			  ;; %fs -- warning face
 			  (setq face nil))
 			 ((and (eq face-key ?\[)
-			       (string-match "^[[]\\([^]]*\\)[]]" chunk)
+			       (string-match "^\\([^]]*\\)[]]" chunk)
 			       (facep (match-string 1 chunk)))
-			  ;; %f[...] -- named face ;
+			  ;; %f[...] -- named face
 			  (setq face (intern (match-string 1 chunk)))
-			  (setq chunk (substring chunk (match-end 1)))))
-		   (setq chunk (substring chunk 1))
-		   "")
-		  (t
-		   ;; just insert the key literally ;
-		   (rcirc-facify (substring chunk 0 1) face))))
+			  (setq chunk (substring chunk (match-end 0)))))
+		   "")))
       (setq result (concat result repl (rcirc-facify chunk face))))
     result))