Small fix for invisible timestamps

* lisp/erc/erc-stamp.el (erc-format-timestamp):
Don't apply intangible property to invisible stamps.

Fixes: debbugs:11706

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 8b1cd18545cd74cb388ed81ec9d083c635cd26cf..6906430eb7be7673b183cb142c40414fbd31811f 100644 (file)
--- 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 1613d03912c287c763f8065cea91ff91c22cd4e9..4fa3f9f5915709d5101c61f59f61f55a2ccdf894 100644 (file)
--- 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)
     ""))