erc-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Erc-commit] [commit][emacs22] Flatten directory structure for easier wo


From: mwolson
Subject: [Erc-commit] [commit][emacs22] Flatten directory structure for easier work with git branches
Date: Sun, 14 Oct 2007 00:49:12 -0400

commit 85bac6a9cc3b6277d8a56fd014a950f6b689453b
Author: Michael W. Olson <address@hidden>
Date:   Fri Sep 7 21:47:50 2007 -0400

    Flatten directory structure for easier work with git branches

diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..f5bf1e8
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,1105 @@
+ERC NEWS                                                       -*- outline -*-
+
+Copyright (C) 2006, 2007  Free Software Foundation, Inc.
+See the end of the file for license conditions.
+
+* Changes in ERC 5.2
+
+** M-x erc RET now starts ERC.
+`erc-select' has been changed to `erc'.  `erc-select' still remains as
+an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
+`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
+known as `erc' is now `erc-open'.
+
+** Open query buffers by default when private messages are received.
+The default value of `erc-auto-query' has been changed to 'bury.
+
+** New command: /RECONNECT
+This command tries to reconnect to the current IRC server exactly
+once.  It does not work in server buffers (throws an error before the
+command is run), but works in query and channel buffers.
+
+** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
+
+** Fix buggy interaction with multi-tty Emacs.
+
+** After running /QUIT, make sure that the IRC process is killed within
+4 seconds.  Freenode, in particular, needs this at times.
+
+** If the IRC process has not responded to our PINGs within a certain
+time, kill it and restart the connection.  See
+`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
+`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
+`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
+
+** Avoid getting into an infinite connection loop.
+Previously, this could happen if your nick was banned, you were using
+Tor, incorrect information was entered, or the connection was bad.
+
+** Make ban messages less confusing.
+
+** Restore the point correctly when reconnecting to an IRC server.
+
+** Make /IGNORE and /UNIGNORE prompt to determine whether their
+argument is a user or a regexp.  This results in less-confusing
+behavior when trying to ignore someone who has a bracket in their
+nick.
+
+** Make the default port "6667" rather than "ircd", because some
+operating systems don't know what port "ircd" maps to.
+
+** Fix several bugs in erc-iswitchb (C-c C-b).
+
+** Clean up internal documentation.
+Special thanks go to Juanma Barranquero for the thorough vetting of
+ERC's internal documentation.
+
+** Display a more informative message when a module is not found.
+
+** Fix a bug where paths were being colored like IRC commands.
+
+** In the customize interface for `erc-modules', add the name of the module.
+This makes it easier to find modules by name.
+
+** erc-server-send-ping-interval: Change to use a default of 30 seconds.
+
+** Some files which are included with the release of ERC 5.2 will not
+appear in the version of ERC that is bundled with Emacs 22.  These
+extras files may be found at:
+
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
+ o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
+
+** Renamed files
+
+Several files were renamed so as to make them distinct to users of the
+MS-DOS operating system.
+
+ o erc-autojoin.el -> erc-join.el
+ o erc-complete.el -> erc-hecomplete.el
+ o erc-nickserv.el -> erc-services.el
+ o ChangeLog.NNNN -> ChangeLog.NN
+
+** Header line changes
+
+*** Remove "[IRC]" from the header line.
+
+*** Add the %l format character to `erc-header-line-format',
+
+*** Document how to remove the header line.
+Namely: (setq erc-header-line-format nil).
+
+** New options
+
+*** erc-server-reconnect-attempts: Determines the number of
+reconnection attempts that ERC will make per server.
+
+*** erc-server-reconnect-timeout: Determines the amount of time,
+in seconds, that ERC will wait between successive reconnect attempts.
+
+*** erc-server-send-ping-timeout: Determines when to consider a connection
+stalled and restart it.  The default is        after 120 seconds.
+
+*** erc-system-name: Determines the system name to use when logging in.
+The default is to figure this out by calling `system-name'.
+
+** New face: `erc-my-nick-face'
+This helps make it easier to distinguish messages sent by yourself
+from messages sent by other users when the value of the variable
+`erc-show-my-nick' is non-nil.
+
+** Namespace changes
+
+*** New macro: `erc-with-server-buffer'
+Switches to the current ERC server buffer and runs some code.  If no
+server buffer is available, return nil.  This is a useful way to
+access variables in the server buffer.
+
+*** New function: `erc-open-server-buffer-p'
+Returns non-nil if the given buffer is an ERC server buffer that has
+an open IRC process.
+
+*** New function: `erc-format-lag-time'
+Returns the estimated lag time to server, `erc-server-lag'.
+
+*** Renamed items
+
+ o `erc-server-setup-periodical-server-ping' is now
+   `erc-server-setup-periodical-ping'
+
+ o `erc-away-p' is now `erc-away-time'
+
+** Changes to the ERC manual
+
+*** New section: Sample Session.
+Describes a sample ERC session for connecting to the #emacs channel on
+Freenode.  Also mention the #erc channel.
+
+*** New section: Special Features.
+Describes some of the special features of ERC.
+
+*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
+interface.
+
+*** Development: Mention ErcDevelopment page on emacswiki.org.
+
+*** Tips and Tricks: Remove empty section for now.
+
+*** Options: Mention how to see available ERC options.
+
+*** Sample Configuration: Add an example of how to configure ERC.
+
+** New modules
+
+*** Autoaway (erc-autoaway.el)
+
+**** Make this much more reliable.
+
+**** Avoid duplicate messages when coming back from being away.
+
+**** Fix bug where autoaway was enabled just by loading the file.
+
+*** BBDB (erc-bbdb.el)
+
+**** Display information on how to cancel merging of info or how to
+create a new John Doe record.
+
+**** Make it so that information from /whois continues to come in, even
+while prompting for a record to merge.
+
+**** Make hitting C-g correctly abort merging the record.
+
+*** Capab identify (erc-capab.el)
+Mark users who haven't identified to NickServ on servers supporting
+CAPAB IDENTIFY-MSG.
+
+** Changes and additions to modules
+
+*** Button (erc-button.el)
+
+**** Make <backtab> go to the previous button.
+
+*** Channel tracking (erc-track.el)
+
+**** Use mouse-face and help-echo for channel names in the mode-line.
+This helps people using a mouse know that they are buttons and can be
+clicked on.
+
+**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
+This is accomplished by moving these bindings to their own global
+minor mode.  Now the default is to check whether the user has bound
+something to C-c C-SPC or C-c address@hidden  If they have, prompt them about
+whether to really override that binding.  This also has the effect of
+preventing ERC from clobbering rcirc's keybinding, unless this is
+desired.  See `erc-track-enable-keybindings' for more details.
+
+**** New option: erc-track-enable-keybindings.
+Determine whether or not to enable the C-c C-SPC and C-c C-@
+keybindings.  The default is to ask whether to do this if a binding to
+these keys already exists.  It can also be set to t or nil to always
+bind or never bind, respectively.
+
+**** Remove `track-when-inactive' module.
+See `erc-track-when-inactive' for further details.
+
+**** New option: erc-track-when-inactive.
+This option replaces the track-when-inactive module.  Set it to
+non-nil to track activity even in visible buffers when inactive.  The
+default is nil.
+
+**** Remove the `track-modified-channels' alias for the `track' module.
+
+*** DCC support (erc-dcc.el)
+
+**** Add Usage section to Commentary.
+
+**** Fix a bug in the server message output.
+
+*** Filling (erc-fill.el)
+
+**** Fix bug involving messages that start with one or more blank lines.
+
+*** Identd (erc-identd.el)
+
+**** New option `erc-identd-port'
+Specifies the port to use if none is given as an argument to
+`erc-identd-start'.  This is placed in the new customization group
+`erc-identd'.
+
+**** New function: `erc-identd-quickstart'
+Ignores any arguments and calls `erc-identd-start'.
+
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
+*** Logging (erc-log.el)
+
+**** Make sure filenames are safe to use before writing to them.
+
+**** Save all log buffers when exiting Emacs.
+
+**** erc-generate-log-file-name-function: Add option for
+`erc-generate-log-file-name-network', which is a new function that
+uses the network name rather than the server name when possible.
+
+*** Menu (erc-menu.el)
+
+**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
+and other clients.
+
+**** Make this into a proper module and load it by default.
+
+**** Add "Current channel" submenu.
+
+*** Networks (erc-networks.el)
+
+**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
+
+**** Escape periods in Konfido.Net and Kewl.Org.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Add new 'both method for the `erc-nickserv-identify-mode' option
+and make it the default.  This tries to do the right thing both when a
+known nickserv message exists for an IRC network, and when it does
+not.
+
+**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
+
+**** Support authentication on BitlBee.
+
+**** Make source code easier to understand by using accessor functions.
+
+*** Sound support (erc-sound.el)
+
+**** Make this work with both Emacs 21 and Emacs 22.
+
+*** Timestamps (erc-stamp.el)
+
+**** Exclude the newline from the erc-timestamp field.
+
+**** New function: `erc-toggle-timestamps'.
+Toggles display of timestamps.
+
+* Changes in ERC 5.1.4
+
+** Make find-function and find-variable work in Emacs 22 for
+names that are constructed by `define-erc-module'.
+
+** Fix bug introduced in ERC 5.1.3 that caused messages to go the
+wrong buffer.
+
+** Changes and additions to modules
+
+*** Highlighting (erc-match.el)
+
+**** Don't activate view-mode.
+
+*** Logging (erc-log.el)
+
+**** When this module is activated, make sure logging is enabled on
+already-opened buffers.  Ditto for disabling logging when the module
+is deactivated.
+
+**** Fix some errors that occur when exiting Emacs without first
+quitting open IRC servers.
+
+* Changes in ERC 5.1.3
+
+** Fix use of /quote command with no initial whitespace.
+
+** Make it possible to customize the colorization of the header line.
+The `erc-header-line' face is used to color the header line.
+The `erc-header-line-face-method' determines the method to use when
+colorizing the header line.
+
+** Add the new function `erc-handle-irc-url', which is a suitable
+candidate to use for `url-irc-function'.  This permits some
+integration of url.el and ERC.
+
+** Fix several errors that occur when server or channel buffers are killed
+prematurely.
+
+** Fix toggling of flood control.
+
+** Match the patterns in `erc-encoding-coding-alist' as regexps,
+instead of verbatim text.  Also, match case-insensitively.
+
+** The /SMV command has been removed, since we no longer have
+meaningful module-specific version information.
+
+** Fix a "(stringp nil)" error that can happen when doing /PART.
+
+** Use a better example in the `erc-part-reason-various-alist'
+documentation.
+
+** When using `erc-quit-reason-various' and `erc-part-reason-various'
+and no matches are found, default to using the ERC version string
+rather than "nil".
+
+** Add the `list' and `page' modules to the `erc-modules' customize
+interface.
+
+** Changes to the ERC manual
+
+*** Update the list of available modules.
+
+*** Revise information about releases and development.
+
+*** Provide a simpler example in the "Getting Started" chapter.
+
+*** Fully document how to connect to an IRC server in the new
+"Connecting" chapter.
+
+** Changes and additions to modules
+
+*** Autoaway (erc-autoaway.el)
+
+**** Rename the `erc-autoaway-use-emacs-idle' option to
+`erc-autoaway-idle-method'.
+
+**** Add support for autoaway based on user idle time.
+This is now the default.
+
+**** If you set the AWAY status yourself, erc-autoaway will not
+interfere by un-setting AWAY prematurely.
+
+**** If you are set away while visiting a non-ERC buffer,
+erc-autoaway used to fail in bringing the user back.  This is now
+fixed.
+
+*** BBDB (erc-bbdb.el)
+
+**** Add new option `erc-bbdb-electric-p', which determines whether
+to make the BBDB buffer electric.  This defaults to not electric.
+
+*** Button (erc-button.el)
+
+**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
+
+*** Identd (erc-identd.el)
+
+**** Fix a bug that involves starting the identd server.
+
+**** Make this work with Emacs 22.
+
+**** Provide a real ERC module named `identd'.
+
+**** Don't create an extra buffer for the identd process.
+
+*** Channel lists (erc-list.el)
+
+**** Enable by default, except in the version of ERC bundled with Emacs 22.
+
+*** Logging (erc-log.el)
+
+**** By default, don't insert old logs when opening an ERC buffer.
+This may be changed by customizing `erc-log-insert-log-on-open'.
+
+**** New option `erc-log-write-after-send' determines whether the
+log file will be written to after every sent message.  The default is
+not to do this.
+
+**** New option `erc-log-write-after-insert' determines whether the
+log file will be written to when new text is added to a logged ERC
+buffer.  The default is not to do this.  With this option and the
+previous option, logging should no longer slow down ERC as much.
+
+**** Default to saving buffers and queries on quit.
+This may be changed by customizing the `erc-save-buffer-on-quit' and
+`erc-save-queries-on-quit' options, respectively.
+
+**** Only perform logging when the `logging' module is added to
+`erc-modules'.  This prevents logging from being activated just by
+loading the erc-log.el file, and makes logging act like other ERC
+modules.
+
+*** Programmable completion (erc-pcomplete.el)
+
+**** Don't complete the user's current nickname.
+
+* Changes in ERC 5.1.2
+
+** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
+
+** Move to end of prompt when ERC reconnects to a server.
+
+** Changes and additions to modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Don't spell-check nicks or words that are prefixed with '/'.
+
+**** Remove flyspell properties from words we shouldn't spell-check.
+
+**** Fix an issue that caused the ispell process to reload every time
+we switch to an ERC buffer.
+
+*** Timestamps (erc-stamp.el)
+
+**** Fix an inconsistency in calculating width of right timestamps.
+
+**** Rename option `erc-timestamp-right-align-by-pixel' to
+`erc-timestamp-use-align-to'.  This controls whether to use the more
+fail-proof method of aligning right timestamps, as mentioned below.
+
+**** Fix a right timestamp spacing problem that used to occur when
+erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
+use the method that aligns right timestamps perfectly in Emacs22 with
+X.  If the current version of Emacs doesn't support this method, use
+the simpler method, which is prone to alignment issues for math
+symbols and other variable-width text.
+
+A side effect of using this new method is that there will only be one
+space before a right timestamp in any saved logs.  If this is
+unacceptable, set `erc-timestamp-use-align-to' to nil.
+
+* Changes in ERC 5.1.1
+
+** Fix a requirement on cl.el.
+
+** Use tls.el for SSL connections, rather than ssl.el.
+
+** Changes and additions to modules
+
+*** ibuffer integration (erc-ibuffer.el)
+
+**** Update this to work with the version of ibuffer.el that comes with
+recent Emacs variants.
+
+*** Old completion (erc-complete.el)
+
+**** Fix a few errors.
+
+*** Speedbar (erc-speedbar.el)
+
+**** Make this work with the version of speedbar.el that comes with
+recent Emacs variants.
+
+*** Timestamps (erc-stamp.el)
+
+**** By default, use a more failsafe method of displaying right timestamps.
+To get right timestamps to align perfectly in Emacs22 using X, set the
+new `erc-timestamp-right-align-by-pixel' option to non-nil.
+
+*** Viper compatibility (erc-viper.el)
+
+**** Since most of these changes are now merged into Emacs22, detect
+whether we need these changes and install them only if necessary.
+
+* Changes in ERC 5.1
+
+** Improve XEmacs compatibility.
+
+** Namespace changes
+
+*** Now ERC doesn't use global variable space.
+Renamed all variables that didn't start with "erc-".
+
+  o `away' is now `erc-away'
+
+  o `current-nick' is now `erc-server-current-nick'
+
+  o `last-peers' is now `erc-server-last-peers'
+
+  o `last-ping-time' is now `erc-server-last-ping-time'
+
+  o `last-sent-time' is now `erc-server-last-sent-time'
+
+  o `lines-sent' is now `erc-server-lines-sent'
+
+  o `quitting' is now `erc-server-quitting'
+
+*** Remove the `with-erc-channel-buffer' function.
+
+** Bugfixes
+
+*** Don't inadvertently destroy face properties.
+
+*** Load erc scripts in a safer way.
+
+*** Don't insert a timestamp if text at point is invisible.
+
+*** Don't hide messages from those in `erc-fools' by default.
+Color their nicks instead.
+
+*** Use a more foolproof method of encoding and decoding strings
+before sending to a channel.
+
+** Backend changes
+
+*** Renamed some server-specific variables
+
+  o `erc-announced-server-name' is now `erc-server-announced-name'
+
+  o `erc-auto-reconnect' is now `erc-server-auto-reconnect'
+
+  o `erc-connect-function' is now `erc-server-connect-function'
+
+  o `erc-default-coding-system' is now `erc-server-coding-system'
+
+  o `erc-duplicate-timeout' is now `erc-server-duplicate-timeout'
+
+  o `erc-duplicates' is now `erc-server-duplicates'
+
+  o `erc-lag' is now `erc-server-lag'
+
+  o `erc-prevent-duplicates' is now `erc-server-prevent-duplicates'
+
+  o `erc-previous-read' is now `erc-server-filter-data'
+
+  o `erc-process' is now `erc-server-process'
+
+  o `erc-ping-handler' is now `erc-server-send-ping-handler'
+
+  o `erc-ping-interval' is now `erc-server-send-ping-interval'
+
+*** Renamed some functions
+
+  o `erc-connect' is now `erc-server-connect'
+
+  o `erc-process-filter' is now `erc-server-filter-function'
+
+  o `erc-send-command' is now `erc-server-send'
+
+  o `erc-send-single-line' is now `erc-send-input'
+
+  o `erc-setup-periodical-server-ping' is now
+    `erc-server-setup-periodical-server-ping'
+
+  o `erc-split-command is now `erc-split-line'
+
+*** New options
+
+  o erc-server-flood-margin, erc-server-flood-penalty: New options
+    that allow tweaking of flood control.
+
+  o erc-split-line-length: The maximum line length of a single
+    message.
+
+*** New variables
+
+  o erc-server-flood-last-message, erc-server-flood-queue,
+    erc-server-flood-timer: Flood control.
+
+  o erc-server-processing-p: Indicate when we're currently processing
+    a message.
+
+*** Remove some options
+
+  o `erc-flood-limit'
+  o `erc-flood-limit2'
+
+** New customization group `erc-server' for dealing with IRC servers.
+
+** ERC can now be installed by doing `make install' from the command line.
+
+** ERC now has a manual in erc.texi.
+Type `make doc' to generate HTML and Info versions of it.
+
+** ERC no longer depends on cl.el.
+Only the macros in cl-macs.el are used.
+
+** Fix an edge case when quitting as new messages come in.
+
+** Make flood protection toggle-able as on/off, removing the 'strict option.
+
+** If possible, re-use channel buffers when reconnecting to a server.
+
+** Text in ERC buffers is now read-only by default.
+To get the previous behavior, 
+
+** Changes and additions to modules
+
+*** Auto-join (erc-autojoin.el)
+
+**** Recognize the Azzurra server.
+
+*** BBDB (erc-bbdb.el)
+
+**** When the user types /WHOIS, ask for a record to merge to.
+
+**** Store the displayed name of a BitlBee contact.
+The new `erc-bbdb-bitlbee-name-field' option specifies the field to use
+to store this information.
+
+**** Don't prompt for a name on /JOIN or /NICK.
+
+*** Button (erc-button.el)
+
+**** Fix customization of `erc-button-alist'
+
+**** New option `erc-button-nickname-face' determines the face to use
+when coloring ERC nicknames.
+
+*** Channel tracking (erc-track.el)
+
+**** Remove channels from the modified channels list if not currently
+connected.  This should remove residue from the mode line after
+quitting ERC.
+
+**** Recognize buttonized text
+
+*** Highlighting (erc-match.el)
+
+**** Highlight current nickname by default.
+
+**** Added the option of beeping when certain matches occur.
+Add `erc-beep-on-match' to `erc-text-matched-hook' to enable
+beeping.  Set the new variable `erc-beep-match-types' which match
+types that make beeps.
+
+*** Nicklist (erc-nicklist.el)
+
+**** Fix a couple of errors.
+
+**** Make sure a stray mouse click doesn't trigger an error.
+
+**** Insert icons from the /images directory next to nicks.
+This indicates their away status.  The location is customizable via
+the new `erc-nicklist-icons-directory' option.
+
+If you do not want these icons, set `erc-nicklist-use-icons' to nil.
+
+*** Nickserv identification (erc-nickserv.el)
+
+**** Recognize Azzurra and OFTC networks.
+
+*** Old completion (erc-complete.el)
+
+**** Disable by default.
+
+*** Programmable completion (erc-pcomplete.el)
+
+**** Enable by default.
+
+*** Timestamps (erc-stamp.el)
+
+**** On Emacs22, align right timestamps perfectly, even if variable-width
+characters are used.  If we aren't using Emacs22, move text farther
+away from the right margin when variable-width characters are used.
+It is considered better to misalign the stamp by a bit than to go past
+the right margin.
+
+**** Enable by default
+
+** New modules
+
+*** Spell-checking (erc-spelling.el)
+
+**** Use flyspell in ERC.
+
+*** Viper compatibility (erc-viper.el)
+
+**** Helps ERC work correctly in viper-mode.
+
+* Changes in ERC 5.0.4
+
+** Fix a problem with undo in channels.
+
+* Changes in ERC 5.0.3
+
+** Fix typo in the `ctcp-request-to' entry of the English catalog.
+
+** Debugging with edegug has been made easier in all of the
+erc-with-* and with-erc* macros.
+
+** Non-ASCII character sets should be better supported when sending
+and processing messages.
+
+** A load failure with erc-autoaway.el and Emacs21 has been fixed.
+
+** A few XEmacs warnings were fixed.
+
+** Changes and additions to modules
+
+*** Backend (erc-backend.el)
+
+**** Move the check for hidden messages into `erc-display-message'
+so there isn't so much replicated code.
+
+**** Add `definition-name' property to constructed symbols so that
+`find-function' and `find-variable' will be able to locate them.
+
+**** Make sure logs are inserted info the correct channel buffers.
+There was previously an error when using `erc-insert-log-on-open' in
+combination with autojoin to multiple channels.
+
+*** Button (erc-button.el)
+
+**** The layering of `erc-button-face' on other faces in ERC buffers
+has been improved.
+
+*** Channel tracking (erc-track.el)
+
+**** Use optimal amount of whitespace around modified channels
+indicator.  Previously, there was an additional unnecessary space.
+
+**** Fix an error that occurred when unchecked buffers existed when
+invoking /QUIT.
+
+* Changes in ERC 5.0.2
+
+** If a channel key is required for a certain channel, ERC will prompt
+for one if `erc-prompt-for-channel-key' is non-nil.
+
+** ERC doesn't try to reconnect if the network connection is refused
+when using `open-network-stream-nowait' as the `erc-connect-function'.
+
+** Messages from multiple servers will not go to the currently active
+buffer.  The messages from each server will be contained in the most
+recently active channel/server buffer that corresponds with the
+server.
+
+** Some text messages were cleaned up slightly.
+
+** Button faces should no longer "cover" other faces.
+
+** Made some XEmacs compatibility fixes.
+
+** Nicknames containing a backslash are now correctly highlighted as
+current-nick and buttonized as nicks.
+
+** `erc-server-select' doesn't offer networks without servers as a
+choice anymore.
+
+** Non-ASCII character support has been improved.
+
+** Changes and additions to modules
+
+*** Menu (erc-menu.el)
+
+**** You can now save logs and truncate buffers from the menu-bar.
+
+* Changes in ERC 5.0.1
+
+** Narrowing in ERC buffers no longer causes formatting errors.
+
+** The BBDB module now loads correctly when customizing `erc-modules'.
+
+** The value of `erc-button-face' is now respected.
+
+** Fixed a bug which caused a read-only error during connection.
+
+** Server buffers are now tracked correctly.
+This means that `erc-track-priority-faces-only', `erc-track-exclude',
+and `erc-track-exclude-types' now work with server buffers.
+
+* Changes in ERC 5.0
+
+** Channel members are now stored as a hash-table.
+`erc-server-users' and `erc-channel-users' are now hash-tables, rather
+than alists.  This significantly increases performance, especially in
+large channels.  Each channel member is stored as an `erc-server-user'
+struct, with additional information about the channels they are on
+stored in an `erc-channel-user' struct.  Code using old alist-style
+channel members needs to be updated to work with hash-tables.
+This new code also removes the need for erc-members.el, which has been
+removed.
+
+** The way ERC deals with input from the server has changed.
+All server response code is now in a new file, erc-backend.el.  There
+should be no real user visible changes.  There are, however, a few
+major changes for implementers, and module writers:
+
+*** The PARSED response that all handlers get called with is
+    no longer a vector, but an `erc-response' struct.
+
+    This means LESS MAGIC NUMBERS in the ERC source code, but a few
+    changes in how you get at parsed responses.
+
+    The sender is accessed via `erc-response.sender'.
+
+    The command is accessed via `erc-response.command'.
+
+    The arguments to the command (everything after the command and
+    before the colon) are accessed via `erc-response.command-args'.
+    This is a /list/ of arguments in the order they appear in the
+    unparsed response.
+
+    The contents of the response is accessed via
+    `erc-response.contents'.
+
+    Should, for some reason, you want to do something with the
+    /unparsed/ response, you can get it via `erc-response.unparsed'.
+
+*** The `erc-server-hook-list' mechanism is gone.
+
+    All server response handlers should be defined with
+    `define-erc-response-handler'.  This defines functions and
+    corresponding hook variables.
+
+    The mapping of server commands to hook variables is no longer
+    done via `erc-event-to-hook', but through an #'equal hashtable,
+    `erc-server-responses'.  In order to find a hook you do:
+
+    (erc-get-hook command)
+
+    See the docstring of `define-erc-response-handler' for more
+    information.
+
+*** ALL hook variables have been renamed.
+
+    In accordance with recommendations in the Emacs Lisp manual,
+    the hook variables are no longer called `erc-server-FOO-hook',
+    but rather `erc-server-FOO-functions'.  This is to indicate
+    that the functions they call take arguments.
+
+    All the modules in ERC have been updated to reflect this change,
+    but external module authors should beware.
+
+** The values of `erc-mode-line-format' and `erc-header-line-format'
+are now defined as strings to be formatted using `format-spec'.
+`erc-mode-line-format' does not replace the whole mode-line anymore,
+only `mode-line-buffer-identification' is set.  This way, personal
+mode-line configurations are not modified and all key bindings work as
+expected.  The process status (connecting, closed) is now shown in
+`mode-line-process'.
+
+** Customization of ERC variables has been made easier.  Variables
+have been split into more groups for better organization.
+
+** New variables
+
+  o `erc-send-whitespace-lines' - Set this to send lines even if they
+    are empty.
+
+  o `erc-manual-set-nick-on-bad-nick-p' - If the nickname you chose is
+    already taken or not allowed, your nick is not changed and you can
+    try again manually if this is non-nil.
+
+  o `erc-mode-line-away-status-format' - You can now set what is shown
+    in the mode-line when you are away.
+
+  o `erc-header-line-uses-help-echo-p' - The header-line now uses the
+    help-echo property. You can set this to nil to disable it.
+
+  o `erc-format-query-as-channel-p' - Set this to nil to have messages
+    in the query buffer formatted like private messages.
+
+  o `erc-show-channel-key-p' - The channel key is now shown with the
+    other channel modes in the header line. Set this to nil if you
+    want it hidden.
+
+  o `erc-prompt-for-channel-key' - Set this if you want to be prompted
+    for the channel key (channel's mode is +k) when you call
+    `erc-join-channel' interactively.
+
+  o `erc-kill-server-buffer-on-quit' - If non-nil, kill the server
+    buffer automatically when you quit.
+
+** New hooks
+
+  o `erc-join-hook' - Called when you join a channel.
+
+  o `erc-kick-hook' - Called when you are kicked from a channel. The
+    channel's buffer is sent as an argument to functions called from
+    this hook.
+
+  o `erc-nick-changed-functions' - Whenever your nickname changes
+    successfully, the functions in this hook are run with the
+    arguments NEW-NICK and OLD-NICK.
+
+** New command /WHOAMI - Do a /WHOIS on your current nickname.
+
+** The key binding for changing channel modes is now C-c C-o.
+
+** Removed variables
+
+  o `erc-echo-notices-in-minibuffer-flag' and
+    `erc-echo-notices-in-current-buffer' - You should use
+    `erc-echo-notice-hook' and `erc-echo-notice-always-hook' instead.
+
+  o `erc-prompt-interactive-input' has been removed (commented out)
+    because nickname completion does not work with it.
+
+  o All INFO buffer-related variables and functions have been removed.
+
+** You can now disable modules by setting `erc-modules' with the
+customization interface.
+
+** Changes and additions to modules
+
+*** Autoaway (erc-autoaway.el)
+
+**** New variable `erc-autoaway-no-auto-back-regexp' - Add text which,
+when you type anything matching it, will not automatically discard
+your away status when `erc-auto-discard-away' is non-nil.
+
+*** Filling (erc-fill.el)
+
+**** New variable `erc-fill-variable-maximum-indentation' - Don't
+indent more than this many characters when indenting a message from a
+user with a long nickname.
+
+*** Goodies (erc-goodies.el)
+
+**** Miscellaneous small modules have been moved from erc.el.
+The functions erc-add-scroll-to-bottom, erc-make-read-only,
+erc-send-distinguish-noncommands, erc-interpret-controls, erc-unmorse,
+erc-smiley, and erc-occur, which were defined in the main erc.el file
+have been moved to erc-goodies.el and have mostly been translated to
+the modules scrolltobottom, readonly, noncommands, irccontrols, smiley
+and unmorse.
+
+**** New variables
+
+  o `erc-input-line-position' - The line number to use with
+    `erc-scroll-to-bottom'.
+
+  o `erc-beep-p' - Beep if there is a \C-g control character in a
+    message.
+
+*** Channel lists (erc-list.el)
+
+**** New variable `erc-chanlist-highlight-face' - A face used for
+highlighting the current line.
+
+*** Highlighting (erc-match.el)
+
+**** `erc-current-nick-highlight-type' has new options: 'keyword and
+'nick-or-keyword.
+
+*** Menu (erc-menu.el)
+
+**** The `IRC' menu is now automatically added to `erc-mode' buffers.
+
+*** Networks (erc-nets.el)
+
+**** The functions for determining current network are in this file.
+There were a couple of functions spread about in different files which
+each had a different way of determining the current network.  The
+methods have been combined, and the big list of known networks
+(`erc-networks-alist') is being put to use.  You can access the
+network's name by calling the new function `erc-network'.  This
+returns the name of the current network as a symbol or 'Unknown if it
+could not determine which network it is.
+
+*** Nicklist (erc-nicklist.el)
+
+**** ERC has a new way of displaying nicknames in a channel.
+The new file erc-nicklist.el defines a new command `erc-nicklist'
+which pops up a small Emacs window showing the nicknames of all
+members of the current channel.  The implementation is not complete
+and is rather proof-of-concept for now.  The result is something a bit
+like erc-speedbar, but not quite as invasive, and doesn't require use
+of a new frame.
+
+*** Internet services / Nickserv (erc-nickserv.el)
+
+**** Network detection is now taken care of by erc-nets.el.
+The function `erc-current-network' is deprecated, use `erc-network'
+instead.  The variable `erc-networks' has been removed, use
+`erc-networks-alist'.  The network symbols used in
+`erc-nickserv-alist' now match those in `erc-networks-alist'.
+
+**** New variable `erc-nickserv-identify-mode' - Choose which method
+to use for automatic identification: you can wait for Nickserv to ask
+you to identify (the default), or send an identify message
+automatically after you change your nickname.
+
+*** Speedbar (erc-speedbar.el)
+
+**** New variable `erc-speedbar-sort-users-type' - Sort users in a
+channel by activity, alphabetically, or not at all.
+
+*** Timestamps (erc-stamp.el)
+
+**** `erc-timestamp-only-if-changed-flag' now works when
+`erc-insert-timestamp-function' is set to 'erc-insert-timestamp-left.
+
+**** New variable `erc-timestamp-intangible' - Set this to nil if
+timestamps should not have the 'intangible property.
+
+*** Channel tracking (erc-track.el)
+
+**** Using faces to indicate channel activity in the modeline now works
+in XEmacs.
+
+**** New variables
+
+  o `erc-track-priority-faces-only' - Ignore changes in a channel
+    unless there is a face from the `erc-track-faces-priority-list' in
+    the message.
+
+  o `erc-track-exclude-server-buffer' - Ignore changes in the server
+    buffer.
+
+  o `erc-track-position-in-mode-line' - Set the position in the
+    mode-line where modified channels are shown (only works in GNU
+    Emacs versions above 21.3).
+
+* Changes in ERC 4.0
+
+** The module system has again changed a lot.  You can now customize
+  the variable `erc-modules' and define once and for all which
+  extension modules you want to use.  This unfortunately may require
+  you to change your current erc initialisation code a bit, if you
+  have some existing customsations.  On the other hand, this change
+  makes the configuration of extension modules a lot easier for new
+  users.  In theory, you should be able to configure all aspects of
+  ERC by using the customize interface, you should no longer really
+  need to write Lisp code for trivial customizations.
+
+  By default, the following modules are now loaded: (pcomplete
+  netsplit fill track ring button autojoin)
+
+  Please use M-x customize-variable RET erc-modules RET to change the
+  default if it does not suite your needs.
+
+** THe symbol used in `erc-nickserv-passwords' for debian.org IRC servers
+  (formerly called OpenProjects, now FreeNode) has changed from
+  openprojects to freenode.  You may need to update your configuration
+  for a successful automatic nickserv identification.
+
+* Changes in ERC 3.0.cvs.20030119
+
+** New module erc-dcc:
+
+This finally implements DCC.  It requires server sockets to fully work
+in both directions.  This feature is currently only available in Emacs
+21.3.50 (CVS). Here is a short list of what should work though.
+
+** Compatibility:
+  * Emacs 21.2, DCC get, and accepting DCC chat offers.
+  * XEmacs 21, Only accepting DCC chat offers.
+
+** erc is switching to global-minor-modes for activation of submodules.
+
+This allows you to customize such a mode and get automatic loading of
+the module.  No longer putting a lot of require statments in .emacs.
+At least this is the long-term plan, not all modules are converted
+yet.
+
+** The most important user visible change is that you now need to activate
+erc-completion-mode, to get TAB completion.  The new completion code
+is based on pcomplete.  To get the old code, manually load
+erc-complete and bind TAB to erc-complete in erc-mode-map.
+
+To activate completion on startup, put (erc-completion-mode 1) in your
+.emacs file.
+
+Same applies to timestamps.  You no longer need to (require
+'erc-stamp), you can customize the variable `erc-timestamp-mode', and
+the rest should be automatic.
+
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GNU Emacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.
+
+arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1
diff --git a/erc.texi b/erc.texi
new file mode 100644
index 0000000..6b78347
--- /dev/null
+++ b/erc.texi
@@ -0,0 +1,1024 @@
+\input texinfo
address@hidden %**start of header
address@hidden ../info/erc
address@hidden ERC Manual
address@hidden %**end of header
+
address@hidden Emacs
address@hidden
+* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
address@hidden direntry
+
address@hidden fn cp
+
address@hidden
+This manual is for ERC version 5.2.
+
+Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
+
address@hidden
+Permission is granted to copy, distribute and/or modify this document
+under the terms of the GNU Free Documentation License, Version 1.2 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, Front-Cover texts, or Back-Cover Texts.  A copy of
+the license is included in the section entitled ``GNU Free
+Documentation License'' in the Emacs manual.
+
+This document is part of a collection distributed under the GNU Free
+Documentation License.  If you want to distribute this document
+separately from the collection, you can do so by adding a copy of the
+license to the document, as described in section 6 of the license.
+
+All Emacs Lisp code contained in this document may be used, distributed,
+and modified without restriction.
address@hidden quotation
address@hidden copying
+
address@hidden
address@hidden ERC manual
address@hidden a full-featured IRC client
address@hidden for GNU Emacs and XEmacs
+
address@hidden The following two commands
address@hidden start the copyright page.
address@hidden
address@hidden 0pt plus 1filll
address@hidden
address@hidden titlepage
+
address@hidden So the toc is printed at the start
address@hidden
+
address@hidden
address@hidden Top, Introduction, (dir), (dir)
address@hidden  node-name,  next,  previous,  up
address@hidden ERC
+
address@hidden
address@hidden ifnottex
+
address@hidden
+* Introduction::                What is ERC?
+* Obtaining ERC::               How to get ERC releases and development
+                                  versions.
+* Installation::                Compiling and installing ERC.
+* Getting Started::             Quick Start guide to using ERC.
+* Keystroke Summary::           Keystrokes used in ERC buffers.
+* Modules::                     Available modules for ERC.
+* Advanced Usage::              Cool ways of using ERC.
+* Getting Help and Reporting Bugs::  
+* History::                     The history of ERC.
+* GNU Free Documentation License:: The license for this documentation.
+* Concept Index::               Search for terms.
+
address@hidden
+ --- The Detailed Node Listing ---
+
+Obtaining ERC
+
+* Releases::                    Released versions of ERC.
+* Development::                 Latest unreleased development changes.
+
+Getting Started
+
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
+
+Advanced Usage
+
+* Connecting::                  Ways of connecting to an IRC server.
+* Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
+
address@hidden detailmenu
address@hidden menu
+
address@hidden Introduction, Obtaining ERC, Top, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Introduction
+
+ERC is a powerful, modular, and extensible IRC client for Emacs.
+
+It comes with the following capabilities enabled by default.
+
address@hidden @bullet
address@hidden Flood control
address@hidden Timestamps
address@hidden Join channels automatically
address@hidden Buttonize URLs, nicknames, and other text
address@hidden Wrap long lines
address@hidden Highlight or remove IRC control characters
address@hidden Highlight pals, fools, and other keywords
address@hidden Detect netsplits
address@hidden Complete nicknames and commands in a programmable fashion
address@hidden Make displayed lines read-only
address@hidden Input history
address@hidden Track channel activity in the mode-line
+
address@hidden itemize
+
address@hidden Obtaining ERC, Installation, Introduction, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Obtaining ERC
+
address@hidden
+* Releases::                    Released versions of ERC.
+* Development::                 Latest unreleased development changes.
address@hidden menu
+
+Note that some ERC files are not included with Emacs due to copyright or
+dependency issues.  If desired, they may be found at the following
+locations, or from your local GNU mirror.
+
address@hidden @bullet
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip}
address@hidden itemize
+
+The rest of this chapter may be skipped if you are using the version of
+ERC that comes with Emacs.
+
address@hidden Releases, Development, Obtaining ERC, Obtaining ERC
address@hidden  node-name,  next,  previous,  up
address@hidden Releases
+
+Choose to install a release if you want to minimize risk.
+
+Errors are corrected in development first.  User-visible changes will be
+announced on the @email{erc-discuss@@gnu.org} mailing list.
address@hidden Help and Reporting Bugs}.
+
address@hidden releases, Debian package
address@hidden Debian package for ERC
+Debian users can get ERC via apt-get.  The @file{erc} package is
+available in the official Debian repository.
+
address@hidden releases, from source
+Alternatively, you can download the latest release from
address@hidden://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
+
address@hidden Development,  , Releases, Obtaining ERC
address@hidden  node-name,  next,  previous,  up
address@hidden Development
address@hidden development
+
+Choose the development version if you want to live on the bleeding edge
+of ERC development or try out new features before release.
+
address@hidden GNU Arch
+
+ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
+up-to-date involves the following steps.
+
address@hidden
address@hidden GNU Arch, installing
address@hidden Install arch
+
address@hidden @bullet
address@hidden Debian: @kbd{apt-get install tla}.
address@hidden Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
address@hidden itemize
+
address@hidden GNU Arch, downloading ERC
address@hidden Register the archive.
address@hidden
+tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
address@hidden example
+
address@hidden Download the ERC source code.
address@hidden
+# Download ERC into the @file{erc} directory.
+tla get erc@@sv.gnu.org/erc--main--0 erc
address@hidden example
+
address@hidden List upstream changes that are missing from your local copy.
+Do this whenever you want to see whether new changes have been committed
+to ERC.
+
address@hidden
+# Change to the source directory you are interested in.
+cd erc/
+
+# Display the summary of changes
+tla missing --summary
address@hidden example
+
address@hidden GNU Arch, updating ERC
address@hidden Update to the latest version by replaying missing changes.
address@hidden
+cd erc
+tla update
address@hidden example
+
address@hidden enumerate
+
+If you are new to Arch and want to learn more about developing ERC with
+it, visit @uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment} for
+full instructions.
+
address@hidden Development snapshots
+
address@hidden development snapshot
+Alternatively, the latest development snapshot may be downloaded in both
+``.tar.gz'' and ``.zip'' forms.
+
address@hidden @bullet
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.tar.gz}
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.zip}
address@hidden itemize
+
+
address@hidden Installation, Getting Started, Obtaining ERC, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Installation
+
+ERC may be compiled and installed on your machine.
+
+This section may be skipped if you are using the version of ERC that
+comes with Emacs.
+
address@hidden Compilation
+
+This is an optional step, since Emacs Lisp source code does not
+necessarily have to be byte-compiled.  It will yield a speed increase,
+though.
+
+A working copy of Emacs or XEmacs is needed in order to compile ERC.  By
+default, the program that is installed with the name @command{emacs}
+will be used.
+
+If you want to use the @command{xemacs} binary to perform the
+compilation, you would need to edit @file{Makefile} in the top-level
+directory as follows.  You can put either a full path to an Emacs or
+XEmacs binary or just the command name, as long as it is in the
address@hidden
+
address@hidden
+EMACS    = xemacs
+SITEFLAG = -no-site-file
address@hidden example
+
+Running @code{make} should compile the ERC source files in the
address@hidden directory.
+
address@hidden Installation
+
+ERC may be installed into your file hierarchy by doing the following.
+
+Edit the @file{Makefile} file so that @env{ELISPDIR} points to where you
+want the source and compiled ERC files to be installed and
address@hidden indicates where to put the ERC manual.  Of course, you
+will want to edit @env{EMACS} and @env{SITEFLAG} as shown in the
+Compilation section if you are using XEmacs.
+
+If you are installing ERC on a Debian system, you might want to change
+the value of @env{INSTALLINFO} as specified in @file{Makefile}.
+
+Run @code{make} as a normal user.
+
+Run @code{make install} as the root user if you have chosen installation
+locations that require this.
+
+
address@hidden Getting Started, Keystroke Summary, Installation, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Getting Started
address@hidden settings
+
+To use ERC, add the directory containing its files to your
address@hidden variable, in your @file{.emacs} file.  Then, load ERC
+itself.  An example follows.
+
address@hidden
+(require 'erc)
address@hidden lisp
+
+Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
+prompt for the server to connect to.
+
+If you want to place ERC settings in their own file, you can place them
+in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
+
+If you would rather use the Customize interface to change how ERC works,
+do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
+lots of modules that may be enabled or disabled; to select which ones
+you want, do @kbd{M-x customize-variable RET erc-modules RET}.
+
address@hidden
+* Sample Session::              Example of connecting to the #emacs channel
+* Special Features::            Differences from standalone IRC clients
address@hidden menu
+
address@hidden Sample Session, Special Features, Getting Started, Getting 
Started
address@hidden  node-name,  next,  previous,  up
address@hidden Sample Session
+
+This is an example ERC session which shows how to connect to the #emacs
+channel on Freenode.  Another IRC channel on Freenode that may be of
+interest is #erc, which is a channel where ERC users and developers hang
+out.
+
address@hidden @bullet
+
address@hidden Connect to Freenode
+
+Run @kbd{M-x erc}.  Use ``irc.freenode.net'' as the IRC server, ``6667''
+as the port, and choose a nickname.
+
address@hidden Get used to the interface
+
+Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
+there.  You will see first some messages about checking for ident, and
+then a bunch of other messages that describe the current IRC server.
+
address@hidden Join the #emacs channel
+
+In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
+on how you've set up ERC, either a new buffer for ``#emacs'' will be
+displayed, or a new buffer called ``#emacs'' will be created in the
+background.  If the latter, switch to the ``#emacs'' buffer.  You will
+see the channel topic and a list of the people who are currently on the
+channel.
+
address@hidden Register your nickname with Freenode
+
+If you would like to be able to talk with people privately on the
+Freenode network, you will have to ``register'' your nickname.  To do
+so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
+NickServ register <password>'', replacing ``<password>'' with your
+desired password.  It should tell you that the operation was successful.
+
address@hidden Talk to people in the channel
+
+If you switch back to the ``#emacs'' buffer, you can type a message, and
+everyone on the channel will see it.
+
address@hidden Open a query buffer to talk to someone
+
+If you want to talk with someone in private (this should usually not be
+done for technical help, only for personal questions), type ``/query
+<nick>'', replacing ``<nick>'' with the nickname of the person you would
+like to talk to.  Depending on how ERC is set up, you will either see a
+new buffer with the name of the person, or such a buffer will be created
+in the background and you will have to switch to it.  Begin typing
+messages, and you will be able to have a conversation.
+
+Note that if the other person is not registered, you will not be able to
+talk with them.
+
address@hidden itemize
+
address@hidden Special Features, , Sample Session, Getting Started
address@hidden  node-name,  next,  previous,  up
address@hidden Special Features
+
+ERC has some features that distinguish it from some IRC clients.
+
address@hidden @bullet
+
address@hidden multiple channels and multiple servers
+
+Every channel is put in a separate buffer.  Several IRC servers may be
+connected to at the same time.
+
address@hidden query buffers
address@hidden private message separation
+
+Private conversations are treated as channels, and are put into separate
+buffers in Emacs.  We call these ``query buffers''.
+
address@hidden highlighting
+
+Some occurences of words can be highlighted, which makes it easier to
+track different kinds of conversations.
+
address@hidden notification
+
+ERC can notify you that certain users are online.
+
address@hidden channel tracking
+
+Channels can be hidden and conversation continue in the background.  You
+are notified when something is said in such a channel that is not
+currently visible.  This makes it easy to get Real Work done while still
+maintaining an IRC presence.
+
address@hidden nick completion
+
+ERC can complete words upon hitting @kbd{TAB}, which eases the writing
+of nicknames in messages.
+
address@hidden history ring
address@hidden history
+
+Past actions are kept in history rings for future use.  To navigate a
+history ring, hit @kbd{M-p} to go backwards and @kbd{M-n} to go
+forwards.
+
address@hidden multiple languages
+
+Different channels and servers may have different language encodings.
+
+In addition, it is possible to translate the messages that ERC uses into
+multiple languages.  Please contact the developers of ERC at
address@hidden@@gnu.org} if you are interested in helping with the
+translation effort.
+
address@hidden user scripting
+
+Users can load scripts (e.g. auto greeting scripts) when ERC starts up.
+
+It is also possible to make custom IRC commands, if you know a little
+Emacs Lisp.  Just make an Emacs Lisp function and call it
address@hidden, where @code{NEWCOMMAND} is the name of the
+new command in capital letters.
+
address@hidden auto reconnect
+
+If the connection goes away at some point, ERC will try to reconnect
+automatically.  If it fails to reconnect, and you want to try to
+manually reestablish the connection at some later point, switch to an
+ERC  buffer and run the @code{/RECONNECT} command.
+
address@hidden itemize
+
+
address@hidden Keystroke Summary, Modules, Getting Started, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Keys Used in ERC
address@hidden keystrokes
+
+This is a summary of keystrokes available in every ERC buffer.
+
address@hidden @kbd
+
address@hidden C-a or <home> (`erc-bol')
+Go to beginning of line or end of prompt.
+
address@hidden RET (`erc-send-current-line')
+Send the current line
+
address@hidden TAB (`erc-complete-word')
+If at prompt, complete the current word.
+Otherwise, move to the next link or button.
+
address@hidden M-TAB (`ispell-complete-word')
+Complete the given word, using ispell.
+
address@hidden C-c C-a (`erc-bol')
+Go to beginning of line or end of prompt.
+
address@hidden C-c C-b (`erc-iswitchb')
+Use `iswitchb-read-buffer' to prompt for a ERC buffer to switch to.
+
address@hidden C-c C-c (`erc-toggle-interpret-controls')
+Toggle interpretation of control sequences in messages.
+
address@hidden C-c C-d (`erc-input-action')
+Interactively input a user action and send it to IRC.
+
address@hidden C-c C-e (`erc-toggle-ctcp-autoresponse')
+Toggle automatic CTCP replies (like VERSION and PING).
+
address@hidden C-c C-f (`erc-toggle-flood-control')
+Toggle use of flood control on sent messages.
+
address@hidden C-c TAB (`erc-invite-only-mode')
+Turn on the invite only mode (+i) for the current channel.
+
address@hidden C-c C-j (`erc-join-channel')
+Join channel.  If point is at the beginning of a channel name, use that
+as default.
+
address@hidden C-c C-k (`erc-go-to-log-matches-buffer')
+Interactively open an erc-log-matches buffer
+
address@hidden C-c C-l (`erc-save-buffer-in-logs')
+Append buffer contents to the log file, if logging is enabled.
+
address@hidden C-c C-n (`erc-channel-names')
+Run "/names #channel" in the current channel.
+
address@hidden C-c C-o (`erc-get-channel-mode-from-keypress')
+Read a key sequence and call the corresponding channel mode function.
+After doing @kbd{C-c C-o}, type in a channel mode letter.
+
address@hidden means quit.
address@hidden lets you type more than one mode at a time.
+If @kbd{l} is pressed, @code{erc-set-channel-limit} gets called.
+If @kbd{k} is pressed, @code{erc-set-channel-key} gets called.
+Anything else will be sent to `erc-toggle-channel-mode'.
+
address@hidden C-c C-p (`erc-part-from-channel')
+Part from the current channel and prompt for a reason.
+
address@hidden C-c C-q (`erc-quit-server')
+Disconnect from current server after prompting for reason.
+
address@hidden C-c C-r (`erc-remove-text-properties-region')
+Clears the region (start,end) in object from all colors, etc.
+
address@hidden C-c C-t (`erc-set-topic')
+Prompt for a topic for the current channel.
+
address@hidden C-c C-u (`erc-kill-input')
+Kill current input line using `erc-bol' followed by `kill-line'.
+
address@hidden table
+
+
address@hidden Modules, Advanced Usage, Keystroke Summary, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Modules
address@hidden modules
+
+One way to add functionality to ERC is to customize which of its many
+modules are loaded.
+
+There is a spiffy customize interface, which may be reached by typing
address@hidden customize-option erc-modules RET}.  Alternatively, set
address@hidden manually and then call @code{erc-update-modules}.
+
+The following is a list of available modules.
+
address@hidden @code
+
address@hidden modules, autoaway
address@hidden autoaway
+Set away status automatically
+
address@hidden modules, autojoin
address@hidden autojoin
+Join channels automatically
+
address@hidden modules, bbdb
address@hidden bbdb
+Integrate with the Big Brother Database
+
address@hidden modules, button
address@hidden button
+Buttonize URLs, nicknames, and other text
+
address@hidden modules, capab-identify
address@hidden capab-identify
+Mark unidentified users on freenode and other servers supporting CAPAB.
+
address@hidden modules, completion
address@hidden modules, pcomplete
address@hidden completion (aka pcomplete)
+Complete nicknames and commands (programmable)
+
address@hidden modules, fill
address@hidden fill
+Wrap long lines
+
address@hidden modules, hecomplete
address@hidden hecomplete
+Complete nicknames and commands (old).  This is the old module---you
+might prefer the ``completion'' module instead.
+
address@hidden modules, identd
address@hidden identd
+Launch an identd server on port 8113
+
address@hidden modules, irccontrols
address@hidden irccontrols
+Highlight or remove IRC control characters
+
address@hidden modules, log
address@hidden log
+Save buffers in logs
+
address@hidden modules, match
address@hidden match
+Highlight pals, fools, and other keywords
+
address@hidden modules, menu
address@hidden menu
+Display a menu in ERC buffers
+
address@hidden modules, netsplit
address@hidden netsplit
+Detect netsplits
+
address@hidden modules, noncommands
address@hidden noncommands
+Don't display non-IRC commands after evaluation
+
address@hidden modules, notify
address@hidden notify
+Notify when the online status of certain users changes
+
address@hidden modules, page
address@hidden page
+Process CTCP PAGE requests from IRC
+
address@hidden modules, readonly
address@hidden readonly
+Make displayed lines read-only
+
address@hidden modules, replace
address@hidden replace
+Replace text in messages
+
address@hidden modules, ring
address@hidden ring
+Enable an input history
+
address@hidden modules, scrolltobottom
address@hidden scrolltobottom
+Scroll to the bottom of the buffer
+
address@hidden modules, services
address@hidden services
+Identify to Nickserv (IRC Services) automatically
+
address@hidden modules, smiley
address@hidden smiley
+Convert smileys to pretty icons
+
address@hidden modules, sound
address@hidden sound
+Play sounds when you receive CTCP SOUND requests
+
address@hidden modules, spelling
address@hidden spelling
+Check spelling of messages
+
address@hidden modules, stamp
address@hidden stamp
+Add timestamps to messages
+
address@hidden modules, track
address@hidden track
+Track channel activity in the mode-line
+
address@hidden modules, truncate
address@hidden truncate
+Truncate buffers to a certain size
+
address@hidden modules, unmorse
address@hidden unmorse
+Translate morse code in messages
+
address@hidden table
+
address@hidden PRE5_3: Document every option of every module in its own subnode
+
+
address@hidden Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Advanced Usage
address@hidden advanced topics
+
address@hidden
+* Connecting::                  Ways of connecting to an IRC server.
+* Sample Configuration::        An example configuration file.
+* Options::                     Options that are available for ERC.
address@hidden menu
+
address@hidden Connecting, Sample Configuration, Advanced Usage, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Connecting to an IRC Server
address@hidden connecting
+
+The easiest way to connect to an IRC server is to call @kbd{M-x erc}.
+If you want to assign this function to a keystroke, the following will
+help you figure out its parameters.
+
address@hidden erc
+Select connection parameters and run ERC.
+Non-interactively, it takes the following keyword arguments.
+
address@hidden @bullet
address@hidden @var{server}
address@hidden @var{port}
address@hidden @var{nick}
address@hidden @var{password}
address@hidden @var{full-name}
address@hidden itemize
+
+That is, if called with the following arguments, @var{server} and
address@hidden will be set to those values, whereas
address@hidden, @code{erc-compute-nick} and
address@hidden will be invoked for the values of the other
+parameters.
+
address@hidden
+(erc :server "irc.freenode.net" :full-name "Harry S Truman")
address@hidden example
address@hidden defun
+
address@hidden Server
+
address@hidden erc-compute-server &optional server
+Return an IRC server name.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
address@hidden @bullet
address@hidden @var{server} (the argument passed to this function)
address@hidden The @code{erc-server} option
address@hidden The value of the IRCSERVER environment variable
address@hidden The @code{erc-default-server} variable
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-server nil
+IRC server to use if one is not provided.
address@hidden defopt
+
address@hidden Port
+
address@hidden erc-compute-port &optional port
+Return a port for an IRC server.
+
+This tries a number of increasingly more default methods until a non-nil
+value is found.
+
address@hidden @bullet
address@hidden @var{port} (the argument passed to this function)
address@hidden The @code{erc-port} option
address@hidden The @code{erc-default-port} variable
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-port
+IRC port to use if not specified.
+
+This can be either a string or a number.
address@hidden defopt
+
address@hidden Nick
+
address@hidden erc-compute-nick &optional nick
+Return user's IRC nick.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
address@hidden
address@hidden @var{nick} (the argument passed to this function)
address@hidden The @code{erc-nick} option
address@hidden The value of the IRCNICK environment variable
address@hidden The result from the @code{user-login-name} function
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-nick
+Nickname to use if one is not provided.
+
+This can be either a string, or a list of strings.
+In the latter case, if the first nick in the list is already in use,
+other nicks are tried in the list order.
address@hidden defopt
+
address@hidden erc-nick-uniquifier
+The string to append to the nick if it is already in use.
address@hidden defopt
+
address@hidden erc-try-new-nick-p
+If the nickname you chose isn't available, and this option is non-nil,
+ERC should automatically attempt to connect with another nickname.
+
+You can manually set another nickname with the /NICK command.
address@hidden defopt
+
address@hidden Full name
+
address@hidden erc-compute-full-name &optional full-name
+Return user's full name.
+
+This tries a number of increasingly more default methods until a
+non-nil value is found.
+
address@hidden @bullet
address@hidden @var{full-name} (the argument passed to this function)
address@hidden The @code{erc-user-full-name} option
address@hidden The value of the IRCNAME environment variable
address@hidden The result from the @code{user-full-name} function
address@hidden itemize
+
address@hidden defun
+
address@hidden erc-user-full-name
+User full name.
+
+This can be either a string or a function to call.
address@hidden defopt
+
address@hidden Sample Configuration, Options, Connecting, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Sample Configuration
address@hidden configuration, sample
+
+Here is an example of configuration settings for ERC.  This can go into
+your Emacs configuration file.  Everything after the @code{(require
+'erc)} command can optionally go into @file{~/.emacs.d/.ercrc.el}.
+
address@hidden
+;;; Sample ERC configuration
+
+;; Add the ERC directory to load path -- you don't need this if you are
+;; using the version of ERC that comes with Emacs
+(add-to-list 'load-path "~/elisp/erc")
+
+;; Load ERC
+(require 'erc)
+
+;; Load authentication info from an external source.  Put sensitive
+;; passwords and the like in here.
+(load "~/.emacs.d/.erc-auth")
+
+;; This is an example of how to make a new command.  Type "/uptime" to
+;; use it.
+(defun erc-cmd-UPTIME (&rest ignore)
+  "Display the uptime of the system, as well as some load-related
+stuff, to the current ERC buffer."
+  (let ((uname-output
+         (replace-regexp-in-string
+          ", load average: " "] @{Load address@hidden ["
+          ;; Collapse spaces, remove
+          (replace-regexp-in-string
+           " +" " "
+           ;; Remove beginning and trailing whitespace
+           (replace-regexp-in-string
+            "^ +\\|[ \n]+$" ""
+            (shell-command-to-string "uptime"))))))
+    (erc-send-message
+     (concat "@address@hidden [" uname-output "]"))))
+
+;; This causes ERC to connect to the Freenode network upon hitting
+;; C-c e f.  Replace MYNICK with your IRC nick.
+(global-set-key "\C-cef" (lambda () (interactive)
+                           (erc :server "irc.freenode.net" :port "6667"
+                                :nick "MYNICK")))
+
+;; This causes ERC to connect to the IRC server on your own machine (if
+;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
+;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
+;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
+;; people on those networks.
+(global-set-key "\C-ceb" (lambda () (interactive)
+                           (erc :server "localhost" :port "6667"
+                                :nick "MYNICK")))
+
+;; Make C-c RET (or C-c C-RET) send messages instead of RET. This has
+;; been commented out to avoid confusing new users.
+;; (define-key erc-mode-map (kbd "RET") nil)
+;; (define-key erc-mode-map (kbd "C-c RET") 'erc-send-current-line)
+;; (define-key erc-mode-map (kbd "C-c C-RET") 'erc-send-current-line)
+
+;;; Options
+
+;; Join the #emacs and #erc channels whenever connecting to Freenode.
+(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
+
+;; Interpret mIRC-style color commands in IRC chats
+(setq erc-interpret-mirc-color t)
+
+;; The following are commented out by default, but users of other
+;; non-Emacs IRC clients might find them useful.
+;; Kill buffers for channels after /part
+;; (setq erc-kill-buffer-on-part t)
+;; Kill buffers for private queries after quitting the server
+;; (setq erc-kill-queries-on-quit t)
+;; Kill buffers for server messages after quitting the server
+;; (setq erc-kill-server-buffer-on-quit t)
address@hidden lisp
+
address@hidden Options, , Sample Configuration, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Options
address@hidden options
+
address@hidden PRE5_3: (Node) Document every ERC option (module options go in
address@hidden previous chapter)
+
+This section has not yet been written.  For now, the easiest way to
+check out the available options for ERC is to do
address@hidden customize-group erc RET}.
+
+
address@hidden Getting Help and Reporting Bugs, History, Advanced Usage, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Getting Help and Reporting Bugs
address@hidden help, getting
address@hidden bugs, reporting
+
+After you have read this guide, if you still have questions about ERC,
+or if you have bugs to report, there are several places you can go.
+
address@hidden @bullet
+
address@hidden
address@hidden://www.emacswiki.org/cgi-bin/wiki/ERC} is the
+emacswiki.org page for ERC.  Anyone may add tips, hints, or bug
+descriptions to it.
+
address@hidden
+There are several mailing lists for ERC.  To subscribe, visit
address@hidden://savannah.gnu.org/mail/?group=erc}.
+
+The mailing lists are also available on Gmane.
+(@url{http://gmane.org/}).  Gmane provides additional methods for
+accessing the mailing lists, adding content to them, and searching them.
+
address@hidden
address@hidden gmane.emacs.erc.announce: Announcements
+
address@hidden gmane.emacs.erc.discuss: General discussion
+
address@hidden gmane.emacs.erc.cvs: Log messages for changes to the ERC source 
code
+
address@hidden enumerate
+
address@hidden
+You can visit the IRC Freenode channel @samp{#emacs}. Many of the
+contributors are frequently around and willing to answer your
+questions.
+
address@hidden itemize
+
+
address@hidden History, GNU Free Documentation License, Getting Help and 
Reporting Bugs, Top
address@hidden  node-name,  next,  previous,  up
address@hidden History
address@hidden history, of ERC
+
+ERC was originally written by Alexander L. Belikoff
address@hidden@@bfr.co.il} and Sergey Berezin
address@hidden@@cs.cmu.edu}.  They stopped development around
+December 1999.  Their last released version was ERC 2.0.
+
+P.S.: If one of the original developers of ERC reads this, we'd like to
+receive additional information for this file and hear comments in
+general.
+
address@hidden
address@hidden 2001
+
+In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
address@hidden@@gnu.org} took over development and created a ERC Project at
address@hidden://sourceforge.net/projects/erc}.
+
+In reaction to a mail about the new ERC development effort, Sergey
+Berezin said, ``First of all, I'm glad that my version of ERC is being
+used out there.  The thing is, I do not have free time and enough
+incentive anymore to work on ERC, so I would be happy if you guys take
+over the project entirely.''
+
+So we happily hacked away on ERC, and soon after (September 2001)
+released the next "stable" version, 2.1.
+
+Most of the development of the new ERC happened on #emacs on
+irc.openprojects.net.  Over time, many people contributed code, ideas,
+bugfixes, and a lot of alpha/beta/gamma testing.
+
+See the @file{CREDITS} file for a list of contributors.
+
address@hidden 2003
+
+ERC 3.0 was released.
+
address@hidden 2004
+
+ERC 4.0 was released.
+
address@hidden 2005
+
+ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
+the release manager and eventually the maintainer.
+
+After some discussion between him and the Emacs developers, it was
+decided to include ERC in Emacs.
+
address@hidden 2006
+
+ERC 5.1 was released.  It was subsequently included in Emacs 22.
+
+ERC became an official GNU project, and development moved to
address@hidden://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
+our revision control system.  Our mailing list address changed as well.
+
address@hidden itemize
+
address@hidden GNU Free Documentation License, Concept Index, History, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
+
address@hidden Concept Index,  , GNU Free Documentation License, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Index
+
address@hidden cp
+
address@hidden
+
address@hidden
+   arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
address@hidden ignore
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
deleted file mode 100644
index f5bf1e8..0000000
--- a/etc/ERC-NEWS
+++ /dev/null
@@ -1,1105 +0,0 @@
-ERC NEWS                                                       -*- outline -*-
-
-Copyright (C) 2006, 2007  Free Software Foundation, Inc.
-See the end of the file for license conditions.
-
-* Changes in ERC 5.2
-
-** M-x erc RET now starts ERC.
-`erc-select' has been changed to `erc'.  `erc-select' still remains as
-an alias of `erc'. Likewise, `erc-select-ssl' has been renamed to
-`erc-ssl' with `erc-select-ssl' as its alias.  The function that was
-known as `erc' is now `erc-open'.
-
-** Open query buffers by default when private messages are received.
-The default value of `erc-auto-query' has been changed to 'bury.
-
-** New command: /RECONNECT
-This command tries to reconnect to the current IRC server exactly
-once.  It does not work in server buffers (throws an error before the
-command is run), but works in query and channel buffers.
-
-** In MS-DOS environments, look for _ercrc.el rather than .ercrc.el.
-
-** Fix buggy interaction with multi-tty Emacs.
-
-** After running /QUIT, make sure that the IRC process is killed within
-4 seconds.  Freenode, in particular, needs this at times.
-
-** If the IRC process has not responded to our PINGs within a certain
-time, kill it and restart the connection.  See
-`erc-server-auto-reconnect', `erc-server-reconnect-attempts',
-`erc-server-reconnect-timeout', `erc-server-send-ping-interval', and
-`erc-server-send-ping-timeout' to fine-tune ERC's behavior.
-
-** Avoid getting into an infinite connection loop.
-Previously, this could happen if your nick was banned, you were using
-Tor, incorrect information was entered, or the connection was bad.
-
-** Make ban messages less confusing.
-
-** Restore the point correctly when reconnecting to an IRC server.
-
-** Make /IGNORE and /UNIGNORE prompt to determine whether their
-argument is a user or a regexp.  This results in less-confusing
-behavior when trying to ignore someone who has a bracket in their
-nick.
-
-** Make the default port "6667" rather than "ircd", because some
-operating systems don't know what port "ircd" maps to.
-
-** Fix several bugs in erc-iswitchb (C-c C-b).
-
-** Clean up internal documentation.
-Special thanks go to Juanma Barranquero for the thorough vetting of
-ERC's internal documentation.
-
-** Display a more informative message when a module is not found.
-
-** Fix a bug where paths were being colored like IRC commands.
-
-** In the customize interface for `erc-modules', add the name of the module.
-This makes it easier to find modules by name.
-
-** erc-server-send-ping-interval: Change to use a default of 30 seconds.
-
-** Some files which are included with the release of ERC 5.2 will not
-appear in the version of ERC that is bundled with Emacs 22.  These
-extras files may be found at:
-
- o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz, or
- o http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip.
-
-** Renamed files
-
-Several files were renamed so as to make them distinct to users of the
-MS-DOS operating system.
-
- o erc-autojoin.el -> erc-join.el
- o erc-complete.el -> erc-hecomplete.el
- o erc-nickserv.el -> erc-services.el
- o ChangeLog.NNNN -> ChangeLog.NN
-
-** Header line changes
-
-*** Remove "[IRC]" from the header line.
-
-*** Add the %l format character to `erc-header-line-format',
-
-*** Document how to remove the header line.
-Namely: (setq erc-header-line-format nil).
-
-** New options
-
-*** erc-server-reconnect-attempts: Determines the number of
-reconnection attempts that ERC will make per server.
-
-*** erc-server-reconnect-timeout: Determines the amount of time,
-in seconds, that ERC will wait between successive reconnect attempts.
-
-*** erc-server-send-ping-timeout: Determines when to consider a connection
-stalled and restart it.  The default is        after 120 seconds.
-
-*** erc-system-name: Determines the system name to use when logging in.
-The default is to figure this out by calling `system-name'.
-
-** New face: `erc-my-nick-face'
-This helps make it easier to distinguish messages sent by yourself
-from messages sent by other users when the value of the variable
-`erc-show-my-nick' is non-nil.
-
-** Namespace changes
-
-*** New macro: `erc-with-server-buffer'
-Switches to the current ERC server buffer and runs some code.  If no
-server buffer is available, return nil.  This is a useful way to
-access variables in the server buffer.
-
-*** New function: `erc-open-server-buffer-p'
-Returns non-nil if the given buffer is an ERC server buffer that has
-an open IRC process.
-
-*** New function: `erc-format-lag-time'
-Returns the estimated lag time to server, `erc-server-lag'.
-
-*** Renamed items
-
- o `erc-server-setup-periodical-server-ping' is now
-   `erc-server-setup-periodical-ping'
-
- o `erc-away-p' is now `erc-away-time'
-
-** Changes to the ERC manual
-
-*** New section: Sample Session.
-Describes a sample ERC session for connecting to the #emacs channel on
-Freenode.  Also mention the #erc channel.
-
-*** New section: Special Features.
-Describes some of the special features of ERC.
-
-*** Getting Started: Mention ~/.emacs.d/.ercrc.el and the Customize
-interface.
-
-*** Development: Mention ErcDevelopment page on emacswiki.org.
-
-*** Tips and Tricks: Remove empty section for now.
-
-*** Options: Mention how to see available ERC options.
-
-*** Sample Configuration: Add an example of how to configure ERC.
-
-** New modules
-
-*** Autoaway (erc-autoaway.el)
-
-**** Make this much more reliable.
-
-**** Avoid duplicate messages when coming back from being away.
-
-**** Fix bug where autoaway was enabled just by loading the file.
-
-*** BBDB (erc-bbdb.el)
-
-**** Display information on how to cancel merging of info or how to
-create a new John Doe record.
-
-**** Make it so that information from /whois continues to come in, even
-while prompting for a record to merge.
-
-**** Make hitting C-g correctly abort merging the record.
-
-*** Capab identify (erc-capab.el)
-Mark users who haven't identified to NickServ on servers supporting
-CAPAB IDENTIFY-MSG.
-
-** Changes and additions to modules
-
-*** Button (erc-button.el)
-
-**** Make <backtab> go to the previous button.
-
-*** Channel tracking (erc-track.el)
-
-**** Use mouse-face and help-echo for channel names in the mode-line.
-This helps people using a mouse know that they are buttons and can be
-clicked on.
-
-**** Fix issue where C-c C-SPC could conflict with user-defined keybindings.
-This is accomplished by moving these bindings to their own global
-minor mode.  Now the default is to check whether the user has bound
-something to C-c C-SPC or C-c address@hidden  If they have, prompt them about
-whether to really override that binding.  This also has the effect of
-preventing ERC from clobbering rcirc's keybinding, unless this is
-desired.  See `erc-track-enable-keybindings' for more details.
-
-**** New option: erc-track-enable-keybindings.
-Determine whether or not to enable the C-c C-SPC and C-c C-@
-keybindings.  The default is to ask whether to do this if a binding to
-these keys already exists.  It can also be set to t or nil to always
-bind or never bind, respectively.
-
-**** Remove `track-when-inactive' module.
-See `erc-track-when-inactive' for further details.
-
-**** New option: erc-track-when-inactive.
-This option replaces the track-when-inactive module.  Set it to
-non-nil to track activity even in visible buffers when inactive.  The
-default is nil.
-
-**** Remove the `track-modified-channels' alias for the `track' module.
-
-*** DCC support (erc-dcc.el)
-
-**** Add Usage section to Commentary.
-
-**** Fix a bug in the server message output.
-
-*** Filling (erc-fill.el)
-
-**** Fix bug involving messages that start with one or more blank lines.
-
-*** Identd (erc-identd.el)
-
-**** New option `erc-identd-port'
-Specifies the port to use if none is given as an argument to
-`erc-identd-start'.  This is placed in the new customization group
-`erc-identd'.
-
-**** New function: `erc-identd-quickstart'
-Ignores any arguments and calls `erc-identd-start'.
-
-*** Channel lists (erc-list.el)
-
-**** Enable by default, except in the version of ERC bundled with Emacs 22.
-
-*** Logging (erc-log.el)
-
-**** Make sure filenames are safe to use before writing to them.
-
-**** Save all log buffers when exiting Emacs.
-
-**** erc-generate-log-file-name-function: Add option for
-`erc-generate-log-file-name-network', which is a new function that
-uses the network name rather than the server name when possible.
-
-*** Menu (erc-menu.el)
-
-**** Name the menu "ERC" instead of "IRC" to avoid confusion with rcirc
-and other clients.
-
-**** Make this into a proper module and load it by default.
-
-**** Add "Current channel" submenu.
-
-*** Networks (erc-networks.el)
-
-**** Add support for Ars OpenIRC, LinuxChix, and OFTC networks.
-
-**** Escape periods in Konfido.Net and Kewl.Org.
-
-*** Internet services / Nickserv (erc-nickserv.el)
-
-**** Add new 'both method for the `erc-nickserv-identify-mode' option
-and make it the default.  This tries to do the right thing both when a
-known nickserv message exists for an IRC network, and when it does
-not.
-
-**** Support nickserv authentication on OFTC, Azzurra, Ars, and QuakeNet.
-
-**** Support authentication on BitlBee.
-
-**** Make source code easier to understand by using accessor functions.
-
-*** Sound support (erc-sound.el)
-
-**** Make this work with both Emacs 21 and Emacs 22.
-
-*** Timestamps (erc-stamp.el)
-
-**** Exclude the newline from the erc-timestamp field.
-
-**** New function: `erc-toggle-timestamps'.
-Toggles display of timestamps.
-
-* Changes in ERC 5.1.4
-
-** Make find-function and find-variable work in Emacs 22 for
-names that are constructed by `define-erc-module'.
-
-** Fix bug introduced in ERC 5.1.3 that caused messages to go the
-wrong buffer.
-
-** Changes and additions to modules
-
-*** Highlighting (erc-match.el)
-
-**** Don't activate view-mode.
-
-*** Logging (erc-log.el)
-
-**** When this module is activated, make sure logging is enabled on
-already-opened buffers.  Ditto for disabling logging when the module
-is deactivated.
-
-**** Fix some errors that occur when exiting Emacs without first
-quitting open IRC servers.
-
-* Changes in ERC 5.1.3
-
-** Fix use of /quote command with no initial whitespace.
-
-** Make it possible to customize the colorization of the header line.
-The `erc-header-line' face is used to color the header line.
-The `erc-header-line-face-method' determines the method to use when
-colorizing the header line.
-
-** Add the new function `erc-handle-irc-url', which is a suitable
-candidate to use for `url-irc-function'.  This permits some
-integration of url.el and ERC.
-
-** Fix several errors that occur when server or channel buffers are killed
-prematurely.
-
-** Fix toggling of flood control.
-
-** Match the patterns in `erc-encoding-coding-alist' as regexps,
-instead of verbatim text.  Also, match case-insensitively.
-
-** The /SMV command has been removed, since we no longer have
-meaningful module-specific version information.
-
-** Fix a "(stringp nil)" error that can happen when doing /PART.
-
-** Use a better example in the `erc-part-reason-various-alist'
-documentation.
-
-** When using `erc-quit-reason-various' and `erc-part-reason-various'
-and no matches are found, default to using the ERC version string
-rather than "nil".
-
-** Add the `list' and `page' modules to the `erc-modules' customize
-interface.
-
-** Changes to the ERC manual
-
-*** Update the list of available modules.
-
-*** Revise information about releases and development.
-
-*** Provide a simpler example in the "Getting Started" chapter.
-
-*** Fully document how to connect to an IRC server in the new
-"Connecting" chapter.
-
-** Changes and additions to modules
-
-*** Autoaway (erc-autoaway.el)
-
-**** Rename the `erc-autoaway-use-emacs-idle' option to
-`erc-autoaway-idle-method'.
-
-**** Add support for autoaway based on user idle time.
-This is now the default.
-
-**** If you set the AWAY status yourself, erc-autoaway will not
-interfere by un-setting AWAY prematurely.
-
-**** If you are set away while visiting a non-ERC buffer,
-erc-autoaway used to fail in bringing the user back.  This is now
-fixed.
-
-*** BBDB (erc-bbdb.el)
-
-**** Add new option `erc-bbdb-electric-p', which determines whether
-to make the BBDB buffer electric.  This defaults to not electric.
-
-*** Button (erc-button.el)
-
-**** Use <backtab> instead of <C-tab> for `erc-button-previous'.
-
-*** Identd (erc-identd.el)
-
-**** Fix a bug that involves starting the identd server.
-
-**** Make this work with Emacs 22.
-
-**** Provide a real ERC module named `identd'.
-
-**** Don't create an extra buffer for the identd process.
-
-*** Channel lists (erc-list.el)
-
-**** Enable by default, except in the version of ERC bundled with Emacs 22.
-
-*** Logging (erc-log.el)
-
-**** By default, don't insert old logs when opening an ERC buffer.
-This may be changed by customizing `erc-log-insert-log-on-open'.
-
-**** New option `erc-log-write-after-send' determines whether the
-log file will be written to after every sent message.  The default is
-not to do this.
-
-**** New option `erc-log-write-after-insert' determines whether the
-log file will be written to when new text is added to a logged ERC
-buffer.  The default is not to do this.  With this option and the
-previous option, logging should no longer slow down ERC as much.
-
-**** Default to saving buffers and queries on quit.
-This may be changed by customizing the `erc-save-buffer-on-quit' and
-`erc-save-queries-on-quit' options, respectively.
-
-**** Only perform logging when the `logging' module is added to
-`erc-modules'.  This prevents logging from being activated just by
-loading the erc-log.el file, and makes logging act like other ERC
-modules.
-
-*** Programmable completion (erc-pcomplete.el)
-
-**** Don't complete the user's current nickname.
-
-* Changes in ERC 5.1.2
-
-** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
-
-** Move to end of prompt when ERC reconnects to a server.
-
-** Changes and additions to modules
-
-*** Spell-checking (erc-spelling.el)
-
-**** Don't spell-check nicks or words that are prefixed with '/'.
-
-**** Remove flyspell properties from words we shouldn't spell-check.
-
-**** Fix an issue that caused the ispell process to reload every time
-we switch to an ERC buffer.
-
-*** Timestamps (erc-stamp.el)
-
-**** Fix an inconsistency in calculating width of right timestamps.
-
-**** Rename option `erc-timestamp-right-align-by-pixel' to
-`erc-timestamp-use-align-to'.  This controls whether to use the more
-fail-proof method of aligning right timestamps, as mentioned below.
-
-**** Fix a right timestamp spacing problem that used to occur when
-erc-stamp.el was byte-compiled.  Now that this is fixed, it is safe to
-use the method that aligns right timestamps perfectly in Emacs22 with
-X.  If the current version of Emacs doesn't support this method, use
-the simpler method, which is prone to alignment issues for math
-symbols and other variable-width text.
-
-A side effect of using this new method is that there will only be one
-space before a right timestamp in any saved logs.  If this is
-unacceptable, set `erc-timestamp-use-align-to' to nil.
-
-* Changes in ERC 5.1.1
-
-** Fix a requirement on cl.el.
-
-** Use tls.el for SSL connections, rather than ssl.el.
-
-** Changes and additions to modules
-
-*** ibuffer integration (erc-ibuffer.el)
-
-**** Update this to work with the version of ibuffer.el that comes with
-recent Emacs variants.
-
-*** Old completion (erc-complete.el)
-
-**** Fix a few errors.
-
-*** Speedbar (erc-speedbar.el)
-
-**** Make this work with the version of speedbar.el that comes with
-recent Emacs variants.
-
-*** Timestamps (erc-stamp.el)
-
-**** By default, use a more failsafe method of displaying right timestamps.
-To get right timestamps to align perfectly in Emacs22 using X, set the
-new `erc-timestamp-right-align-by-pixel' option to non-nil.
-
-*** Viper compatibility (erc-viper.el)
-
-**** Since most of these changes are now merged into Emacs22, detect
-whether we need these changes and install them only if necessary.
-
-* Changes in ERC 5.1
-
-** Improve XEmacs compatibility.
-
-** Namespace changes
-
-*** Now ERC doesn't use global variable space.
-Renamed all variables that didn't start with "erc-".
-
-  o `away' is now `erc-away'
-
-  o `current-nick' is now `erc-server-current-nick'
-
-  o `last-peers' is now `erc-server-last-peers'
-
-  o `last-ping-time' is now `erc-server-last-ping-time'
-
-  o `last-sent-time' is now `erc-server-last-sent-time'
-
-  o `lines-sent' is now `erc-server-lines-sent'
-
-  o `quitting' is now `erc-server-quitting'
-
-*** Remove the `with-erc-channel-buffer' function.
-
-** Bugfixes
-
-*** Don't inadvertently destroy face properties.
-
-*** Load erc scripts in a safer way.
-
-*** Don't insert a timestamp if text at point is invisible.
-
-*** Don't hide messages from those in `erc-fools' by default.
-Color their nicks instead.
-
-*** Use a more foolproof method of encoding and decoding strings
-before sending to a channel.
-
-** Backend changes
-
-*** Renamed some server-specific variables
-
-  o `erc-announced-server-name' is now `erc-server-announced-name'
-
-  o `erc-auto-reconnect' is now `erc-server-auto-reconnect'
-
-  o `erc-connect-function' is now `erc-server-connect-function'
-
-  o `erc-default-coding-system' is now `erc-server-coding-system'
-
-  o `erc-duplicate-timeout' is now `erc-server-duplicate-timeout'
-
-  o `erc-duplicates' is now `erc-server-duplicates'
-
-  o `erc-lag' is now `erc-server-lag'
-
-  o `erc-prevent-duplicates' is now `erc-server-prevent-duplicates'
-
-  o `erc-previous-read' is now `erc-server-filter-data'
-
-  o `erc-process' is now `erc-server-process'
-
-  o `erc-ping-handler' is now `erc-server-send-ping-handler'
-
-  o `erc-ping-interval' is now `erc-server-send-ping-interval'
-
-*** Renamed some functions
-
-  o `erc-connect' is now `erc-server-connect'
-
-  o `erc-process-filter' is now `erc-server-filter-function'
-
-  o `erc-send-command' is now `erc-server-send'
-
-  o `erc-send-single-line' is now `erc-send-input'
-
-  o `erc-setup-periodical-server-ping' is now
-    `erc-server-setup-periodical-server-ping'
-
-  o `erc-split-command is now `erc-split-line'
-
-*** New options
-
-  o erc-server-flood-margin, erc-server-flood-penalty: New options
-    that allow tweaking of flood control.
-
-  o erc-split-line-length: The maximum line length of a single
-    message.
-
-*** New variables
-
-  o erc-server-flood-last-message, erc-server-flood-queue,
-    erc-server-flood-timer: Flood control.
-
-  o erc-server-processing-p: Indicate when we're currently processing
-    a message.
-
-*** Remove some options
-
-  o `erc-flood-limit'
-  o `erc-flood-limit2'
-
-** New customization group `erc-server' for dealing with IRC servers.
-
-** ERC can now be installed by doing `make install' from the command line.
-
-** ERC now has a manual in erc.texi.
-Type `make doc' to generate HTML and Info versions of it.
-
-** ERC no longer depends on cl.el.
-Only the macros in cl-macs.el are used.
-
-** Fix an edge case when quitting as new messages come in.
-
-** Make flood protection toggle-able as on/off, removing the 'strict option.
-
-** If possible, re-use channel buffers when reconnecting to a server.
-
-** Text in ERC buffers is now read-only by default.
-To get the previous behavior, 
-
-** Changes and additions to modules
-
-*** Auto-join (erc-autojoin.el)
-
-**** Recognize the Azzurra server.
-
-*** BBDB (erc-bbdb.el)
-
-**** When the user types /WHOIS, ask for a record to merge to.
-
-**** Store the displayed name of a BitlBee contact.
-The new `erc-bbdb-bitlbee-name-field' option specifies the field to use
-to store this information.
-
-**** Don't prompt for a name on /JOIN or /NICK.
-
-*** Button (erc-button.el)
-
-**** Fix customization of `erc-button-alist'
-
-**** New option `erc-button-nickname-face' determines the face to use
-when coloring ERC nicknames.
-
-*** Channel tracking (erc-track.el)
-
-**** Remove channels from the modified channels list if not currently
-connected.  This should remove residue from the mode line after
-quitting ERC.
-
-**** Recognize buttonized text
-
-*** Highlighting (erc-match.el)
-
-**** Highlight current nickname by default.
-
-**** Added the option of beeping when certain matches occur.
-Add `erc-beep-on-match' to `erc-text-matched-hook' to enable
-beeping.  Set the new variable `erc-beep-match-types' which match
-types that make beeps.
-
-*** Nicklist (erc-nicklist.el)
-
-**** Fix a couple of errors.
-
-**** Make sure a stray mouse click doesn't trigger an error.
-
-**** Insert icons from the /images directory next to nicks.
-This indicates their away status.  The location is customizable via
-the new `erc-nicklist-icons-directory' option.
-
-If you do not want these icons, set `erc-nicklist-use-icons' to nil.
-
-*** Nickserv identification (erc-nickserv.el)
-
-**** Recognize Azzurra and OFTC networks.
-
-*** Old completion (erc-complete.el)
-
-**** Disable by default.
-
-*** Programmable completion (erc-pcomplete.el)
-
-**** Enable by default.
-
-*** Timestamps (erc-stamp.el)
-
-**** On Emacs22, align right timestamps perfectly, even if variable-width
-characters are used.  If we aren't using Emacs22, move text farther
-away from the right margin when variable-width characters are used.
-It is considered better to misalign the stamp by a bit than to go past
-the right margin.
-
-**** Enable by default
-
-** New modules
-
-*** Spell-checking (erc-spelling.el)
-
-**** Use flyspell in ERC.
-
-*** Viper compatibility (erc-viper.el)
-
-**** Helps ERC work correctly in viper-mode.
-
-* Changes in ERC 5.0.4
-
-** Fix a problem with undo in channels.
-
-* Changes in ERC 5.0.3
-
-** Fix typo in the `ctcp-request-to' entry of the English catalog.
-
-** Debugging with edegug has been made easier in all of the
-erc-with-* and with-erc* macros.
-
-** Non-ASCII character sets should be better supported when sending
-and processing messages.
-
-** A load failure with erc-autoaway.el and Emacs21 has been fixed.
-
-** A few XEmacs warnings were fixed.
-
-** Changes and additions to modules
-
-*** Backend (erc-backend.el)
-
-**** Move the check for hidden messages into `erc-display-message'
-so there isn't so much replicated code.
-
-**** Add `definition-name' property to constructed symbols so that
-`find-function' and `find-variable' will be able to locate them.
-
-**** Make sure logs are inserted info the correct channel buffers.
-There was previously an error when using `erc-insert-log-on-open' in
-combination with autojoin to multiple channels.
-
-*** Button (erc-button.el)
-
-**** The layering of `erc-button-face' on other faces in ERC buffers
-has been improved.
-
-*** Channel tracking (erc-track.el)
-
-**** Use optimal amount of whitespace around modified channels
-indicator.  Previously, there was an additional unnecessary space.
-
-**** Fix an error that occurred when unchecked buffers existed when
-invoking /QUIT.
-
-* Changes in ERC 5.0.2
-
-** If a channel key is required for a certain channel, ERC will prompt
-for one if `erc-prompt-for-channel-key' is non-nil.
-
-** ERC doesn't try to reconnect if the network connection is refused
-when using `open-network-stream-nowait' as the `erc-connect-function'.
-
-** Messages from multiple servers will not go to the currently active
-buffer.  The messages from each server will be contained in the most
-recently active channel/server buffer that corresponds with the
-server.
-
-** Some text messages were cleaned up slightly.
-
-** Button faces should no longer "cover" other faces.
-
-** Made some XEmacs compatibility fixes.
-
-** Nicknames containing a backslash are now correctly highlighted as
-current-nick and buttonized as nicks.
-
-** `erc-server-select' doesn't offer networks without servers as a
-choice anymore.
-
-** Non-ASCII character support has been improved.
-
-** Changes and additions to modules
-
-*** Menu (erc-menu.el)
-
-**** You can now save logs and truncate buffers from the menu-bar.
-
-* Changes in ERC 5.0.1
-
-** Narrowing in ERC buffers no longer causes formatting errors.
-
-** The BBDB module now loads correctly when customizing `erc-modules'.
-
-** The value of `erc-button-face' is now respected.
-
-** Fixed a bug which caused a read-only error during connection.
-
-** Server buffers are now tracked correctly.
-This means that `erc-track-priority-faces-only', `erc-track-exclude',
-and `erc-track-exclude-types' now work with server buffers.
-
-* Changes in ERC 5.0
-
-** Channel members are now stored as a hash-table.
-`erc-server-users' and `erc-channel-users' are now hash-tables, rather
-than alists.  This significantly increases performance, especially in
-large channels.  Each channel member is stored as an `erc-server-user'
-struct, with additional information about the channels they are on
-stored in an `erc-channel-user' struct.  Code using old alist-style
-channel members needs to be updated to work with hash-tables.
-This new code also removes the need for erc-members.el, which has been
-removed.
-
-** The way ERC deals with input from the server has changed.
-All server response code is now in a new file, erc-backend.el.  There
-should be no real user visible changes.  There are, however, a few
-major changes for implementers, and module writers:
-
-*** The PARSED response that all handlers get called with is
-    no longer a vector, but an `erc-response' struct.
-
-    This means LESS MAGIC NUMBERS in the ERC source code, but a few
-    changes in how you get at parsed responses.
-
-    The sender is accessed via `erc-response.sender'.
-
-    The command is accessed via `erc-response.command'.
-
-    The arguments to the command (everything after the command and
-    before the colon) are accessed via `erc-response.command-args'.
-    This is a /list/ of arguments in the order they appear in the
-    unparsed response.
-
-    The contents of the response is accessed via
-    `erc-response.contents'.
-
-    Should, for some reason, you want to do something with the
-    /unparsed/ response, you can get it via `erc-response.unparsed'.
-
-*** The `erc-server-hook-list' mechanism is gone.
-
-    All server response handlers should be defined with
-    `define-erc-response-handler'.  This defines functions and
-    corresponding hook variables.
-
-    The mapping of server commands to hook variables is no longer
-    done via `erc-event-to-hook', but through an #'equal hashtable,
-    `erc-server-responses'.  In order to find a hook you do:
-
-    (erc-get-hook command)
-
-    See the docstring of `define-erc-response-handler' for more
-    information.
-
-*** ALL hook variables have been renamed.
-
-    In accordance with recommendations in the Emacs Lisp manual,
-    the hook variables are no longer called `erc-server-FOO-hook',
-    but rather `erc-server-FOO-functions'.  This is to indicate
-    that the functions they call take arguments.
-
-    All the modules in ERC have been updated to reflect this change,
-    but external module authors should beware.
-
-** The values of `erc-mode-line-format' and `erc-header-line-format'
-are now defined as strings to be formatted using `format-spec'.
-`erc-mode-line-format' does not replace the whole mode-line anymore,
-only `mode-line-buffer-identification' is set.  This way, personal
-mode-line configurations are not modified and all key bindings work as
-expected.  The process status (connecting, closed) is now shown in
-`mode-line-process'.
-
-** Customization of ERC variables has been made easier.  Variables
-have been split into more groups for better organization.
-
-** New variables
-
-  o `erc-send-whitespace-lines' - Set this to send lines even if they
-    are empty.
-
-  o `erc-manual-set-nick-on-bad-nick-p' - If the nickname you chose is
-    already taken or not allowed, your nick is not changed and you can
-    try again manually if this is non-nil.
-
-  o `erc-mode-line-away-status-format' - You can now set what is shown
-    in the mode-line when you are away.
-
-  o `erc-header-line-uses-help-echo-p' - The header-line now uses the
-    help-echo property. You can set this to nil to disable it.
-
-  o `erc-format-query-as-channel-p' - Set this to nil to have messages
-    in the query buffer formatted like private messages.
-
-  o `erc-show-channel-key-p' - The channel key is now shown with the
-    other channel modes in the header line. Set this to nil if you
-    want it hidden.
-
-  o `erc-prompt-for-channel-key' - Set this if you want to be prompted
-    for the channel key (channel's mode is +k) when you call
-    `erc-join-channel' interactively.
-
-  o `erc-kill-server-buffer-on-quit' - If non-nil, kill the server
-    buffer automatically when you quit.
-
-** New hooks
-
-  o `erc-join-hook' - Called when you join a channel.
-
-  o `erc-kick-hook' - Called when you are kicked from a channel. The
-    channel's buffer is sent as an argument to functions called from
-    this hook.
-
-  o `erc-nick-changed-functions' - Whenever your nickname changes
-    successfully, the functions in this hook are run with the
-    arguments NEW-NICK and OLD-NICK.
-
-** New command /WHOAMI - Do a /WHOIS on your current nickname.
-
-** The key binding for changing channel modes is now C-c C-o.
-
-** Removed variables
-
-  o `erc-echo-notices-in-minibuffer-flag' and
-    `erc-echo-notices-in-current-buffer' - You should use
-    `erc-echo-notice-hook' and `erc-echo-notice-always-hook' instead.
-
-  o `erc-prompt-interactive-input' has been removed (commented out)
-    because nickname completion does not work with it.
-
-  o All INFO buffer-related variables and functions have been removed.
-
-** You can now disable modules by setting `erc-modules' with the
-customization interface.
-
-** Changes and additions to modules
-
-*** Autoaway (erc-autoaway.el)
-
-**** New variable `erc-autoaway-no-auto-back-regexp' - Add text which,
-when you type anything matching it, will not automatically discard
-your away status when `erc-auto-discard-away' is non-nil.
-
-*** Filling (erc-fill.el)
-
-**** New variable `erc-fill-variable-maximum-indentation' - Don't
-indent more than this many characters when indenting a message from a
-user with a long nickname.
-
-*** Goodies (erc-goodies.el)
-
-**** Miscellaneous small modules have been moved from erc.el.
-The functions erc-add-scroll-to-bottom, erc-make-read-only,
-erc-send-distinguish-noncommands, erc-interpret-controls, erc-unmorse,
-erc-smiley, and erc-occur, which were defined in the main erc.el file
-have been moved to erc-goodies.el and have mostly been translated to
-the modules scrolltobottom, readonly, noncommands, irccontrols, smiley
-and unmorse.
-
-**** New variables
-
-  o `erc-input-line-position' - The line number to use with
-    `erc-scroll-to-bottom'.
-
-  o `erc-beep-p' - Beep if there is a \C-g control character in a
-    message.
-
-*** Channel lists (erc-list.el)
-
-**** New variable `erc-chanlist-highlight-face' - A face used for
-highlighting the current line.
-
-*** Highlighting (erc-match.el)
-
-**** `erc-current-nick-highlight-type' has new options: 'keyword and
-'nick-or-keyword.
-
-*** Menu (erc-menu.el)
-
-**** The `IRC' menu is now automatically added to `erc-mode' buffers.
-
-*** Networks (erc-nets.el)
-
-**** The functions for determining current network are in this file.
-There were a couple of functions spread about in different files which
-each had a different way of determining the current network.  The
-methods have been combined, and the big list of known networks
-(`erc-networks-alist') is being put to use.  You can access the
-network's name by calling the new function `erc-network'.  This
-returns the name of the current network as a symbol or 'Unknown if it
-could not determine which network it is.
-
-*** Nicklist (erc-nicklist.el)
-
-**** ERC has a new way of displaying nicknames in a channel.
-The new file erc-nicklist.el defines a new command `erc-nicklist'
-which pops up a small Emacs window showing the nicknames of all
-members of the current channel.  The implementation is not complete
-and is rather proof-of-concept for now.  The result is something a bit
-like erc-speedbar, but not quite as invasive, and doesn't require use
-of a new frame.
-
-*** Internet services / Nickserv (erc-nickserv.el)
-
-**** Network detection is now taken care of by erc-nets.el.
-The function `erc-current-network' is deprecated, use `erc-network'
-instead.  The variable `erc-networks' has been removed, use
-`erc-networks-alist'.  The network symbols used in
-`erc-nickserv-alist' now match those in `erc-networks-alist'.
-
-**** New variable `erc-nickserv-identify-mode' - Choose which method
-to use for automatic identification: you can wait for Nickserv to ask
-you to identify (the default), or send an identify message
-automatically after you change your nickname.
-
-*** Speedbar (erc-speedbar.el)
-
-**** New variable `erc-speedbar-sort-users-type' - Sort users in a
-channel by activity, alphabetically, or not at all.
-
-*** Timestamps (erc-stamp.el)
-
-**** `erc-timestamp-only-if-changed-flag' now works when
-`erc-insert-timestamp-function' is set to 'erc-insert-timestamp-left.
-
-**** New variable `erc-timestamp-intangible' - Set this to nil if
-timestamps should not have the 'intangible property.
-
-*** Channel tracking (erc-track.el)
-
-**** Using faces to indicate channel activity in the modeline now works
-in XEmacs.
-
-**** New variables
-
-  o `erc-track-priority-faces-only' - Ignore changes in a channel
-    unless there is a face from the `erc-track-faces-priority-list' in
-    the message.
-
-  o `erc-track-exclude-server-buffer' - Ignore changes in the server
-    buffer.
-
-  o `erc-track-position-in-mode-line' - Set the position in the
-    mode-line where modified channels are shown (only works in GNU
-    Emacs versions above 21.3).
-
-* Changes in ERC 4.0
-
-** The module system has again changed a lot.  You can now customize
-  the variable `erc-modules' and define once and for all which
-  extension modules you want to use.  This unfortunately may require
-  you to change your current erc initialisation code a bit, if you
-  have some existing customsations.  On the other hand, this change
-  makes the configuration of extension modules a lot easier for new
-  users.  In theory, you should be able to configure all aspects of
-  ERC by using the customize interface, you should no longer really
-  need to write Lisp code for trivial customizations.
-
-  By default, the following modules are now loaded: (pcomplete
-  netsplit fill track ring button autojoin)
-
-  Please use M-x customize-variable RET erc-modules RET to change the
-  default if it does not suite your needs.
-
-** THe symbol used in `erc-nickserv-passwords' for debian.org IRC servers
-  (formerly called OpenProjects, now FreeNode) has changed from
-  openprojects to freenode.  You may need to update your configuration
-  for a successful automatic nickserv identification.
-
-* Changes in ERC 3.0.cvs.20030119
-
-** New module erc-dcc:
-
-This finally implements DCC.  It requires server sockets to fully work
-in both directions.  This feature is currently only available in Emacs
-21.3.50 (CVS). Here is a short list of what should work though.
-
-** Compatibility:
-  * Emacs 21.2, DCC get, and accepting DCC chat offers.
-  * XEmacs 21, Only accepting DCC chat offers.
-
-** erc is switching to global-minor-modes for activation of submodules.
-
-This allows you to customize such a mode and get automatic loading of
-the module.  No longer putting a lot of require statments in .emacs.
-At least this is the long-term plan, not all modules are converted
-yet.
-
-** The most important user visible change is that you now need to activate
-erc-completion-mode, to get TAB completion.  The new completion code
-is based on pcomplete.  To get the old code, manually load
-erc-complete and bind TAB to erc-complete in erc-mode-map.
-
-To activate completion on startup, put (erc-completion-mode 1) in your
-.emacs file.
-
-Same applies to timestamps.  You no longer need to (require
-'erc-stamp), you can customize the variable `erc-timestamp-mode', and
-the rest should be automatic.
-
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 3, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to the
-Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.
-
-arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1
diff --git a/etc/images/icq-offline.png b/etc/images/icq-offline.png
deleted file mode 100644
index 5100f1a..0000000
Binary files a/etc/images/icq-offline.png and /dev/null differ
diff --git a/etc/images/icq-online.png b/etc/images/icq-online.png
deleted file mode 100644
index 4fa44c6..0000000
Binary files a/etc/images/icq-online.png and /dev/null differ
diff --git a/etc/images/irc-offline.png b/etc/images/irc-offline.png
deleted file mode 100644
index 30ce279..0000000
Binary files a/etc/images/irc-offline.png and /dev/null differ
diff --git a/etc/images/irc-online.png b/etc/images/irc-online.png
deleted file mode 100644
index 94ef41b..0000000
Binary files a/etc/images/irc-online.png and /dev/null differ
diff --git a/etc/images/msn-offline.png b/etc/images/msn-offline.png
deleted file mode 100644
index e6854ec..0000000
Binary files a/etc/images/msn-offline.png and /dev/null differ
diff --git a/etc/images/msn-online.png b/etc/images/msn-online.png
deleted file mode 100644
index cef3075..0000000
Binary files a/etc/images/msn-online.png and /dev/null differ
diff --git a/images/icq-offline.png b/images/icq-offline.png
new file mode 100644
index 0000000..5100f1a
Binary files /dev/null and b/images/icq-offline.png differ
diff --git a/images/icq-online.png b/images/icq-online.png
new file mode 100644
index 0000000..4fa44c6
Binary files /dev/null and b/images/icq-online.png differ
diff --git a/images/irc-offline.png b/images/irc-offline.png
new file mode 100644
index 0000000..30ce279
Binary files /dev/null and b/images/irc-offline.png differ
diff --git a/images/irc-online.png b/images/irc-online.png
new file mode 100644
index 0000000..94ef41b
Binary files /dev/null and b/images/irc-online.png differ
diff --git a/images/msn-offline.png b/images/msn-offline.png
new file mode 100644
index 0000000..e6854ec
Binary files /dev/null and b/images/msn-offline.png differ
diff --git a/images/msn-online.png b/images/msn-online.png
new file mode 100644
index 0000000..cef3075
Binary files /dev/null and b/images/msn-online.png differ
diff --git a/man/erc.texi b/man/erc.texi
deleted file mode 100644
index 6b78347..0000000
--- a/man/erc.texi
+++ /dev/null
@@ -1,1024 +0,0 @@
-\input texinfo
address@hidden %**start of header
address@hidden ../info/erc
address@hidden ERC Manual
address@hidden %**end of header
-
address@hidden Emacs
address@hidden
-* ERC: (erc).           Powerful, modular, and extensible IRC client for Emacs.
address@hidden direntry
-
address@hidden fn cp
-
address@hidden
-This manual is for ERC version 5.2.
-
-Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
-
address@hidden
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, Front-Cover texts, or Back-Cover Texts.  A copy of
-the license is included in the section entitled ``GNU Free
-Documentation License'' in the Emacs manual.
-
-This document is part of a collection distributed under the GNU Free
-Documentation License.  If you want to distribute this document
-separately from the collection, you can do so by adding a copy of the
-license to the document, as described in section 6 of the license.
-
-All Emacs Lisp code contained in this document may be used, distributed,
-and modified without restriction.
address@hidden quotation
address@hidden copying
-
address@hidden
address@hidden ERC manual
address@hidden a full-featured IRC client
address@hidden for GNU Emacs and XEmacs
-
address@hidden The following two commands
address@hidden start the copyright page.
address@hidden
address@hidden 0pt plus 1filll
address@hidden
address@hidden titlepage
-
address@hidden So the toc is printed at the start
address@hidden
-
address@hidden
address@hidden Top, Introduction, (dir), (dir)
address@hidden  node-name,  next,  previous,  up
address@hidden ERC
-
address@hidden
address@hidden ifnottex
-
address@hidden
-* Introduction::                What is ERC?
-* Obtaining ERC::               How to get ERC releases and development
-                                  versions.
-* Installation::                Compiling and installing ERC.
-* Getting Started::             Quick Start guide to using ERC.
-* Keystroke Summary::           Keystrokes used in ERC buffers.
-* Modules::                     Available modules for ERC.
-* Advanced Usage::              Cool ways of using ERC.
-* Getting Help and Reporting Bugs::  
-* History::                     The history of ERC.
-* GNU Free Documentation License:: The license for this documentation.
-* Concept Index::               Search for terms.
-
address@hidden
- --- The Detailed Node Listing ---
-
-Obtaining ERC
-
-* Releases::                    Released versions of ERC.
-* Development::                 Latest unreleased development changes.
-
-Getting Started
-
-* Sample Session::              Example of connecting to the #emacs channel
-* Special Features::            Differences from standalone IRC clients
-
-Advanced Usage
-
-* Connecting::                  Ways of connecting to an IRC server.
-* Sample Configuration::        An example configuration file.
-* Options::                     Options that are available for ERC.
-
address@hidden detailmenu
address@hidden menu
-
address@hidden Introduction, Obtaining ERC, Top, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Introduction
-
-ERC is a powerful, modular, and extensible IRC client for Emacs.
-
-It comes with the following capabilities enabled by default.
-
address@hidden @bullet
address@hidden Flood control
address@hidden Timestamps
address@hidden Join channels automatically
address@hidden Buttonize URLs, nicknames, and other text
address@hidden Wrap long lines
address@hidden Highlight or remove IRC control characters
address@hidden Highlight pals, fools, and other keywords
address@hidden Detect netsplits
address@hidden Complete nicknames and commands in a programmable fashion
address@hidden Make displayed lines read-only
address@hidden Input history
address@hidden Track channel activity in the mode-line
-
address@hidden itemize
-
address@hidden Obtaining ERC, Installation, Introduction, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Obtaining ERC
-
address@hidden
-* Releases::                    Released versions of ERC.
-* Development::                 Latest unreleased development changes.
address@hidden menu
-
-Note that some ERC files are not included with Emacs due to copyright or
-dependency issues.  If desired, they may be found at the following
-locations, or from your local GNU mirror.
-
address@hidden @bullet
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.tar.gz}
address@hidden @uref{http://ftp.gnu.org/gnu/erc/erc-5.2-extras.zip}
address@hidden itemize
-
-The rest of this chapter may be skipped if you are using the version of
-ERC that comes with Emacs.
-
address@hidden Releases, Development, Obtaining ERC, Obtaining ERC
address@hidden  node-name,  next,  previous,  up
address@hidden Releases
-
-Choose to install a release if you want to minimize risk.
-
-Errors are corrected in development first.  User-visible changes will be
-announced on the @email{erc-discuss@@gnu.org} mailing list.
address@hidden Help and Reporting Bugs}.
-
address@hidden releases, Debian package
address@hidden Debian package for ERC
-Debian users can get ERC via apt-get.  The @file{erc} package is
-available in the official Debian repository.
-
address@hidden releases, from source
-Alternatively, you can download the latest release from
address@hidden://ftp.gnu.org/gnu/erc}, or your local GNU mirror.
-
address@hidden Development,  , Releases, Obtaining ERC
address@hidden  node-name,  next,  previous,  up
address@hidden Development
address@hidden development
-
-Choose the development version if you want to live on the bleeding edge
-of ERC development or try out new features before release.
-
address@hidden GNU Arch
-
-ERC is developed using GNU Arch.  Downloading ERC with Arch and staying
-up-to-date involves the following steps.
-
address@hidden
address@hidden GNU Arch, installing
address@hidden Install arch
-
address@hidden @bullet
address@hidden Debian: @kbd{apt-get install tla}.
address@hidden Other distributions: see @uref{ftp://ftp.gnu.org/gnu/gnu-arch/}.
address@hidden itemize
-
address@hidden GNU Arch, downloading ERC
address@hidden Register the archive.
address@hidden
-tla register-archive -f http://arch.sv.gnu.org/archives/erc/erc
address@hidden example
-
address@hidden Download the ERC source code.
address@hidden
-# Download ERC into the @file{erc} directory.
-tla get erc@@sv.gnu.org/erc--main--0 erc
address@hidden example
-
address@hidden List upstream changes that are missing from your local copy.
-Do this whenever you want to see whether new changes have been committed
-to ERC.
-
address@hidden
-# Change to the source directory you are interested in.
-cd erc/
-
-# Display the summary of changes
-tla missing --summary
address@hidden example
-
address@hidden GNU Arch, updating ERC
address@hidden Update to the latest version by replaying missing changes.
address@hidden
-cd erc
-tla update
address@hidden example
-
address@hidden enumerate
-
-If you are new to Arch and want to learn more about developing ERC with
-it, visit @uref{http://emacswiki.org/cgi-bin/wiki/ErcDevelopment} for
-full instructions.
-
address@hidden Development snapshots
-
address@hidden development snapshot
-Alternatively, the latest development snapshot may be downloaded in both
-``.tar.gz'' and ``.zip'' forms.
-
address@hidden @bullet
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.tar.gz}
address@hidden @uref{http://www.mwolson.org/static/dist/erc-latest.zip}
address@hidden itemize
-
-
address@hidden Installation, Getting Started, Obtaining ERC, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Installation
-
-ERC may be compiled and installed on your machine.
-
-This section may be skipped if you are using the version of ERC that
-comes with Emacs.
-
address@hidden Compilation
-
-This is an optional step, since Emacs Lisp source code does not
-necessarily have to be byte-compiled.  It will yield a speed increase,
-though.
-
-A working copy of Emacs or XEmacs is needed in order to compile ERC.  By
-default, the program that is installed with the name @command{emacs}
-will be used.
-
-If you want to use the @command{xemacs} binary to perform the
-compilation, you would need to edit @file{Makefile} in the top-level
-directory as follows.  You can put either a full path to an Emacs or
-XEmacs binary or just the command name, as long as it is in the
address@hidden
-
address@hidden
-EMACS    = xemacs
-SITEFLAG = -no-site-file
address@hidden example
-
-Running @code{make} should compile the ERC source files in the
address@hidden directory.
-
address@hidden Installation
-
-ERC may be installed into your file hierarchy by doing the following.
-
-Edit the @file{Makefile} file so that @env{ELISPDIR} points to where you
-want the source and compiled ERC files to be installed and
address@hidden indicates where to put the ERC manual.  Of course, you
-will want to edit @env{EMACS} and @env{SITEFLAG} as shown in the
-Compilation section if you are using XEmacs.
-
-If you are installing ERC on a Debian system, you might want to change
-the value of @env{INSTALLINFO} as specified in @file{Makefile}.
-
-Run @code{make} as a normal user.
-
-Run @code{make install} as the root user if you have chosen installation
-locations that require this.
-
-
address@hidden Getting Started, Keystroke Summary, Installation, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Getting Started
address@hidden settings
-
-To use ERC, add the directory containing its files to your
address@hidden variable, in your @file{.emacs} file.  Then, load ERC
-itself.  An example follows.
-
address@hidden
-(require 'erc)
address@hidden lisp
-
-Once ERC is loaded, the command @kbd{M-x erc} will start ERC and
-prompt for the server to connect to.
-
-If you want to place ERC settings in their own file, you can place them
-in @file{~/.emacs.d/.ercrc.el}, creating it if necessary.
-
-If you would rather use the Customize interface to change how ERC works,
-do @kbd{M-x customize-group RET erc RET}.  In particular, ERC comes with
-lots of modules that may be enabled or disabled; to select which ones
-you want, do @kbd{M-x customize-variable RET erc-modules RET}.
-
address@hidden
-* Sample Session::              Example of connecting to the #emacs channel
-* Special Features::            Differences from standalone IRC clients
address@hidden menu
-
address@hidden Sample Session, Special Features, Getting Started, Getting 
Started
address@hidden  node-name,  next,  previous,  up
address@hidden Sample Session
-
-This is an example ERC session which shows how to connect to the #emacs
-channel on Freenode.  Another IRC channel on Freenode that may be of
-interest is #erc, which is a channel where ERC users and developers hang
-out.
-
address@hidden @bullet
-
address@hidden Connect to Freenode
-
-Run @kbd{M-x erc}.  Use ``irc.freenode.net'' as the IRC server, ``6667''
-as the port, and choose a nickname.
-
address@hidden Get used to the interface
-
-Switch to the ``irc.freenode.net:6667'' buffer, if you're not already
-there.  You will see first some messages about checking for ident, and
-then a bunch of other messages that describe the current IRC server.
-
address@hidden Join the #emacs channel
-
-In that buffer, type ``/join SPC #emacs'' and hit @kbd{RET}.  Depending
-on how you've set up ERC, either a new buffer for ``#emacs'' will be
-displayed, or a new buffer called ``#emacs'' will be created in the
-background.  If the latter, switch to the ``#emacs'' buffer.  You will
-see the channel topic and a list of the people who are currently on the
-channel.
-
address@hidden Register your nickname with Freenode
-
-If you would like to be able to talk with people privately on the
-Freenode network, you will have to ``register'' your nickname.  To do
-so, switch to the ``irc.freenode.net:6667'' buffer and type ``/msg
-NickServ register <password>'', replacing ``<password>'' with your
-desired password.  It should tell you that the operation was successful.
-
address@hidden Talk to people in the channel
-
-If you switch back to the ``#emacs'' buffer, you can type a message, and
-everyone on the channel will see it.
-
address@hidden Open a query buffer to talk to someone
-
-If you want to talk with someone in private (this should usually not be
-done for technical help, only for personal questions), type ``/query
-<nick>'', replacing ``<nick>'' with the nickname of the person you would
-like to talk to.  Depending on how ERC is set up, you will either see a
-new buffer with the name of the person, or such a buffer will be created
-in the background and you will have to switch to it.  Begin typing
-messages, and you will be able to have a conversation.
-
-Note that if the other person is not registered, you will not be able to
-talk with them.
-
address@hidden itemize
-
address@hidden Special Features, , Sample Session, Getting Started
address@hidden  node-name,  next,  previous,  up
address@hidden Special Features
-
-ERC has some features that distinguish it from some IRC clients.
-
address@hidden @bullet
-
address@hidden multiple channels and multiple servers
-
-Every channel is put in a separate buffer.  Several IRC servers may be
-connected to at the same time.
-
address@hidden query buffers
address@hidden private message separation
-
-Private conversations are treated as channels, and are put into separate
-buffers in Emacs.  We call these ``query buffers''.
-
address@hidden highlighting
-
-Some occurences of words can be highlighted, which makes it easier to
-track different kinds of conversations.
-
address@hidden notification
-
-ERC can notify you that certain users are online.
-
address@hidden channel tracking
-
-Channels can be hidden and conversation continue in the background.  You
-are notified when something is said in such a channel that is not
-currently visible.  This makes it easy to get Real Work done while still
-maintaining an IRC presence.
-
address@hidden nick completion
-
-ERC can complete words upon hitting @kbd{TAB}, which eases the writing
-of nicknames in messages.
-
address@hidden history ring
address@hidden history
-
-Past actions are kept in history rings for future use.  To navigate a
-history ring, hit @kbd{M-p} to go backwards and @kbd{M-n} to go
-forwards.
-
address@hidden multiple languages
-
-Different channels and servers may have different language encodings.
-
-In addition, it is possible to translate the messages that ERC uses into
-multiple languages.  Please contact the developers of ERC at
address@hidden@@gnu.org} if you are interested in helping with the
-translation effort.
-
address@hidden user scripting
-
-Users can load scripts (e.g. auto greeting scripts) when ERC starts up.
-
-It is also possible to make custom IRC commands, if you know a little
-Emacs Lisp.  Just make an Emacs Lisp function and call it
address@hidden, where @code{NEWCOMMAND} is the name of the
-new command in capital letters.
-
address@hidden auto reconnect
-
-If the connection goes away at some point, ERC will try to reconnect
-automatically.  If it fails to reconnect, and you want to try to
-manually reestablish the connection at some later point, switch to an
-ERC  buffer and run the @code{/RECONNECT} command.
-
address@hidden itemize
-
-
address@hidden Keystroke Summary, Modules, Getting Started, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Keys Used in ERC
address@hidden keystrokes
-
-This is a summary of keystrokes available in every ERC buffer.
-
address@hidden @kbd
-
address@hidden C-a or <home> (`erc-bol')
-Go to beginning of line or end of prompt.
-
address@hidden RET (`erc-send-current-line')
-Send the current line
-
address@hidden TAB (`erc-complete-word')
-If at prompt, complete the current word.
-Otherwise, move to the next link or button.
-
address@hidden M-TAB (`ispell-complete-word')
-Complete the given word, using ispell.
-
address@hidden C-c C-a (`erc-bol')
-Go to beginning of line or end of prompt.
-
address@hidden C-c C-b (`erc-iswitchb')
-Use `iswitchb-read-buffer' to prompt for a ERC buffer to switch to.
-
address@hidden C-c C-c (`erc-toggle-interpret-controls')
-Toggle interpretation of control sequences in messages.
-
address@hidden C-c C-d (`erc-input-action')
-Interactively input a user action and send it to IRC.
-
address@hidden C-c C-e (`erc-toggle-ctcp-autoresponse')
-Toggle automatic CTCP replies (like VERSION and PING).
-
address@hidden C-c C-f (`erc-toggle-flood-control')
-Toggle use of flood control on sent messages.
-
address@hidden C-c TAB (`erc-invite-only-mode')
-Turn on the invite only mode (+i) for the current channel.
-
address@hidden C-c C-j (`erc-join-channel')
-Join channel.  If point is at the beginning of a channel name, use that
-as default.
-
address@hidden C-c C-k (`erc-go-to-log-matches-buffer')
-Interactively open an erc-log-matches buffer
-
address@hidden C-c C-l (`erc-save-buffer-in-logs')
-Append buffer contents to the log file, if logging is enabled.
-
address@hidden C-c C-n (`erc-channel-names')
-Run "/names #channel" in the current channel.
-
address@hidden C-c C-o (`erc-get-channel-mode-from-keypress')
-Read a key sequence and call the corresponding channel mode function.
-After doing @kbd{C-c C-o}, type in a channel mode letter.
-
address@hidden means quit.
address@hidden lets you type more than one mode at a time.
-If @kbd{l} is pressed, @code{erc-set-channel-limit} gets called.
-If @kbd{k} is pressed, @code{erc-set-channel-key} gets called.
-Anything else will be sent to `erc-toggle-channel-mode'.
-
address@hidden C-c C-p (`erc-part-from-channel')
-Part from the current channel and prompt for a reason.
-
address@hidden C-c C-q (`erc-quit-server')
-Disconnect from current server after prompting for reason.
-
address@hidden C-c C-r (`erc-remove-text-properties-region')
-Clears the region (start,end) in object from all colors, etc.
-
address@hidden C-c C-t (`erc-set-topic')
-Prompt for a topic for the current channel.
-
address@hidden C-c C-u (`erc-kill-input')
-Kill current input line using `erc-bol' followed by `kill-line'.
-
address@hidden table
-
-
address@hidden Modules, Advanced Usage, Keystroke Summary, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Modules
address@hidden modules
-
-One way to add functionality to ERC is to customize which of its many
-modules are loaded.
-
-There is a spiffy customize interface, which may be reached by typing
address@hidden customize-option erc-modules RET}.  Alternatively, set
address@hidden manually and then call @code{erc-update-modules}.
-
-The following is a list of available modules.
-
address@hidden @code
-
address@hidden modules, autoaway
address@hidden autoaway
-Set away status automatically
-
address@hidden modules, autojoin
address@hidden autojoin
-Join channels automatically
-
address@hidden modules, bbdb
address@hidden bbdb
-Integrate with the Big Brother Database
-
address@hidden modules, button
address@hidden button
-Buttonize URLs, nicknames, and other text
-
address@hidden modules, capab-identify
address@hidden capab-identify
-Mark unidentified users on freenode and other servers supporting CAPAB.
-
address@hidden modules, completion
address@hidden modules, pcomplete
address@hidden completion (aka pcomplete)
-Complete nicknames and commands (programmable)
-
address@hidden modules, fill
address@hidden fill
-Wrap long lines
-
address@hidden modules, hecomplete
address@hidden hecomplete
-Complete nicknames and commands (old).  This is the old module---you
-might prefer the ``completion'' module instead.
-
address@hidden modules, identd
address@hidden identd
-Launch an identd server on port 8113
-
address@hidden modules, irccontrols
address@hidden irccontrols
-Highlight or remove IRC control characters
-
address@hidden modules, log
address@hidden log
-Save buffers in logs
-
address@hidden modules, match
address@hidden match
-Highlight pals, fools, and other keywords
-
address@hidden modules, menu
address@hidden menu
-Display a menu in ERC buffers
-
address@hidden modules, netsplit
address@hidden netsplit
-Detect netsplits
-
address@hidden modules, noncommands
address@hidden noncommands
-Don't display non-IRC commands after evaluation
-
address@hidden modules, notify
address@hidden notify
-Notify when the online status of certain users changes
-
address@hidden modules, page
address@hidden page
-Process CTCP PAGE requests from IRC
-
address@hidden modules, readonly
address@hidden readonly
-Make displayed lines read-only
-
address@hidden modules, replace
address@hidden replace
-Replace text in messages
-
address@hidden modules, ring
address@hidden ring
-Enable an input history
-
address@hidden modules, scrolltobottom
address@hidden scrolltobottom
-Scroll to the bottom of the buffer
-
address@hidden modules, services
address@hidden services
-Identify to Nickserv (IRC Services) automatically
-
address@hidden modules, smiley
address@hidden smiley
-Convert smileys to pretty icons
-
address@hidden modules, sound
address@hidden sound
-Play sounds when you receive CTCP SOUND requests
-
address@hidden modules, spelling
address@hidden spelling
-Check spelling of messages
-
address@hidden modules, stamp
address@hidden stamp
-Add timestamps to messages
-
address@hidden modules, track
address@hidden track
-Track channel activity in the mode-line
-
address@hidden modules, truncate
address@hidden truncate
-Truncate buffers to a certain size
-
address@hidden modules, unmorse
address@hidden unmorse
-Translate morse code in messages
-
address@hidden table
-
address@hidden PRE5_3: Document every option of every module in its own subnode
-
-
address@hidden Advanced Usage, Getting Help and Reporting Bugs, Modules, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Advanced Usage
address@hidden advanced topics
-
address@hidden
-* Connecting::                  Ways of connecting to an IRC server.
-* Sample Configuration::        An example configuration file.
-* Options::                     Options that are available for ERC.
address@hidden menu
-
address@hidden Connecting, Sample Configuration, Advanced Usage, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Connecting to an IRC Server
address@hidden connecting
-
-The easiest way to connect to an IRC server is to call @kbd{M-x erc}.
-If you want to assign this function to a keystroke, the following will
-help you figure out its parameters.
-
address@hidden erc
-Select connection parameters and run ERC.
-Non-interactively, it takes the following keyword arguments.
-
address@hidden @bullet
address@hidden @var{server}
address@hidden @var{port}
address@hidden @var{nick}
address@hidden @var{password}
address@hidden @var{full-name}
address@hidden itemize
-
-That is, if called with the following arguments, @var{server} and
address@hidden will be set to those values, whereas
address@hidden, @code{erc-compute-nick} and
address@hidden will be invoked for the values of the other
-parameters.
-
address@hidden
-(erc :server "irc.freenode.net" :full-name "Harry S Truman")
address@hidden example
address@hidden defun
-
address@hidden Server
-
address@hidden erc-compute-server &optional server
-Return an IRC server name.
-
-This tries a number of increasingly more default methods until a non-nil
-value is found.
-
address@hidden @bullet
address@hidden @var{server} (the argument passed to this function)
address@hidden The @code{erc-server} option
address@hidden The value of the IRCSERVER environment variable
address@hidden The @code{erc-default-server} variable
address@hidden itemize
-
address@hidden defun
-
address@hidden erc-server nil
-IRC server to use if one is not provided.
address@hidden defopt
-
address@hidden Port
-
address@hidden erc-compute-port &optional port
-Return a port for an IRC server.
-
-This tries a number of increasingly more default methods until a non-nil
-value is found.
-
address@hidden @bullet
address@hidden @var{port} (the argument passed to this function)
address@hidden The @code{erc-port} option
address@hidden The @code{erc-default-port} variable
address@hidden itemize
-
address@hidden defun
-
address@hidden erc-port
-IRC port to use if not specified.
-
-This can be either a string or a number.
address@hidden defopt
-
address@hidden Nick
-
address@hidden erc-compute-nick &optional nick
-Return user's IRC nick.
-
-This tries a number of increasingly more default methods until a
-non-nil value is found.
-
address@hidden
address@hidden @var{nick} (the argument passed to this function)
address@hidden The @code{erc-nick} option
address@hidden The value of the IRCNICK environment variable
address@hidden The result from the @code{user-login-name} function
address@hidden itemize
-
address@hidden defun
-
address@hidden erc-nick
-Nickname to use if one is not provided.
-
-This can be either a string, or a list of strings.
-In the latter case, if the first nick in the list is already in use,
-other nicks are tried in the list order.
address@hidden defopt
-
address@hidden erc-nick-uniquifier
-The string to append to the nick if it is already in use.
address@hidden defopt
-
address@hidden erc-try-new-nick-p
-If the nickname you chose isn't available, and this option is non-nil,
-ERC should automatically attempt to connect with another nickname.
-
-You can manually set another nickname with the /NICK command.
address@hidden defopt
-
address@hidden Full name
-
address@hidden erc-compute-full-name &optional full-name
-Return user's full name.
-
-This tries a number of increasingly more default methods until a
-non-nil value is found.
-
address@hidden @bullet
address@hidden @var{full-name} (the argument passed to this function)
address@hidden The @code{erc-user-full-name} option
address@hidden The value of the IRCNAME environment variable
address@hidden The result from the @code{user-full-name} function
address@hidden itemize
-
address@hidden defun
-
address@hidden erc-user-full-name
-User full name.
-
-This can be either a string or a function to call.
address@hidden defopt
-
address@hidden Sample Configuration, Options, Connecting, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Sample Configuration
address@hidden configuration, sample
-
-Here is an example of configuration settings for ERC.  This can go into
-your Emacs configuration file.  Everything after the @code{(require
-'erc)} command can optionally go into @file{~/.emacs.d/.ercrc.el}.
-
address@hidden
-;;; Sample ERC configuration
-
-;; Add the ERC directory to load path -- you don't need this if you are
-;; using the version of ERC that comes with Emacs
-(add-to-list 'load-path "~/elisp/erc")
-
-;; Load ERC
-(require 'erc)
-
-;; Load authentication info from an external source.  Put sensitive
-;; passwords and the like in here.
-(load "~/.emacs.d/.erc-auth")
-
-;; This is an example of how to make a new command.  Type "/uptime" to
-;; use it.
-(defun erc-cmd-UPTIME (&rest ignore)
-  "Display the uptime of the system, as well as some load-related
-stuff, to the current ERC buffer."
-  (let ((uname-output
-         (replace-regexp-in-string
-          ", load average: " "] @{Load address@hidden ["
-          ;; Collapse spaces, remove
-          (replace-regexp-in-string
-           " +" " "
-           ;; Remove beginning and trailing whitespace
-           (replace-regexp-in-string
-            "^ +\\|[ \n]+$" ""
-            (shell-command-to-string "uptime"))))))
-    (erc-send-message
-     (concat "@address@hidden [" uname-output "]"))))
-
-;; This causes ERC to connect to the Freenode network upon hitting
-;; C-c e f.  Replace MYNICK with your IRC nick.
-(global-set-key "\C-cef" (lambda () (interactive)
-                           (erc :server "irc.freenode.net" :port "6667"
-                                :nick "MYNICK")))
-
-;; This causes ERC to connect to the IRC server on your own machine (if
-;; you have one) upon hitting C-c e b.  Replace MYNICK with your IRC
-;; nick.  Often, people like to run bitlbee (http://bitlbee.org/) as an
-;; AIM/Jabber/MSN to IRC gateway, so that they can use ERC to chat with
-;; people on those networks.
-(global-set-key "\C-ceb" (lambda () (interactive)
-                           (erc :server "localhost" :port "6667"
-                                :nick "MYNICK")))
-
-;; Make C-c RET (or C-c C-RET) send messages instead of RET. This has
-;; been commented out to avoid confusing new users.
-;; (define-key erc-mode-map (kbd "RET") nil)
-;; (define-key erc-mode-map (kbd "C-c RET") 'erc-send-current-line)
-;; (define-key erc-mode-map (kbd "C-c C-RET") 'erc-send-current-line)
-
-;;; Options
-
-;; Join the #emacs and #erc channels whenever connecting to Freenode.
-(setq erc-autojoin-channels-alist '(("freenode.net" "#emacs" "#erc")))
-
-;; Interpret mIRC-style color commands in IRC chats
-(setq erc-interpret-mirc-color t)
-
-;; The following are commented out by default, but users of other
-;; non-Emacs IRC clients might find them useful.
-;; Kill buffers for channels after /part
-;; (setq erc-kill-buffer-on-part t)
-;; Kill buffers for private queries after quitting the server
-;; (setq erc-kill-queries-on-quit t)
-;; Kill buffers for server messages after quitting the server
-;; (setq erc-kill-server-buffer-on-quit t)
address@hidden lisp
-
address@hidden Options, , Sample Configuration, Advanced Usage
address@hidden  node-name,  next,  previous,  up
address@hidden Options
address@hidden options
-
address@hidden PRE5_3: (Node) Document every ERC option (module options go in
address@hidden previous chapter)
-
-This section has not yet been written.  For now, the easiest way to
-check out the available options for ERC is to do
address@hidden customize-group erc RET}.
-
-
address@hidden Getting Help and Reporting Bugs, History, Advanced Usage, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Getting Help and Reporting Bugs
address@hidden help, getting
address@hidden bugs, reporting
-
-After you have read this guide, if you still have questions about ERC,
-or if you have bugs to report, there are several places you can go.
-
address@hidden @bullet
-
address@hidden
address@hidden://www.emacswiki.org/cgi-bin/wiki/ERC} is the
-emacswiki.org page for ERC.  Anyone may add tips, hints, or bug
-descriptions to it.
-
address@hidden
-There are several mailing lists for ERC.  To subscribe, visit
address@hidden://savannah.gnu.org/mail/?group=erc}.
-
-The mailing lists are also available on Gmane.
-(@url{http://gmane.org/}).  Gmane provides additional methods for
-accessing the mailing lists, adding content to them, and searching them.
-
address@hidden
address@hidden gmane.emacs.erc.announce: Announcements
-
address@hidden gmane.emacs.erc.discuss: General discussion
-
address@hidden gmane.emacs.erc.cvs: Log messages for changes to the ERC source 
code
-
address@hidden enumerate
-
address@hidden
-You can visit the IRC Freenode channel @samp{#emacs}. Many of the
-contributors are frequently around and willing to answer your
-questions.
-
address@hidden itemize
-
-
address@hidden History, GNU Free Documentation License, Getting Help and 
Reporting Bugs, Top
address@hidden  node-name,  next,  previous,  up
address@hidden History
address@hidden history, of ERC
-
-ERC was originally written by Alexander L. Belikoff
address@hidden@@bfr.co.il} and Sergey Berezin
address@hidden@@cs.cmu.edu}.  They stopped development around
-December 1999.  Their last released version was ERC 2.0.
-
-P.S.: If one of the original developers of ERC reads this, we'd like to
-receive additional information for this file and hear comments in
-general.
-
address@hidden
address@hidden 2001
-
-In June 2001, Mario Lang @email{mlang@@delysid.org} and Alex Schroeder
address@hidden@@gnu.org} took over development and created a ERC Project at
address@hidden://sourceforge.net/projects/erc}.
-
-In reaction to a mail about the new ERC development effort, Sergey
-Berezin said, ``First of all, I'm glad that my version of ERC is being
-used out there.  The thing is, I do not have free time and enough
-incentive anymore to work on ERC, so I would be happy if you guys take
-over the project entirely.''
-
-So we happily hacked away on ERC, and soon after (September 2001)
-released the next "stable" version, 2.1.
-
-Most of the development of the new ERC happened on #emacs on
-irc.openprojects.net.  Over time, many people contributed code, ideas,
-bugfixes, and a lot of alpha/beta/gamma testing.
-
-See the @file{CREDITS} file for a list of contributors.
-
address@hidden 2003
-
-ERC 3.0 was released.
-
address@hidden 2004
-
-ERC 4.0 was released.
-
address@hidden 2005
-
-ERC 5.0 was released.  Michael Olson @email{mwolson@@gnu.org} became
-the release manager and eventually the maintainer.
-
-After some discussion between him and the Emacs developers, it was
-decided to include ERC in Emacs.
-
address@hidden 2006
-
-ERC 5.1 was released.  It was subsequently included in Emacs 22.
-
-ERC became an official GNU project, and development moved to
address@hidden://sv.gnu.org/projects/erc}.  We switched to using GNU Arch as
-our revision control system.  Our mailing list address changed as well.
-
address@hidden itemize
-
address@hidden GNU Free Documentation License, Concept Index, History, Top
address@hidden GNU Free Documentation License
address@hidden doclicense.texi
-
address@hidden Concept Index,  , GNU Free Documentation License, Top
address@hidden  node-name,  next,  previous,  up
address@hidden Index
-
address@hidden cp
-
address@hidden
-
address@hidden
-   arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e
address@hidden ignore
diff --git a/scripts/common.defs b/scripts/common.defs
index 08872da..37707b5 100644
--- a/scripts/common.defs
+++ b/scripts/common.defs
@@ -1,6 +1,51 @@
 # Common definitions for syncing ERC             -*- Shell-script -*-
 
-EMACS=~/proj/emacs/emacs
-ETC=$EMACS/etc
-LISP=$EMACS/lisp
-MAN=$EMACS/man
+EMACS=~/proj/emacs/emacs/git
+
+# Contents
+
+IMAGES="images/icq-offline.png
+images/icq-online.png
+images/irc-offline.png
+images/irc-online.png
+images/msn-offline.png
+images/msn-online.png"
+
+NEWS="NEWS"
+
+LISP="erc-autoaway.el
+erc-backend.el
+erc-button.el
+erc-capab.el
+erc-compat.el
+erc-dcc.el
+erc-ezbounce.el
+erc-fill.el
+erc-goodies.el
+erc-hecomplete.el
+erc-ibuffer.el
+erc-identd.el
+erc-imenu.el
+erc-join.el
+erc-lang.el
+erc-log.el
+erc-match.el
+erc-menu.el
+erc-netsplit.el
+erc-networks.el
+erc-notify.el
+erc-page.el
+erc-pcomplete.el
+erc-replace.el
+erc-ring.el
+erc-services.el
+erc-sound.el
+erc-speedbar.el
+erc-spelling.el
+erc-stamp.el
+erc-track.el
+erc-truncate.el
+erc-xdcc.el
+erc.el"
+
+MAN="erc.texi"
diff --git a/scripts/sync-from-emacs b/scripts/sync-from-emacs
index 3527bd7..a5b2a5b 100755
--- a/scripts/sync-from-emacs
+++ b/scripts/sync-from-emacs
@@ -3,7 +3,7 @@
 # Load common definitions
 . scripts/common.defs
 
-(cd $LISP/erc && find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $OLDPWD \;)
-cp $ETC/ERC-NEWS etc/
-cp $MAN/erc.texi man/
+(cd $EMACS/lisp/erc && find . -maxdepth 1 -mindepth 1 -type f -exec cp {} 
$OLDPWD \;)
+cp $EMACS/etc/ERC-NEWS NEWS
+cp $EMACS/doc/misc/erc.texi .
 rm -f *.elc
diff --git a/scripts/sync-to-emacs b/scripts/sync-to-emacs
index 354953b..9ce9659 100755
--- a/scripts/sync-to-emacs
+++ b/scripts/sync-to-emacs
@@ -3,6 +3,19 @@
 # Load common definitions
 . scripts/common.defs
 
-find . -maxdepth 1 -mindepth 1 -type f -exec cp {} $LISP/erc \;
-find ./etc -maxdepth 1 -mindepth 1 -type f -exec cp {} $ETC \;
-find ./man -maxdepth 1 -mindepth 1 -type f -exec cp {} $MAN \;
+IFS="
+"
+
+for i in $LISP; do
+    cp $i $EMACS/lisp/erc
+done
+
+for i in $MAN; do
+    cp $i $EMACS/doc/misc
+done
+
+for i in $IMAGES; do
+    # Do nothing
+done
+
+cp $NEWS $EMACS/etc/ERC-NEWS




reply via email to

[Prev in Thread] Current Thread [Next in Thread]