Merge from origin/emacs-25

2c117fc * etc/NEWS: Document new mpc.el features
71a0496 * lisp/custom.el (defface): Revert indentation change.  (Bug#22524)
9dfece1 Correctly fontify C++ initializations which "look like" functions.
4485222 Improve newsticker-treeview-selection-face
4236944 Minor fix in tagging Ruby accessors by etags
35fc77d Spelling fixes
3dda110 Remove 'def X' from the example

1 files changed, 3 insertions, 2 deletions

diff --git a/lib-src/etags.c b/lib-src/etags.c
index ca50f35f80b..65720e85f49 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -4733,9 +4733,10 @@ Ruby_functions (FILE *inf)
                   do {
                     char *np = cp;
 
-                    if (*np == ':')
-                      np++;
                     cp = skip_name (cp);
+                    if (*np != ':')
+                      continue;
+                    np++;
                     if (reader)
                       {
                         make_tag (np, cp - np, true,