Fix a bug with parsing of overlapping markup sequences in rcirc

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b550cdcc481cb278333cf060506aee68896af99e..2297d1c35b5f024918c7b75ee0531cb4adae19a4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 5eb96c0b5dc0216f45fb27a6c439161756deb67b..228b55c01ba92cb0da6a80b0523746e61d200628 100644 (file)
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2196,7 +2196,7 @@ keywords when no KEYWORD is given."
     (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))))