1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Commit Graph

88 Commits

Author SHA1 Message Date
Miles Bader
01d9e862ba Merge from erc--main--0
Backport additional functions and macros that erc-capab.el needs.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-600
Creator:  Michael Olson <mwolson@gnu.org>
2007-01-17 18:17:35 +00:00
Miles Bader
6904f7fe8e Merge from erc--main--0
Highlights:

 - Display messages starting with "/" but are not commands correctly.
 - Add erc-capab.el file, with capab-identify module.
 - Fix various ERC menu bugs and add "Current channel" submenu.
 - Make header-line display look nicer.
 - Fix warning when auto-authenticating to bitlbee.
 - New option erc-system-name allows the hostname next to your nick to be
   customized.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-599
Creator:  Michael Olson <mwolson@gnu.org>
2007-01-17 18:17:25 +00:00
Miles Bader
10dc9f9eba Update from erc--emacs--22
Highlights:
 - New /RECONNECT command.
 - Improve default method for auto-identify to nickserv.
 - Fix another erc-iswitchb bug.
 - Fix reconnect lockup (defaulting to twice before giving up).
 - Fix reconnect on ban.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-587
Creator:  Michael Olson <mwolson@gnu.org>
2007-01-05 02:09:07 +00:00
Glenn Morris
dd7bf8ce57 Change from author with no copyright assignment was "tiny". 2006-12-17 06:14:02 +00:00
Miles Bader
16e62ecc3d erc-iswitchb: Temporarily enable iswitchb mode
* erc.el: (erc-iswitchb): Temporarily enable iswitchb mode if it isn't
   active already, instead of leaving it on.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-555
Creator:  Michael Olson <mwolson@gnu.org>
2006-12-13 02:36:31 +00:00
Juanma Barranquero
28e86dc414 *** empty log message *** 2006-12-10 23:52:35 +00:00
Miles Bader
cb0a26d3c3 Update from erc--emacs--22
Highlights:
 - Remove contributions from someone who has not assigned changes yet.
 - Merge in a couple of bug-fixes from the main branch.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-546
