aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeniz Dogan2012-04-10 04:51:39 +0200
committerLars Magne Ingebrigtsen2012-04-10 04:51:39 +0200
commitec3e5f739a282667021905a3f62effcc8b0d6d80 (patch)
tree58294584686b5bac4d158fe00be5e7945db853f5
parent6c3eab300810b2c30cd567afc0426b62206038be (diff)
downloademacs-ec3e5f739a282667021905a3f62effcc8b0d6d80.tar.gz
emacs-ec3e5f739a282667021905a3f62effcc8b0d6d80.zip
Add `field' to `erc-display-prompt'
* erc.el (erc-display-prompt): Adds the field text property to the ERC prompt. This allows users to use `kill-whole-line' to kill all text back to the prompt given that it's on a single line. Fixes: debbugs:10841
-rw-r--r--lisp/erc/ChangeLog7
-rw-r--r--lisp/erc/erc.el1
2 files changed, 8 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 34aa015d7ac..9f858ba96e5 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,10 @@
12012-04-10 Deniz Dogan <deniz@dogan.se> (tiny change)
2
3 * erc.el (erc-display-prompt): Adds the field text property to the
4 ERC prompt. This allows users to use `kill-whole-line' to kill
5 all text back to the prompt given that it's on a single line
6 (bug#10841).
7
12012-04-09 Chong Yidong <cyd@gnu.org> 82012-04-09 Chong Yidong <cyd@gnu.org>
2 9
3 * erc.el (erc-cmd-SET): Call custom-variable-p instead of 10 * erc.el (erc-cmd-SET): Call custom-variable-p instead of
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 62b701204d1..b79c2fd6c5e 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -3646,6 +3646,7 @@ If FACE is non-nil, it will be used to propertize the prompt. If it is nil,
3646 'start-open t ; XEmacs 3646 'start-open t ; XEmacs
3647 'rear-nonsticky t ; Emacs 3647 'rear-nonsticky t ; Emacs
3648 'erc-prompt t 3648 'erc-prompt t
3649 'field t
3649 'front-sticky t 3650 'front-sticky t
3650 'read-only t)) 3651 'read-only t))
3651 (erc-put-text-property 0 (1- (length prompt)) 3652 (erc-put-text-property 0 (1- (length prompt))