# HG changeset patch # User Miles Bader # Date 1139143371 0 # Node ID 86c478cccc57a53f3b8e2b0f42b5893aa298a2d4 # Parent 7d4f2e27819562aaf90da275880d4dab9c084391 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-46 Creator: Michael Olson Merge from erc--emacs--0 diff -r 7d4f2e278195 -r 86c478cccc57 etc/ChangeLog --- a/etc/ChangeLog Sun Feb 05 12:21:40 2006 +0000 +++ b/etc/ChangeLog Sun Feb 05 12:42:51 2006 +0000 @@ -1,3 +1,8 @@ +2006-02-04 Michael Olson + + * NEWS: Update for ERC 5.1.1. Use the same wording for headings + that Emacs does in its NEWS file. + 2006-02-03 Bill Wohler Release MH-E version 7.91. diff -r 7d4f2e278195 -r 86c478cccc57 etc/ERC-NEWS --- a/etc/ERC-NEWS Sun Feb 05 12:21:40 2006 +0000 +++ b/etc/ERC-NEWS Sun Feb 05 12:42:51 2006 +0000 @@ -1,6 +1,39 @@ ERC NEWS -*- outline -*- -* Changes since ERC 5.0.4 +* Changes in ERC 5.1.1 + +** Fix a requirement on cl.el. + +** Use tls.el for SSL connections, rather than ssl.el. + +** Changes and additions to modules + +*** ibuffer integration (erc-ibuffer.el) + +**** Update this to work with the version of ibuffer.el that comes with +recent Emacs variants. + +*** Old completion (erc-complete.el) + +**** Fix a few errors. + +*** Speedbar (erc-speedbar.el) + +**** Make this work with the version of speedbar.el that comes with +recent Emacs variants. + +*** Timestamps (erc-stamp.el) + +**** By default, use a more failsafe method of displaying right timestamps. +To get right timestamps to align perfectly in Emacs22 using X, set the +new `erc-timestamp-right-align-by-pixel' option to non-nil. + +*** Viper compatibility (erc-viper.el) + +**** Since most of these changes are now merged into Emacs22, detect +whether we need these changes and install them only if necessary. + +* Changes in ERC 5.1 ** Improve XEmacs compatibility. @@ -206,11 +239,11 @@ **** Helps ERC work correctly in viper-mode. -* Fixes since ERC 5.0.3 +* Changes in ERC 5.0.4 ** Fix a problem with undo in channels. -* Fixes since ERC 5.0.2 +* Changes in ERC 5.0.3 ** Fix typo in the `ctcp-request-to' entry of the English catalog. @@ -251,7 +284,7 @@ **** Fix an error that occurred when unchecked buffers existed when invoking /QUIT. -* Fixes since ERC 5.0.1 +* Changes in ERC 5.0.2 ** If a channel key is required for a certain channel, ERC will prompt for one if `erc-prompt-for-channel-key' is non-nil. @@ -284,7 +317,7 @@ **** You can now save logs and truncate buffers from the menu-bar. -* Fixes since ERC 5.0 +* Changes in ERC 5.0.1 ** Narrowing in ERC buffers no longer causes formatting errors. @@ -298,7 +331,7 @@ This means that `erc-track-priority-faces-only', `erc-track-exclude', and `erc-track-exclude-types' now work with server buffers. -* Changes since ERC 4.0 +* Changes in ERC 5.0 ** Channel members are now stored as a hash-table. `erc-server-users' and `erc-channel-users' are now hash-tables, rather @@ -542,7 +575,7 @@ mode-line where modified channels are shown (only works in GNU Emacs versions above 21.3). -* Changes since ERC 3.0.cvs.20030119 +* Changes in ERC 4.0 ** The module system has again changed a lot. You can now customize the variable `erc-modules' and define once and for all which @@ -565,7 +598,7 @@ openprojects to freenode. You may need to update your configuration for a successful automatic nickserv identification. -* Changes since ERC 2.93.cvs.20020819 +* Changes in ERC 3.0.cvs.20030119 ** New module erc-dcc: diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/ChangeLog --- a/lisp/erc/ChangeLog Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/ChangeLog Sun Feb 05 12:42:51 2006 +0000 @@ -1,8 +1,38 @@ +2006-02-05 Michael Olson + + * erc-spelling.el (erc-spelling-init): If + `erc-spelling-dictionaries' is nil, do not set + ispell-local-dictionary. Before, it was being set to nil, which + was causing a long delay while the ispell process restarted. + (erc-spelling-unhighlight-word): New function that removes + flyspell properties from a spell-checked word. + (erc-spelling-flyspell-verify): Don't spell-check nicks or words + that have '/' before them. + +2006-02-04 Michael Olson + + * erc-autojoin.el: Use (eval-when-compile (require 'cl)). + + * erc-complete.el (erc-nick-completion-exclude-myself) + (erc-try-complete-nick): Use better function for getting list of + channel users. + + * erc-goodies.el: Docfix. + + * erc-stamp.el: Use new arch tagline, since the other one wasn't + being treated properly. + + * erc.el (erc-version-string): Release ERC 5.1.1 + 2006-02-03 Zhang Wei (tiny change) * erc.el (erc-version-string): Don't hard-code Emacs version. (erc-version): Use emacs-version. +2006-01-31 Michael Olson + + * erc-stamp.el: Update copyright years. + 2006-01-30 Simon Josefsson * erc.el (erc-open-ssl-stream): Use tls.el. diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/erc-autojoin.el --- a/lisp/erc/erc-autojoin.el Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/erc-autojoin.el Sun Feb 05 12:42:51 2006 +0000 @@ -34,7 +34,7 @@ ;;; Code: (require 'erc) -;;; Minor Mode +(eval-when-compile (require 'cl)) (defgroup erc-autojoin nil "Enable autojoining." diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/erc-complete.el --- a/lisp/erc/erc-complete.el Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/erc-complete.el Sun Feb 05 12:42:51 2006 +0000 @@ -84,9 +84,9 @@ your own nick. This way if you're named foo and someone is called foobar, typing \"f o TAB\" will directly give you foobar. Use this with `erc-nick-completion'." - (delete + (remove (erc-current-nick) - (mapcar (function car) (erc-get-channel-user-list)))) + (erc-get-channel-nickname-list))) (defcustom erc-nick-completion-postfix ": " "*When `erc-complete' is used in the first word after the prompt, @@ -110,8 +110,7 @@ (try-complete-erc-nick old erc-pals)) ((eq erc-nick-completion 'all) (try-complete-erc-nick old (append - (mapcar (function car) - (erc-get-channel-user-list)) + (erc-get-channel-nickname-list) (erc-command-list)))) ((functionp erc-nick-completion) (try-complete-erc-nick old (funcall erc-nick-completion))) diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/erc-goodies.el --- a/lisp/erc/erc-goodies.el Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/erc-goodies.el Sun Feb 05 12:42:51 2006 +0000 @@ -110,7 +110,7 @@ (put-text-property (point-min) (point-max) 'front-sticky t) (put-text-property (point-min) (point-max) 'rear-nonsticky t)) -;; Distingush non-commands +;; Distinguish non-commands (defvar erc-noncommands-list '(erc-cmd-ME erc-cmd-COUNTRY erc-cmd-SV diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/erc-spelling.el --- a/lisp/erc/erc-spelling.el Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/erc-spelling.el Sun Feb 05 12:42:51 2006 +0000 @@ -64,29 +64,52 @@ "Enable flyspell mode in an ERC buffer." (let ((name (downcase (buffer-name))) (dicts erc-spelling-dictionaries)) - (while (and dicts - (not (string= name (downcase (caar dicts))))) - (setq dicts (cdr dicts))) - (setq ispell-local-dictionary - (if dicts - (cadr (car dicts)) - (let ((server (erc-server-buffer))) - (if server - (with-current-buffer server - ispell-local-dictionary) - nil))))) + (when dicts + (while (and dicts + (not (string= name (downcase (caar dicts))))) + (setq dicts (cdr dicts))) + (setq ispell-local-dictionary + (if dicts + (cadr (car dicts)) + (let ((server (erc-server-buffer))) + (if server + (with-current-buffer server + ispell-local-dictionary) + nil)))))) (setq flyspell-generic-check-word-p 'erc-spelling-flyspell-verify) (flyspell-mode 1)) +(defun erc-spelling-unhighlight-word (word) + "Unhighlight the given WORD. +The cadr is the beginning and the caddr is the end." + (let ((beg (nth 1 word)) + (end (nth 2 word))) + (flyspell-unhighlight-at beg) + (when (> end beg) + (flyspell-unhighlight-at (1- end))))) + +(defun erc-spelling-flyspell-verify () + "Flyspell only the input line, nothing else." + (let ((word-data (and (boundp 'flyspell-word) + flyspell-word))) + (when word-data + (cond ((< (point) erc-input-marker) + nil) + ;; don't spell-check names of users + ((and erc-channel-users + (erc-get-channel-user (car word-data))) + (erc-spelling-unhighlight-word word-data) + nil) + ;; if '/' occurs before the word, don't spell-check it + ((eq (char-before (nth 1 word-data)) ?/) + (erc-spelling-unhighlight-word word-data) + nil) + (t t))))) + (put 'erc-mode 'flyspell-mode-predicate 'erc-spelling-flyspell-verify) -(defun erc-spelling-flyspell-verify () - "Flyspell only the input line, nothing else." - (> (point) - erc-input-marker)) - (provide 'erc-spelling) ;; arch-tag: 04ae1c46-0fd1-4e1a-8b80-55bfa471c945 diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/erc-stamp.el --- a/lisp/erc/erc-stamp.el Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/erc-stamp.el Sun Feb 05 12:42:51 2006 +0000 @@ -1,6 +1,6 @@ ;;; erc-stamp.el --- Timestamping for Emacs IRC CLient -;; Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. ;; Author: Mario Lang ;; Keywords: comm, processes, timestamp @@ -338,4 +338,4 @@ ;; tab-width: 8 ;; End: -;; arch-tag: 9f6d31bf-61ba-45c5-bdbf-56331486ea27 +;; arch-tag: 57aefab4-63e0-4c48-91d5-6efa145487e0 diff -r 7d4f2e278195 -r 86c478cccc57 lisp/erc/erc.el --- a/lisp/erc/erc.el Sun Feb 05 12:21:40 2006 +0000 +++ b/lisp/erc/erc.el Sun Feb 05 12:42:51 2006 +0000 @@ -66,7 +66,7 @@ ;;; Code: -(defconst erc-version-string "Version 5.1" +(defconst erc-version-string "Version 5.1.1" "ERC version. This is used by function `erc-version'.") (eval-when-compile (require 'cl)) diff -r 7d4f2e278195 -r 86c478cccc57 man/ChangeLog --- a/man/ChangeLog Sun Feb 05 12:21:40 2006 +0000 +++ b/man/ChangeLog Sun Feb 05 12:42:51 2006 +0000 @@ -1,3 +1,7 @@ +2006-02-04 Michael Olson + + * erc.texi (History): Note that ERC is now included with Emacs. + 2006-02-03 Eli Zaretskii * custom.texi (Init File, Find Init): Add cross-references to diff -r 7d4f2e278195 -r 86c478cccc57 man/erc.texi --- a/man/erc.texi Sun Feb 05 12:21:40 2006 +0000 +++ b/man/erc.texi Sun Feb 05 12:42:51 2006 +0000 @@ -12,7 +12,7 @@ @syncodeindex fn cp @copying -This manual is for ERC version 5.1. +This manual is for ERC version 5.1.1. Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc. @@ -607,7 +607,7 @@ @item 2006 -ERC 5.1 is released. +ERC 5.1 is released. It is subsequently included in Emacs 22. @end itemize