# HG changeset patch
# User Miles Bader <miles@gnu.org>
# Date 1214812827 0
# Node ID 3dc335bd8a91b1a502406ebc02229cdcc679aa88
# Parent  abddf0a4cec041f2a2e04cf678b5e431c110b5cf
Fix a bug with parsing of overlapping markup sequences in rcirc

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

diff -r abddf0a4cec0 -r 3dc335bd8a91 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Jun 30 07:40:40 2008 +0000
+++ b/lisp/ChangeLog	Mon Jun 30 08:00:27 2008 +0000
@@ -1,3 +1,8 @@
+2008-06-30  Miles Bader  <miles@gnu.org>
+
+	* net/rcirc.el (rcirc-markup-attributes): Don't skip a character
+	after processing an escape sequence.
+
 2008-06-29  Michael Albinus  <michael.albinus@gmx.de>
 
 	* net/tramp-ftp.el (tramp-ftp-file-name-handler): Revert patch
diff -r abddf0a4cec0 -r 3dc335bd8a91 lisp/net/rcirc.el
--- a/lisp/net/rcirc.el	Mon Jun 30 07:40:40 2008 +0000
+++ b/lisp/net/rcirc.el	Mon Jun 30 08:00:27 2008 +0000
@@ -2196,7 +2196,7 @@
     (when (not (eq ?\C-o (char-before (match-end 2))))
       (delete-region (match-beginning 2) (match-end 2)))
     (delete-region (match-beginning 1) (match-end 1))
-    (goto-char (1+ (match-beginning 1))))
+    (goto-char (match-beginning 1)))
   ;; remove the ^O characters now
   (while (re-search-forward "\C-o+" nil t)
     (delete-region (match-beginning 0) (match-end 0))))