10:48 p.m.
User: adrian
Date: 06/05/01 23:48:37
Modified: packages/xemacs-packages/erc CREDITS ChangeLog
ChangeLog.upstream Makefile Makefile.upstream
erc-autojoin.el erc-backend.el erc-bbdb.el
erc-button.el erc-ezbounce.el erc-identd.el
erc-netsplit.el erc.el erc.texi
Log:
packages: Sync with ERC 5.1.2
-------------------- ChangeLog entries follow: --------------------
xemacs-packages/erc/ChangeLog addition:
2006-05-01 Adrian Aichner <adrian(a)xemacs.org>
* 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):
Revision Changes Path
1.8 +9 -2 XEmacs/packages/xemacs-packages/erc/CREDITS
Index: CREDITS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/CREDITS,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- CREDITS 2006/02/19 12:57:26 1.7
+++ CREDITS 2006/05/01 21:48:26 1.8
＠＠ -124,8 +124,15 ＠＠ Luigi Panzeri (matley AT muppetslab DOT
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>:
+ * Made BBDB buffers not electric by default (6 lines changed).
+
+Aravind Gottipati <aravind(a)freeshell.org>:
+ * 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.
1.39 +43 -0 XEmacs/packages/xemacs-packages/erc/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ChangeLog 2006/02/20 07:25:37 1.38
+++ ChangeLog 2006/05/01 21:48:26 1.39
＠＠ -1,3 +1,46 ＠＠
+2006-05-01 Adrian Aichner <adrian(a)xemacs.org>
+
+ * 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):
+
2006-02-20 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 0.20 released.
1.11 +77 -3 XEmacs/packages/xemacs-packages/erc/ChangeLog.upstream
Index: ChangeLog.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog.upstream,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ChangeLog.upstream 2006/02/19 12:57:26 1.10
+++ ChangeLog.upstream 2006/05/01 21:48:26 1.11
＠＠ -1,3 +1,79 ＠＠
+2006-04-05 Diane Murray <disumu(a)x3y2z1.net>
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * erc.texi: Update direntry. Remove unneeded local variables.
+
+2006-03-26 Michael Olson <mwolson(a)gnu.org>
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * 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>
+
+ * erc.el (erc-version-string): Release ERC 5.1.2.
+
+2006-02-19 Diane Murray <disumu(a)x3y2z1.net>
+
+ * 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>
* 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>
＠＠ -490,5 +566,3 ＠＠ See ChangeLog.2005 for earlier changes.
;; End:
;; arch-tag: 865a75f6-2bcb-46df-bf0c-b514dadf688a
-
-;; arch-tag: cceaf370-9880-4031-842b-223ab2bb597d
1.33 +1 -1 XEmacs/packages/xemacs-packages/erc/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- Makefile 2006/02/20 07:25:37 1.32
+++ Makefile 2006/05/01 21:48:27 1.33
＠＠ -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>
PACKAGE = erc
PKG_TYPE = regular
1.9 +2 -2 XEmacs/packages/xemacs-packages/erc/Makefile.upstream
Index: Makefile.upstream
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile.upstream,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- Makefile.upstream 2006/02/19 12:57:27 1.8
+++ Makefile.upstream 2006/05/01 21:48:27 1.9
＠＠ -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
1.9 +3 -3 XEmacs/packages/xemacs-packages/erc/erc-autojoin.el
Index: erc-autojoin.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-autojoin.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- erc-autojoin.el 2006/02/19 12:57:27 1.8
+++ erc-autojoin.el 2006/05/01 21:48:27 1.9
＠＠ -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 ＠＠ servers, presumably in the same domain."
(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 ＠＠ servers, presumably in the same domain."
(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
1.6 +5 -11 XEmacs/packages/xemacs-packages/erc/erc-backend.el
Index: erc-backend.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-backend.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- erc-backend.el 2006/02/19 12:57:27 1.5
+++ erc-backend.el 2006/05/01 21:48:27 1.6
＠＠ -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 ＠＠ alist."
: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 ＠＠ PROCs `process-buffer' is `current-buffe
(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 ＠＠ PROCs `process-buffer' is `current-buffe
(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
1.8 +8 -2 XEmacs/packages/xemacs-packages/erc/erc-bbdb.el
Index: erc-bbdb.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-bbdb.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- erc-bbdb.el 2006/02/19 12:57:27 1.7
+++ erc-bbdb.el 2006/05/01 21:48:27 1.8
＠＠ -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 ＠＠ their \"displayed name\"."
: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 ＠＠ their \"displayed name\"."
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
1.10 +18 -1 XEmacs/packages/xemacs-packages/erc/erc-button.el
Index: erc-button.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-button.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- erc-button.el 2006/02/19 12:57:27 1.9
+++ erc-button.el 2006/05/01 21:48:27 1.10
＠＠ -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 ＠＠ PAR is a number of a regexp grouping who
(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 ＠＠ call it with the value of the `erc-data'
(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)
1.10 +2 -2 XEmacs/packages/xemacs-packages/erc/erc-ezbounce.el
Index: erc-ezbounce.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-ezbounce.el,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- erc-ezbounce.el 2006/02/19 12:57:28 1.9
+++ erc-ezbounce.el 2006/05/01 21:48:27 1.10
＠＠ -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 ＠＠ in the alist is `nil', prompt for the ap
(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)))
1.5 +10 -7 XEmacs/packages/xemacs-packages/erc/erc-identd.el
Index: erc-identd.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-identd.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- erc-identd.el 2006/02/19 12:57:28 1.4
+++ erc-identd.el 2006/05/01 21:48:27 1.5
＠＠ -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>
;; 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 ＠＠ system."
(setq port (string-to-number port))))
(if erc-identd-process
(delete-process erc-identd-process))
- (if (fboundp 'make-network-process)
- (setq erc-identd-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))
- (open-network-stream-server "identd" (generate-new-buffer
"identd")
- port nil '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))))
+;;;###autoload
(defun erc-identd-stop (&rest ignore)
(interactive)
(when erc-identd-process
1.9 +4 -3 XEmacs/packages/xemacs-packages/erc/erc-netsplit.el
Index: erc-netsplit.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-netsplit.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- erc-netsplit.el 2006/02/19 12:57:29 1.8
+++ erc-netsplit.el 2006/05/01 21:48:27 1.9
＠＠ -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 ＠＠ sever buffer."
: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 ＠＠ join from that split has been detected o
(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 "^[^＠!]+\\.[^(a)!]+$" (erc-response.sender parsed))
+ (when (string-match "^[^＠!\n]+\\.[^(a)!\n]+$" (erc-response.sender parsed))
(and erc-netsplit-debug
(erc-display-message
parsed 'notice (process-buffer proc)
1.15 +40 -12 XEmacs/packages/xemacs-packages/erc/erc.el
Index: erc.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc.el,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- erc.el 2006/02/19 12:57:31 1.14
+++ erc.el 2006/05/01 21:48:28 1.15
＠＠ -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,12 +1116,19 ＠＠ which the local user typed."
"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)
(defface erc-prompt-face
- '((t (:bold t :foreground "Black" :background"lightBlue2")))
+ '((t (:bold t :foreground "Black" :background "lightBlue2")))
"ERC face for the prompt."
:group 'erc-faces)
＠＠ -2981,7 +2988,7 ＠＠ Otherwise leave the channel indicated by
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 ＠＠ the message given by REASON."
(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 ＠＠ the message given by REASON."
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 FACE is non-nil, it will be used to p
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 ＠＠ EmacsSpeak support."
Return a list of the three separate tokens."
(cond
- ((string-match "^\\([^!]*\\)!\\([^＠]*\\)(a)\\(.*\\)$" string)
+ ((string-match "^\\([^!\n]*\\)!\\([^＠\n]*\\)(a)\\(.*\\)$" 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 ＠＠ This returns non-nil only iff we actuall
(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 ＠＠ user matches any regexp in `erc-ignore-r
"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 ＠＠ when you move point into the header line
: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 ＠＠ if `erc-away' is non-nil."
((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 ＠＠ if `erc-away' is non-nil."
(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)
1.2 +2 -6 XEmacs/packages/xemacs-packages/erc/erc.texi
Index: erc.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc.texi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- erc.texi 2006/02/19 16:38:27 1.1
+++ erc.texi 2006/05/01 21:48:28 1.2
＠＠ -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 ＠＠ to permit their use in free software.
＠printindex cp
＠bye
-
-＠c Local Variables:
-＠c ispell-local-pdict: "ispell-dict"
-＠c End:
＠ignore
arch-tag: cf9cfaff-fc12-4297-ad15-ec2493002b1e