* lisp/erc/erc-stamp.el (erc-timestamp-intangible): Disable by default because

`intangible' is evil.

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b2860c25520da901800050566164770980cffa01..bf7e1924b52385a500e56fb36f62fa8ccd5f37e1 100644 (file)
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * erc-stamp.el (erc-timestamp-intangible): Disable by default because
+       `intangible' is evil.
+
 2014-08-07  Kelvin White  <kwhite@gnu.org>
 
        * erc.el (erc-channel-receive-names): Fix variable names

diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index ab951652bcc2f9e001426372f7eb292c9a8bc691..37982069abea45c7dbadb707310e8193e296e85d 100644 (file)
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -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 "24.5"
   :type 'boolean)
 
 (defface erc-timestamp-face '((t :weight bold :foreground "green"))