[Erc-commit] [commit][emacs22] Merged from erc--rel--5.1.

[mwolson]

commit fe894a55afc3997c0fc8746f178d624b2cc24f8d
Author: Michael Olson <address@hidden>
Date:   Mon Jul 10 04:02:01 2006 +0000

    Merged from erc--rel--5.1.
    
    Patches applied:
    
     * address@hidden/erc--emacs--22--patch-1
       Fix typos in the manual.
    
     * address@hidden/erc--rel--5.1--patch-6
       Match coding system targets case-insensitively.
    
     * address@hidden/erc--rel--5.1--patch-7
       erc-identd: Do not prompt user about killing process on exit.
    git-archimport-id: address@hidden/erc--main--0--patch-17

diff --git a/ChangeLog b/ChangeLog
index 2cc0745..1917fb4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -30,6 +30,21 @@
        is given, and no matches are found, use our default reason instead
        of "nil".
 
+2006-06-30  Michael Olson  <address@hidden>
+
+       * erc-goodies.el (erc-handle-irc-url): Docfix.
+
+       * erc-identd.el (erc-identd-start): Do not prompt the user about
+       killing the identd process on exit.
+
+2006-06-29  Michael Olson  <address@hidden>
+
+       * erc-backend.el (erc-coding-system-for-target): Match
+       case-insensitively.  Use a pattern match instead of `assoc', as
+       per the documentation for `erc-encoding-coding-alist'.
+
+       * erc-track.el (erc-track-shorten-aggressively): Fix typo.
+
 2006-06-27  Michael Olson  <address@hidden>
 
        * erc.el: Update maintainer information and URLs.
@@ -59,6 +74,10 @@
        indicators when the user is no longer away.
        (autoaway): Add the above function to the 305 hook.
 
+2006-06-05  Romain Francoise  <address@hidden>
+
+       * erc.texi (History): Fix various typos.
+
 2006-06-04  Michael Olson  <address@hidden>
 
        * erc-autoaway.el (erc-autoaway-idle-method): Move after the
diff --git a/erc-backend.el b/erc-backend.el
index 817a67d..925b43a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -565,7 +565,11 @@ action."
   "Return the coding system or cons cell appropriate for TARGET.
 This is determined via `erc-encoding-coding-alist' or
 `erc-server-coding-system'."
-  (or (cdr (assoc target erc-encoding-coding-alist))
+  (or (let ((case-fold-search t))
+        (catch 'match
+          (dolist (pat erc-encoding-coding-alist)
+            (when (string-match (car pat) target)
+              (throw 'match (cdr pat))))))
       (and (functionp erc-server-coding-system)
            (funcall erc-server-coding-system))
       erc-server-coding-system))
diff --git a/erc-goodies.el b/erc-goodies.el
index d50a8d9..72efb4d 100644
--- a/erc-goodies.el
+++ b/erc-goodies.el
@@ -521,7 +521,7 @@ servers.  If called from a program, PROC specifies the 
server process."
 
 (defun erc-handle-irc-url (host port channel user password)
   "Use ERC to IRC on HOST:PORT in CHANNEL as USER with PASSWORD.
-If ERC is already connected to HOST:PORT, simly /join CHANNEL.
+If ERC is already connected to HOST:PORT, simply /join CHANNEL.
 Otherwise, connect to HOST:PORT as USER and /join CHANNEL."
   (let ((server-buffer
          (car (erc-buffer-filter
diff --git a/erc-identd.el b/erc-identd.el
index 197d51c..e93b495 100644
--- a/erc-identd.el
+++ b/erc-identd.el
@@ -46,6 +46,10 @@
                             system-type (user-login-name)))
        (process-send-eof erc-identd-process)))))
 
+;; Ignore useless byte-compile warning
+(eval-when-compile
+  (put 'process-kill-without-query 'byte-compile nil))
+
 ;;;###autoload
 (defun erc-identd-start (&optional port)
   "Start an identd server listening to port 8113.
@@ -69,7 +73,10 @@ system."
                                  :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)))
+  (if (fboundp 'set-process-query-on-exit-flag)
+      (set-process-query-on-exit-flag erc-identd-process nil)
+    (process-kill-without-query erc-identd-process)))
 
 ;;;###autoload
 (defun erc-identd-stop (&rest ignore)
diff --git a/erc-track.el b/erc-track.el
index 28d5589..4d0850c 100644
--- a/erc-track.el
+++ b/erc-track.el
@@ -111,7 +111,7 @@ If this variable is set to `max', then channel names will 
be shortened
 to the max.  Usually, shortened channel names will remain unique for a
 given set of existing channels.  When shortening to the max, the shortened
 channel names will be unique for the set of active channels only.
-Example: If there are tow active channels #emacs and #vi, and two inactive
+Example: If there are two active channels #emacs and #vi, and two inactive
 channels #electronica and #folk, then usually the active channels are
 shortened to #em and #v.  When shortening to the max, however, #emacs is
 not compared to #electronica -- only to #vi, therefore it can be shortened
diff --git a/erc.texi b/erc.texi
index e1fb8b6..2ce3095 100644
--- a/erc.texi
+++ b/erc.texi
@@ -566,7 +566,7 @@ questions.
 ERC was originally written by Alexander L. Belikoff
 @email{abel@@bfr.co.il} and Sergey Berezin
 @email{sergey.berezin@@cs.cmu.edu}.  They stopped development around
-december 1999. Their last released version was ERC 2.0.
+December 1999. Their last released version was ERC 2.0.
 
 P.S.: If one of the original developers of ERC reads this, we'd like to
 receive additional information for this file and hear comments in
@@ -585,12 +585,12 @@ there. The thing is, I do not have free time and enough 
incentive
 anymore to work on ERC, so I would be happy if you guys take over the
 project entirely."
 
-So we happily hacked away on ERC, and soon after (september 2001)
+So we happily hacked away on ERC, and soon after (September 2001)
 released the next "stable" version, 2.1.
 
-Most of the development of the new ERC happend on #emacs on
+Most of the development of the new ERC happened on #emacs on
 irc.openprojects.net. Over time, many people contributed code, ideas,
-bugfixes. And not to forget alot of alpha/beta/gamma testing.
+bugfixes. And not to forget a lot of alpha/beta/gamma testing.
 
 See the @file{CREDITS} file for a list of contributors.