2 files changed, 6 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a078c43cd6c..9669fbe70d0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-13  Leo Liu  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-markup-attributes): Move point to the
+        beginning so that all \C-o chars are removed.
+
 2012-02-12  Teodor Zlatanov  <tzz@lifelogs.com>
 
         * net/gnutls.el (gnutls-algorithm-priority): Add missing :group
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index b8bf270d87c..1c74e6190dc 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2384,6 +2384,7 @@ keywords when no KEYWORD is given."
     (delete-region (match-beginning 1) (match-end 1))
     (goto-char (match-beginning 1)))
   ;; remove the ^O characters now
+  (goto-char (point-min))
   (while (re-search-forward "\C-o+" nil t)
     (delete-region (match-beginning 0) (match-end 0))))