# HG changeset patch # User Michael Olson # Date 1190172543 0 # Node ID ffc87ddd4025cc76517b931b38d3f098b5be097a # Parent f539dbd0a615201940ecdcb609937f041ab94691 Sync changes from upstream ERC diff -r f539dbd0a615 -r ffc87ddd4025 doc/misc/ChangeLog --- a/doc/misc/ChangeLog Wed Sep 19 02:00:54 2007 +0000 +++ b/doc/misc/ChangeLog Wed Sep 19 03:29:03 2007 +0000 @@ -1,3 +1,7 @@ +2007-09-18 Exal de Jesus Garcia Carrillo + + * erc.texi (Special-Features): Fix small typo. + 2007-09-14 Michael Albinus * tramp.texi (Filename Syntax): Provide links to "Inline methods" diff -r f539dbd0a615 -r ffc87ddd4025 doc/misc/erc.texi --- a/doc/misc/erc.texi Wed Sep 19 02:00:54 2007 +0000 +++ b/doc/misc/erc.texi Wed Sep 19 03:29:03 2007 +0000 @@ -393,7 +393,7 @@ @item highlighting -Some occurences of words can be highlighted, which makes it easier to +Some occurrences of words can be highlighted, which makes it easier to track different kinds of conversations. @item notification diff -r f539dbd0a615 -r ffc87ddd4025 lisp/erc/ChangeLog --- a/lisp/erc/ChangeLog Wed Sep 19 02:00:54 2007 +0000 +++ b/lisp/erc/ChangeLog Wed Sep 19 03:29:03 2007 +0000 @@ -1,5 +1,33 @@ +2007-09-18 Exal de Jesus Garcia Carrillo + + * erc.texi (Special-Features): Fix small typo. + +2007-09-16 Michael Olson + + * erc-track.el (erc-track-switch-direction): Mention + erc-track-faces-priority-list. Thanks to Leo for the suggestion. + +2007-09-11 Exal de Jesus Garcia Carrillo + + * erc-sound.el: Fix typo in setting up instructions. + +2007-09-10 Michael Olson + + * Makefile (elpa): Copy dir template rather than echoing a few + lines. The reason for this is that the ELPA package for ERC was + getting a corrupt dir entry. + + * dir-template: Template for the ELPA dir file. + 2007-09-08 Michael Olson + * erc-log.el (erc-log-filter-function): New option that specifies + the function to call for filtering text before writing it to a log + file. Thanks to David O'Toole for the suggestion. + (erc-save-buffer-in-logs): Use erc-log-filter-function. Make sure + we carry along the value of coding-system-for-write, because this + could potentially be shadowed by the temporary buffer. + * erc.el (erc-version-string): Update to 5.3, development version. 2007-09-07 Glenn Morris diff -r f539dbd0a615 -r ffc87ddd4025 lisp/erc/erc-log.el --- a/lisp/erc/erc-log.el Wed Sep 19 02:00:54 2007 +0000 +++ b/lisp/erc/erc-log.el Wed Sep 19 03:29:03 2007 +0000 @@ -205,6 +205,16 @@ `emacs-mule', or `iso-2022-7bit'." :group 'erc-log) +(defcustom erc-log-filter-function nil + "*If non-nil, pass text through the given function before writing it to +a log file. + +The function should take one argument, which is the text to filter." + :group 'erc-log + :type '(choice (function "Function") + (const :tag "No filtering" nil))) + + ;;;###autoload (autoload 'erc-log-mode "erc-log" nil t) (define-erc-module log nil "Automatically logs things you receive on IRC into files. @@ -405,17 +415,25 @@ (or buffer (setq buffer (current-buffer))) (when (erc-logging-enabled buffer) (let ((file (erc-current-logfile buffer)) - (coding-system-for-write erc-log-file-coding-system)) + (coding-system erc-log-file-coding-system)) (save-excursion (with-current-buffer buffer (save-restriction (widen) - ;; early on in the initalisation, don't try and write the log out + ;; early on in the initialization, don't try and write the log out (when (and (markerp erc-last-saved-position) (> erc-insert-marker (1+ erc-last-saved-position))) - (write-region (1+ (marker-position erc-last-saved-position)) - (marker-position erc-insert-marker) - file t 'nomessage) + (let ((start (1+ (marker-position erc-last-saved-position))) + (end (marker-position erc-insert-marker))) + (if (functionp erc-log-filter-function) + (let ((text (buffer-substring start end))) + (with-temp-buffer + (insert (funcall erc-log-filter-function text)) + (let ((coding-system-for-write coding-system)) + (write-region (point-min) (point-max) + file t 'nomessage)))) + (let ((coding-system-for-write coding-system)) + (write-region start end file t 'nomessage)))) (if (and erc-truncate-buffer-on-save (interactive-p)) (progn (let ((inhibit-read-only t)) (erase-buffer)) diff -r f539dbd0a615 -r ffc87ddd4025 lisp/erc/erc-sound.el --- a/lisp/erc/erc-sound.el Wed Sep 19 02:00:54 2007 +0000 +++ b/lisp/erc/erc-sound.el Wed Sep 19 03:29:03 2007 +0000 @@ -30,7 +30,7 @@ ;; Add the following to your .emacs if you want to play sounds. ;; -;; (require 'erc-soud) +;; (require 'erc-sound) ;; (erc-sound-enable) ;; ;; To send requests to other users from within query buffers, type the diff -r f539dbd0a615 -r ffc87ddd4025 lisp/erc/erc-track.el --- a/lisp/erc/erc-track.el Wed Sep 19 02:00:54 2007 +0000 +++ b/lisp/erc/erc-track.el Wed Sep 19 03:29:03 2007 +0000 @@ -285,7 +285,11 @@ oldest - find oldest active buffer newest - find newest active buffer leastactive - find buffer with least unseen messages - mostactive - find buffer with most unseen messages." + mostactive - find buffer with most unseen messages. + +If set to 'importance, the importance is determined by position +in `erc-track-faces-priority-list', where first is most +important." :group 'erc-track :type '(choice (const importance) (const oldest)