[Erc-commit] [commit][emacs22] Merged from address@hidden (patch 25-27)

[mwolson]

commit 6556a9b2a6aed3e4d383675e8b059861c3aae3cb
Merge: 4f03cfd... 273f1ae...
Author: Michael Olson <address@hidden>
Date:   Mon Feb 20 05:05:23 2006 +0000

    Merged from address@hidden (patch 25-27)
    
    Patches applied:
    
     * address@hidden/erc--cvs--5.1--patch-25
       Release ERC 5.1.2.
    
     * address@hidden/erc--cvs--5.1--patch-27
       Update Makefile version variables for release.
    git-archimport-id: address@hidden/erc--cvs--0--patch-128

diff --cc ChangeLog
index 3405fa8,3d0ca8f..cc80019
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,19 -1,9 +1,21 @@@
  2006-02-19  Michael Olson  <address@hidden>
  
 +      * erc-capab.el (erc-capab-send-identify-messages): Make sure some
 +      parameters are strings before using them.  Thanks to Alejandro
 +      Benitez for the report.
 +
+       * erc.el (erc-version-string): Release ERC 5.1.2.
+ 
 +2006-02-19  Diane Murray  <address@hidden>
 +
 +      * erc-button.el (erc-button-keymap): Bind `erc-button-previous' to
 +      <C-tab>.
 +      (erc-button-previous): New function.
 +
  2006-02-15  Michael Olson  <address@hidden>
  
 +      * NEWS: Add category for ERC 5.2.
 +
        * erc.el (erc): Move to the end of the buffer when a continued
        session is detected.  Thanks to e1f and indio for the report and
        testing a potential fix.
diff --cc NEWS
index 71950da,4527c3c..ef98227
--- a/NEWS
+++ b/NEWS
@@@ -1,14 -1,10 +1,14 @@@
  ERC NEWS                                                       -*- outline -*-
  
 -* Changes in ERC 5.1.2
 +* Changes in ERC 5.2 (unreleased)
 +
 +** New modules
  
 -** Go back to using ssl.el so that SSL connections work as expected.
 -Connecting with `open-tls-stream' only seems to work (if at all?) when
 -using the tls.el located in lisp/net/ in Emacs22.
 +*** Capab identify (erc-capab.el)
 +
 +**** Mark unidentified users on servers supporting CAPAB IDENTIFY-MSG.
 +
- * Changes in ERC 5.1.2 (unreleased)
++* Changes in ERC 5.1.2
  
  ** Fix compiler errors in erc-autojoin.el and erc-dcc.el.
  
diff --cc erc.el
index 39ae6cc,eb12ad5..5f37a74
--- a/erc.el
+++ b/erc.el
@@@ -66,7 -66,7 +66,7 @@@
  
  ;;; Code:
  
- (defconst erc-version-string "Version 5.1.1 (CVS) $Revision: 1.808 $"
 -(defconst erc-version-string "Version 5.1.2 $Revision: 1.796.2.4 $"
++(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.808 $"
    "ERC version.  This is used by function `erc-version'.")
  
  (eval-when-compile (require 'cl))