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

[mwolson]

commit a487fc435040b178374135867db6e610f2f06b1a
Author: Michael Olson <address@hidden>
Date:   Thu Aug 3 04:02:08 2006 +0000

    Merged from erc--rel--5.1
    
    Patches applied:
    
     * address@hidden/erc--rel--5.1--patch-31
       Release ERC 5.1.4.
    
     * address@hidden/erc--rel--5.1--patch-32
       Bundle erc-backend fix with 5.1.4 release.
    git-archimport-id: address@hidden/erc--main--0--patch-28

diff --git a/ChangeLog b/ChangeLog
index a59c842..eca944d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,15 @@
 2006-08-02  Michael Olson  <address@hidden>
 
+       * erc.el (erc-version-string): Release ERC 5.1.4.
+
+       * Makefile, NEWS, erc.texi: Update for the 5.1.4 release.
+
        * erc.el (erc-active-buffer): Fix bug that caused messages to go
        to the wrong buffer.  Thanks to offby1 for the report.
 
+       * erc-backend.el (erc-coding-system-for-target): Handle case where
+       target is nil.  Thanks to Kai Fan for the patch.
+
 2006-07-29  Michael Olson  <address@hidden>
 
        * erc-log.el (erc-log-setup-logging): Don't offer to save the
diff --git a/Makefile b/Makefile
index 62da9c8..449ff29 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-VERSION=5.1.3
+VERSION=5.1.4
 SNAPDIR=erc-$(VERSION)
-LASTUPLOAD = 5.1.2-1
+LASTUPLOAD = 5.1.3-2
 BUILDOPTS  =
 
 SPECIAL = erc-auto.el
diff --git a/NEWS b/NEWS
index b735089..ec5c217 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,29 @@ ERC NEWS                                                       
-*- outline -*-
 
 **** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 
+* Changes in ERC 5.1.4
+
+** Make find-function and find-variable work in Emacs 22 for
+names that are constructed by `define-erc-module'.
+
+** Fix bug introduced in ERC 5.1.3 that caused messages to go the
+wrong buffer.
+
+** Changes and additions to modules
+
+*** Highlighting (erc-match.el)
+
+**** Don't activate view-mode.
+
+*** Logging (erc-log.el)
+
+**** When this module is activated, make sure logging is enabled on
+already-opened buffers.  Ditto for disabling logging when the module
+is deactivated.
+
+**** Fix some errors that occur when exiting Emacs without first
+quitting open IRC servers.
+
 * Changes in ERC 5.1.3
 
 ** Fix use of /quote command with no initial whitespace.
diff --git a/erc-backend.el b/erc-backend.el
index 7dce9e4..705ca7a 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -563,11 +563,12 @@ 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 (let ((case-fold-search t))
-        (catch 'match
-          (dolist (pat erc-encoding-coding-alist)
-            (when (string-match (car pat) target)
-              (throw 'match (cdr pat))))))
+  (or (when target
+        (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.el b/erc.el
index bfc8c9e..79fd987 100644
--- a/erc.el
+++ b/erc.el
@@ -67,7 +67,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.3 (devel)"
+(defconst erc-version-string "Version 5.1.4 (devel)"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
diff --git a/erc.texi b/erc.texi
index cfa7743..ac41ca1 100644
--- a/erc.texi
+++ b/erc.texi
@@ -12,7 +12,7 @@
 @syncodeindex fn cp
 
 @copying
-This manual is for ERC version 5.1.3.
+This manual is for ERC version 5.1.4.
 
 Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.