summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2014-08-11 22:56:28 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2014-08-11 22:56:28 -0400
commitf95757188287d28e9247379f69c0d308f8319782 (patch)
tree6586dcd679addd02766fe491fd680b7ecdda9e4a /lisp
parentdfd4d9b742bed1421c86fecf84a633747b444447 (diff)
downloademacs-f95757188287d28e9247379f69c0d308f8319782.tar.gz
* lisp/erc/erc-stamp.el (erc-timestamp-intangible): Disable by default because
`intangible' is evil.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/erc/ChangeLog5
-rw-r--r--lisp/erc/erc-stamp.el3
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b2860c25520..bf7e1924b52 100644
--- 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 ab951652bcc..37982069abe 100644
--- 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"))