[Emacs-diffs] trunk r117666: * lisp/erc/erc.el: rename server buffers and fix variable names

[Kelvin White]

------------------------------------------------------------
revno: 117666
revision-id: address@hidden
parent: address@hidden
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Thu 2014-08-07 12:44:19 -0400
message:
  * lisp/erc/erc.el: rename server buffers and fix variable names 
modified:
  lisp/erc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-4305
  lisp/erc/erc.el                erc.el-20091113204419-o5vbwnq5f7feedwu-4346

=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog        2014-07-08 19:45:24 +0000
+++ b/lisp/erc/ChangeLog        2014-08-07 16:44:19 +0000
@@ -1,8 +1,14 @@
+2014-08-07  Kelvin White  <address@hidden>
+
+       * 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  <address@hidden>
 
        * erc.el (erc-channel-receive-names): Reduce redundancy.
 
-2014-06-19  Kelvin White  <address@hidden>
+2014-06-19  Kelvin White  <address@hidden>
 
        * erc-backend.el: Handle user modes in relevant server responses
        * erc.el: Better user mode support.

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-07-08 19:45:24 +0000
+++ b/lisp/erc/erc.el   2014-08-07 16:44:19 +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))))))
 
 (defun erc-format-away-status ()