[Emacs-diffs] trunk r117699: * erc.el Disable display commands in current buffer, fix case where buffer name is already set

[Kelvin White]

------------------------------------------------------------
revno: 117699
revision-id: address@hidden
parent: address@hidden
committer: Kelvin White <address@hidden>
branch nick: trunk
timestamp: Wed 2014-08-13 09:14:43 -0400
message:
  * erc.el Disable display commands in current buffer, fix case where buffer 
name is already set
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-08-12 02:56:28 +0000
+++ b/lisp/erc/ChangeLog        2014-08-13 13:14:43 +0000
@@ -1,3 +1,8 @@
+2014-08-13  Kelvin White  <address@hidden> 
+
+       * 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  <address@hidden>
 
        * erc-stamp.el (erc-timestamp-intangible): Disable by default because

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-08-07 16:44:19 +0000
+++ b/lisp/erc/erc.el   2014-08-13 13:14:43 +0000
@@ -5376,9 +5376,7 @@
                                           (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 @@
            (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))))))