* erc.el Disable display commands in current buffer, fix case where buffer name is already set

2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bf7e1924b52..dcde62af9c2 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-13  Kelvin White  <kwhite@gnu.org> 
+
+        * erc.el (erc-send-input): Disable display commands in current buffer
+        (erc-format-target-and/or-network): Fix cases when buffer name is set
+
 2014-08-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * erc-stamp.el (erc-timestamp-intangible): Disable by default because
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 36a176c6925..cedc4f6b517 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -5376,9 +5376,7 @@ This returns non-nil only if we actually send anything."
                                           (null erc-flood-protect) t))
                 (or (and erc-flood-protect (erc-split-line line))
                     (list line))))
-             (split-string str "\n"))
-          ;; Insert the prompt along with the command.
-          (erc-display-command str)
+             (split-string str "\n")) 
           (erc-process-input-line (concat str "\n") t nil))
         t)))))
 
@@ -6234,7 +6232,7 @@ shortened server name instead."
            (concat (erc-string-no-properties (erc-default-target))
                    "@" network-name))
           ((and network-name 
-                (not (string-equal network-name (buffer-name))))
+                (not (get-buffer network-name)))
            (rename-buffer network-name)
            network-name)
           (t (buffer-name (current-buffer))))))