diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/erc/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/erc/erc-stamp.el | 3 |
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")) |