[Erc-commit] [commit][emacs22] Update from CVS

[mwolson]

commit d7595db8340d5a452c18f3821831fcb39ba5fd11
Author: Michael Olson <address@hidden>
Date:   Thu Apr 6 02:28:16 2006 +0000

    Update from CVS
    
    2006-04-05  Diane Murray  <address@hidden>
    
       * erc.el (erc-cmd-SV): Removed the exclamation point. Show the
       build date as it's shown in `emacs-version'.
    
       * erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
       with the same face property as the previous character.
    git-archimport-id: address@hidden/erc--cvs--0--patch-153

diff --git a/ChangeLog b/ChangeLog
index f610603..aeb6e57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,14 @@
        detect the existence of the `open-network-stream-nowait' function,
        since I can't find it in Emacs21, XEmacs21, or Emacs22.
 
+2006-04-05  Diane Murray  <address@hidden>
+
+       * erc.el (erc-cmd-SV): Removed the exclamation point.  Show the
+       build date as it's shown in `emacs-version'.
+
+       * erc-capab.el (erc-capab-identify-add-prefix): Insert the prefix
+       with the same face property as the previous character.
+
 2006-03-27  Michael Olson  <address@hidden>
 
        * erc.texi: Update direntry.  Remove unneeded local variables.
diff --git a/erc-backend.el b/erc-backend.el
index 634e1cc..5f86ea5 100644
--- a/erc-backend.el
+++ b/erc-backend.el
@@ -105,7 +105,7 @@
 
 ;;;; Variables and options
 
-(defconst erc-backend-version "$Revision: 1.46 $")
+(defconst erc-backend-version "$Revision: 1.48 $")
 
 (defvar erc-server-responses (make-hash-table :test #'equal)
   "Hashtable mapping server responses to their handler hooks.")
diff --git a/erc-capab.el b/erc-capab.el
index a857ef3..6dc4584 100644
--- a/erc-capab.el
+++ b/erc-capab.el
@@ -66,7 +66,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-capab-version "$Revision: 1.10 $"
+(defconst erc-capab-version "$Revision: 1.11 $"
   "ERC CAPAB revision number.")
 
 ;;; Customization:
@@ -187,7 +187,9 @@ PARSED is an `erc-parsed' response struct."
                  ;; assuming the first use of `nickname' is the sender's nick
                  (re-search-forward (regexp-quote nickname) nil t))
         (goto-char (match-beginning 0))
-        (insert erc-capab-identify-prefix)))))
+        (insert (erc-propertize erc-capab-identify-prefix
+                                'face (get-char-property (- (point) 1)
+                                                         'face)))))))
 
 (defun erc-capab-find-parsed ()
   "Return the position of text found with the `erc-parsed' property."
diff --git a/erc-ezbounce.el b/erc-ezbounce.el
index 518fc73..f8d09ff 100644
--- a/erc-ezbounce.el
+++ b/erc-ezbounce.el
@@ -29,7 +29,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-ezb-version "$Revision: 1.14 $"
+(defconst erc-ezb-version "$Revision: 1.15 $"
   "ERC EZBouncer revision.")
 
 (defgroup erc-ezbounce nil
diff --git a/erc-join.el b/erc-join.el
index 02a7d4d..8691c5f 100644
--- a/erc-join.el
+++ b/erc-join.el
@@ -36,7 +36,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-join-version "$Revision: 1.1 $"
+(defconst erc-join-version "$Revision: 1.2 $"
   "ERC autojoin revision.")
 
 (defgroup erc-autojoin nil
diff --git a/erc-netsplit.el b/erc-netsplit.el
index 5ef9d9e..7a5236b 100644
--- a/erc-netsplit.el
+++ b/erc-netsplit.el
@@ -34,7 +34,7 @@
 (require 'erc)
 (eval-when-compile (require 'cl))
 
-(defconst erc-netsplit-version "$Revision: 1.17 $"
+(defconst erc-netsplit-version "$Revision: 1.18 $"
   "ERC netsplit version.")
 
 (defgroup erc-netsplit nil
diff --git a/erc.el b/erc.el
index f076d20..8240f10 100644
--- a/erc.el
+++ b/erc.el
@@ -66,7 +66,7 @@
 
 ;;; Code:
 
-(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.813 $"
+(defconst erc-version-string "Version 5.1.2 (CVS) $Revision: 1.815 $"
   "ERC version.  This is used by function `erc-version'.")
 
 (eval-when-compile (require 'cl))
@@ -3139,7 +3139,7 @@ the message given by REASON."
 
 (defun erc-cmd-SV ()
   "Say the current ERC and Emacs version into channel."
-  (erc-send-message (format "I'm using ERC %s with %s %s (%s%s%s)!"
+  (erc-send-message (format "I'm using ERC %s with %s %s (%s%s) of %s."
                            erc-version-string
                            (if (featurep 'xemacs) "XEmacs" "GNU Emacs")
                            emacs-version
@@ -3162,7 +3162,7 @@ the message given by REASON."
                                                      x-toolkit-scroll-bars)))
                               "")
                             (if (featurep 'multi-tty) ", multi-tty" ""))
-                           (concat ", built " erc-emacs-build-time)))
+                           erc-emacs-build-time))
   t)
 
 (defun erc-cmd-SM ()