[PATCH] ERC bugfixes and improvements

[Kelvin White <kwhite@gnu.org>]

I plan to install the following patch in emacs trunk if there are no
objections. This patch fixes a bug in loss of user mode prefix display,
and adds feature to rename server buffers to network name if available.

=== modified file 'lisp/erc/erc.el'
--- lisp/erc/erc.el     2014-07-08 19:45:24 +0000
+++ lisp/erc/erc.el     2014-08-06 17:36:30 +0000
@@ -4783,10 +4783,10 @@
                (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 @@
     (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))))))