User: adrian Date: 05/10/21 00:49:53 Modified: packages/xemacs-packages/erc ChangeLog ChangeLog.upstream Makefile erc-compat.el erc-match.el erc-nets.el erc.el Log: packages: Sync erc after cooperation with upstream -------------------- ChangeLog entries follow: -------------------- xemacs-packages/erc/ChangeLog addition: 2005-10-21 Adrian Aichner <adrian(a)xemacs.org&gt; * Full sync with upstream revision 1.776. * ChangeLog.upstream: * Makefile (AUTHOR_VERSION): * erc-compat.el: * erc-compat.el (erc-compat-version): * erc-compat.el (erc-make-obsolete): New. * erc-compat.el (erc-make-obsolete-variable): New. * erc-match.el: * erc-match.el (erc-match-version): * erc-match.el (erc-current-nick-highlight-type): * erc-match.el (erc-beep-match-types): New. * erc-match.el (erc-beep-on-match): New. * erc-nets.el: * erc-nets.el (erc-nets-version): * erc-nets.el (erc-current-network): * erc.el: * erc.el (erc-version-string): * erc.el (fboundp): * erc.el (erc-send-command): Revision Changes Path 1.35 +22 -0 XEmacs/packages/xemacs-packages/erc/ChangeLog Index: ChangeLog =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/ChangeLog,v retrieving revision 1.34 retrieving revision 1.35 diff -u -p -r1.34 -r1.35 --- ChangeLog 2005/10/16 17:20:31 1.34 +++ ChangeLog 2005/10/20 22:49:50 1.35 ＠＠ -1,3 +1,25 ＠＠ +2005-10-21 Adrian Aichner <adrian(a)xemacs.org&gt; + + * Full sync with upstream revision 1.776. + * ChangeLog.upstream: + * Makefile (AUTHOR_VERSION): + * erc-compat.el: + * erc-compat.el (erc-compat-version): + * erc-compat.el (erc-make-obsolete): New. + * erc-compat.el (erc-make-obsolete-variable): New. + * erc-match.el: + * erc-match.el (erc-match-version): + * erc-match.el (erc-current-nick-highlight-type): + * erc-match.el (erc-beep-match-types): New. + * erc-match.el (erc-beep-on-match): New. + * erc-nets.el: + * erc-nets.el (erc-nets-version): + * erc-nets.el (erc-current-network): + * erc.el: + * erc.el (erc-version-string): + * erc.el (fboundp): + * erc.el (erc-send-command): + 2005-10-16 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 0.18 released. 1.9 +28 -0 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.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- ChangeLog.upstream 2005/10/15 18:15:26 1.8 +++ ChangeLog.upstream 2005/10/20 22:49:50 1.9 ＠＠ -1,3 +1,31 ＠＠ +2005-10-20 Diane Murray <disumu(a)x3y2z1.net&gt; + + * erc-match.el (erc-current-nick-highlight-type): Set to `keyword' + as default. + (erc-beep-match-types): New variable. + (erc-text-matched-hook): Doc fix. Added `erc-beep-on-match' to + customization options. + (erc-beep-on-match): New function. If the MATCH-TYPE is found in + `erc-beep-match-types', beep. + + * erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable): + New functions to deal with the difference in the number of + arguments accepted by `make-obsolete' and `make-obsolete-variable' + in Emacs and XEmacs. + + * erc.el, erc-nets.el: Use `erc-make-obsolete' and + `erc-make-obsolete-variable'. + + * erc-compat.el (erc-make-obsolete, erc-make-obsolete-variable): + Handle `wrong-number-of-arguments' error instead of checking for + xemacs feature as future versions of XEmacs might accept three + arguments. + +2005-10-18 Edward O'Connor <ted(a)oconnor.cx&gt; + + * erc.el: Tell emacs-lisp-mode how to font-lock define-erc-module + docstrings. + 2005-10-08 Diane Murray <disumu(a)x3y2z1.net&gt; * AUTHORS, CREDITS, ChangeLog, ChangeLog.2002, ChangeLog.2004: 1.29 +1 -1 XEmacs/packages/xemacs-packages/erc/Makefile Index: Makefile =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/Makefile,v retrieving revision 1.28 retrieving revision 1.29 diff -u -p -r1.28 -r1.29 --- Makefile 2005/10/16 17:20:31 1.28 +++ Makefile 2005/10/20 22:49:50 1.29 ＠＠ -19,7 +19,7 ＠＠ VERSION = 0.18 -AUTHOR_VERSION = Version 5.0 Revision: 1.774 +AUTHOR_VERSION = Version 5.0 Revision: 1.776 MAINTAINER = Adrian Aichner <adrian(a)xemacs.org&gt; PACKAGE = erc PKG_TYPE = regular 1.7 +24 -2 XEmacs/packages/xemacs-packages/erc/erc-compat.el Index: erc-compat.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-compat.el,v retrieving revision 1.6 retrieving revision 1.7 diff -u -p -r1.6 -r1.7 --- erc-compat.el 2005/10/15 18:15:27 1.6 +++ erc-compat.el 2005/10/20 22:49:50 1.7 ＠＠ -1,6 +1,6 ＠＠ ;;; erc-compat.el --- ERC compatibility code for XEmacs -;; Copyright (C) 2002,2003 Free Software Foundation, Inc. +;; Copyright (C) 2002,2003,2005 Free Software Foundation, Inc. ;; Author: Alex Schroeder <alex(a)gnu.org&gt; ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?EmacsIRCClient ＠＠ -28,7 +28,7 ＠＠ ;;; Code: -(defconst erc-compat-version "$Revision: 1.23 $" +(defconst erc-compat-version "$Revision: 1.25 $" "ERC compat revision.") ;; erc-define-minor-mode: the easy-mmode-define-minor-mode available ＠＠ -256,6 +256,28 ＠＠ starting with a character." (delete-itimer timer)) (t (error "Cannot find `cancel-timer' variant")))) + +;; Emacs accepts three arguments to `make-obsolete', `make-obsolete-variable' +;; XEmacs only takes two arguments +(defun erc-make-obsolete (old-name new-name when) + "Make the byte-compiler warn that OLD-NAME is obsolete. +The warning will say that NEW-NAME should be used instead. +WHEN should be a string indicating when the function was +first made obsolete, either the file's revision number or an +ERC release version number." + (condition-case nil + (make-obsolete old-name new-name when) + (wrong-number-of-arguments (make-obsolete old-name new-name)))) + +(defun erc-make-obsolete-variable (old-name new-name when) + "Make the byte-compiler warn that OLD-NAME is obsolete. +The warning will say that NEW-NAME should be used instead. +WHEN should be a string indicating when the variable was +first made obsolete, either the file's revision number or an +ERC release version number." + (condition-case nil + (make-obsolete-variable old-name new-name when) + (wrong-number-of-arguments (make-obsolete-variable old-name new-name)))) (provide 'erc-compat) 1.10 +24 -5 XEmacs/packages/xemacs-packages/erc/erc-match.el Index: erc-match.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-match.el,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- erc-match.el 2005/10/15 18:15:28 1.9 +++ erc-match.el 2005/10/20 22:49:51 1.10 ＠＠ -1,6 +1,6 ＠＠ ;;; erc-match.el --- Highlight messages matching certain regexps -;; Copyright (C) 2002,2003,2004 Free Software Foundation, Inc. +;; Copyright (C) 2002,2003,2004,2005 Free Software Foundation, Inc. ;; Copyright (C) 2004 Jeremy Bertram Maitin-Shepard ;; Author: Andreas Fuchs <asf(a)void.at&gt; ＠＠ -38,7 +38,7 ＠＠ ;; Customisation: -(defconst erc-match-version "$Revision: 1.45 $" +(defconst erc-match-version "$Revision: 1.46 $" "ERC match mode revision.") (defgroup erc-match nil ＠＠ -85,7 +85,7 ＠＠ Useful to mark nicks from dangerous host :group 'erc-match :type '(repeat regexp)) -(defcustom erc-current-nick-highlight-type nil +(defcustom erc-current-nick-highlight-type 'keyword "*Determines how to highlight text in which your current nickname appears \(does not apply to text sent by you\). ＠＠ -213,12 +213,25 ＠＠ be formatted. The various format specs a :group 'erc-match :type 'string) +(defcustom erc-beep-match-types '(current-nick) + "Types of matches to beep for when a match occurs. +The function `erc-beep-on-match' needs to be added to `erc-text-matched-hook' +for beeping to work." + :group 'erc-match + :type '(choice (repeat :tag "Beep on match" (choice + (const current-nick) + (const keyword) + (const pal) + (const dangerous-host) + (const fool))) + (const :tag "Don't beep" nil))) + (defcustom erc-text-matched-hook '(erc-log-matches) "Hook run when text matches a given match-type. Functions in this hook are passed as arguments: \(match-type nick!user＠host message) where MATCH-TYPE is a symbol of: -keyword, pal, dangerous-host, fool" - :options '(erc-log-matches erc-hide-fools) +current-nick, keyword, pal, dangerous-host, fool" + :options '(erc-log-matches erc-hide-fools erc-beep-on-match) :group 'erc-match :type 'hook) ＠＠ -625,6 +638,12 ＠＠ This function should be called from `erc (erc-put-text-properties (point-min) (point-max) '(invisible intangible) (current-buffer)))) + +(defun erc-beep-on-match (match-type nickuserhost message) + "Beep when text matches. +This function is meant to be called from `erc-text-matched-hook'." + (when (member match-type erc-beep-match-types) + (beep))) (provide 'erc-match) 1.8 +3 -6 XEmacs/packages/xemacs-packages/erc/erc-nets.el Index: erc-nets.el =================================================================== RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/erc/erc-nets.el,v retrieving revision 1.7 retrieving revision 1.8 diff -u -p -r1.7 -r1.8 --- erc-nets.el 2005/10/15 18:15:29 1.7 +++ erc-nets.el 2005/10/20 22:49:51 1.8 ＠＠ -1,6 +1,6 ＠＠ ;;; erc-nets.el --- IRC networks -;; Copyright (C) 2002,2004 Free Software Foundation, Inc. +;; Copyright (C) 2002,2004,2005 Free Software Foundation, Inc. ;; Author: Mario Lang <mlang(a)lexx.delysid.org&gt; ;; Keywords: comm ＠＠ -27,7 +27,7 ＠＠ (require 'erc) -(defconst erc-nets-version "$Revision: 1.20 $" +(defconst erc-nets-version "$Revision: 1.21 $" "ERC networks revision.") ;; Variables ＠＠ -726,11 +726,8 ＠＠ network as a symbol." (with-current-buffer (erc-server-buffer) (intern (downcase (symbol-name erc-network))))) -(condition-case nil - (make-obsolete 'erc-current-network 'erc-network +(erc-make-obsolete 'erc-current-network 'erc-network "Obsolete since erc-nets 1.5") - (wrong-number-of-arguments (make-obsolete 'erc-current-network - 'erc-network))) (defun erc-network-name () "Returns the name of the current network as a string." 1.13 +11 -9 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.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- erc.el 2005/10/15 18:15:30 1.12 +++ erc.el 2005/10/20 22:49:51 1.13 ＠＠ -64,7 +64,7 ＠＠ ;;; Code: -(defconst erc-version-string "Version 5.0 (CVS) $Revision: 1.774 $" +(defconst erc-version-string "Version 5.0 (CVS) $Revision: 1.776 $" "ERC version. This is used by function `erc-version'.") (require 'cl) ＠＠ -123,21 +123,21 ＠＠ (if (fboundp 'defvaralias) (progn (defvaralias 'erc-announced-server-name 'erc-server-announced-name) - (make-obsolete-variable 'erc-announced-server-name - 'erc-server-announced-name - "ERC 5.1") + (erc-make-obsolete-variable 'erc-announced-server-name + 'erc-server-announced-name + "ERC 5.1") (defvaralias 'erc-process 'erc-server-process) - (make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1") + (erc-make-obsolete-variable 'erc-process 'erc-server-process "ERC 5.1") (defvaralias 'erc-default-coding-system 'erc-server-coding-system) - (make-obsolete-variable 'erc-default-coding-system - 'erc-server-coding-system - "ERC 5.1")) + (erc-make-obsolete-variable 'erc-default-coding-system + 'erc-server-coding-system + "ERC 5.1")) (message (concat "ERC: You're using an old version of Emacs; " "this might break backward-compatibility attempts " "for old versions of ERC."))) (defalias 'erc-send-command 'erc-server-send) -(make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1") +(erc-make-obsolete 'erc-send-command 'erc-server-send "ERC 5.1") ;; tunable connection and authentication parameters ＠＠ -1206,6 +1206,8 ＠＠ With arg, turn ERC %S mode on if and onl (downcase (symbol-name alias))))) (quote ,mode)))))) + +(put 'define-erc-module 'doc-string-elt 3) (defun erc-once-with-server-event (event &rest forms) "Execute FORMS the next time EVENT occurs in the `current-buffer'.