[Emacs-diffs] /srv/bzr/emacs/trunk r110406: Small fix for invisible timestamps

[Glenn Morris]

------------------------------------------------------------
revno: 110406
fixes bug: http://debbugs.gnu.org/11706
author: Antoine Levitt <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2012-10-06 18:41:03 -0700
message:
  Small fix for invisible timestamps
  
  * lisp/erc/erc-stamp.el (erc-format-timestamp):
  Don't apply intangible property to invisible stamps.
modified:
  lisp/erc/ChangeLog
  lisp/erc/erc-stamp.el

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2012-10-07 01:28:04 +0000
+++ b/lisp/erc/ChangeLog        2012-10-07 01:41:03 +0000
@@ -1,3 +1,8 @@
+2012-10-07  Antoine Levitt  <address@hidden>
+
+       * erc-stamp.el (erc-format-timestamp): Don't apply intangible
+       property to invisible stamps.  (Bug#11706)
+
 2012-10-07  Glenn Morris  <address@hidden>
 
        * erc-backend.el (NICK): Handle pre-existing buffers.  (Bug#12002)

=== modified file 'lisp/erc/erc-stamp.el'
--- a/lisp/erc/erc-stamp.el     2012-10-06 01:04:53 +0000
+++ b/lisp/erc/erc-stamp.el     2012-10-07 01:41:03 +0000
@@ -353,8 +353,9 @@
                               '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)
     ""))