From: Eli Zaretskii <eliz@gnu.org>
Date: Tue, 2 Feb 2016 17:50:08 +0000 (+0200)
Subject: Change Ruby file names and extensions recognized by 'etags'
X-Git-Tag: emacs-25.0.91~116
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e42e662f26523ba0d10c41ab6deead85077c9f79;p=emacs.git

Change Ruby file names and extensions recognized by 'etags'

* lib-src/etags.c <Ruby_filenames>: New variable, holds names
of Ruby files.
<Ruby_suffixes>: Treat .rb, .ru, and .rbw as Ruby extensions.
<lang_names>: Add Ruby_filenames to the Ruby entry.
* test/etags/ruby-src/test1.ru: Renamed from test1.ruby.
(Bug#22241)
---

diff --git a/lib-src/etags.c b/lib-src/etags.c
index 769a22027f7..acf20ddceb9 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -729,7 +729,9 @@ static const char Python_help [] =
 generate a tag.";
 
 static const char *Ruby_suffixes [] =
-  { "rb", "ruby", NULL };
+  { "rb", "ru", "rbw", NULL };
+static const char *Ruby_filenames [] =
+  { "Rakefile", "Thorfile", NULL };
 static const char Ruby_help [] =
   "In Ruby code, 'def' or 'class' or 'module' at the beginning of\n\
 a line generate a tag.  Constants also generate a tag.";
@@ -813,7 +815,7 @@ static language lang_names [] =
   { "proc",      no_lang_help,   plain_C_entries,   plain_C_suffixes   },
   { "prolog",    Prolog_help,    Prolog_functions,  Prolog_suffixes    },
   { "python",    Python_help,    Python_functions,  Python_suffixes    },
-  { "ruby",      Ruby_help,      Ruby_functions,    Ruby_suffixes      },
+  { "ruby",      Ruby_help,Ruby_functions,Ruby_suffixes,Ruby_filenames },
   { "scheme",    Scheme_help,    Scheme_functions,  Scheme_suffixes    },
   { "tex",       TeX_help,       TeX_commands,      TeX_suffixes       },
   { "texinfo",   Texinfo_help,   Texinfo_nodes,     Texinfo_suffixes   },
diff --git a/test/etags/ruby-src/test1.ru b/test/etags/ruby-src/test1.ru
new file mode 100644
index 00000000000..75dcd51bbe0
--- /dev/null
+++ b/test/etags/ruby-src/test1.ru
@@ -0,0 +1,38 @@
+class A
+ def a()
+  super(" do ")
+ end
+ def b()
+ end
+end
+
+module A
+  class B
+    ABC = 4
+    Def_ = 'blah'
+    Xyzzy =10
+
+    def foo!
+    end
+
+    def self._bar?(abc)
+    end
+
+    class << self
+      def qux=(tee)
+      end
+    end
+    def X
+      attr_reader :foo
+      attr_reader :read1, :read2; attr_writer :write1, :write2
+      attr_writer :bar
+      attr_accessor :tee
+      alias_method :qux, :tee
+    end
+  end
+end
+
+A::Constant = 5
+
+# def foo_in_comment
+# end
diff --git a/test/etags/ruby-src/test1.ruby b/test/etags/ruby-src/test1.ruby
deleted file mode 100644
index 75dcd51bbe0..00000000000
--- a/test/etags/ruby-src/test1.ruby
+++ /dev/null
@@ -1,38 +0,0 @@
-class A
- def a()
-  super(" do ")
- end
- def b()
- end
-end
-
-module A
-  class B
-    ABC = 4
-    Def_ = 'blah'
-    Xyzzy =10
-
-    def foo!
-    end
-
-    def self._bar?(abc)
-    end
-
-    class << self
-      def qux=(tee)
-      end
-    end
-    def X
-      attr_reader :foo
-      attr_reader :read1, :read2; attr_writer :write1, :write2
-      attr_writer :bar
-      attr_accessor :tee
-      alias_method :qux, :tee
-    end
-  end
-end
-
-A::Constant = 5
-
-# def foo_in_comment
-# end