aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index cdbfbd669d6..f5dab2b0196 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
12009-01-03 Michael Olson <mwolson@gnu.org>
2
3 * erc.el (erc-user-input): Do not include text properties when
4 returning user input.
5
12008-11-19 Andy Stewart <lazycat.manatee@gmail.com> 62008-11-19 Andy Stewart <lazycat.manatee@gmail.com>
2 7
3 * erc.el (erc-header-line-uses-tabbar-p): New option that makes 8 * erc.el (erc-header-line-uses-tabbar-p): New option that makes
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index fc0d7b58b0c..8638eb054e0 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5097,7 +5097,7 @@ Specifically, return the position of `erc-insert-marker'."
5097 5097
5098(defun erc-user-input () 5098(defun erc-user-input ()
5099 "Return the input of the user in the current buffer." 5099 "Return the input of the user in the current buffer."
5100 (buffer-substring 5100 (buffer-substring-no-properties
5101 erc-input-marker 5101 erc-input-marker
5102 (erc-end-of-input-line))) 5102 (erc-end-of-input-line)))
5103 5103