COMMIT No hurry to get this package out, Norbert. I just had time to do this today. Best regards! Adrian packages ChangeLog patch: Diff command: cvs -q diff -U 0 Files affected: xemacs-packages/erc/ChangeLog Index: xemacs-packages/erc/ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v retrieving revision 1.38 diff -u -U0 -r1.38 ChangeLog --- xemacs-packages/erc/ChangeLog 20 Feb 2006 07:25:37 -0000 1.38 +++ xemacs-packages/erc/ChangeLog 1 May 2006 21:47:15 -0000 ＠＠ -0,0 +1,43 ＠＠ +2006-05-01 Adrian Aichner <adrian(a)xemacs.org&gt; + + * CREDITS: Full sync with upstream Version 5.1.2 $Revision: + 1.796.2.6 (current state of release_5_1_branch). + * ChangeLog.upstream: + * Makefile (AUTHOR_VERSION): + * Makefile.upstream: + * erc-autojoin.el (erc-autojoin-version): + * erc-autojoin.el (erc-autojoin-add): + * erc-autojoin.el (erc-autojoin-remove): + * erc-backend.el (erc-backend-version): + * erc-backend.el (erc-server-connect-function): + * erc-backend.el (erc-parse-server-response): + * erc-bbdb.el: + * erc-bbdb.el (erc-bbdb-version): + * erc-bbdb.el (erc-bbdb-electric-p): New. + * erc-bbdb.el (erc-bbdb-show-entry): + * erc-button.el: + * erc-button.el (erc-button-version): + * erc-button.el (erc-button-keymap): + * erc-button.el (erc-button-next): + * erc-button.el (erc-button-previous): New. + * erc-ezbounce.el (erc-ezb-version): + * erc-ezbounce.el (erc-ezb-add-session): + * erc-identd.el: + * erc-identd.el (erc-identd-start): + * erc-netsplit.el (erc-netsplit-version): + * erc-netsplit.el (erc-netsplit-regexp): + * erc-netsplit.el (erc-netsplit-MODE): + * erc.el: + * erc.el (erc-version-string): + * erc.el (erc-header-line): New. + * erc.el (erc-cmd-QUOTE): + * erc.el (erc-cmd-SV): + * erc.el (erc-join-channel): + * erc.el (erc-parse-user): + * erc.el (erc-send-input): + * erc.el (erc-message-target): + * erc.el (erc-header-line-face-method): New. + * erc.el (erc-update-mode-line-buffer): + * erc.texi: + * erc.texi (Concept Index): + packages source patch: Diff command: cvs -f -z3 -q diff -u -w -N Files affected: xemacs-packages/erc/erc.texi xemacs-packages/erc/erc.el xemacs-packages/erc/erc-netsplit.el xemacs-packages/erc/erc-identd.el xemacs-packages/erc/erc-ezbounce.el xemacs-packages/erc/erc-button.el xemacs-packages/erc/erc-bbdb.el xemacs-packages/erc/erc-backend.el xemacs-packages/erc/erc-autojoin.el xemacs-packages/erc/Makefile.upstream xemacs-packages/erc/Makefile xemacs-packages/erc/ChangeLog.upstream xemacs-packages/erc/CREDITS Index: xemacs-packages/erc/CREDITS =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/CREDITS,v retrieving revision 1.7 diff -u -w -r1.7 CREDITS --- xemacs-packages/erc/CREDITS 19 Feb 2006 12:57:26 -0000 1.7 +++ xemacs-packages/erc/CREDITS 1 May 2006 21:40:54 -0000 ＠＠ -124,8 +124,15 ＠＠ Simon Josefsson (jas AT extundo DOT com): * Changed erc.el to use tls.el instead of ssl.el. +Nelson Ferreira <nelson.ferreira(a)ieee.org&gt;: + * Made BBDB buffers not electric by default (6 lines changed). + +Aravind Gottipati <aravind(a)freeshell.org&gt;: + * Made /quote work with lines that don't have leading whitespace (1 + line changed). + ---- P.S.: Many people contributed small bits to ERC whose names I probably -forgot. If you aren't listed here, simply write a mail to mlang(a)delysid.org, -I'll add you then. +forgot. If you aren't listed here and should be, send an email to +mwolson(a)gnu.org along with a list of your contributions. Index: xemacs-packages/erc/ChangeLog.upstream =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog.upstream,v retrieving revision 1.10 diff -u -w -r1.10 ChangeLog.upstream --- xemacs-packages/erc/ChangeLog.upstream 19 Feb 2006 12:57:26 -0000 1.10 +++ xemacs-packages/erc/ChangeLog.upstream 1 May 2006 21:40:54 -0000 ＠＠ -1,3 +1,79 ＠＠ +2006-04-05 Diane Murray <disumu(a)x3y2z1.net&gt; + + * erc.el (erc-cmd-SV): Removed the exclamation point. Show the + build date as it's shown in `emacs-version'. + + * erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix + with the same face property as the previous character. + +2006-04-02 Michael Olson <mwolson(a)gnu.org&gt; + + * erc-backend.el, erc-ezbounce.el, erc-join.el, erc-netsplit.el, + erc.el: Make sure to include a newline inside of negated classes, + so that a newline is not matched. + +2006-04-01 Michael Olson <mwolson(a)gnu.org&gt; + + * erc-backend.el (erc-server-connect-function): Don't try to + detect the existence of the `open-network-stream-nowait' function, + since I can't find it in Emacs21, XEmacs21, or Emacs22. + +2006-03-27 Michael Olson <mwolson(a)gnu.org&gt; + + * erc.texi: Update direntry. Remove unneeded local variables. + +2006-03-26 Michael Olson <mwolson(a)gnu.org&gt; + + * erc.el (erc-header-line): New face that will be used to colorize + the text of the header-line, provided that + `erc-header-line-face-method' is non-nil. + (erc-prompt-face): Fix formatting. + (erc-header-line-face-method): New option that determines the + method used for colorizing header-line text. This may be a + function, nil, or non-nil. + (erc-update-mode-line-buffer): Use the aforementioned option and + face to colorize the header-line text, if that is what the user + wants. + (erc-send-input): If flood control is not activated, don't split + the input line. + +2006-03-25 Michael Olson <mwolson(a)gnu.org&gt; + + * erc.el (erc-cmd-QUOTE): Install patch from Aravind Gottipati + that fixes the case where there is no leading whitespace. Only + remove the first space character, though. + + * erc-identd.el (erc-identd-start): Fix a bug by making sure that + erc-identd-process is set properly. + (erc-identd-start, erc-identd-stop): Add autoload cookies. + (erc-identd-start): Pass :host parameter so this works with Emacs + 22. + +2006-03-21 Michael Olson <mwolson(a)gnu.org&gt; + + * CREDITS: Add Nelson Ferreira. Change contact address. + + * erc-bbdb.el: Install patch from Nelson Ferreira. + (erc-bbdb-electric-p): New option that indicates whether to make + the BBDB buffer electric. Defaults to "not electric". + (erc-bbdb-show-entry): Use `erc-bbdb-electric-p'. + +2006-03-09 Diane Murray <disumu(a)x3y2z1.net&gt; + + * erc-button.el (erc-button-keymap): Use <backtab> rather than + <C-tab> for `erc-button-previous' as it is a more standard key + binding for this type of function. + +2006-02-19 Michael Olson <mwolson(a)gnu.org&gt; + + * erc.el (erc-version-string): Release ERC 5.1.2. + +2006-02-19 Diane Murray <disumu(a)x3y2z1.net&gt; + + * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to + <C-tab>. + (erc-button-previous): New function. + 2006-02-15 Michael Olson <mwolson(a)gnu.org&gt; * erc.el (erc): Move to the end of the buffer when a continued ＠＠ -117,7 +193,7 ＠＠ * erc.texi (History): Note that ERC is now included with Emacs. - * erc.el (erc-version-string): Release ERC 5.1.1 + * erc.el (erc-version-string): Release ERC 5.1.1. 2006-01-31 Michael Olson <mwolson(a)gnu.org&gt; ＠＠ -490,5 +566,3 ＠＠ ;; End: ;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a - -;; arch-tag: cceaf370-9880-4031-842b-223ab2bb597d Index: xemacs-packages/erc/Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile,v retrieving revision 1.32 diff -u -w -r1.32 Makefile --- xemacs-packages/erc/Makefile 20 Feb 2006 07:25:37 -0000 1.32 +++ xemacs-packages/erc/Makefile 1 May 2006 21:40:54 -0000 ＠＠ -19,7 +19,7 ＠＠ VERSION = 0.20 -AUTHOR_VERSION = Version 5.1.1 Revision: 1.796.2.3 +AUTHOR_VERSION = Version 5.1.2 Revision: 1.796.2.6 MAINTAINER = Adrian Aichner <adrian(a)xemacs.org&gt; PACKAGE = erc PKG_TYPE = regular Index: xemacs-packages/erc/Makefile.upstream =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile.upstream,v retrieving revision 1.8 diff -u -w -r1.8 Makefile.upstream --- xemacs-packages/erc/Makefile.upstream 19 Feb 2006 12:57:27 -0000 1.8 +++ xemacs-packages/erc/Makefile.upstream 1 May 2006 21:40:54 -0000 ＠＠ -1,6 +1,6 ＠＠ -VERSION=5.1.1 +VERSION=5.1.2 SNAPDIR=erc-$(VERSION) -LASTUPLOAD = 5.1.1-2 +LASTUPLOAD = 5.1.1-3 BUILDOPTS = SPECIAL = erc-auto.el Index: xemacs-packages/erc/erc-autojoin.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-autojoin.el,v retrieving revision 1.8 diff -u -w -r1.8 erc-autojoin.el --- xemacs-packages/erc/erc-autojoin.el 19 Feb 2006 12:57:27 -0000 1.8 +++ xemacs-packages/erc/erc-autojoin.el 1 May 2006 21:40:54 -0000 ＠＠ -36,7 +36,7 ＠＠ (require 'erc) (eval-when-compile (require 'cl)) -(defconst erc-autojoin-version "$Revision: 1.15.2.1 $" +(defconst erc-autojoin-version "$Revision: 1.15.2.2 $" "ERC autojoin revision.") (defgroup erc-autojoin nil ＠＠ -95,7 +95,7 ＠＠ (or erc-server-announced-name erc-session-server)))) (when (erc-current-nick-p nick) (when (and erc-autojoin-domain-only - (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server)) + (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) (setq server (match-string 1 server))) (let ((elem (assoc server erc-autojoin-channels-alist))) (if elem ＠＠ -118,7 +118,7 ＠＠ (or erc-server-announced-name erc-session-server)))) (when (erc-current-nick-p nick) (when (and erc-autojoin-domain-only - (string-match "[^.]+\\.\\([^.]+\\.[^.]+\\)$" server)) + (string-match "[^.\n]+\\.\\([^.\n]+\\.[^.\n]+\\)$" server)) (setq server (match-string 1 server))) (let ((elem (assoc server erc-autojoin-channels-alist))) (when elem Index: xemacs-packages/erc/erc-backend.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-backend.el,v retrieving revision 1.5 diff -u -w -r1.5 erc-backend.el --- xemacs-packages/erc/erc-backend.el 19 Feb 2006 12:57:27 -0000 1.5 +++ xemacs-packages/erc/erc-backend.el 1 May 2006 21:40:54 -0000 ＠＠ -105,7 +105,7 ＠＠ ;;;; Variables and options -(defconst erc-backend-version "$Revision: 1.44.2.1 $") +(defconst erc-backend-version "$Revision: 1.44.2.2 $") (defvar erc-server-responses (make-hash-table :test #'equal) "Hashtable mapping server responses to their handler hooks.") ＠＠ -314,13 +314,7 ＠＠ :type '(repeat (cons (string :tag "Target") coding-system))) -(defcustom erc-server-connect-function - (if (and (fboundp 'open-network-stream-nowait) - ;; CVS Emacs claims to define open-network-stream-nowait on - ;; windows, however, it does, in fact, not work. - (not (memq system-type '(windows-nt cygwin ms-dos darwin)))) - 'open-network-stream-nowait - 'open-network-stream) +(defcustom erc-server-connect-function 'open-network-stream "Function used to initiate a connection. It should take same arguments as `open-network-stream' does." :group 'erc-server ＠＠ -764,10 +758,10 ＠＠ (substring string 1 posn))) (setf (erc-response.command msg) - (let* ((bposn (string-match "[^ ]" string posn)) + (let* ((bposn (string-match "[^ \n]" string posn)) (eposn (string-match " " string bposn))) (setq posn (and eposn - (string-match "[^ ]" string eposn))) + (string-match "[^ \n]" string eposn))) (substring string bposn eposn))) (while (and posn ＠＠ -775,7 +769,7 ＠＠ (push (let* ((bposn posn) (eposn (string-match " " string bposn))) (setq posn (and eposn - (string-match "[^ ]" string eposn))) + (string-match "[^ \n]" string eposn))) (substring string bposn eposn)) (erc-response.command-args msg))) (when posn Index: xemacs-packages/erc/erc-bbdb.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-bbdb.el,v retrieving revision 1.7 diff -u -w -r1.7 erc-bbdb.el --- xemacs-packages/erc/erc-bbdb.el 19 Feb 2006 12:57:27 -0000 1.7 +++ xemacs-packages/erc/erc-bbdb.el 1 May 2006 21:40:55 -0000 ＠＠ -50,7 +50,7 ＠＠ (require 'bbdb-gui) (require 'bbdb-hooks) -(defconst erc-bbdb-version "$Revision: 1.31.2.1 $" +(defconst erc-bbdb-version "$Revision: 1.31.2.2 $" "ERC BBDB revision.") (defgroup erc-bbdb nil ＠＠ -113,6 +113,11 ＠＠ :group 'erc-bbdb :type 'boolean) +(defcustom erc-bbdb-electric-p nil + "*If t, BBDB popup buffer is electric." +:group 'erc-bbdb +:type 'boolean) + (defun erc-bbdb-search-name-and-create (create-p name nick finger-host silent) (let* ((ircnick (cons erc-bbdb-irc-nick-field (concat "^" (regexp-quote nick)))) ＠＠ -133,7 +138,8 ＠＠ record))) (defun erc-bbdb-show-entry (record channel proc) - (let ((bbdb-display-layout (bbdb-grovel-elide-arg erc-bbdb-elide-display))) + (let ((bbdb-display-layout (bbdb-grovel-elide-arg erc-bbdb-elide-display)) + (bbdb-electric-p erc-bbdb-electric-p)) (when (and record (or (eq erc-bbdb-popup-type t) (and (eq erc-bbdb-popup-type 'visible) (and channel Index: xemacs-packages/erc/erc-button.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-button.el,v retrieving revision 1.9 diff -u -w -r1.9 erc-button.el --- xemacs-packages/erc/erc-button.el 19 Feb 2006 12:57:27 -0000 1.9 +++ xemacs-packages/erc/erc-button.el 1 May 2006 21:40:55 -0000 ＠＠ -68,7 +68,7 ＠＠ ;;; Variables -(defconst erc-button-version "$Revision: 1.71.2.1 $" +(defconst erc-button-version "$Revision: 1.71.2.2 $" "ERC button mode revision.") (defface erc-button '((t (:bold t))) ＠＠ -219,6 +219,7 ＠＠ (define-key map (kbd "<button2>") 'erc-button-click-button) (define-key map (kbd "<mouse-2>") 'erc-button-click-button)) (define-key map (kbd "TAB") 'erc-button-next) + (define-key map (kbd "<backtab>") 'erc-button-previous) (set-keymap-parent map erc-mode-map) map) "Local keymap for ERC buttons.") ＠＠ -428,6 +429,22 ＠＠ (if (< here (point-max)) (goto-char here) (error "No next button")) + t))) + +(defun erc-button-previous () + "Go to the previous button in this buffer." + (interactive) + (let ((here (point))) + (when (< here (erc-beg-of-input-line)) + (while (and (get-text-property here 'erc-callback) + (not (= here (point-min)))) + (setq here (1- here))) + (while (and (not (get-text-property here 'erc-callback)) + (not (= here (point-min)))) + (setq here (1- here))) + (if (> here (point-min)) + (goto-char here) + (error "No previous button")) t))) (defun erc-browse-emacswiki (thing) Index: xemacs-packages/erc/erc-ezbounce.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-ezbounce.el,v retrieving revision 1.9 diff -u -w -r1.9 erc-ezbounce.el --- xemacs-packages/erc/erc-ezbounce.el 19 Feb 2006 12:57:28 -0000 1.9 +++ xemacs-packages/erc/erc-ezbounce.el 1 May 2006 21:40:55 -0000 ＠＠ -29,7 +29,7 ＠＠ (require 'erc) (eval-when-compile (require 'cl)) -(defconst erc-ezb-version "$Revision: 1.12.2.1 $" +(defconst erc-ezb-version "$Revision: 1.12.2.2 $" "ERC EZBouncer revision.") (defgroup erc-ezbounce nil ＠＠ -142,7 +142,7 ＠＠ (defun erc-ezb-add-session (message) "Add an EZBounce session to the session list." (when (and erc-ezb-inside-session-listing - (string-match "^\\([^ ]+\\) +\\([^ ]+\\) +\\([^ ]+\\) +\\([^ ]+\\)$" message)) + (string-match "^\\([^ \n]+\\) +\\([^ \n]+\\) +\\([^ \n]+\\) +\\([^ \n]+\\)$" message)) (let ((id (match-string 1 message)) (nick (match-string 2 message)) (to (match-string 3 message))) Index: xemacs-packages/erc/erc-identd.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-identd.el,v retrieving revision 1.4 diff -u -w -r1.4 erc-identd.el --- xemacs-packages/erc/erc-identd.el 19 Feb 2006 12:57:28 -0000 1.4 +++ xemacs-packages/erc/erc-identd.el 1 May 2006 21:40:55 -0000 ＠＠ -1,6 +1,6 ＠＠ ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server -;; Copyright (C) 2003 Free Software Foundation, Inc. +;; Copyright (C) 2003, 2006 Free Software Foundation, Inc. ;; Author: John Wiegley <johnw(a)gnu.org&gt; ;; Keywords: comm, processes ＠＠ -46,6 +46,7 ＠＠ system-type (user-login-name))) (process-send-eof erc-identd-process))))) +;;;###autoload (defun erc-identd-start (&optional port) "Start an identd server listening to port 8113. Port 113 (auth) will need to be redirected to port 8113 on your ＠＠ -60,15 +61,17 ＠＠ (setq port (string-to-number port)))) (if erc-identd-process (delete-process erc-identd-process)) - (if (fboundp 'make-network-process) (setq erc-identd-process + (if (fboundp 'make-network-process) (make-network-process :name "identd" :buffer (generate-new-buffer "identd") - :service port :server t :noquery t - :filter 'erc-identd-filter)) + :host 'local :service port + :server t :noquery t + :filter 'erc-identd-filter) (open-network-stream-server "identd" (generate-new-buffer "identd") - port nil 'erc-identd-filter))) + port nil 'erc-identd-filter)))) +;;;###autoload (defun erc-identd-stop (&rest ignore) (interactive) (when erc-identd-process Index: xemacs-packages/erc/erc-netsplit.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-netsplit.el,v retrieving revision 1.8 diff -u -w -r1.8 erc-netsplit.el --- xemacs-packages/erc/erc-netsplit.el 19 Feb 2006 12:57:29 -0000 1.8 +++ xemacs-packages/erc/erc-netsplit.el 1 May 2006 21:40:55 -0000 ＠＠ -34,7 +34,7 ＠＠ (require 'erc) (eval-when-compile (require 'cl)) -(defconst erc-netsplit-version "$Revision: 1.15.2.1 $" +(defconst erc-netsplit-version "$Revision: 1.15.2.2 $" "ERC netsplit version.") (defgroup erc-netsplit nil ＠＠ -67,7 +67,8 ＠＠ :group 'erc-netsplit :type 'boolean) -(defcustom erc-netsplit-regexp "^[^ ＠!\"]+\\.[^ ＠!]+ [^ ＠!]+\\.[^ ＠!\"]+$" +(defcustom erc-netsplit-regexp + "^[^ ＠!\"\n]+\\.[^ ＠!\n]+ [^ ＠!\n]+\\.[^ ＠!\"\n]+$" "This regular expression should match quit reasons produced by netsplits." :group 'erc-netsplit ＠＠ -134,7 +135,7 ＠＠ (defun erc-netsplit-MODE (proc parsed) "Hide mode changes from servers." ;; regexp matches things with a . in them, and no ! or ＠ in them. - (when (string-match &quot;^[^＠!]+\\.[^(a)!]+$&quot; (erc-response.sender parsed)) + (when (string-match &quot;^[^＠!\n]+\\.[^(a)!\n]+$&quot; (erc-response.sender parsed)) (and erc-netsplit-debug (erc-display-message parsed 'notice (process-buffer proc) Index: xemacs-packages/erc/erc.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc.el,v retrieving revision 1.14 diff -u -w -r1.14 erc.el --- xemacs-packages/erc/erc.el 19 Feb 2006 12:57:31 -0000 1.14 +++ xemacs-packages/erc/erc.el 1 May 2006 21:40:58 -0000 ＠＠ -66,7 +66,7 ＠＠ ;;; Code: -(defconst erc-version-string "Version 5.1.1 $Revision: 1.796.2.3 $" +(defconst erc-version-string "Version 5.1.2 $Revision: 1.796.2.6 $" "ERC version. This is used by function `erc-version'.") (eval-when-compile (require 'cl)) ＠＠ -1116,6 +1116,13 ＠＠ "ERC face used for messages you receive in the main erc buffer." :group 'erc-faces) +(defface erc-header-line + '((t (:foreground "grey20" :background "grey90"))) + "ERC face used for the header line. + +This will only be used if `erc-header-line-face-method' is non-nil." +:group 'erc-faces) + (defface erc-input-face '((t (:foreground "brown"))) "ERC face used for your input." :group 'erc-faces) ＠＠ -2981,7 +2988,7 ＠＠ All the text given as argument is sent to the sever as unmodified, just as you provided it. Use this command with care!" (cond - ((string-match "^\\s-\\(.+\\)$" line) + ((string-match "^ ?\\(.+\\)$" line) (erc-server-send (match-string 1 line))) (t nil))) (put 'erc-cmd-QUOTE 'do-not-parse-args t) ＠＠ -3110,7 +3117,7 ＠＠ (defun erc-cmd-SV () "Say the current ERC and Emacs version into channel." - (erc-send-message (format "I'm using ERC %s with %s %s (%s%s%s)!" + (erc-send-message (format "I'm using ERC %s with %s %s (%s%s) of %s." erc-version-string (if (featurep 'xemacs) "XEmacs" "GNU Emacs") emacs-version ＠＠ -3133,7 +3140,7 ＠＠ x-toolkit-scroll-bars))) "") (if (featurep 'multi-tty) ", multi-tty" "")) - (concat ", built " erc-emacs-build-time))) + erc-emacs-build-time)) t) (defun erc-cmd-SM () ＠＠ -3474,7 +3481,7 ＠＠ If `point' is at the beginning of a channel name, use that as default." (interactive (list - (let ((chnl (if (looking-at "\\([&#+!][^ ]+\\)") (match-string 1) "")) + (let ((chnl (if (looking-at "\\([&#+!][^ \n]+\\)") (match-string 1) "")) (table (when (erc-server-buffer-live-p) (set-buffer (process-buffer erc-server-process)) erc-channel-list))) ＠＠ -4718,12 +4725,12 ＠＠ Return a list of the three separate tokens." (cond - ((string-match &quot;^\\([^!]*\\)!\\([^＠]*\\)(a)\\(.*\\)$&quot; string) + ((string-match &quot;^\\([^!\n]*\\)!\\([^＠\n]*\\)(a)\\(.*\\)$&quot; string) (list (match-string 1 string) (match-string 2 string) (match-string 3 string))) ;; Some bogus bouncers send Nick!(null), try to live with that. - ((string-match "^\\([^!]*\\)!\\(.*\\)$" string) + ((string-match "^\\([^!\n]*\\)!\\(.*\\)$" string) (list (match-string 1 string) "" (match-string 2 string))) ＠＠ -4841,7 +4848,8 ＠＠ (erc-display-msg line) (erc-process-input-line (concat line "\n") (null erc-flood-protect) t)) - (erc-split-line line))) + (or (and erc-flood-protect (erc-split-line line)) + (list line)))) (split-string str "\n")) ;; Insert the prompt along with the command. (erc-display-command str) ＠＠ -5036,7 +5044,7 ＠＠ "Return the addressed target in MSG. The addressed target is the string before the first colon in MSG." - (if (string-match "^\\([^: ]*\\):" msg) + (if (string-match "^\\([^: \n]*\\):" msg) (match-string 1 msg) nil)) ＠＠ -5607,6 +5615,17 ＠＠ :group 'erc-mode-line-and-header :type 'boolean) +(defcustom erc-header-line-face-method nil + "Determine what method to use when colorizing the header line text. + +If nil, don't colorize the header text. +If given a function, call it and use the resulting face name. +Otherwise, use the `erc-header-line' face." +:group 'erc-mode-line-and-header +:type '(choice (const :tag "Don't colorize" nil) + (const :tag "Use the erc-header-line face" t) + (function :tag "Call a function"))) + (defcustom erc-show-channel-key-p t "Show the the channel key in the header line." :group 'erc-paranoia ＠＠ -5713,7 +5732,13 ＠＠ ((erc-server-process-alive) "") (t - ": CLOSED")))) + ": CLOSED"))) + (face (cond ((eq erc-header-line-face-method nil) + nil) + ((functionp erc-header-line-face-method) + (funcall erc-header-line-face-method)) + (t + erc-header-line)))) (cond ((featurep 'xemacs) (setq modeline-buffer-identification (list (format-spec erc-mode-line-format spec))) ＠＠ -5737,7 +5762,10 ＠＠ (erc-replace-regexp-in-string "%" "%%" - (erc-propertize header 'help-echo help-echo))))) + (if face + (erc-propertize header 'help-echo help-echo + 'face face) + (erc-propertize header 'help-echo help-echo)))))) (t (setq header-line-format header)))))) (if (featurep 'xemacs) (redraw-modeline) Index: xemacs-packages/erc/erc.texi =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc.texi,v retrieving revision 1.1 diff -u -w -r1.1 erc.texi --- xemacs-packages/erc/erc.texi 19 Feb 2006 16:38:27 -0000 1.1 +++ xemacs-packages/erc/erc.texi 1 May 2006 21:40:59 -0000 ＠＠ -6,13 +6,13 ＠＠ ＠dircategory Emacs ＠direntry -* ERC: (erc). Full-featured IRC client for Emacs. +* ERC: (erc). Powerful, modular, and extensible IRC client for Emacs. ＠end direntry ＠syncodeindex fn cp ＠copying -This manual is for ERC version 5.1.1. +This manual is for ERC version 5.1.2. Copyright ＠copyright{} 2005, 2006 Free Software Foundation, Inc. ＠＠ -1434,10 +1434,6 ＠＠ ＠printindex cp ＠bye - -＠c Local Variables: -＠c ispell-local-pdict: "ispell-dict" -＠c End: ＠ignore arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e -- Adrian Aichner mailto:adrian＠xemacs.org http://www.xemacs.org/