* erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).

diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index b21b0cf827e9be8b54696d0778c49646ff1f36c1..1ebef32f324041830f68c8e427b3c048edcf3312 100644 (file)
--- 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 cf82bafe6d0e3a17345b1e8d72f0864f1483d77c..c916aea6954a6966610ddcdc5370c100cfd9b0e0 100644 (file)
--- 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))