Creator:  Michael Olson <mwolson@gnu.org>
2006-12-08 07:13:33 +00:00
Juanma Barranquero
a3d2f0a3b8 (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify.
(erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook,
erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer,
erc-modules, erc-display-message-highlight, erc-process-input-line,
erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers,
erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers,
erc-echo-notice-in-first-user-buffer, erc-connection-established,
erc-update-user-nick, erc-update-channel-member, erc-highlight-notice,
erc-command-symbol, erc-add-query, erc-process-script-line,
erc-determine-parameters, erc-client-info, erc-popup-input-buffer,
erc-script-echo): Fix typos in docstrings.
(erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list,
define-erc-module, erc-once-with-server-event,
erc-once-with-server-event-global, erc-debug-irc-protocol, erc-log-irc-protocol,
erc-cmd-LOAD, erc-update-user, erc-update-current-channel-member,
erc-load-script, erc-mode-line-away-status-format): Doc fixes.
2006-11-28 01:39:08 +00:00
Juanma Barranquero
550831ed89 *** empty log message *** 2006-11-24 11:16:37 +00:00
Miles Bader
83dc699514 Merge from erc--emacs--22
Merge from my ERC Emacs 22 integration branch.  The version is now "5.2
stable pre-release".  This will probably be the last change to the
version of ERC in Emacs 22 before the release, pending any bugfixes.  For
details on the changes, see the lisp/erc/ChangeLog file.

Note that ERC is now invoked with M-x erc, not M-x erc-select.  If you
were using the old `erc' function programmatically, use `erc-open'
instead.

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-520
Creator:  Michael Olson <mwolson@gnu.org>
2006-11-20 06:50:29 +00:00
Juanma Barranquero
d57727c978 *** empty log message *** 2006-11-20 00:35:02 +00:00
Juanma Barranquero
33462dfacd Add "add-log-time-zone-rule: t" to Local Variables section. 2006-11-10 00:21:57 +00:00
Chong Yidong
df6a248a59 * erc.el (erc-header-line): Fix typo. 2006-11-09 01:50:20 +00:00
Juanma Barranquero
0b8f64bca9 *** empty log message *** 2006-11-06 03:04:08 +00:00
Romain Francoise
43db7b94c9 Fix last entry. 2006-08-13 17:04:56 +00:00
Romain Francoise
35dbb6cf1d (erc-log-matches-make-buffer): Add missing space. 2006-08-13 16:01:44 +00:00
Miles Bader
f2c0569849 Update from erc--emacs--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-388
Creator:  Michael Olson <mwolson@gnu.org>
2006-08-07 07:43:48 +00:00
Miles Bader
26cced449a Fix ERC bug introduced in last patch
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-387
Creator:  Michael Olson <mwolson@gnu.org>
2006-08-07 07:43:37 +00:00
Miles Bader
b5bc193f30 Update from erc--emacs--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-386
Creator:  Michael Olson <mwolson@gnu.org>
2006-08-07 07:43:25 +00:00
Miles Bader
2e3ef421a9 Merge from erc--emacs--21
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-379
Creator:  Michael Olson <mwolson@gnu.org>
2006-08-03 05:10:38 +00:00
Miles Bader
0b6bb13008 Update for ERC 5.1.3.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-348
Creator:  Michael Olson <mwolson@gnu.org>
2006-07-14 02:29:50 +00:00
Miles Bader
21bc768b9b Revision: emacs@sv.gnu.org/emacs--devo--0--patch-208
Creator:  Michael Olson <mwolson@gnu.org>

Sync from erc--emacs--0
2006-04-11 22:09:49 +00:00
Eli Zaretskii
61be4a8a1f *** empty log message *** 2006-04-01 14:32:13 +00:00
Miles Bader
c89e5cd70a Revision: emacs@sv.gnu.org/emacs--devo--0--patch-179
Creator:  Michael Olson <mwolson@gnu.org>

Update from erc--emacs--0
2006-03-27 11:27:46 +00:00
Miles Bader
d8bd1ad494 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-102
Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--emacs--0
2006-02-20 09:40:28 +00:00
Miles Bader
e7559e307d Revision: emacs@sv.gnu.org/emacs--devo--0--patch-88
Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--emacs--0
2006-02-16 01:41:30 +00:00
Miles Bader
240029d92c Revision: emacs@sv.gnu.org/emacs--devo--0--patch-82
Creator:  Michael Olson <mwolson@gnu.org>

Fix compiler error in erc-dcc.el.
2006-02-13 22:57:54 +00:00
Miles Bader
92ed2bfbc0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-75
Creator:  Michael Olson <mwolson@gnu.org>

Make ERC comply with the new copyright year guidelines.
2006-02-12 20:25:00 +00:00
Miles Bader
9cc8d0b62e Revision: emacs@sv.gnu.org/emacs--devo--0--patch-73
Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--emacs--0
2006-02-12 12:02:53 +00:00
Miles Bader
c6b99621a2 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-55
Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--emacs--0
2006-02-08 02:41:23 +00:00
Miles Bader
8508e990c1 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-46
Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--emacs--0
2006-02-05 12:42:51 +00:00
Eli Zaretskii
24d5d3e2fd *** empty log message *** 2006-02-03 11:23:35 +00:00
Simon Josefsson
176cc13b33 * erc.el (erc-open-ssl-stream): Use tls.el. 2006-01-31 15:30:53 +00:00
Miles Bader
360613cb30 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-30
Creator:  Michael Olson <mwolson@gnu.org>

Merge from erc--main--0

2006-01-30  Michael Olson  <mwolson@gnu.org>

	* erc-stamp.el (erc-timestamp-right-align-by-pixel): New option
	that determines whether to use pixel values to align right
	timestamps.  The default is not to do so, since it only works with
	Emacs22 on X, and even then some people have trouble.
	(erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'.
2006-01-31 00:24:36 +00:00
Miles Bader
98c414c7fd Revision: emacs@sv.gnu.org/emacs--devo--0--patch-27
Creator:  Michael Olson <mwolson@gnu.org>

Merge ERC-related Viper hacks into Viper.
2006-01-30 03:16:50 +00:00
Miles Bader
19750a726e Revision: emacs@sv.gnu.org/emacs--devo--0--patch-25
Creator:  Michael Olson <mwolson@gnu.org>

Use utf-8 encoding in ERC ChangeLogs.
2006-01-30 00:30:03 +00:00
Miles Bader
059e26cf0d Revision: emacs@sv.gnu.org/emacs--devo--0--patch-24
Creator:  Michael Olson <mwolson@gnu.org>

Fix ERC compiler warnings.
2006-01-30 00:29:49 +00:00
Miles Bader
597993cf44 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-22
Creator:  Michael Olson <mwolson@gnu.org>

Install ERC.
2006-01-29 13:08:58 +00:00