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 b7306f9bcb35028c5bc37ce104ff8fd01cdebd8e..39ffbb4bf3819b299b230f754d05812889a4658a 100644 (file)
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,9 +1,9 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002-2004, 2006-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2004, 2006-2014 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
-;; Maintainer: FSF
+;; Maintainer: emacs-devel@gnu.org
 ;; Keywords: comm, processes, timestamp
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcStamp
 
@@ -147,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"))