diff options
| author | Joakim Verona | 2012-11-30 18:16:05 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-11-30 18:16:05 +0100 |
| commit | fb4eb7bd9bc495921fa03ecd3129cc2552bb1054 (patch) | |
| tree | ba9fdb91e0f8a14dd6fa91fe735033822f4cb326 /lisp/erc | |
| parent | 21e02f21a66871b3e585c4b889da48102a9858bb (diff) | |
| parent | fb3bf6ced41eea1431954e97137f52850a3b395c (diff) | |
| download | emacs-fb4eb7bd9bc495921fa03ecd3129cc2552bb1054.tar.gz emacs-fb4eb7bd9bc495921fa03ecd3129cc2552bb1054.zip | |
auto upstream
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index eeb31f99037..847b995997c 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-11-30 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * erc.el (erc-accidental-paste-threshold-seconds): Add :version. | ||
| 4 | |||
| 1 | 2012-11-30 Eric Hanchrow <eric.hanchrow@gmail.com> | 5 | 2012-11-30 Eric Hanchrow <eric.hanchrow@gmail.com> |
| 2 | 6 | ||
| 3 | * erc.el (erc-last-input-time): New variable. | 7 | * erc.el (erc-last-input-time): New variable. |
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index e03a0c5dc43..bead7759e13 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el | |||
| @@ -5230,6 +5230,7 @@ IRC server. | |||
| 5230 | If the value is nil, `erc-send-current-line' always considers any | 5230 | If the value is nil, `erc-send-current-line' always considers any |
| 5231 | submitted line to be intentional." | 5231 | submitted line to be intentional." |
| 5232 | :group 'erc | 5232 | :group 'erc |
| 5233 | :version "24.4" | ||
| 5233 | :type '(choice number (other :tag "disabled" nil))) | 5234 | :type '(choice number (other :tag "disabled" nil))) |
| 5234 | 5235 | ||
| 5235 | (defun erc-send-current-line () | 5236 | (defun erc-send-current-line () |