diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-10-02 12:28:26 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-10-02 12:28:26 -0700 |
| commit | f3c69fb76f3933ba4165855ec5c3ae0635dc4734 (patch) | |
| tree | 4f9d7964c82e4a63afbbf4fa7413cbdb4bbc6ace /lisp/erc | |
| parent | a7f5d04fbf9ed4a095a242892a58bf28f1287fda (diff) | |
| download | emacs-f3c69fb76f3933ba4165855ec5c3ae0635dc4734.tar.gz | |
* erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).
Diffstat (limited to 'lisp/erc')
| -rw-r--r-- | lisp/erc/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/erc/erc.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog index b21b0cf827e..1ebef32f324 100644 --- a/lisp/erc/ChangeLog +++ b/lisp/erc/ChangeLog @@ -1,3 +1,7 @@ +2014-10-02 Paul Eggert <eggert@cs.ucla.edu> + + * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755). + 2014-10-02 Kelvin White <kwhite@gnu.org> * 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 cf82bafe6d0..c916aea6954 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)) |