From: Antoine Levitt Date: Sun, 7 Oct 2012 01:41:03 +0000 (-0700) Subject: Small fix for invisible timestamps X-Git-Tag: emacs-24.2.90~239^2~13 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1bac999506468ca481c118b87893c44ec54afc4b;p=emacs.git 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 8b1cd18545c..6906430eb7b 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,8 @@ +2012-10-07 Antoine Levitt + + * erc-stamp.el (erc-format-timestamp): Don't apply intangible + property to invisible stamps. (Bug#11706) + 2012-10-07 Glenn Morris * 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) ""))