Commit cb0a26d3 authored by Miles Bader's avatar Miles Bader

Update from erc--emacs--22

 - Remove contributions from someone who has not assigned changes yet.
 - Merge in a couple of bug-fixes from the main branch.

Creator:  Michael Olson <>
parent addc252e
2006-12-08 Michael Olson <>
* ERC-NEWS: Note that the list module has been removed.
2006-12-05 Micha,Ak(Bl Cadilhac <>
* NEWS (Changes to cmuscheme): Mention the alternative for
......@@ -10,6 +10,11 @@ known as `erc' is now `erc-open'.
** Changes and additions to modules
*** Channel lists (erc-list.el)
**** This has been removed from Emacs 22, since a major contributor
to it has not yet assigned changes.
*** Channel tracking (erc-track.el)
**** Use mouse-face and help-echo for channel names in the mode-line.
2006-12-08 Michael Olson <>
* erc.el: Re-evaluate contributions from a contributor, and found
them under 15 lines of non-obvious code, so it is safe to remove
the copyright notice.
(erc-modules): Remove list module.
* erc-list.el: Remove, since a contributor who has not completed
their assignment has contributed significantly more than 15 lines
of code to this file.
2006-11-28 Juanma Barranquero <>
* erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
......@@ -18,6 +29,11 @@
(erc-update-current-channel-member, erc-load-script):
(erc-mode-line-away-status-format): Doc fixes.
2006-11-20 Andrea Russo <>
* erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker'
before calling `erc-display-prompt'.
2006-11-24 Juanma Barranquero <>
* erc.el (erc-after-connect, erc-open-ssl-stream)
......@@ -86,6 +102,11 @@
`erc-show-my-nick' is non-nil.
(erc-compute-server): Doc fix.
2006-10-01 John J Foerch <>
* erc-stamp.el (erc-insert-timestamp-right): Exclude the newline
from the erc-timestamp field.
2006-09-11 Michael Olson <>
* erc-nicklist.el (erc-nicklist-insert-contents): Add missing
......@@ -1035,6 +1035,7 @@ other client."
(setq erc-dcc-entry-data entry)
(setq erc-dcc-unprocessed-output "")
(setq erc-insert-marker (set-marker (make-marker) (point-max)))
(setq erc-input-marker (make-marker))
(erc-display-prompt buffer (point-max))
(set-process-buffer proc buffer)
(add-hook 'kill-buffer-hook 'erc-dcc-chat-buffer-killed nil t)
This diff is collapsed.
......@@ -266,8 +266,8 @@ be printed just before the window-width."
(indent-to pos)
(setq from (point))
(insert string))
(erc-put-text-property from (1+ (point)) 'field 'erc-timestamp)
(erc-put-text-property from (1+ (point)) 'rear-nonsticky t)
(erc-put-text-property from (point) 'field 'erc-timestamp)
(erc-put-text-property from (point) 'rear-nonsticky t)
(when erc-timestamp-intangible
(erc-put-text-property from (1+ (point)) 'intangible t)))))
......@@ -2,7 +2,6 @@
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006 Free Software Foundation, Inc.
;; Copyright (C) 2004 Brian Palmer
;; Author: Alexander L. Belikoff (
;; Contributors: Sergey Berezin (,
......@@ -1761,7 +1760,7 @@ all channel buffers on all servers."
(defcustom erc-modules '(netsplit fill button match track completion readonly
ring autojoin noncommands irccontrols
stamp list)
"A list of modules which ERC should enable.
If you set the value of this without using `customize' remember to call
\(erc-update-modules) after you change it. When using `customize', modules
......@@ -1792,7 +1791,6 @@ removed from the list will be disabled."
(const :tag "Launch an identd server on port 8113" identd)
(const :tag "Highlight or remove IRC control characters"
(const :tag "List channels in a separate buffer" list)
(const :tag "Save buffers in logs" log)
(const :tag "Highlight pals, fools, and other keywords" match)
(const :tag "Detect netsplits" netsplit)
2006-12-08 Michael Olson <>
* erc.texi (Modules): Remove documentation for list module.
2006-12-06 Richard Stallman <>
* text.texi (Outline Format): Say to set outline-regexp
......@@ -422,10 +422,6 @@ Launch an identd server on port 8113
@item irccontrols
Highlight or remove IRC control characters
@cindex modules, list
@item list
List channels nicely in a separate buffer
@cindex modules, log
@item log
Save buffers in logs
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment