mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-01 11:14:55 +00:00
Code Issues Releases Activity

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

Browse Source
This commit is contained in:
Kelvin White 2014-08-13 09:14:43 -04:00
parent b5354531ba
commit 92180ebd2e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/erc/ChangeLog
View File

@ -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

6
lisp/erc/erc.el
View File

@ -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))))))