aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo Liu2012-02-13 15:54:47 +0800
committerLeo Liu2012-02-13 15:54:47 +0800
commit142b4d90fa4a147dcfd2075448f39bf7a4356187 (patch)
treeb569abb41b842a1904a1b56890b5a50ebd837729
parent9554f4ac2f4c26420ec71a06e76e8e5ac0d7deda (diff)
downloademacs-142b4d90fa4a147dcfd2075448f39bf7a4356187.tar.gz
emacs-142b4d90fa4a147dcfd2075448f39bf7a4356187.zip
Trivial fix for rcirc-markup-attributes
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/rcirc.el1
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 @@
12012-02-13 Leo Liu <sdl.web@gmail.com>
2
3 * net/rcirc.el (rcirc-markup-attributes): Move point to the
4 beginning so that all \C-o chars are removed.
5
12012-02-12 Teodor Zlatanov <tzz@lifelogs.com> 62012-02-12 Teodor Zlatanov <tzz@lifelogs.com>
2 7
3 * net/gnutls.el (gnutls-algorithm-priority): Add missing :group 8 * 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."
2384 (delete-region (match-beginning 1) (match-end 1)) 2384 (delete-region (match-beginning 1) (match-end 1))
2385 (goto-char (match-beginning 1))) 2385 (goto-char (match-beginning 1)))
2386 ;; remove the ^O characters now 2386 ;; remove the ^O characters now
2387 (goto-char (point-min))
2387 (while (re-search-forward "\C-o+" nil t) 2388 (while (re-search-forward "\C-o+" nil t)
2388 (delete-region (match-beginning 0) (match-end 0)))) 2389 (delete-region (match-beginning 0) (match-end 0))))
2389 2390