From: Paul Eggert Date: Thu, 2 Oct 2014 19:28:26 +0000 (-0700) Subject: * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). X-Git-Tag: emacs-25.0.90~2635^2~679^2~154 X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/f3c69fb76f3933ba4165855ec5c3ae0635dc4734 * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). --- diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b21b0cf827..1ebef32f32 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-02 Paul Eggert + + * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). + 2014-10-02 Kelvin White * erc.el (erc-rename-buffer-p): When set to t buffers will be diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el index cf82bafe6d..c916aea695 100644 --- a/lisp/erc/erc.el +++ b/lisp/erc/erc.el @@ -5374,7 +5374,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")) + (split-string str "\n")) (erc-process-input-line (concat str "\n") t nil)) t))))) @@ -6082,7 +6082,7 @@ entry of `channel-members'." nick login host (if full-name (format " (%s)" full-name) "") (if (or voice halfop op admin owner) - (format " and is +%s%s on %s" + (format " and is +%s%s%s%s%s on %s" (if voice "v" "") (if halfop "h" "") (if op "o" "") @@ -6229,7 +6229,7 @@ shortened server name instead." (cond ((erc-default-target) (concat (erc-string-no-properties (erc-default-target)) "@" network-name)) - ((and network-name + ((and network-name (not (get-buffer network-name))) (when erc-rename-buffer-p (rename-buffer network-name))