* lisp/erc/erc.el: rename server buffers and fix variable names

2 files changed, 14 insertions, 5 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 58aa0387f19..b2860c25520 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,8 +1,14 @@
+2014-08-07  Kelvin White  <kwhite@gnu.org>
+
+        * erc.el (erc-channel-receive-names): Fix variable names
+        (erc-format-target-and/or-network): Rename server-buffers to
+        network name if possible
+
 2014-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc.el (erc-channel-receive-names): Reduce redundancy.
 
-2014-06-19  Kelvin White  <kelvin.white77@gmail.com>
+2014-06-19  Kelvin White  <kwhite@gnu.org>
 
         * erc-backend.el: Handle user modes in relevant server responses
         * erc.el: Better user mode support.
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 3bd9ff3ce71..36a176c6925 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -4783,10 +4783,10 @@ channel."
                 (setq name (substring item 1))
                 (setf (pcase (aref item 0)
                         ((pred (eq voice-ch)) voice)
-                        ((pred (eq hop-ch))   hop)
+                        ((pred (eq hop-ch))   halfop)
                         ((pred (eq op-ch))    op)
-                        ((pred (eq adm-ch))   adm)
-                        ((pred (eq own-ch))   own))
+                        ((pred (eq adm-ch))   admin)
+                        ((pred (eq own-ch))   owner))
                       'on)))
           (when updatep
             (puthash (erc-downcase name) t
@@ -6233,7 +6233,10 @@ shortened server name instead."
     (cond ((erc-default-target)
            (concat (erc-string-no-properties (erc-default-target))
                    "@" network-name))
-          (network-name network-name)
+          ((and network-name 
+                (not (string-equal network-name (buffer-name))))
+           (rename-buffer network-name)
+           network-name)
           (t (buffer-name (current-buffer))))))
 
 (defun erc-format-away-status ()