[Emacs-diffs] trunk r118017: * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).

[Paul Eggert]

------------------------------------------------------------
revno: 118017
revision-id: address@hidden
parent: address@hidden
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Thu 2014-10-02 12:28:26 -0700
message:
  * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).
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-10-02 11:55:22 +0000
+++ b/lisp/erc/ChangeLog        2014-10-02 19:28:26 +0000
@@ -1,3 +1,7 @@
+2014-10-02  Paul Eggert  <address@hidden>
+
+       * erc.el (erc-nick-at-point): Fix format-string typo (Bug#17755).
+
 2014-10-02  Kelvin White  <address@hidden>
 
        * erc.el (erc-rename-buffer-p): When set to t buffers will be

=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el   2014-10-02 11:55:22 +0000
+++ b/lisp/erc/erc.el   2014-10-02 19:28:26 +0000
@@ -5374,7 +5374,7 @@
                                           (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 @@
                  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 @@
     (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))