[Erc-commit] [commit][emacs22] Fix `erc' to use correct full-name. New face for my nick.

[mwolson]

commit f81e4190a4e917a257c63ae51b6475a805101379
Author: Diane Murray <address@hidden>
Date:   Thu Oct 5 20:13:00 2006 +0000

    Fix `erc' to use correct full-name.  New face for my nick.
    
    * erc.el (erc-my-nick-face): New face.
      (erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
      fixes a bug where the :full-name argument passed to the function
      was not respected.
      (erc-format-my-nick): Use `erc-my-nick-face'.  This should help
      make it easier to find messages you sent in conversations when
      `erc-show-my-nick' is non-nil.
      (erc-compute-server): Doc fix.
    git-archimport-id: address@hidden/erc--main--0--patch-55

diff --git a/ChangeLog b/ChangeLog
index 5c4e6fe..a7a9320 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-05  Diane Murray  <address@hidden>
+
+       * erc.el (erc-my-nick-face): New face.
+       (erc): Use FULL-NAME argument, not `erc-user-full-name'.  This
+       fixes a bug where the :full-name argument passed to the function
+       was not respected.
+       (erc-format-my-nick): Use `erc-my-nick-face'.  This should help
+       make it easier to find messages you sent in conversations when
+       `erc-show-my-nick' is non-nil.
+       (erc-compute-server): Doc fix.
+
 2006-09-11  Michael Olson  <address@hidden>
 
        * erc-nicklist.el (erc-nicklist-insert-contents): Add missing
diff --git a/erc.el b/erc.el
index 0297dd7..e7f4d39 100644
--- a/erc.el
+++ b/erc.el
@@ -1173,6 +1173,12 @@ See the variable `erc-command-indicator'."
   "ERC face for errors."
   :group 'erc-faces)
 
+;; same default color as `erc-input-face'
+(defface erc-my-nick-face '((t (:bold t :foreground "brown")))
+  "ERC face for your current nickname in messages sent by you.
+See also `erc-show-my-nick'."
+  :group 'erc-faces)
+
 (defface erc-nick-default-face '((t (:bold t)))
   "ERC nickname default face."
   :group 'erc-faces)
@@ -2120,7 +2126,7 @@ be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
 
   (run-hook-with-args 'erc-before-connect server port nick)
-  (erc-open server port nick erc-user-full-name t password))
+  (erc-open server port nick full-name t password))
 
 (defalias 'erc-select 'erc)
 
@@ -3907,7 +3913,7 @@ See also `erc-format-nick-function'."
            (nick (erc-current-nick)))
        (concat
         (erc-propertize open 'face 'erc-default-face)
-        (erc-propertize nick 'face 'erc-nick-default-face)
+        (erc-propertize nick 'face 'erc-my-nick-face)
         (erc-propertize close 'face 'erc-default-face)))
     (let ((prefix "> "))
       (erc-propertize prefix 'face 'erc-default-face))))
@@ -5460,7 +5466,7 @@ Sets the buffer local variables:
 This tries a number of increasingly more default methods until a
 non-nil value is found.
 
-- SERVER (the argument passwd to this function)
+- SERVER (the argument passed to this function)
 - The `erc-server' option
 - The value of the IRCSERVER environment variable
 - The `erc-default-server' variable"