Port current-time change to XEmacs 21.4.

[gnu-emacs] / lisp / erc / erc-stamp.el

diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index 5831233affedca012b2f32013d1d5c87fb3e49f6..39ffbb4bf3819b299b230f754d05812889a4658a 100644 (file)
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,8 +1,9 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002-2004, 2006-2012  Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes, timestamp
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp
 
@@ -43,7 +44,7 @@ group provides settings related to the format and display
 of timestamp information in `erc-mode' buffer.
 
 For timestamping to be activated, you just need to load `erc-stamp'
-in your .emacs file or interactively using `load-library'."
+in your init file or interactively using `load-library'."
   :group 'erc)
 
 (defcustom erc-timestamp-format "[%H:%M]"
@@ -146,10 +147,11 @@ the minibuffer."
   :group 'erc-stamp
   :type 'string)
 
-(defcustom erc-timestamp-intangible t
+(defcustom erc-timestamp-intangible nil
   "Whether the timestamps should be intangible, i.e. prevent the point
 from entering them and instead jump over them."
   :group 'erc-stamp
+  :version "25.1"
   :type 'boolean)
 
 (defface erc-timestamp-face '((t :weight bold :foreground "green"))
@@ -352,8 +354,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)
     ""))