summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-02-09 14:23:09 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-02-09 14:23:09 -0800
commitfdc2da4ef44b32e2dd360defc9bd64d644ed1783 (patch)
tree0c4c996897292cec2115b21f40db68836af0190e /lib-src
parentf414fe61dd5e9f54c562adc65739305198173001 (diff)
parent2c117fc7e283ad20f404c392be433c74f5cf8a4e (diff)
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
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/etags.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib-src/etags.c b/lib-src/etags.c
index ca50f35f80..65720e85f4 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,