Mercurial > emacs
annotate lisp/erc/ChangeLog.06 @ 82325:c9f47b4c81d5
(calc-convert-temperature): Use `/' to create fractions.
author | Jay Belanger <jay.p.belanger@gmail.com> |
---|---|
date | Tue, 07 Aug 2007 21:03:40 +0000 |
parents | 85d67fae9a94 |
children | 5f92874bde07 |
rev | line source |
---|---|
76856 | 1 2006-12-28 Michael Olson <mwolson@gnu.org> |
2 | |
3 * erc-list.el: Change header to mention that this is part of ERC, | |
4 rather than GNU Emacs. | |
5 | |
6 * erc-networks.el (erc-server-alist): Add Ars OpenIRC and | |
7 LinuxChix networks. Thanks to Angelina Carlton for mentioning | |
8 them. Properly escape periods in Konfido.Net and Kewl.Org. | |
9 (erc-networks-alist): Add entries for Ars and LinuxChix, though | |
10 the latter does not actually provide an announced network name. | |
11 | |
12 * erc-services.el (erc-nickserv-identify-mode): Add 'both method, | |
13 which waits for a NickServ message if the network supports it, | |
14 otherwise sends the password after connecting. | |
15 (erc-nickserv-identify-mode): Default to 'both. | |
16 (erc-nickserv-passwords): Add OFTC and Azzurra to custom options. | |
17 (erc-nickserv-alist): Indentation fix. | |
18 (erc-nickserv-identify-on-connect) | |
19 (erc-nickserv-identify-on-nick-change): Handle 'both method. | |
20 | |
21 2006-12-28 Leo <sdl.web@gmail.com> (tiny change) | |
22 | |
23 * erc.el (erc-iswitchb): Wrap body in unwind-protect so that | |
24 hitting C-g does not leave iswitchb-mode on. | |
25 | |
26 2006-12-27 Michael Olson <mwolson@gnu.org> | |
27 | |
28 * erc.el (erc-cmd-RECONNECT): New command that calls | |
29 erc-server-reconnect. | |
30 | |
31 * erc-backend.el (erc-server-reconnect-count): New server variable | |
32 that keeps track of reconnection attempts. | |
33 (erc-server-reconnect-attempts): New option that determines the | |
34 number of reconnection attempts that ERC will make per server. | |
35 (erc-server-reconnect-timeout): New option that determines the | |
36 amount of time, in seconds, that ERC will wait between successive | |
37 reconnect attempts. | |
38 (erc-server-reconnect): New function that reestablishes the | |
39 current IRC connection. Move some commands from | |
40 erc-process-sentinel-1 here. | |
41 (erc-process-sentinel-1): If we have been disconnected, loop until | |
42 we either reconnect or run out of attempts. | |
43 (erc-server-reconnect-p): Move higher and make this a defsubst, | |
44 since I'm worried about the current buffer changing from | |
45 underneath us. Implement limit of number of reconnect attempts.. | |
46 | |
47 * erc.texi (Getting Started): Update for /RECONNECT command. | |
48 | |
49 2006-12-26 Michael Olson <mwolson@gnu.org> | |
50 | |
51 * erc.el (erc-open): Restore old point correctly, or at least get | |
52 closer to doing so than before. | |
53 | |
54 2006-12-13 Leo <sdl.web@gmail.com> (tiny change) | |
55 | |
56 * erc.el (erc-iswitchb): Temporarily enable iswitchb mode if it | |
57 isn't active already, instead of leaving it on. | |
58 | |
59 2006-12-10 Juanma Barranquero <lekktu@gmail.com> | |
60 | |
61 * erc-ezbounce.el (erc-ezb-init-session-list): Doc fix. | |
62 | |
63 2006-12-08 Michael Olson <mwolson@gnu.org> | |
64 | |
65 * erc.el: Re-evaluate contributions from a contributor, and found | |
66 them under 15 lines of non-obvious code, so it is safe to remove | |
67 the copyright notice. | |
68 (erc-modules): Remove list module. | |
69 | |
70 * erc-list.el: Remove, since a contributor who has not completed | |
71 their assignment has contributed significantly more than 15 lines | |
72 of code to this file. | |
73 | |
74 2006-11-28 Juanma Barranquero <lekktu@gmail.com> | |
75 | |
76 * erc.el (erc-cmd-BANLIST, erc-cmd-MASSUNBAN): Simplify. | |
77 (erc-prompt-for-channel-key, erc-ignore-reply-list, erc-send-post-hook) | |
78 (erc-active-buffer, erc-join-buffer, erc-frame-alist, erc-with-buffer) | |
79 (erc-modules, erc-display-message-highlight, erc-process-input-line) | |
80 (erc-cmd-HELP, erc-server-hooks, erc-echo-notice-in-user-buffers) | |
81 (erc-format-my-nick, erc-echo-notice-in-user-and-target-buffers) | |
82 (erc-echo-notice-in-first-user-buffer, erc-connection-established) | |
83 (erc-update-user-nick, erc-update-channel-member, erc-highlight-notice) | |
84 (erc-command-symbol, erc-add-query, erc-process-script-line) | |
85 (erc-determine-parameters, erc-client-info, erc-popup-input-buffer): | |
86 (erc-script-echo): Fix typos in docstrings. | |
87 (erc-channel-user-op-p, erc-channel-user-voice-p, erc-startup-file-list) | |
88 (define-erc-module, erc-once-with-server-event) | |
89 (erc-once-with-server-event-global, erc-debug-irc-protocol) | |
90 (erc-log-irc-protocol, erc-cmd-LOAD, erc-update-user) | |
91 (erc-update-current-channel-member, erc-load-script): | |
92 (erc-mode-line-away-status-format): Doc fixes. | |
93 | |
94 2006-11-20 Andrea Russo <rastandy@inventati.org> (tiny change) | |
95 | |
96 * erc-dcc.el (erc-dcc-chat-setup): Initialize `erc-input-marker' | |
97 before calling `erc-display-prompt'. | |
98 | |
99 2006-11-24 Juanma Barranquero <lekktu@gmail.com> | |
100 | |
101 * erc.el (erc-after-connect, erc-open-ssl-stream) | |
102 (erc-display-line-1, erc-display-line): | |
103 * erc-backend.el (005): Fix space/tab mixup in docstrings. | |
104 | |
105 2006-11-20 Michael Olson <mwolson@gnu.org> | |
106 | |
107 * erc.el (erc-version-string): Call this Version 5.2 stable | |
108 pre-release, since it diverges slightly from our 5.2 branch, in | |
109 that unstable features are not included. | |
110 (erc-update-modules): Display better error message when module not | |
111 found. | |
112 | |
113 2006-11-12 Michael Olson <mwolson@gnu.org> | |
114 | |
115 * erc-log.el: Save all log buffers when Emacs exits, in case | |
116 someone ignores the warning about open processes. Remove the | |
117 advice code in the commentary. | |
118 (erc-save-query-buffers): Docfix. | |
119 (erc-log-save-all-buffers): New function that saves all ERC | |
120 buffers to logs. | |
121 (erc-current-logfile): Fix bug in filename selection, where the | |
122 current buffer was erroneously being preferred over the given | |
123 buffer. | |
124 | |
125 2006-11-08 Michael Olson <mwolson@gnu.org> | |
126 | |
127 * erc.el (erc-string-to-port): Avoid error when a numerical port | |
128 is passed. Thanks to Zekeriya KOÇ for the report. | |
129 | |
130 2006-11-08 Łukasz Demianiuk <ldemianiuk@gmail.com> (tiny change) | |
131 | |
132 * erc.el (erc-header-line): Fix typo. | |
133 | |
134 2006-11-06 Juanma Barranquero <lekktu@gmail.com> | |
135 | |
136 * erc-dcc.el (erc-dcc-send-file): Fix typo in error message. | |
137 | |
138 * erc.el (read-passwd): | |
139 * erc-autoaway.el (erc-autoaway-reestablish-idletimer): | |
140 * erc-truncate.el (truncate): Fix typo in docstring. | |
141 | |
142 2006-10-21 Michael Olson <mwolson@gnu.org> | |
143 | |
144 * erc.el (erc-iswitchb): Fix bug when hitting C-c C-b without | |
145 first loading iswitchb. Thanks to Leo for the report. | |
146 | |
147 2006-10-10 Michael Olson <mwolson@gnu.org> | |
148 | |
149 * erc.el (erc-default-port): Make the default be 6667 instead of | |
150 ircd. since Mac OS X apparently has problems with looking up that | |
151 port name. | |
152 | |
153 * erc-backend.el (353): Receive names after displaying the initial | |
154 message, instead of before. | |
155 | |
156 2006-10-05 Diane Murray <disumu@x3y2z1.net> | |
157 | |
158 * erc.el (erc-my-nick-face): New face. | |
159 (erc): Use FULL-NAME argument, not `erc-user-full-name'. This | |
160 fixes a bug where the :full-name argument passed to the function | |
161 was not respected. | |
162 (erc-format-my-nick): Use `erc-my-nick-face'. This should help | |
163 make it easier to find messages you sent in conversations when | |
164 `erc-show-my-nick' is non-nil. | |
165 (erc-compute-server): Doc fix. | |
166 | |
167 2006-10-01 John J Foerch <jjfoerch@earthlink.net> (tiny change) | |
168 | |
169 * erc-stamp.el (erc-insert-timestamp-right): Exclude the newline | |
170 from the erc-timestamp field. | |
171 | |
172 2006-09-11 Michael Olson <mwolson@gnu.org> | |
173 | |
174 * erc-nicklist.el (erc-nicklist-insert-contents): Add missing | |
175 parenthesis. Thanks to Stephan Stahl for the report. | |
176 | |
177 2006-09-10 Eric Hanchrow <offby1@blarg.net> (tiny change) | |
178 | |
179 * erc.el (erc-cmd-IGNORE): Prompt user if this might be a regexp | |
180 instead of a single user. | |
181 | |
182 2006-09-10 Michael Olson <mwolson@gnu.org> | |
183 | |
184 * erc.el (erc-generate-new-buffer-name): If this is a server | |
185 buffer and a process exists already, create a new buffer. | |
186 (erc-open): If the IRC session was continued, restore the old | |
187 point. Thanks to Stephan Stahl for the report. | |
188 (erc-member-ignore-case): Coding style tweak. | |
189 (erc-cmd-UNIGNORE): Quote the user before comparison. If we don't | |
190 find the user listed verbatim, try to match them against the list | |
191 using string-match. In this case, prompt as to whether the regexp | |
192 should be removed. | |
193 (erc-ignored-user-p): Remove CL-ism. | |
194 | |
195 * erc-autoaway.el (erc-autoaway-possibly-set-away): Check to see | |
196 whether we are already away. | |
197 | |
198 * erc-menu.el: Fix potential compiler warning. | |
199 | |
200 2006-09-07 Diane Murray <disumu@x3y2z1.net> | |
201 | |
202 * erc.el: Updated Commentary and URL. | |
203 (erc-iswitchb, erc-display-line, erc-set-modes, erc-update-modes) | |
204 (erc-arrange-session-in-multiple-windows): No need to check if | |
205 `erc-server-process' is bound. | |
206 (erc-server-buffer-live-p): Doc fix. | |
207 (erc-part-from-channel): Don't use any initial contents at prompt. | |
208 (erc-format-nick, erc-format-@nick): Doc fix. Use `when'. | |
209 (s367): Fixed to support only banmask and channel which is the | |
210 standard. Also, there's no reason to add a message to each banned | |
211 user entry trying to persuade the user to use /banlist instead of | |
212 /mode #channel +b. That part of the message was a little | |
213 confusing, anyways. | |
214 (s367-set-by): New catalog entry. The user who set the ban and | |
215 the time of ban seem to be specific to only certain servers such | |
216 as freenode. | |
217 | |
218 * erc-autoaway.el (erc-autoaway-idletimer): Doc fix. | |
219 | |
220 * erc-backend.el (erc-server-process-alive): No need to check if | |
221 `erc-server-process' is bound. | |
222 (367): Use s367 or s367-set-by where appropriate. | |
223 | |
224 * erc-compat.el: Fixed URL. | |
225 | |
226 * erc-dcc.el: Updated copyright years. Added Usage section. | |
227 Changed supported Emacs version number from 21.3.50 to 22 in | |
228 Commentary. | |
229 | |
230 * erc-ibuffer.el (erc-server-name, erc-target, erc-away): No need | |
231 to check if `erc-server-process' is bound. | |
232 | |
233 * erc-nicklist.el: Added to the Commentary section an explanation | |
234 that `erc-nicklist-quit' should be called from within the nicklist | |
235 buffer. Set file coding to utf-8 so a contributor's name is | |
236 displayed correctly. | |
237 (erc-nicklist-icons-directory): Use customize type directory | |
238 instead of string. | |
239 (erc-nicklist-insert-contents): Set bbdb-nick to an empty string | |
240 if it wasn't found. This fixes a bug where an error would occur | |
241 when using `string=' on bbdb-nick if it was nil. | |
242 | |
243 * erc-replace.el: Removed URL from file information since it | |
244 doesn't exist. | |
245 | |
246 * erc-sound.el: Updated copyright years. Fixed Commentary and | |
247 added Usage section. | |
248 (define-erc-module): Add and remove `erc-ctcp-query-SOUND' to | |
249 `erc-ctcp-query-SOUND-hook' here. Removed the keybinding | |
250 definitions. | |
251 (erc-play-sound, erc-default-sound, erc-cmd-SOUND) | |
252 (erc-ctcp-query-SOUND): Doc fix. | |
253 (erc-play-command): Removed, not necessary anymore. | |
254 (erc-ctcp-query-SOUND-hook): Set to nil as default. Moved up | |
255 higher in code, added docstring. | |
256 (erc-play-sound): Use `play-sound-file'. It exists in GNU Emacs | |
257 as well since version 21 or earlier. Removed commented-out older | |
258 version of function. | |
259 | |
260 * NEWS: Fixed formatting, added channel tracking change. | |
261 | |
262 2006-09-03 Diane Murray <disumu@x3y2z1.net> | |
263 | |
264 * erc.el: M-x erc RET can now be used to start ERC. | |
265 (erc-open): Renamed from `erc'. | |
266 (erc-before-connect): Change erc-select to erc. | |
267 (erc): Renamed from `erc-select'. Use `erc-open'. | |
268 (erc-select): Defined as alias of `erc'. | |
269 (erc-ssl): Renamed from `erc-select-ssl'. Use `erc'. | |
270 (erc-select-ssl): Defined as alias of `erc-ssl'. | |
271 (erc-cmd-SERVER): Use `erc'. | |
272 (erc-query, erc-handle-irc-url): Use `erc-open'. | |
273 | |
274 * erc-backend.el (erc-process-sentinel-1, JOIN): Use `erc-open'. | |
275 | |
276 * erc-menu.el (erc-menu-definition): Use `erc'. | |
277 | |
278 * erc-networks.el: Updated copyright years. | |
279 (erc-server-select): Use keyword arguments when calling `erc'. | |
280 | |
281 * erc.texi (Getting Started, Connecting): Changed erc-select to | |
282 erc. | |
283 | |
284 * README: Changed erc-select to erc. | |
285 | |
286 * NEWS: Added note about these changes. | |
287 | |
288 * FOR-RELEASE: Marked this item as done. | |
289 | |
290 2006-08-21 Diane Murray <disumu@x3y2z1.net> | |
291 | |
292 * erc-track.el (erc-track-mode-line-mouse-face): New variable. | |
293 (erc-make-mode-line-buffer-name): Add help-echo and mouse-face | |
294 properties to channel name. | |
295 | |
296 2006-08-20 Michael Olson <mwolson@gnu.org> | |
297 | |
298 * erc-identd.el (erc-identd): New customization group. | |
299 (erc-identd-port): New option that specifies the port to use if | |
300 none is given as an argument to erc-identd-start. | |
301 (identd): Place erc-identd-quickstart in erc-connect-pre-hook | |
302 instead of erc-identd-start so that we deal with the different | |
303 meaning of the first argument. | |
304 (erc-identd-start): Use erc-identd-port. | |
305 (erc-identd-quickstart): New function that ignores any arguments | |
306 and calls erc-identd-start. | |
307 | |
308 * erc.el (erc-with-server-buffer): New macro that switches to the | |
309 current ERC server buffer and runs some code. If no server buffer | |
310 is available, return nil. This is a useful way to access | |
311 variables in the server buffer. | |
312 (erc-get-server-user, erc-add-server-user) | |
313 (erc-remove-server-user, erc-change-user-nickname) | |
314 (erc-get-server-nickname-list, erc-get-server-nickname-alist) | |
315 (erc-ison-p, erc-active-buffer, erc-cmd-IGNORE) | |
316 (erc-cmd-UNIGNORE, erc-cmd-IDLE, erc-cmd-NICK, erc-cmd-BANLIST) | |
317 (erc-cmd-MASSUNBAN, erc-nickname-in-use, erc-ignored-user-p) | |
318 (erc-format-channel-modes): Use it. | |
319 (erc-once-with-server-event, erc-once-with-server-event-global) | |
320 (erc-with-buffer, erc-with-all-buffers-of-server): Use make-symbol | |
321 instead of gensym. | |
322 (erc-open-server-buffer-p): New function that returns non-nil if | |
323 the given buffer is an ERC server buffer that has an open IRC | |
324 process. | |
325 (erc-with-buffer): Use buffer-live-p here to set a good example, | |
326 though it isn't really needed here. | |
327 (erc-away): Mention erc-away-time. | |
328 (erc): Don't propagate the erc-away setting, since it makes more | |
329 sense to access it from the server buffer. Set up the prompt | |
330 before connecting rather than after. Run erc-connect-pre-hook | |
331 with the buffer as an argument, instead of no arguments. | |
332 (erc-cmd-GAWAY): Use erc-open-server-buffer-p instead of | |
333 erc-server-buffer-p so that only open connections are set away. | |
334 (erc-cmd-GQUIT): Use erc-open-server-buffer-p. | |
335 (erc-process-away): Docfix. Don't set erc-away in channel | |
336 buffers. | |
337 (erc-set-current-nick): Make this uniform with the style used in | |
338 erc-current-nick. | |
339 (erc-away-time): Rename from erc-away-p, since this is no longer a | |
340 boolean-style predicate. | |
341 (erc-format-away-status): Use it. | |
342 (erc-initialize-log-marker): Accept a `buffer' argument. | |
343 (erc-connect-pre-hook): Docfix. | |
344 (erc-connection-established): Make sure this runs in the correct | |
345 buffer. | |
346 (erc-set-initial-user-mode): Accept a `buffer' argument. | |
347 | |
348 * erc-stamp.el (erc-add-timestamp): Use erc-away-time. | |
349 | |
350 * erc-spelling.el (erc-spelling-init): Use | |
351 erc-with-server-buffer. Accept `buffer' argument. | |
352 (spelling): Call erc-spelling-init with the `buffer' argument. | |
353 | |
354 * erc-speedbar.el (erc-speedbar-buttons): Use erc-server-buffer-p. | |
355 | |
356 * erc-pcomplete.el (pcomplete/erc-mode/UNIGNORE) | |
357 (pcomplete-erc-all-nicks): Use erc-with-server-buffer. | |
358 | |
359 * erc-notify.el (erc-notify-timer, erc-cmd-NOTIFY): Use | |
360 erc-with-server-buffer. | |
361 | |
362 * erc-networks.el (erc-network, erc-current-network) | |
363 (erc-network-name): Use erc-with-server-buffer. | |
364 | |
365 * erc-netsplit.el (erc-cmd-WHOLEFT): Use erc-with-server-buffer. | |
366 | |
367 * erc-match.el (erc-log-matches, erc-log-matches-come-back): Use | |
368 erc-away-time. | |
369 | |
370 * erc-log.el (log): Use erc-away-time. Remove unnecessary check. | |
371 Pass `buffer' argument to erc-log-setup-logging instead of setting | |
372 the current buffer. Ditto for erc-log-disable-logging. | |
373 (erc-log-setup-logging, erc-log-disable-loggin): Accept a `buffer' | |
374 argument. | |
375 | |
376 * erc-list.el (erc-chanlist): Use erc-with-server-buffer. | |
377 | |
378 * erc-ibuffer.el (erc-away): Use erc-away-time. | |
379 | |
380 * erc-dcc.el (erc-dcc-get-filter): Temporarily make the buffer | |
381 read only instead of permanently doing so. | |
382 | |
383 * erc-compat.el (erc-gensym, *erc-sym-counter*): Remove, since | |
384 Emacs Lisp has make-symbol, which is better. | |
385 | |
386 * erc-chess.el (erc-chess-handler, erc-cmd-CHESS): Use | |
387 erc-with-server-buffer. | |
388 | |
389 * erc-capab.el (capab-identify): Only deal with server buffers | |
390 that have an open IRC process. | |
391 (erc-capab-identify-add-prefix): Use erc-with-server-buffer. | |
392 | |
393 * erc-backend.el (erc-server-connected): Docfix. Recommend the | |
394 `erc-server-process-alive' function. | |
395 (erc-coding-system-for-target): Supply a default target if one is | |
396 not given. | |
397 (erc-server-send): Simplify slightly. | |
398 (erc-call-hooks): Use erc-with-server-buffer. | |
399 (erc-server-connect, erc-server-setup-periodical-ping): Accept | |
400 `buffer' argument. | |
401 | |
402 * erc-autoaway.el (erc-autoaway-reestablish-idletimer): Move | |
403 higher to avoid an automatic load snafu. | |
404 (erc-autoaway-some-server-buffer): New function that returns an | |
405 ERC server buffer with a live connection, or nil otherwise. | |
406 (erc-autoaway-insinuate-maybe): New function that adds the | |
407 autoaway reset function to post-command-hook if at least one ERC | |
408 process is alive. | |
409 (erc-autoaway-remove-maybe): New function that removes the | |
410 autoaway reset function from post-command-hook if no ERC process | |
411 is alive. | |
412 (autoaway): Don't touch post-command-hook unless an IRC process is | |
413 already open. Remove our addition to post-command-hook as soon as | |
414 there are no more IRC processes open. Reset the indicators before | |
415 connecting to an IRC server, which fixes a bug when re-connecting. | |
416 (erc-autoaway-reset-idle-user): Call erc-autoaway-remove-maybe if | |
417 there are no more IRC processes open. | |
418 (erc-autoaway-set-back): Pick an open IRC process. Accept an | |
419 argument which is a function call if we can't find one. | |
420 (erc-autoaway-some-open-server-buffer): New function which returns | |
421 an ERC server buffer with an open connection and a user that is | |
422 not away. | |
423 (erc-autoaway-possibly-set-away, erc-autoaway-set-away): Use it. | |
424 (erc-autoaway-set-away): Accept a `notest' argument which is used | |
425 to avoid testing the same thing twice. | |
426 (erc-autoaway-last-sent-time, erc-autoaway-caused-away): Move | |
427 higher in file to fix byte-compile warning. | |
428 | |
429 2006-08-20 Diane Murray <disumu@x3y2z1.net> | |
430 | |
431 * erc-backend.el (erc-process-sentinel-1): Doc fix. Let | |
432 `erc-server-reconnect-p' check all condition cases. | |
433 (erc-server-reconnect-p): Moved rest of checks from | |
434 `erc-process-sentinel-1' to here. Now takes an argument, EVENT. | |
435 | |
436 2006-08-14 Diane Murray <disumu@x3y2z1.net> | |
437 | |
438 * erc-menu.el: Updated copyright years. Removed EmacsWiki URL. | |
439 (erc-menu-definition): Name the menu "ERC" instead of "IRC" to | |
440 avoid confusion with rcirc and other clients. | |
441 | |
442 * erc-backend.el (erc-server-banned): New variable. | |
443 (erc-server-connect): Set `erc-server-banned' to nil. | |
444 (erc-process-sentinel-1): Use `erc-server-reconnect-p'. | |
445 (erc-server-reconnect-p): New function. Return non-nil if the | |
446 user wants automatic reconnects and if the user has not been | |
447 banned from the server. This should fix a bug where ERC gets into | |
448 a loop trying to reconnect with no way to stop it when the user is | |
449 denied access to the server due to a server ban. It might also | |
450 help when Tor users are blocked from freenode if freenode servers | |
451 send the 465 message before disconnecting. | |
452 (465): Handle "banned from server" error notices. | |
453 | |
454 2006-08-13 Romain Francoise <romain@orebokech.com> | |
455 | |
456 * erc-match.el (erc-log-matches-make-buffer): End `y-or-n-p' | |
457 prompt with a space. | |
458 | |
459 2006-08-13 Michael Olson <mwolson@gnu.org> | |
460 | |
461 * erc-backend.el (erc-server-timed-out): New variable that | |
462 indicates whether the current connection has timed out due to | |
463 failure to respond to a ping. | |
464 (erc-server-send-ping): Set erc-server-timed-out to t. | |
465 (erc-server-connect): Initialize erc-server-timed-out to nil. | |
466 (erc-process-sentinel-1): Consult erc-server-timed-out. | |
467 | |
468 2006-08-11 Michael Olson <mwolson@gnu.org> | |
469 | |
470 * erc-fill.el (erc-fill): Skip any initial empty lines so that we | |
471 avoid errors when inserting disconnect messages and other messages | |
472 that begin with newlines. | |
473 | |
474 2006-08-07 Michael Olson <mwolson@gnu.org> | |
475 | |
476 * erc-backend.el (erc-process-sentinel-1): Use erc-display-message | |
477 in several places instead of inserting text. | |
478 (erc-process-sentinel): Move to the input-marker before removing | |
479 the prompt. | |
480 | |
481 * erc.el (erc-port): Fix customization options. | |
482 (erc-display-message): Handle null type explicitly. Previously, | |
483 this was relying on a chance side-effect. Cosmetic indentation | |
484 tweak. | |
485 (english): Add 'finished and 'terminated entries to the catalog. | |
486 Add initial and terminal newlines to 'disconnected and | |
487 'disconnected-noreconnect entries. Avoid long lines. | |
488 (erc-cmd-QUIT): Bind the current erc-server-process to | |
489 server-proc. If the IRC server responds quickly, it is possible | |
490 for the connection to close, and hence server buffer to be killed, | |
491 if erc-kill-server-buffer-on-quit is non-nil. This avoids that | |
492 problem. | |
493 | |
494 2006-08-06 Michael Olson <mwolson@gnu.org> | |
495 | |
496 * erc-backend.el (erc-server-send-queue): Update from Circe | |
497 version of this function. | |
498 (erc-server-ping-timer-alist): New variable that keeps track of | |
499 ping timers according to their associated server. | |
500 (erc-server-last-received-time): New variable that specifies the | |
501 time of the last message we received from the server. This is | |
502 used to detect hung processes. | |
503 (erc-server-send-ping): New function that sends a ping to the IRC | |
504 process corresponding with the given buffer. Split from | |
505 erc-server-setup-periodical-ping. If the server buffer no longer | |
506 exists, cancel the timer. If the server process has not given us | |
507 a message, including PING responses, since the last PING, kill it. | |
508 This is necessary to deal with some aberrant freenode behavior. | |
509 Idea taken from rcirc. | |
510 (erc-server-setup-periodical-ping): Rename from | |
511 erc-server-setup-periodical-server-ping. | |
512 (erc-server-filter-function): Use erc-current-time instead of | |
513 current-time. | |
514 | |
515 * erc.el (erc-arrange-session-in-multiple-windows): Fix bug with | |
516 multi-tty Emacs. | |
517 (erc-select-startup-file): Fix bug introduced by recent change. | |
518 (erc-cmd-QUIT): If the IRC process has not terminated itself | |
519 within 4 seconds of completing our quit-hook, kill it manually. | |
520 Freenode in particular needs this. | |
521 (erc-connection-established): Use erc-server-setup-periodical-ping | |
522 instead of erc-server-setup-periodical-server-ping. | |
523 | |
524 2006-08-05 Michael Olson <mwolson@gnu.org> | |
525 | |
526 * erc-log.el (erc-log-standardize-name): New function that returns | |
527 a filename that is safe for use for a log file. | |
528 (erc-current-logfile): Use it. | |
529 | |
530 * erc.el (erc-startup-file-list): Search in ~/.emacs.d first, | |
531 since that is a fairly standard directory. | |
532 (erc-select-startup-file): Re-write to use | |
533 convert-standard-filename, which will ensure that MS-DOS systems | |
534 look for the _ercrc.el file. | |
535 | |
536 2006-08-02 Michael Olson <mwolson@gnu.org> | |
537 | |
538 * erc.el (erc-version-string): Release ERC 5.1.4. | |
539 | |
540 * Makefile, NEWS, erc.texi: Update for the 5.1.4 release. | |
541 | |
542 * erc.el (erc-active-buffer): Fix bug that caused messages to go | |
543 to the wrong buffer. Thanks to offby1 for the report. | |
544 | |
545 * erc-backend.el (erc-coding-system-for-target): Handle case where | |
546 target is nil. Thanks to Kai Fan for the patch. | |
547 | |
548 2006-07-29 Michael Olson <mwolson@gnu.org> | |
549 | |
550 * erc-log.el (erc-log-setup-logging): Don't offer to save the | |
551 buffer. It will be saved automatically killed. Thanks to Johan | |
552 Bockgård and Tassilo Horn for pointing this out. | |
553 | |
554 2006-07-27 Johan Bockgård <bojohan@users.sourceforge.net> | |
555 | |
556 * erc.el (define-erc-module): Make find-function and find-variable | |
557 find the names constructed by `define-erc-module' in Emacs 22. | |
558 | |
559 2006-07-14 Michael Olson <mwolson@gnu.org> | |
560 | |
561 * erc-log.el (log): Make sure that we enable logging on | |
562 already-opened buffers as well, in case the user toggles this | |
563 module after loading ERC. Also be sure to remove logging ability | |
564 from all ERC buffers when the module is disabled. | |
565 (erc-log-setup-logging): Set buffer-file-name to nil rather than | |
566 the empty string. This should fix some errors that occur when | |
567 quitting Emacs without first killing all ERC buffers. | |
568 (erc-log-disable-logging): New function that removes the logging | |
569 ability from the current buffer. | |
570 | |
571 * erc-spelling.el (spelling): Use dolist and buffer-live-p. | |
572 | |
573 2006-07-12 Michael Olson <mwolson@gnu.org> | |
574 | |
575 * erc-match.el (erc-log-matches): Bind inhibit-read-only rather | |
576 than call toggle-read-only. | |
577 | |
578 * erc.el (erc-handle-irc-url): Move here from erc-goodies.el and | |
579 add autoload cookie. | |
580 | |
581 2006-07-09 Michael Olson <mwolson@gnu.org> | |
582 | |
583 * erc.el (erc-version-string): Release ERC 5.1.3. | |
584 | |
585 * erc.texi: Update for the 5.1.3 release. | |
586 | |
587 * erc-autoaway.el (erc-autoaway-set-back): Fix bug after returning | |
588 from being set automatically away and current buffer is not an ERC | |
589 buffer. | |
590 | |
591 * erc-identd.el: Fix compiler error. | |
592 | |
593 * erc.texi (Development): Use @subheading instead of @subsection. | |
594 (Advanced Usage): Add menu. | |
595 (Connecting): Fully document how to connect to an IRC server. | |
596 (Options, Tips and Tricks, Sample Configuration): New unwritten | |
597 sections. | |
598 | |
599 * erc.el (erc-server, erc-port, erc-nick, erc-nick-uniquifier) | |
600 (erc-user-full-name, erc-password): Docfixes and customization | |
601 interface tweaks. | |
602 (erc-try-new-nick-p): Rename from | |
603 `erc-manual-set-nick-on-bad-nick-p' and invert meaning. | |
604 (erc-nickname-in-use): Use `erc-try-new-nick-p'. Check the length | |
605 of `erc-nick-uniquifier', in case someone wants multiple | |
606 characters. | |
607 (erc-compute-server, erc-compute-nick, erc-compute-full-name) | |
608 (erc-compute-port): Docfixes. | |
609 | |
610 * erc-log.el (log): Move all add-hook calls here, rather than | |
611 executing them immediately, and also cause them to be un-hooked | |
612 when the module is removed. | |
613 (erc-save-buffer-on-part): Move next to | |
614 `erc-save-queries-on-quit'. | |
615 (erc-save-buffer-on-quit, erc-save-queries-on-quit): Default to t. | |
616 (erc-log-write-after-send, erc-log-write-after-insert): Default to | |
617 nil. This makes things fast, but reasonably failsafe, by default. | |
618 | |
619 2006-07-08 Michael Olson <mwolson@gnu.org> | |
620 | |
621 * erc-log.el (erc-log-insert-log-on-open): Make this nil by | |
622 default, since most IRC clients don't do this. | |
623 (erc-log-write-after-send): New option that determines whether the | |
624 log file will be written to after every sent message. | |
625 (erc-log-write-after-insert): New option that determines whether | |
626 the log file will be written to when new text is added to a logged | |
627 ERC buffer. | |
628 (log): Use the aforementioned options. | |
629 | |
630 * erc.texi (Modules): Document the "completion" module. | |
631 | |
632 * erc-pcomplete.el (pcomplete-erc-nicks): Make sure that we don't | |
633 have a nil element in the list when ignore-self is non-nil. | |
634 | |
635 2006-07-05 Michael Olson <mwolson@gnu.org> | |
636 | |
637 * erc.el (erc-modules): Use `set' instead of `set-default', since | |
638 this setting should never be buffer-local. Add the `page' module | |
639 to the list. | |
640 | |
641 * erc.texi (Modules): Add entries for `list' and `page' modules. | |
642 Change "spell" to "spelling". | |
643 (History): Use past tense throughout. | |
644 | |
645 2006-07-02 Michael Olson <mwolson@gnu.org> | |
646 | |
647 * erc-backend.el (erc-call-hooks): Fix (stringp nil) error that | |
648 can happen when doing /PART. | |
649 | |
650 * erc.el (erc-quit-reason-various-alist) | |
651 (erc-part-reason-various-alist): In the example, use "^$" as an | |
652 example, since "" matches anything. | |
653 (erc-quit-reason-various, erc-part-reason-various): If no argument | |
654 is given, and no matches are found, use our default reason instead | |
655 of "nil". | |
656 | |
657 2006-06-30 Michael Olson <mwolson@gnu.org> | |
658 | |
659 * erc.texi (Modules): Mention identd. | |
660 (Releases): Update mailing list address and download location. | |
661 (Development): Refactor. Provide updated directions for Arch. | |
662 Make URLs clickable. | |
663 (Keystroke Summary): Typo fix. Use more Texinfo syntax. | |
664 (Getting Started): Give simpler example. We do not need to | |
665 explicitly load every module. | |
666 (History): Update. | |
667 | |
668 * erc-autoaway.el, erc-join.el, erc-backend.el, erc-bbdb.el: | |
669 erc-button.el, erc-chess.el, erc-compat.el, erc-hecomplete.el: | |
670 erc-dcc.el, erc-ezbounce.el, erc-fill.el, erc-ibuffer.el: | |
671 erc-imenu.el, erc-list.el, erc-log.el, erc-match.el, erc-menu.el: | |
672 erc-networks.el, erc-netsplit.el, erc-nicklist.el: | |
673 erc-services.el, erc-pcomplete.el, erc-replace.el, erc-ring.el: | |
674 erc-speedbar.el, erc-spelling.el, erc-stamp.el, erc-track.el: | |
675 erc.el: Remove version strings. | |
676 | |
677 * erc.el (erc-cmd-SMV): Remove, since we do not have meaningful | |
678 module versions anymore. | |
679 (erc-version-modules): Remove, since we do not use this function | |
680 anymore. | |
681 (erc-latest-version, erc-ediff-latest-version): Remove, since this | |
682 was only useful back when ERC consisted of one file. | |
683 (erc-modules): Add line for identd. | |
684 (erc-get-channel-mode-from-keypress): Typo fix. | |
685 | |
686 * erc-imenu.el: Remove unnecessary lines in header. | |
687 | |
688 * erc-goodies.el (erc-handle-irc-url): Docfix. | |
689 | |
690 * erc-identd.el: Define an ERC module for this. | |
691 (erc-identd-start): Don't create a process buffer if possible. | |
692 Otherwise, use conventional hidden names for process buffers. | |
693 | |
694 2006-06-29 Michael Olson <mwolson@gnu.org> | |
695 | |
696 * erc-backend.el (erc-coding-system-for-target): Match | |
697 case-insensitively. Use a pattern match instead of `assoc', as | |
698 per the documentation for `erc-encoding-coding-alist'. | |
699 | |
700 * erc-track.el (erc-track-shorten-aggressively): Fix typo. | |
701 | |
702 2006-06-27 Michael Olson <mwolson@gnu.org> | |
703 | |
704 * erc.el: Update maintainer information and URLs. | |
705 | |
706 2006-06-14 Michael Olson <mwolson@gnu.org> | |
707 | |
708 * erc.el (erc-active-buffer): If the active buffer has been | |
709 deleted, default to the server buffer. | |
710 (erc-toggle-flood-control): When the user hits C-c C-f, make flood | |
711 control really toggle, not unconditionally turn off. | |
712 | |
713 2006-06-12 Michael Olson <mwolson@gnu.org> | |
714 | |
715 * NEWS: Add items since the 5.1.2 release. | |
716 | |
717 * erc-autoaway.el (erc-autoaway-caused-away): New variable that | |
718 indicates whether the current away status was caused by this | |
719 module. | |
720 (erc-autoaway-set-back): Only set back if this module set the user | |
721 away. | |
722 (erc-autoaway-set-away): Update `erc-autoaway-caused-away'. | |
723 (erc-autoaway-reset-indicators): New function that resets some | |
724 indicators when the user is no longer away. | |
725 (autoaway): Add the above function to the 305 hook. | |
726 | |
727 2006-06-05 Romain Francoise <romain@orebokech.com> | |
728 | |
729 * erc.texi (History): Fix various typos. | |
730 | |
731 2006-06-04 Michael Olson <mwolson@gnu.org> | |
732 | |
733 * erc-autoaway.el (erc-autoaway-idle-method): Move after the | |
734 definition of the autoaway module. | |
735 (autoaway): Don't do anything if erc-autoaway-idle-method is | |
736 unbound. This prevents an error on startup. | |
737 | |
738 2006-06-03 Michael Olson <mwolson@gnu.org> | |
739 | |
740 * erc-autoaway.el: Thanks to Mark Plaksin for the ideas and patch. | |
741 (erc-autoaway-idle-method): Renamed from | |
742 `erc-autoaway-use-emacs-idle'. We have more than two choices for | |
743 how to do this, so it's best to make this take symbol values. | |
744 Improve documentation. Remove warning against Emacs idle-time; | |
745 the point is moot now that we get user idle time via a different | |
746 method. Make sure we disable and re-enable the module when | |
747 changing this value. | |
748 (autoaway): Conditionalize on the above option. If using the idle | |
749 timer or user idle methods, don't add anything to the | |
750 send-completed or server-001 hooks, since it is unnecessary. | |
751 (erc-autoaway-reestablish-idletimer, erc-autoaway-message): | |
752 Docfix. | |
753 (erc-autoaway-idle-seconds): Use erc-autoaway-idle-method. | |
754 (erc-autoaway-reset-idle-irc): Renamed from | |
755 `erc-autoaway-reset-idle'. Don't pass line to | |
756 `erc-autoaway-set-away', since it is not used. | |
757 (erc-autoaway-reset-idle-user): New function that resets the idle | |
758 state for user idle time. | |
759 (erc-autoaway-set-back): Remove line argument, since it is not | |
760 used. | |
761 | |
762 2006-06-01 Michael Olson <mwolson@gnu.org> | |
763 | |
764 * erc.el (erc-buffer-filter): Make sure all buffers returned from | |
765 this are live. | |
766 | |
767 2006-05-01 Edward O'Connor <ted@oconnor.cx> | |
768 | |
769 * erc-goodies.el (erc-handle-irc-url): New function, suitable as | |
770 a value for `url-irc-function'. | |
771 | |
772 2006-04-18 Diane Murray <disumu@x3y2z1.net> | |
773 | |
774 * erc-pcomplete.el (pcomplete-erc-nicks): Added new optional | |
775 argument IGNORE-SELF. If this is non-nil, don't return the user's | |
776 current nickname. Doc fix. | |
777 (pcomplete/erc-mode/complete-command): Don't complete the current | |
778 nickname. | |
779 | |
780 2006-04-05 Diane Murray <disumu@x3y2z1.net> | |
781 | |
782 * erc.el (erc-cmd-SV): Removed the exclamation point. Show the | |
783 build date as it's shown in `emacs-version'. | |
784 | |
785 * erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix | |
786 with the same face property as the previous character. | |
787 | |
788 2006-04-02 Michael Olson <mwolson@gnu.org> | |
789 | |
790 * erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el, | |
791 erc.el: Make sure to include a newline inside of negated classes, | |
792 so that a newline is not matched. | |
793 | |
794 2006-04-01 Michael Olson <mwolson@gnu.org> | |
795 | |
796 * erc-backend.el (erc-server-connect-function): Don't try to | |
797 detect the existence of the `open-network-stream-nowait' function, | |
798 since I can't find it in Emacs21, XEmacs21, or Emacs22. | |
799 | |
800 2006-03-27 Michael Olson <mwolson@gnu.org> | |
801 | |
802 * erc.texi: Update direntry. Remove unneeded local variables. | |
803 | |
804 2006-03-26 Michael Olson <mwolson@gnu.org> | |
805 | |
806 * erc.el (erc-header-line): New face that will be used to colorize | |
807 the text of the header-line, provided that | |
808 `erc-header-line-face-method' is non-nil. | |
809 (erc-prompt-face): Fix formatting. | |
810 (erc-header-line-face-method): New option that determines the | |
811 method used for colorizing header-line text. This may be a | |
812 function, nil, or non-nil. | |
813 (erc-update-mode-line-buffer): Use the aforementioned option and | |
814 face to colorize the header-line text, if that is what the user | |
815 wants. | |
816 (erc-send-input): If flood control is not activated, don't split | |
817 the input line. | |
818 | |
819 2006-03-25 Michael Olson <mwolson@gnu.org> | |
820 | |
821 * erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati | |
822 that fixes the case where there is no leading whitespace. Only | |
823 remove the first space character, though. | |
824 | |
825 * erc-identd.el (erc-identd-start): Fix a bug by making sure that | |
826 erc-identd-process is set properly. | |
827 (erc-identd-start, erc-identd-stop): Add autoload cookies. | |
828 (erc-identd-start): Pass :host parameter so this works with Emacs | |
829 22. | |
830 | |
831 2006-03-09 Diane Murray <disumu@x3y2z1.net> | |
832 | |
833 * erc-button.el (erc-button-keymap): Use <backtab> rather than | |
834 <C-tab> for `erc-button-previous' as it is a more standard key | |
835 binding for this type of function. | |
836 | |
837 2006-02-28 Diane Murray <disumu@x3y2z1.net> | |
838 | |
839 * erc-capab.el: Removed things that were accidentally committed on | |
840 2006-02-20. Removed Todo section. | |
841 (erc-capab-unidentified): Removed. | |
842 | |
843 2006-02-26 Michael Olson <mwolson@gnu.org> | |
844 | |
845 * erc-capab.el: Use (eval-when-compile (require 'cl)). | |
846 (erc-capab-unidentified): Fix compiler warning by specifying | |
847 group. | |
848 | |
849 2006-02-20 Diane Murray <disumu@x3y2z1.net> | |
850 | |
851 * erc-capab.el (erc-capab-send-identify-messages): Fixed comment | |
852 to explain thoughts better. `erc-server-parameters' is an | |
853 associated list when it's set, not a string. | |
854 | |
855 2006-02-19 Michael Olson <mwolson@gnu.org> | |
856 | |
857 * erc-capab.el (erc-capab-send-identify-messages): Make sure some | |
858 parameters are strings before using them. Thanks to Alejandro | |
859 Benitez for the report. | |
860 | |
861 * erc.el (erc-version-string): Release ERC 5.1.2. | |
862 | |
863 2006-02-19 Diane Murray <disumu@x3y2z1.net> | |
864 | |
865 * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to | |
866 <C-tab>. | |
867 (erc-button-previous): New function. | |
868 | |
869 2006-02-15 Michael Olson <mwolson@gnu.org> | |
870 | |
871 * NEWS: Add category for ERC 5.2. | |
872 | |
873 * erc.el (erc): Move to the end of the buffer when a continued | |
874 session is detected. Thanks to e1f and indio for the report and | |
875 testing a potential fix. | |
876 | |
877 2006-02-14 Michael Olson <mwolson@gnu.org> | |
878 | |
879 * debian/changelog: Prepare a new Debian package. | |
880 | |
881 * Makefile (debprepare): New rule that creates an ERC snapshot | |
882 directory for use in both new Debian releases and revisions for | |
883 Debian packages. | |
884 (debrelease, debrevision-mwolson): Use debprepare. | |
885 | |
886 * NEWS: Bring up-to-date. | |
887 | |
888 * erc-stamp.el (erc-insert-timestamp-right): For now, put | |
889 timestamps before rather than after erc-fill-column when | |
890 erc-timestamp-right-column is nil. This way we won't surprise | |
891 anyone unpleasantly, or so it is hoped. | |
892 | |
893 2006-02-13 Michael Olson <mwolson@gnu.org> | |
894 | |
895 * erc-dcc.el: Use (eval-when-compile (require 'cl)). | |
896 | |
897 2006-02-12 Michael Olson <mwolson@gnu.org> | |
898 | |
899 * erc-autoaway.el, erc-dcc.el, erc-ezbounce.el, erc-fill.el | |
900 * erc-goodies.el, erc-hecomplete.el, erc-ibuffer.el, erc-identd.el | |
901 * erc-imenu.el, erc-join.el, erc-lang.el, erc-list.el, erc-log.el | |
902 * erc-match.el, erc-menu.el, erc-netsplit.el, erc-networks.el | |
903 * erc-notify.el, erc-page.el, erc-pcomplete.el, erc-replace.el | |
904 * erc-ring.el, erc-services.el, erc-sound.el, erc-speedbar.el | |
905 * erc-spelling.el, erc-track.el, erc-truncate.el, erc-xdcc.el: | |
906 Add 2006 to copyright years, to comply with the changed guidelines. | |
907 | |
908 2006-02-11 Michael Olson <mwolson@gnu.org> | |
909 | |
910 * erc.el (erc-update-modules): Handle erc-capab-identify | |
911 correctly. Make some requirements shorter, so that it's easier to | |
912 see why they are needed. | |
913 | |
914 * erc-capab.el: Add autoload cookie for capab-identify. | |
915 (erc-capab-send-identify-messages, erc-capab-identify-activate): | |
916 Minor whitespace fix in code. | |
917 | |
918 * erc-stamp.el (erc-timestamp-use-align-to): Renamed from | |
919 `erc-timestamp-right-align-by-pixel'. Set the default based on | |
920 whether we are in Emacs 22, and using X. Improve documentation. | |
921 (erc-insert-aligned): Remove calculation of offset, since | |
922 :align-to pos works after all. Unlike the previous solution, this | |
923 one works when erc-stamp.el is compiled. | |
924 (erc-insert-timestamp-right): Don't add length of string, and then | |
925 later remove its displayed width. This puts timestamps after | |
926 erc-fill-column when erc-timestamp-right-column is nil, rather | |
927 than before it. It also fixes a subtle bug. Remove use of | |
928 `current-window', since there is no variable by that name in | |
929 Emacs21, Emacs22, or XEmacs21 beta. Check to see whether | |
930 `erc-fill-column' is non-nil before using it. | |
931 | |
932 2006-02-11 Diane Murray <disumu@x3y2z1.net> | |
933 | |
934 * erc-list.el: Define `list' module which sets the alias | |
935 `erc-cmd-LIST' to `erc-list-channels' when enabled and | |
936 `erc-list-channels-simple' when disabled. | |
937 (erc-list-channels): Was `erc-cmd-LIST', renamed. | |
938 (erc-list-channels-simple): New function. | |
939 | |
940 * erc.el (erc-modules): Added `list' to enabled modules. Changed | |
941 `capab-identify' description. Moved customization options left in | |
942 source code. | |
943 | |
944 * erc-menu.el (erc-menu-definition): Use `erc-list-channels'. | |
945 | |
946 * erc-capab.el: Put a little more detail into Usage section. | |
947 (define-erc-module): Run `erc-capab-identify-setup' in all open | |
948 server buffers when enabling. | |
949 (erc-capab-identify-setup): Make PROC and PARSED optional | |
950 arguments. | |
951 (erc-capab-identify-add-prefix): Simplified nickname regexp. This | |
952 should now also match nicknames that are formatted differently | |
953 than the default. | |
954 | |
955 * erc-spelling.el (define-erc-module): Make sure there's a buffer | |
956 before calling `with-current-buffer'. | |
957 | |
958 2006-02-10 Michael Olson <mwolson@gnu.org> | |
959 | |
960 * Makefile (debbuild): Split from debrelease. | |
961 (debrevision-mwolson): New rule that causes a Debian revision to | |
962 be built. | |
963 | |
964 * erc.el (erc-migrate-modules): Use a better algorithm. Thanks to | |
965 Johan Bockgård. | |
966 (erc-modules): Change use of 'pcomplete to 'completion. | |
967 | |
968 2006-02-09 Diane Murray <disumu@x3y2z1.net> | |
969 | |
970 * erc.el (erc-get-parsed-vector, erc-get-parsed-vector-nick) | |
971 * erc-capab.el: Require erc. | |
972 (erc-capab-send-identify-messages): Use `erc-server-send'. | |
973 (erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as | |
974 the flags so we can also check whether the `erc-identified' text | |
975 property is there at all. | |
976 (erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'. | |
977 This fixes a bug where the prefix wasn't inserted when timestamps | |
978 are inserted on the right. Tweaked nickname regexp. | |
979 (erc-capab-find-parsed): New function. | |
980 (erc-capab-get-unidentified-nickname): Updated to check for 0 | |
981 flag. Only get nickname if there's a nickuserhost associated with | |
982 this message. | |
983 | |
984 * erc-capab.el: New file. Adds the new module | |
985 `erc-capab-identify', which allows flagging of unidentified users | |
986 on servers running an ircd based on dancer - irc.freenode.net, for | |
987 example. | |
988 | |
989 * erc.el (erc-modules): Added `capab-identify' to options. | |
990 (erc-get-parsed-vector, erc-get-parsed-vector-nick) | |
991 (erc-get-parsed-vector-type): Moved here from erc-match.el. | |
992 | |
993 * erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick) | |
994 (erc-get-parsed-vector-type): Moved these functions to erc.el | |
995 since they can be useful outside of the text matching module. | |
996 | |
997 * NEWS: Added erc-capab.el. | |
998 | |
999 * erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client" | |
1000 to "ERC". | |
1001 | |
1002 2006-02-07 Michael Olson <mwolson@gnu.org> | |
1003 | |
1004 * ChangeLog.01, ChangeLog.02, ChangeLog.03, ChangeLog.04, | |
1005 ChangeLog.05: Rename from ChangeLog.NNNN in order to disambiguate | |
1006 the filenames in DOS. | |
1007 | |
1008 * erc-goodies.el: Comment fix. | |
1009 | |
1010 * erc-hecomplete.el: Rename from erc-complete.el. Update | |
1011 commentary. Use define-erc-module so that it's possible to | |
1012 actually use this. | |
1013 (erc-hecomplete): Rename function from `erc-complete'. | |
1014 (erc-hecomplete): Rename group from `erc-old-complete'. Docfix. | |
1015 | |
1016 * erc-join.el: Rename from erc-autojoin.el. | |
1017 | |
1018 * erc-networks.el: Rename from erc-nets.el. | |
1019 | |
1020 * erc-services.el: Rename from erc-nickserv.el. | |
1021 | |
1022 * erc-stamp.el (erc-insert-aligned): Don't take 3rd argument. Use | |
1023 the simpler `indent-to' function when | |
1024 `erc-timestamp-right-align-by-pixel' is nil. | |
1025 (erc-insert-timestamp-right): If the timestamp goes on the | |
1026 following line, don't add timestamp properties to the spaces in | |
1027 front of it. | |
1028 | |
1029 * erc.el (erc-migrate-modules): New function that eases migration | |
1030 of module names. | |
1031 (erc-modules): Call erc-migrate-modules in the :get accessor. | |
1032 (erc-modules, erc-update-modules): Update for new modules names. | |
1033 (erc-cmd-SMV): Remove, since this does not give useful output due | |
1034 to the version strings being removed from ERC modules. | |
1035 | |
1036 2006-02-05 Michael Olson <mwolson@gnu.org> | |
1037 | |
1038 * erc-spelling.el (erc-spelling-init): If | |
1039 `erc-spelling-dictionaries' is nil, do not set | |
1040 ispell-local-dictionary. Before, it was being set to nil, which | |
1041 was causing a long delay while the ispell process restarted. | |
1042 (erc-spelling-unhighlight-word): New function that removes | |
1043 flyspell properties from a spell-checked word. | |
1044 (erc-spelling-flyspell-verify): Don't spell-check nicks or words | |
1045 that have '/' before them. | |
1046 | |
1047 2006-02-04 Michael Olson <mwolson@gnu.org> | |
1048 | |
1049 * erc-autojoin.el: Use (eval-when-compile (require 'cl)). | |
1050 | |
1051 * erc-complete.el (erc-nick-completion-exclude-myself) | |
1052 (erc-try-complete-nick): Use better function for getting list of | |
1053 channel users. | |
1054 | |
1055 * erc-goodies.el: Docfix. | |
1056 | |
1057 * erc-stamp.el: Use new arch tagline, since the other one wasn't | |
1058 being treated properly. | |
1059 | |
1060 * erc.el (erc-version-string): Release ERC 5.1.1. | |
1061 | |
1062 2006-02-03 Zhang Wei <id.brep@gmail.com> | |
1063 | |
1064 * erc.el (erc-version-string): Don't hard-code Emacs version. | |
1065 (erc-version): Use emacs-version. | |
1066 | |
1067 2006-01-31 Michael Olson <mwolson@gnu.org> | |
1068 | |
1069 * erc-stamp.el: Update copyright years. | |
1070 | |
1071 2006-01-30 Simon Josefsson <jas@extundo.com> | |
1072 | |
1073 * erc.el (erc-open-ssl-stream): Use tls.el. | |
1074 | |
1075 2006-01-30 Michael Olson <mwolson@gnu.org> | |
1076 | |
1077 * erc-stamp.el (erc-timestamp-right-align-by-pixel): New option | |
1078 that determines whether to use pixel values to align right | |
1079 timestamps. The default is not to do so, since it only works with | |
1080 Emacs22 on X, and even then some people have trouble. | |
1081 (erc-insert-aligned): Use `erc-timestamp-right-align-by-pixel'. | |
1082 | |
1083 2006-01-29 Michael Olson <mwolson@gnu.org> | |
1084 | |
1085 * ChangeLog, ChangeLog.2005, ChangeLog.2004, ChangeLog.2003, | |
1086 ChangeLog.2002, ChangeLog.2001: Add "See ChangeLog.NNNN" line for | |
1087 earlier changes. Use utf-8 encoding. Fix some accent typos. | |
1088 | |
1089 * erc-speedbar.el (erc-speedbar-buttons): Fix reference to free | |
1090 variable. | |
1091 (erc-speedbar-goto-buffer): Fix compiler warning. | |
1092 | |
1093 * erc-ibuffer.el: Use `define-ibuffer-filter' instead of | |
1094 `ibuffer-degine-limiter'. Use `define-ibuffer-column' instead of | |
1095 `ibuffer-define-column'. Require 'ibuf-ext so that the macros | |
1096 work without compiler warnings. | |
1097 | |
1098 * man/erc.texi (Obtaining ERC, Installation): Note that these | |
1099 sections may be skipped if using the version of ERC that comes | |
1100 with Emacs. | |
1101 | |
1102 2006-01-29 Edward O'Connor <ted@oconnor.cx> | |
1103 | |
1104 * erc-viper.el: Remove. Now that ERC is included in Emacs, these | |
1105 work-arounds live in Viper itself. | |
1106 | |
1107 2006-01-28 Michael Olson <mwolson@gnu.org> | |
1108 | |
1109 * erc-*.el, erc.texi, NEWS: Add Arch taglines as per Emacs | |
1110 guidelines. | |
1111 | |
1112 * erc-*.el: Space out copyright years like the rest of Emacs. Use | |
1113 the Emacs copyright statement. Refer to ourselves as ERC rather | |
1114 than "Emacs IRC Client", since there are now several IRC clients | |
1115 for Emacs. | |
1116 | |
1117 * erc-compat.el (erc-emacs-build-time): Define as a variable. | |
1118 | |
1119 * erc-log.el (erc-log-setup-logging): Use write-file-functions. | |
1120 | |
1121 * erc-ibuffer.el: Require 'erc. | |
1122 | |
1123 * erc-stamp.el (erc-insert-aligned): Only use the special text | |
1124 property when window-system is X. | |
1125 | |
1126 * erc.texi: Adapt for inclusion in Emacs. | |
1127 | |
1128 2006-01-28 Johan Bockgård <bojohan@users.sourceforge.net> | |
1129 | |
1130 * erc.el (erc-format-message): More `cl' breakage; don't use | |
1131 `oddp'. | |
1132 | |
1133 2006-01-27 Michael Olson <mwolson@gnu.org> | |
1134 | |
1135 * debian/changelog: Update for new release. | |
1136 | |
1137 * debian/control (Description): Update. | |
1138 | |
1139 * debian/rules: Concatenate ChangeLog for 2005. | |
1140 | |
1141 * Makefile (MISC): Include ChangeLog.2005 and erc.texi. | |
1142 (debrelease, release): Copy images directory. | |
1143 | |
1144 * NEWS: Spelling fixes. Add items for recent changes. | |
1145 | |
1146 * erc.el (erc): Move call to erc-update-modules before the call to | |
1147 erc-mode. This should fix a timestamp display issue. | |
1148 (erc-version-string): Release ERC 5.1. | |
1149 | |
1150 2006-01-26 Michael Olson <mwolson@gnu.org> | |
1151 | |
1152 * erc-stamp.el (erc-insert-aligned): New function that inserts | |
1153 text in an perfectly-aligned way relative to the right margin. It | |
1154 only works well with Emacs22. A sane fallback is provided for | |
1155 other versions of Emacs. | |
1156 (erc-insert-timestamp-right): Use the new function. | |
1157 | |
1158 2006-01-25 Edward O'Connor <ted@oconnor.cx> | |
1159 | |
1160 * erc.el (erc-modules): Ensure that `erc-button-mode' gets enabled | |
1161 before `erc-match-mode'. | |
1162 | |
1163 * erc-match.el (match): Append `erc-match-message' to | |
1164 `erc-insert-modify-hook'. | |
1165 | |
1166 2006-01-25 Michael Olson <mwolson@gnu.org> | |
1167 | |
1168 * FOR-RELEASE: Mark last release requirement as done. | |
1169 | |
1170 * Makefile (realclean, distclean): Remove docs. | |
1171 | |
1172 * erc.texi: Take care of all pre-5.1 items. | |
1173 | |
1174 * erc-backend.el (erc-server-send, erc-server-send-queue): Wrap | |
1175 `process-send-string' in `condition-case' to avoid an error when | |
1176 quitting ERC. | |
1177 | |
1178 * erc-stamp.el (erc-insert-timestamp-right): Try to deal with | |
1179 variable-width characters in the timestamp and on the same line. | |
1180 The latter is a kludge, but it seems to work with most of the | |
1181 input I've thrown at it so far. It's certainly better than going | |
1182 past the end of line consistently when we have variable-width | |
1183 characters on the same line. When `erc-timestamp-intangible' is | |
1184 non-nil, add intangible properties to the whitespace as well, so | |
1185 that hitting <end> does what you'd expect. | |
1186 | |
1187 * erc.el (erc-flood-protect, erc-toggle-flood-control): Update | |
1188 this to only use boolean values for `erc-flood-protect'. Update | |
1189 documentation. | |
1190 (erc-cmd-QUIT): Set the active buffer to be the server buffer, so | |
1191 that any QUIT-related messages go there. | |
1192 (erc): Try to be more clever about re-using channel buffers when | |
1193 automatically re-connecting. Thanks to e1f for noticing. | |
1194 | |
1195 2006-01-23 Michael Olson <mwolson@gnu.org> | |
1196 | |
1197 * ChangeLog.2005: Remove erroneous line. | |
1198 | |
1199 * FOR-RELEASE: Make that the Makefile tweaking is complete. | |
1200 (NEWS): Mark as done. | |
1201 | |
1202 * Makefile (MANUAL): New option indicating the name of the manual. | |
1203 (PREFIX, ELISPDIR, INFODIR): New options that specify the | |
1204 directories to install lisp code and info manuals to. PREFIX is | |
1205 used only by ELISPDIR and INFODIR. | |
1206 (all): Call `lisp' and create the manual. | |
1207 (lisp): Compile lisp code. | |
1208 (%.info, %.html): New rules that make Info files and HTML files, | |
1209 respectively, from a TexInfo source. | |
1210 (doc): Create both the Info and HTML versions of the manual. This | |
1211 is for the user -- we never call it automatically. | |
1212 (install-info): Install Info files. | |
1213 (install-bin): Install compiled and source Lisp files. | |
1214 (todo): Remove, since it seems pointless. | |
1215 | |
1216 * NEWS: Update. | |
1217 | |
1218 * README: Add Installation instructions. Tweak layout. | |
1219 | |
1220 * erc.texi: Work on some pre-5.1 items. | |
1221 | |
1222 * erc-stamp.el, erc-track.el: Move some functions and options in | |
1223 order to get rid of a few compiler warnings. | |
1224 | |
1225 * erc.el (erc-modules): Enable readonly by default. This will | |
1226 prevent new users from accidentally removing old messages, which | |
1227 could be disconcerting. Also enable stamp by default, since | |
1228 timestamps are a fairly standard feature among IRC clients. | |
1229 | |
1230 * erc-button.el: Munge whitespace. | |
1231 | |
1232 * erc-identd.el (erc-identd-start): Instead of throwing an error, | |
1233 just try to use the obsolete function. | |
1234 | |
1235 2006-01-22 Michael Olson <mwolson@gnu.org> | |
1236 | |
1237 * erc-backend.el (erc-decode-string-from-target): Make sure that | |
1238 we have a string as an argument. If not, coerce it to the empty | |
1239 string. Hopefully, this will work painlessly around an edge case | |
1240 related to quitting ERC around the same time a message comes in. | |
1241 | |
1242 2006-01-22 Johan Bockgård <bojohan@users.sourceforge.net> | |
1243 | |
1244 * erc-track.el: Use `(eval-when-compile (require 'cl))' (for | |
1245 `case'). Doc fixes. | |
1246 (erc-find-parsed-property): Simplify. | |
1247 (erc-track-get-active-buffer): Fix logic. Simplify. | |
1248 (erc-track-switch-buffer): Remove unused variable `dir'. Simplify. | |
1249 | |
1250 * erc-speak.el: Doc fixes. | |
1251 (erc-speak-region): `propertize' --> `erc-propertize'. | |
1252 | |
1253 * erc-dcc.el (erc-dcc-chat-parse-output): `propertize' --> | |
1254 `erc-propertize'. | |
1255 | |
1256 * erc-button.el (erc-button-add-button): Take erc-fill-prefix into | |
1257 account when wrapping URLs. | |
1258 | |
1259 * erc-bbdb.el (erc-bbdb-elide-display): Doc fix. | |
1260 | |
1261 * erc-backend.el (define-erc-response-handler): Doc fix. | |
1262 | |
1263 2006-01-22 Michael Olson <mwolson@gnu.org> | |
1264 | |
1265 * erc.el (erc-update-modules): Use `require' instead of `load', | |
1266 but prevent it from causing errors, in order to preserve the | |
1267 previous behavior. | |
1268 | |
1269 2006-01-21 Michael Olson <mwolson@gnu.org> | |
1270 | |
1271 * FOR-RELEASE (Source): Mark cl task as done. | |
1272 | |
1273 * Makefile (erc-auto.el): Call erc-generate-autoloads rather than | |
1274 generate-autoloads. | |
1275 (erc-auto.el, %.elc): Don't show command, just its output. | |
1276 | |
1277 * NEWS: Add items from 2005-01-01 to 2005-08-13. | |
1278 | |
1279 * debian/copyright (Copyright): Update. | |
1280 | |
1281 * erc-auto.in (erc-generate-autoloads): Rename from | |
1282 generate-autoloads. | |
1283 | |
1284 * erc.el, erc-autoaway.el, erc-backend.el: Use | |
1285 erc-server-process-alive instead of erc-process-alive. | |
1286 | |
1287 * erc.el, erc-backend.el, erc-ezbounce.el, erc-list.el, | |
1288 erc-log.el, erc-match.el, erc-nets.el, erc-netsplit.el, | |
1289 erc-nicklist.el, erc-nickserv.el, erc-notify.el, erc-pcomplete.el: | |
1290 Use (eval-when-compile (require 'cl)), so that compilation doesn't | |
1291 fail. | |
1292 | |
1293 * erc-fill.el, erc-truncate.el: Whitespace munging. | |
1294 | |
1295 * erc.el: Update copyright notice. Remove eval-after-load code. | |
1296 (erc-with-buffer): Docfix. | |
1297 (erc-once-with-server-event, erc-once-with-server-event-global) | |
1298 (erc-with-buffer, erc-with-all-buffers-of-server): Use erc-gensym | |
1299 instead of gensym. | |
1300 (erc-banlist-update): Use erc-delete-if instead of delete-if. | |
1301 (erc): Call `erc-update-modules' here. | |
1302 | |
1303 * erc-backend.el: Require 'erc-compat to minimize compiler | |
1304 warnings. | |
1305 (erc-decode-parsed-server-response): Docfix. | |
1306 (erc-server-process-alive): Move here from erc.el and rename from | |
1307 `erc-process-alive'. | |
1308 (erc-server-send, erc-remove-channel-users): Make sure process is | |
1309 alive before sending data to it. | |
1310 | |
1311 * erc-bbdb.el: Update copyright years. | |
1312 (erc-bbdb-whois): Remove overexuberant comment. | |
1313 | |
1314 * erc-button.el: Require erc-fill, since we make liberal use of | |
1315 `erc-fill-column'. | |
1316 | |
1317 * erc-compat.el (erc-const-expr-p, erc-list*, erc-assert): New | |
1318 functions, the latter of which provides an `assert' equivalent. | |
1319 (erc-remove-if-not): New function that provides a simple | |
1320 implementation of `remove-if-not'. | |
1321 (erc-gensym): New function that provides a simple implementation | |
1322 of `gensym'. | |
1323 (erc-delete-if): New function that provides a simple | |
1324 implementation of `delete-if'. | |
1325 (erc-member-if): New function that provides a simple | |
1326 implementation of `member-if'. | |
1327 (field-end): Remove this, since it is unused, and later versions | |
1328 of XEmacs have this function already. | |
1329 (erc-function-arglist): Moved here from erc.el. | |
1330 (erc-delete-dups): New compatibility function for dealing with | |
1331 XEmacs. | |
1332 (erc-subseq): New function copied from cl-extra.el. | |
1333 | |
1334 * erc-dcc.el: Require pcomplete during compilation to avoid | |
1335 compiler warnings. | |
1336 (erc-unpack-int, erc-dcc-send-filter) | |
1337 (erc-dcc-get-filter): Use erc-assert instead of assert. | |
1338 (pcomplete/erc-mode/DCC): Use erc-remove-if-not instead of | |
1339 remove-if-not. | |
1340 | |
1341 * erc-match.el (erc-log-matches): Fix compiler warning. | |
1342 | |
1343 * erc-nicklist.el: Update copyright notice. | |
1344 (erc-nicklist-menu): Change use of caadr to (car (cadr ...)). | |
1345 (erc-nicklist-bitlbee-connected-p): Remove. | |
1346 (erc-nicklist-insert-medium-name-or-icon): Accept channel | |
1347 argument. Use it to determine whether we are on bitlbee. Now | |
1348 that bitlbee names its channel "&bitlbee", this is trivial. | |
1349 (erc-nicklist-insert-contents): Pass channel as specified above. | |
1350 Don't try to determine whether we are on bitlbee here. | |
1351 (erc-nicklist-channel-users-info): Use erc-remove-if-not instead | |
1352 of remove-if-not. | |
1353 (erc-nicklist-search-for-nick): Use erc-member-if instead of | |
1354 member-if. | |
1355 | |
1356 * erc-notify.el (erc-notify-QUIT): Use erc-delete-if with a | |
1357 partially-evaluated lambda expression instead of `delete' and | |
1358 `find'. | |
1359 | |
1360 * erc-track.el: Use erc-assert. | |
1361 (erc-track-modified-channels): Remove use of `return'. | |
1362 (erc-track-modified-channels): Use `cadr' instead of `second', | |
1363 since otherwise we would need yet another eval-when-compile line. | |
1364 | |
1365 2006-01-19 Michael Olson <mwolson@gnu.org> | |
1366 | |
1367 * erc-backend.el (erc-process-sentinel-1): Remove attempt to | |
1368 detect SIGPIPE, since it doesn't work. | |
1369 | |
1370 2006-01-10 Diane Murray <disumu@x3y2z1.net> | |
1371 | |
1372 * erc-spelling.el: Updated copyright years. | |
1373 (define-erc-module): Enable/disable `flyspell-mode' for all open | |
1374 ERC buffers as well. | |
1375 (erc-spelling-dictionaries): Reworded customize description. | |
1376 | |
1377 * erc.el (erc-command-symbol): New function. | |
1378 (erc-extract-command-from-line): Use `erc-command-symbol'. This | |
1379 fixes a bug where "Symbol's function definition is void: | |
1380 erc-cmd-LIST" would be shown after typing /list at the prompt (the | |
1381 command was interned because erc-menu.el uses it and is enabled by | |
1382 default whereas erc-list.el is not). | |
1383 | |
1384 * NEWS: Started a list of renamed variables. | |
1385 | |
1386 * erc.el: Reworded the message sent when defining variable | |
1387 aliases. | |
1388 (erc-command-indicator-face): Doc fix. | |
1389 (erc-modules): Enable the match module by default which makes | |
1390 current nickname highlighting on as the default. | |
1391 | |
1392 * erc-button.el: Updated copyright years. | |
1393 (erc-button): New face. | |
1394 (erc-button-face): Use `erc-button'. | |
1395 (erc-button-nickname-face): New customizable variable. | |
1396 (erc-button-add-nickname-buttons, erc-button-add-buttons-1): Send | |
1397 new argument to `erc-button-add-button'. | |
1398 (erc-button-add-button): Doc fix. Added new argument to function | |
1399 definition, NICK-P. If it's a nickname, use | |
1400 `erc-button-nickname-face', otherwise use `erc-button-face'. This | |
1401 makes channel tracking and buttons work better together when | |
1402 `erc-button-buttonize-nicks' is enabled, since there is a nickname | |
1403 on just about every line. | |
1404 | |
1405 * erc-track.el (erc-track-use-faces): Doc fix. | |
1406 (erc-track-faces-priority-list): Added `erc-button' to list. | |
1407 (erc-track-priority-faces-only): Doc fix. | |
1408 | |
1409 2006-01-09 Diane Murray <disumu@x3y2z1.net> | |
1410 | |
1411 * erc-button.el (erc-button-url-regexp): Use `concat' so the | |
1412 regexp is not one long line. | |
1413 (erc-button-alist): Fixed so that customizing works correctly. | |
1414 Reorganized. Removed lambda functions with more than two lines. | |
1415 Doc fix. | |
1416 (erc-button-describe-symbol, erc-button-beats-to-time): New | |
1417 functions. Moved from `erc-button-alist'. | |
1418 | |
1419 2006-01-07 Michael Olson <mwolson@gnu.org> | |
1420 | |
1421 * erc-backend.el (erc-process-sentinel-1): Don't try to re-open a | |
1422 process if a SIGPIPE occurs. This happens when a new message | |
1423 comes in at the same time a /quit is requested. | |
1424 (erc-process-sentinel): Use string-match rather than string= to do | |
1425 these comparisons. Matching literal newlines makes me nervous. | |
1426 | |
1427 * erc-track.el (erc-track-remove-from-mode-line): Handle case | |
1428 where global-mode-string is not a list. Emacs22 permits this. | |
1429 | |
1430 | |
1431 See ChangeLog.05 for earlier changes. | |
1432 | |
1433 Copyright (C) 2006, 2007 Free Software Foundation, Inc. | |
1434 | |
1435 This file is part of GNU Emacs. | |
1436 | |
1437 GNU Emacs is free software; you can redistribute it and/or modify | |
1438 it under the terms of the GNU General Public License as published by | |
78219
85d67fae9a94
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
76856
diff
changeset
|
1439 the Free Software Foundation; either version 3, or (at your option) |
76856 | 1440 any later version. |
1441 | |
1442 GNU Emacs is distributed in the hope that it will be useful, | |
1443 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
1444 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
1445 GNU General Public License for more details. | |
1446 | |
1447 You should have received a copy of the GNU General Public License | |
1448 along with GNU Emacs; see the file COPYING. If not, write to the | |
1449 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
1450 Boston, MA 02110-1301, USA. | |
1451 | |
1452 ;; Local Variables: | |
1453 ;; coding: utf-8 | |
1454 ;; add-log-time-zone-rule: t | |
1455 ;; End: | |
1456 | |
1457 ;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a |