diff options
| author | Antoine Levitt <antoine.levitt@gmail.com> | 2012-10-06 18:41:03 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-10-06 18:41:03 -0700 |
| commit | 1bac999506468ca481c118b87893c44ec54afc4b (patch) | |
| tree | 6418b49bc7e9355102db0d6da6d88009607f7591 | |
| parent | 87a95afe81dc7775ef134a94548dea68ed0cc3c3 (diff) | |
| download | emacs-1bac999506468ca481c118b87893c44ec54afc4b.tar.gz | |
Small fix for invisible timestamps
* lisp/erc/erc-stamp.el (erc-format-timestamp):
Don't apply intangible property to invisible stamps.
Fixes: debbugs:11706
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc-stamp.el | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index 8b1cd18545c..6906430eb7b 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2012-10-07 Antoine Levitt <antoine.levitt@gmail.com> + + * erc-stamp.el (erc-format-timestamp): Don't apply intangible + property to invisible stamps. (Bug#11706) + 2012-10-07 Glenn Morris <rgm@gnu.org> * erc-backend.el (NICK): Handle pre-existing buffers. (Bug#12002) diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el index 1613d03912c..4fa3f9f5915 100644 --- a/lisp/erc/erc-stamp.el +++ b/lisp/erc/erc-stamp.el @@ -353,8 +353,9 @@ Return the empty string if FORMAT is nil." 'isearch-open-invisible 'timestamp ts) ;; N.B. Later use categories instead of this harmless, but ;; inelegant, hack. -- BPT - (when erc-timestamp-intangible - (erc-put-text-property 0 (length ts) 'intangible t ts)) + (and erc-timestamp-intangible + (not erc-hide-timestamps) ; bug#11706 + (erc-put-text-property 0 (length ts) 'intangible t ts)) ts) "")) |