aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/automated/data/package/macro-problem-package-1.0/macro-aux.el12
-rw-r--r--test/automated/data/package/macro-problem-package-1.0/macro-problem.el21
-rw-r--r--test/automated/data/package/macro-problem-package-2.0/macro-aux.el16
-rw-r--r--test/automated/data/package/macro-problem-package-2.0/macro-problem.el30
-rw-r--r--test/automated/url-expand-tests.el (renamed from test/lisp/url/url-expand-tests.el)0
-rw-r--r--test/automated/url-parse-tests.el167
-rw-r--r--test/etags/lua-src/test.lua36
-rw-r--r--test/etags/ruby-src/test.rb54
-rw-r--r--test/etags/ruby-src/test1.ruby7
-rw-r--r--test/lisp/abbrev-tests.el53
-rw-r--r--test/lisp/autorevert-tests.el4
-rw-r--r--test/lisp/calendar/icalendar-tests.el56
-rw-r--r--test/lisp/character-fold-tests.el72
-rw-r--r--test/lisp/emacs-lisp/package-tests.el14
-rw-r--r--test/lisp/faces-tests.el5
-rw-r--r--test/lisp/gnus/auth-source-tests.el45
-rw-r--r--test/lisp/gnus/message-tests.el6
-rw-r--r--test/lisp/help-fns-tests.el10
-rw-r--r--test/lisp/json-tests.el297
-rw-r--r--test/lisp/net/tramp-tests.el47
-rw-r--r--test/lisp/progmodes/elisp-mode-tests.el4
-rw-r--r--test/lisp/simple-tests.el89
-rw-r--r--test/lisp/subr-tests.el112
-rw-r--r--test/manual/etags/CTAGS.good33
-rw-r--r--test/manual/etags/ETAGS.good_1187
-rw-r--r--test/manual/etags/ETAGS.good_2203
-rw-r--r--test/manual/etags/ETAGS.good_3203
-rw-r--r--test/manual/etags/ETAGS.good_4187
-rw-r--r--test/manual/etags/ETAGS.good_5219
-rw-r--r--test/manual/etags/ETAGS.good_6219
-rw-r--r--test/manual/etags/Makefile5
-rw-r--r--test/manual/indent/js.js14
-rw-r--r--test/src/keymap-tests.el2
33 files changed, 1860 insertions, 569 deletions
diff --git a/test/automated/data/package/macro-problem-package-1.0/macro-aux.el b/test/automated/data/package/macro-problem-package-1.0/macro-aux.el
new file mode 100644
index 00000000000..f43232224af
--- /dev/null
+++ b/test/automated/data/package/macro-problem-package-1.0/macro-aux.el
@@ -0,0 +1,12 @@
1;;; macro-aux.el --- laksd -*- lexical-binding: t; -*-
2
3;; Author: Artur Malabarba <emacs@endlessparentheses.com>
4
5;;; Code:
6
7(defun macro-aux-1 ( &rest forms)
8 "Description"
9 `(progn ,@forms))
10
11(provide 'macro-aux)
12;;; macro-aux.el ends here
diff --git a/test/automated/data/package/macro-problem-package-1.0/macro-problem.el b/test/automated/data/package/macro-problem-package-1.0/macro-problem.el
new file mode 100644
index 00000000000..0533b1bd9c4
--- /dev/null
+++ b/test/automated/data/package/macro-problem-package-1.0/macro-problem.el
@@ -0,0 +1,21 @@
1;;; macro-problem.el --- laksd -*- lexical-binding: t; -*-
2
3;; Author: Artur Malabarba <emacs@endlessparentheses.com>
4;; Keywords: tools
5;; Version: 1.0
6
7;;; Code:
8
9(require 'macro-aux)
10
11(defmacro macro-problem-1 ( &rest forms)
12 "Description"
13 `(progn ,@forms))
14
15(defun macro-problem-func ()
16 ""
17 (macro-problem-1 'a 'b)
18 (macro-aux-1 'a 'b))
19
20(provide 'macro-problem)
21;;; macro-problem.el ends here
diff --git a/test/automated/data/package/macro-problem-package-2.0/macro-aux.el b/test/automated/data/package/macro-problem-package-2.0/macro-aux.el
new file mode 100644
index 00000000000..6a55a40e3b4
--- /dev/null
+++ b/test/automated/data/package/macro-problem-package-2.0/macro-aux.el
@@ -0,0 +1,16 @@
1;;; macro-aux.el --- laksd -*- lexical-binding: t; -*-
2
3;; Author: Artur Malabarba <emacs@endlessparentheses.com>
4
5;;; Code:
6
7(defmacro macro-aux-1 ( &rest forms)
8 "Description"
9 `(progn ,@forms))
10
11(defmacro macro-aux-3 ( &rest _)
12 "Description"
13 90)
14
15(provide 'macro-aux)
16;;; macro-aux.el ends here
diff --git a/test/automated/data/package/macro-problem-package-2.0/macro-problem.el b/test/automated/data/package/macro-problem-package-2.0/macro-problem.el
new file mode 100644
index 00000000000..cad4ed93f19
--- /dev/null
+++ b/test/automated/data/package/macro-problem-package-2.0/macro-problem.el
@@ -0,0 +1,30 @@
1;;; macro-problem.el --- laksd -*- lexical-binding: t; -*-
2
3;; Author: Artur Malabarba <emacs@endlessparentheses.com>
4;; Keywords: tools
5;; Version: 2.0
6
7;;; Code:
8
9(require 'macro-aux)
10
11(defmacro macro-problem-1 ( &rest forms)
12 "Description"
13 `(progn ,(cadr (car forms))))
14
15
16(defun macro-problem-func ()
17 ""
18 (list (macro-problem-1 '1 'b)
19 (macro-aux-1 'a 'b)))
20
21(defmacro macro-problem-3 (&rest _)
22 "Description"
23 10)
24
25(defun macro-problem-10-and-90 ()
26 ""
27 (list (macro-problem-3 haha) (macro-aux-3 hehe)))
28
29(provide 'macro-problem)
30;;; macro-problem.el ends here
diff --git a/test/lisp/url/url-expand-tests.el b/test/automated/url-expand-tests.el
index 2bd28687f8d..2bd28687f8d 100644
--- a/test/lisp/url/url-expand-tests.el
+++ b/test/automated/url-expand-tests.el
diff --git a/test/automated/url-parse-tests.el b/test/automated/url-parse-tests.el
new file mode 100644
index 00000000000..443034a603e
--- /dev/null
+++ b/test/automated/url-parse-tests.el
@@ -0,0 +1,167 @@
1;;; url-parse-tests.el --- Test suite for URI/URL parsing.
2
3;; Copyright (C) 2012-2015 Free Software Foundation, Inc.
4
5;; Author: Alain Schneble <a.s@realize.ch>
6;; Version: 1.0
7
8;; This file is part of GNU Emacs.
9
10;; GNU Emacs is free software: you can redistribute it and/or modify
11;; it under the terms of the GNU General Public License as published by
12;; the Free Software Foundation, either version 3 of the License, or
13;; (at your option) any later version.
14
15;; GNU Emacs is distributed in the hope that it will be useful,
16;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18;; GNU General Public License for more details.
19
20;; You should have received a copy of the GNU General Public License
21;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
22
23;;; Commentary:
24
25;; Test cases covering generic URI syntax as described in RFC3986,
26;; section 3. Syntax Components and 4. Usage. See also appendix
27;; A. Collected ABNF for URI, as the example given here are all
28;; productions of this grammar.
29
30;; Each tests parses a given URI string - whether relative or absolute -
31;; using `url-generic-parse-url' and compares the constructed
32;; URL-struct (Actual) against a manually `url-parse-make-urlobj'-
33;; constructed URL-struct (Expected).
34
35;;; Code:
36
37(require 'url-parse)
38(require 'ert)
39
40(ert-deftest url-generic-parse-url/generic-uri-examples ()
41 "RFC 3986, section 1.1.2. Examples / Example illustrating several URI schemes and variations in their common syntax components"
42 (should (equal (url-generic-parse-url "ftp://ftp.is.co.za/rfc/rfc1808.txt") (url-parse-make-urlobj "ftp" nil nil "ftp.is.co.za" nil "/rfc/rfc1808.txt" nil nil t)))
43 (should (equal (url-generic-parse-url "http://www.ietf.org/rfc/rfc2396.txt") (url-parse-make-urlobj "http" nil nil "www.ietf.org" nil "/rfc/rfc2396.txt" nil nil t)))
44 (should (equal (url-generic-parse-url "ldap://[2001:db8::7]/c=GB?objectClass?one") (url-parse-make-urlobj "ldap" nil nil "[2001:db8::7]" nil "/c=GB?objectClass?one" nil nil t)))
45 (should (equal (url-generic-parse-url "mailto:John.Doe@example.com") (url-parse-make-urlobj "mailto" nil nil nil nil "John.Doe@example.com" nil nil nil)))
46 (should (equal (url-generic-parse-url "news:comp.infosystems.www.servers.unix") (url-parse-make-urlobj "news" nil nil nil nil "comp.infosystems.www.servers.unix" nil nil nil)))
47 (should (equal (url-generic-parse-url "tel:+1-816-555-1212") (url-parse-make-urlobj "tel" nil nil nil nil "+1-816-555-1212" nil nil nil)))
48 (should (equal (url-generic-parse-url "telnet://192.0.2.16:80/") (url-parse-make-urlobj "telnet" nil nil "192.0.2.16" 80 "/" nil nil t)))
49 (should (equal (url-generic-parse-url "urn:oasis:names:specification:docbook:dtd:xml:4.1.2") (url-parse-make-urlobj "urn" nil nil nil nil "oasis:names:specification:docbook:dtd:xml:4.1.2" nil nil nil))))
50
51(ert-deftest url-generic-parse-url/generic-uri ()
52 "RFC 3986, section 3. Syntax Components / generic URI syntax"
53 ;; empty path
54 (should (equal (url-generic-parse-url "http://host#") (url-parse-make-urlobj "http" nil nil "host" nil "" "" nil t)))
55 (should (equal (url-generic-parse-url "http://host#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "" "fragment" nil t)))
56 (should (equal (url-generic-parse-url "http://host?#") (url-parse-make-urlobj "http" nil nil "host" nil "?" "" nil t)))
57 (should (equal (url-generic-parse-url "http://host?query#") (url-parse-make-urlobj "http" nil nil "host" nil "?query" "" nil t)))
58 (should (equal (url-generic-parse-url "http://host?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "?" "fragment" nil t)))
59 (should (equal (url-generic-parse-url "http://host?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "?query" "fragment" nil t)))
60 ;; absolute path /
61 (should (equal (url-generic-parse-url "http://host/#") (url-parse-make-urlobj "http" nil nil "host" nil "/" "" nil t)))
62 (should (equal (url-generic-parse-url "http://host/#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/" "fragment" nil t)))
63 (should (equal (url-generic-parse-url "http://host/?#") (url-parse-make-urlobj "http" nil nil "host" nil "/?" "" nil t)))
64 (should (equal (url-generic-parse-url "http://host/?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/?query" "" nil t)))
65 (should (equal (url-generic-parse-url "http://host/?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/?" "fragment" nil t)))
66 (should (equal (url-generic-parse-url "http://host/?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/?query" "fragment" nil t)))
67 ;; absolute path /foo
68 (should (equal (url-generic-parse-url "http://host/foo#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo" "" nil t)))
69 (should (equal (url-generic-parse-url "http://host/foo#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo" "fragment" nil t)))
70 (should (equal (url-generic-parse-url "http://host/foo?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?" "" nil t)))
71 (should (equal (url-generic-parse-url "http://host/foo?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?query" "" nil t)))
72 (should (equal (url-generic-parse-url "http://host/foo?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?" "fragment" nil t)))
73 (should (equal (url-generic-parse-url "http://host/foo?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?query" "fragment" nil t)))
74 ;; absolute path /foo/
75 (should (equal (url-generic-parse-url "http://host/foo/#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/" "" nil t)))
76 (should (equal (url-generic-parse-url "http://host/foo/#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/" "fragment" nil t)))
77 (should (equal (url-generic-parse-url "http://host/foo/?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?" "" nil t)))
78 (should (equal (url-generic-parse-url "http://host/foo/?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?query" "" nil t)))
79 (should (equal (url-generic-parse-url "http://host/foo/?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?" "fragment" nil t)))
80 (should (equal (url-generic-parse-url "http://host/foo/?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?query" "fragment" nil t)))
81 ;; absolute path /foo/bar
82 (should (equal (url-generic-parse-url "http://host/foo/bar#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar" "" nil t)))
83 (should (equal (url-generic-parse-url "http://host/foo/bar#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar" "fragment" nil t)))
84 (should (equal (url-generic-parse-url "http://host/foo/bar?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?" "" nil t)))
85 (should (equal (url-generic-parse-url "http://host/foo/bar?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?query" "" nil t)))
86 (should (equal (url-generic-parse-url "http://host/foo/bar?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?" "fragment" nil t)))
87 (should (equal (url-generic-parse-url "http://host/foo/bar?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?query" "fragment" nil t)))
88 ;; absolute path /foo/bar/
89 (should (equal (url-generic-parse-url "http://host/foo/bar/#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/" "" nil t)))
90 (should (equal (url-generic-parse-url "http://host/foo/bar/#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/" "fragment" nil t)))
91 (should (equal (url-generic-parse-url "http://host/foo/bar/?#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?" "" nil t)))
92 (should (equal (url-generic-parse-url "http://host/foo/bar/?query#") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?query" "" nil t)))
93 (should (equal (url-generic-parse-url "http://host/foo/bar/?#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?" "fragment" nil t)))
94 (should (equal (url-generic-parse-url "http://host/foo/bar/?query#fragment") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?query" "fragment" nil t)))
95 ;; for more examples of URIs without fragments, see tests covering section 4.3. Absolute URI
96 )
97
98(ert-deftest url-generic-parse-url/network-path-reference ()
99 "RFC 3986, section 4.2. Relative Reference / network-path reference: a relative reference that begins with two slash characters"
100 (should (equal (url-generic-parse-url "//host") (url-parse-make-urlobj nil nil nil "host" nil "" nil nil t)))
101 (should (equal (url-generic-parse-url "//host/") (url-parse-make-urlobj nil nil nil "host" nil "/" nil nil t)))
102 (should (equal (url-generic-parse-url "//host/foo") (url-parse-make-urlobj nil nil nil "host" nil "/foo" nil nil t)))
103 (should (equal (url-generic-parse-url "//host/foo/bar") (url-parse-make-urlobj nil nil nil "host" nil "/foo/bar" nil nil t)))
104 (should (equal (url-generic-parse-url "//host/foo/bar/") (url-parse-make-urlobj nil nil nil "host" nil "/foo/bar/" nil nil t))))
105
106(ert-deftest url-generic-parse-url/absolute-path-reference ()
107 "RFC 3986, section 4.2. Relative Reference / absolute-path reference: a relative reference that begins with a single slash character"
108 (should (equal (url-generic-parse-url "/") (url-parse-make-urlobj nil nil nil nil nil "/" nil nil nil)))
109 (should (equal (url-generic-parse-url "/foo") (url-parse-make-urlobj nil nil nil nil nil "/foo" nil nil nil)))
110 (should (equal (url-generic-parse-url "/foo/bar") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar" nil nil nil)))
111 (should (equal (url-generic-parse-url "/foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar/" nil nil nil)))
112 (should (equal (url-generic-parse-url "/foo/bar#") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar" "" nil nil)))
113 (should (equal (url-generic-parse-url "/foo/bar/#") (url-parse-make-urlobj nil nil nil nil nil "/foo/bar/" "" nil nil))))
114
115(ert-deftest url-generic-parse-url/relative-path-reference ()
116 "RFC 3986, section 4.2. Relative Reference / relative-path reference: a relative reference that does not begin with a slash character"
117 (should (equal (url-generic-parse-url "foo") (url-parse-make-urlobj nil nil nil nil nil "foo" nil nil nil)))
118 (should (equal (url-generic-parse-url "foo/bar") (url-parse-make-urlobj nil nil nil nil nil "foo/bar" nil nil nil)))
119 (should (equal (url-generic-parse-url "foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "foo/bar/" nil nil nil)))
120 (should (equal (url-generic-parse-url "./foo") (url-parse-make-urlobj nil nil nil nil nil "./foo" nil nil nil)))
121 (should (equal (url-generic-parse-url "./foo/bar") (url-parse-make-urlobj nil nil nil nil nil "./foo/bar" nil nil nil)))
122 (should (equal (url-generic-parse-url "./foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "./foo/bar/" nil nil nil)))
123 (should (equal (url-generic-parse-url "../foo") (url-parse-make-urlobj nil nil nil nil nil "../foo" nil nil nil)))
124 (should (equal (url-generic-parse-url "../foo/bar") (url-parse-make-urlobj nil nil nil nil nil "../foo/bar" nil nil nil)))
125 (should (equal (url-generic-parse-url "../foo/bar/") (url-parse-make-urlobj nil nil nil nil nil "../foo/bar/" nil nil nil)))
126 (should (equal (url-generic-parse-url "./this:that") (url-parse-make-urlobj nil nil nil nil nil "./this:that" nil nil nil)))
127 ;; for more examples of relative-path references, see tests covering section 4.4. Same-Document Reference
128 )
129
130(ert-deftest url-generic-parse-url/absolute-uri ()
131 "RFC 3986, section 4.3. Absolute URI / absolute URI: absolute form of a URI without a fragment identifier"
132 ;; empty path
133 (should (equal (url-generic-parse-url "http://host") (url-parse-make-urlobj "http" nil nil "host" nil "" nil nil t)))
134 (should (equal (url-generic-parse-url "http://host?") (url-parse-make-urlobj "http" nil nil "host" nil "?" nil nil t)))
135 (should (equal (url-generic-parse-url "http://host?query") (url-parse-make-urlobj "http" nil nil "host" nil "?query" nil nil t)))
136 ;; absolute path /
137 (should (equal (url-generic-parse-url "http://host/") (url-parse-make-urlobj "http" nil nil "host" nil "/" nil nil t)))
138 (should (equal (url-generic-parse-url "http://host/?") (url-parse-make-urlobj "http" nil nil "host" nil "/?" nil nil t)))
139 (should (equal (url-generic-parse-url "http://host/?query") (url-parse-make-urlobj "http" nil nil "host" nil "/?query" nil nil t)))
140 ;; absolute path /foo
141 (should (equal (url-generic-parse-url "http://host/foo") (url-parse-make-urlobj "http" nil nil "host" nil "/foo" nil nil t)))
142 (should (equal (url-generic-parse-url "http://host/foo?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?" nil nil t)))
143 (should (equal (url-generic-parse-url "http://host/foo?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo?query" nil nil t)))
144 ;; absolute path /foo/
145 (should (equal (url-generic-parse-url "http://host/foo/") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/" nil nil t)))
146 (should (equal (url-generic-parse-url "http://host/foo/?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?" nil nil t)))
147 (should (equal (url-generic-parse-url "http://host/foo/?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/?query" nil nil t)))
148 ;; absolute path /foo/bar
149 (should (equal (url-generic-parse-url "http://host/foo/bar") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar" nil nil t)))
150 (should (equal (url-generic-parse-url "http://host/foo/bar?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?" nil nil t)))
151 (should (equal (url-generic-parse-url "http://host/foo/bar?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar?query" nil nil t)))
152 ;; absolute path /foo/bar/
153 (should (equal (url-generic-parse-url "http://host/foo/bar/") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/" nil nil t)))
154 (should (equal (url-generic-parse-url "http://host/foo/bar/?") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?" nil nil t)))
155 (should (equal (url-generic-parse-url "http://host/foo/bar/?query") (url-parse-make-urlobj "http" nil nil "host" nil "/foo/bar/?query" nil nil t)))
156 ;; example mentioned in RFC3986, section 5.4. Reference Resolution Examples
157 (should (equal (url-generic-parse-url "http://a/b/c/d;p?q") (url-parse-make-urlobj "http" nil nil "a" nil "/b/c/d;p?q" nil nil t))))
158
159(ert-deftest url-generic-parse-url/same-document-reference ()
160 "RFC 3986, section 4.4. Same-Document Reference / same-document reference: empty or number sign (\"#\") followed by a fragment identifier"
161 (should (equal (url-generic-parse-url "") (url-parse-make-urlobj nil nil nil nil nil "" nil nil nil)))
162 (should (equal (url-generic-parse-url "#") (url-parse-make-urlobj nil nil nil nil nil "" "" nil nil)))
163 (should (equal (url-generic-parse-url "#foo") (url-parse-make-urlobj nil nil nil nil nil "" "foo" nil nil))))
164
165(provide 'url-parse-tests)
166
167;;; url-parse-tests.el ends here
diff --git a/test/etags/lua-src/test.lua b/test/etags/lua-src/test.lua
new file mode 100644
index 00000000000..405eb5f1de0
--- /dev/null
+++ b/test/etags/lua-src/test.lua
@@ -0,0 +1,36 @@
1Rectangle = {}
2function Rectangle.getPos ()
3end
4
5Circle = {}
6function Circle.getPos ()
7end
8
9Cube = {}
10function Cube.data.getFoo ()
11end
12
13Square = {}
14function Square.something:Bar ()
15end
16
17-- Comment line
18 -- Indented comment line
19
20test = {}
21
22 function test.me_22a(one, two)
23 print"me_22a"
24 end
25 local function test.me22b (one)
26 print"me_22b"
27 end
28
29
30 test.i_123 = function (x)
31 print"i_123"
32end
33
34
35test.me_12a(1,2)
36test.i_123(1)
diff --git a/test/etags/ruby-src/test.rb b/test/etags/ruby-src/test.rb
new file mode 100644
index 00000000000..9254c5bffa9
--- /dev/null
+++ b/test/etags/ruby-src/test.rb
@@ -0,0 +1,54 @@
1module ModuleExample
2 class ClassExample
3 def class_method
4 puts "in class_method"
5 end
6 def ClassExample.singleton_class_method
7 puts "in singleton_class_method"
8 end
9 def class_method_exclamation!
10 puts "in class_method_exclamation!"
11 end
12 def class_method_question?
13 puts "in class_method_question?"
14 end
15 def class_method_equals=
16 puts "in class_method_equals="
17 end
18 def `(command)
19 return "just testing a backquote override"
20 end
21 def +(y)
22 @x + y
23 end
24 def [](y)
25 @ary[y]
26 end
27 def []=(y, val)
28 @ary[y] = val
29 end
30 def <<(y)
31 @x << y
32 end
33 def ==(y)
34 @ary.length == y.ary.length
35 end
36 def <=(y)
37 '@ary.length < y.ary.length'
38 end
39 def <=>(y)
40 nil
41 end
42 def ===(y)
43 self == y
44 end
45 end
46 def module_method
47 puts "in module_method"
48 end
49 def ModuleExample.singleton_module_method
50 puts "in singleton_module_method"
51 end
52end
53
54ModuleExample::ClassExample.singleton_class_method
diff --git a/test/etags/ruby-src/test1.ruby b/test/etags/ruby-src/test1.ruby
new file mode 100644
index 00000000000..43b1a14b95e
--- /dev/null
+++ b/test/etags/ruby-src/test1.ruby
@@ -0,0 +1,7 @@
1class A
2 def a()
3 super(" do ")
4 end
5 def b()
6 end
7end
diff --git a/test/lisp/abbrev-tests.el b/test/lisp/abbrev-tests.el
index 17aea5d0f82..37917ec5353 100644
--- a/test/lisp/abbrev-tests.el
+++ b/test/lisp/abbrev-tests.el
@@ -22,10 +22,21 @@
22 22
23;;; Commentary: 23;;; Commentary:
24 24
25;; `kill-all-abbrevs-test' will remove all user *and* system abbrevs
26;; if called noninteractively with the init file loaded.
27
25;;; Code: 28;;; Code:
26 29
27(require 'ert) 30(require 'ert)
28(require 'abbrev) 31(require 'abbrev)
32(require 'seq)
33
34;; set up test abbrev table and abbrev entry
35(defun setup-test-abbrev-table ()
36 (defvar ert-test-abbrevs nil)
37 (define-abbrev-table 'ert-test-abbrevs '(("a-e-t" "abbrev-ert-test")))
38 (abbrev-table-put ert-test-abbrevs :ert-test "ert-test-value")
39 ert-test-abbrevs)
29 40
30(ert-deftest abbrev-table-p-test () 41(ert-deftest abbrev-table-p-test ()
31 (should-not (abbrev-table-p 42)) 42 (should-not (abbrev-table-p 42))
@@ -70,5 +81,47 @@
70 (should (abbrev-table-p new-foo-abbrev-table))) 81 (should (abbrev-table-p new-foo-abbrev-table)))
71 (should-not (string-equal (buffer-name) "*Backtrace*"))) 82 (should-not (string-equal (buffer-name) "*Backtrace*")))
72 83
84(ert-deftest kill-all-abbrevs-test ()
85 "Test undefining all defined abbrevs"
86 (unless noninteractive
87 (ert-skip "Cannot test kill-all-abbrevs in interactive mode"))
88
89 (let ((num-tables 0))
90 ;; ensure at least one abbrev exists
91 (should (abbrev-table-p (setup-test-abbrev-table)))
92 (setf num-tables (length abbrev-table-name-list))
93 (kill-all-abbrevs)
94
95 ;; no tables should have been removed/added
96 (should (= num-tables (length abbrev-table-name-list)))
97 ;; number of empty tables should be the same as number of tables
98 (should (= num-tables (length (seq-filter
99 (lambda (table)
100 (abbrev-table-empty-p (symbol-value table)))
101 abbrev-table-name-list))))))
102
103(ert-deftest abbrev-table-name-test ()
104 "Test returning name of abbrev-table"
105 (let ((ert-test-abbrevs (setup-test-abbrev-table))
106 (no-such-table nil))
107 (should (equal 'ert-test-abbrevs (abbrev-table-name ert-test-abbrevs)))
108 (should (equal nil (abbrev-table-name no-such-table)))))
109
110(ert-deftest clear-abbrev-table-test ()
111 "Test clearing single abbrev table"
112 (let ((ert-test-abbrevs (setup-test-abbrev-table)))
113 (should (equal "a-e-t" (symbol-name
114 (abbrev-symbol "a-e-t" ert-test-abbrevs))))
115 (should (equal "abbrev-ert-test" (symbol-value
116 (abbrev-symbol "a-e-t" ert-test-abbrevs))))
117
118 (clear-abbrev-table ert-test-abbrevs)
119
120 (should (equal "nil" (symbol-name
121 (abbrev-symbol "a-e-t" ert-test-abbrevs))))
122 (should (equal nil (symbol-value
123 (abbrev-symbol "a-e-t" ert-test-abbrevs))))
124 (should (equal t (abbrev-table-empty-p ert-test-abbrevs)))))
125
73(provide 'abbrev-tests) 126(provide 'abbrev-tests)
74;;; abbrev-tests.el ends here 127;;; abbrev-tests.el ends here
diff --git a/test/lisp/autorevert-tests.el b/test/lisp/autorevert-tests.el
index 6f186973ee7..043f80de49e 100644
--- a/test/lisp/autorevert-tests.el
+++ b/test/lisp/autorevert-tests.el
@@ -39,7 +39,9 @@
39 (null (string-match 39 (null (string-match
40 (format-message "Reverting buffer `%s'." (buffer-name buffer)) 40 (format-message "Reverting buffer `%s'." (buffer-name buffer))
41 (buffer-string))) 41 (buffer-string)))
42 (read-event nil nil 0.1))))) 42 (if (with-current-buffer buffer auto-revert-use-notify)
43 (read-event nil nil 0.1)
44 (sleep-for 0.1))))))
43 45
44(ert-deftest auto-revert-test00-auto-revert-mode () 46(ert-deftest auto-revert-test00-auto-revert-mode ()
45 "Check autorevert for a file." 47 "Check autorevert for a file."
diff --git a/test/lisp/calendar/icalendar-tests.el b/test/lisp/calendar/icalendar-tests.el
index 7e05d49883e..829cbf2d765 100644
--- a/test/lisp/calendar/icalendar-tests.el
+++ b/test/lisp/calendar/icalendar-tests.el
@@ -2231,7 +2231,63 @@ END:VCALENDAR"
2231 Class: PUBLIC 2231 Class: PUBLIC
2232 UID: 040000008200E00074C5B7101A82E0080000000020FFAED0CFEFCC01000000000000000010000000575268034ECDB649A15349B1BF240F15 2232 UID: 040000008200E00074C5B7101A82E0080000000020FFAED0CFEFCC01000000000000000010000000575268034ECDB649A15349B1BF240F15
2233" nil) 2233" nil)
2234
2235 ;; 2015-12-05, mixed line endings and empty lines, see Bug#22092.
2236 (icalendar-tests--test-import
2237 "BEGIN:VCALENDAR\r
2238PRODID:-//www.norwegian.no//iCalendar MIMEDIR//EN\r
2239VERSION:2.0\r
2240METHOD:REQUEST\r
2241BEGIN:VEVENT\r
2242UID:RFCALITEM1\r
2243SEQUENCE:1512040950\r
2244DTSTAMP:20141204T095043Z\r
2245ORGANIZER:noreply@norwegian.no\r
2246DTSTART:20141208T173000Z\r
2247
2248DTEND:20141208T215500Z\r
2249
2250LOCATION:Stavanger-Sola\r
2251
2252DESCRIPTION:Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390\r
2253
2254X-ALT-DESC;FMTTYPE=text/html:<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\"><html><head><META NAME=\"Generator\" CONTENT=\"MS Exchange Server version 08.00.0681.000\"><title></title></head><body><b><font face=\"Calibri\" size=\"3\">Reisereferanse</p></body></html>
2255SUMMARY:Norwegian til Tromsoe-Langnes -\r
2256
2257CATEGORIES:Appointment\r
2258
2259
2260PRIORITY:5\r
2261
2262CLASS:PUBLIC\r
2263
2264TRANSP:OPAQUE\r
2265END:VEVENT\r
2266END:VCALENDAR
2267"
2268"&2014/12/8 18:30-22:55 Norwegian til Tromsoe-Langnes -
2269 Desc: Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390
2270 Location: Stavanger-Sola
2271 Organizer: noreply@norwegian.no
2272 Class: PUBLIC
2273 UID: RFCALITEM1
2274"
2275"&8/12/2014 18:30-22:55 Norwegian til Tromsoe-Langnes -
2276 Desc: Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390
2277 Location: Stavanger-Sola
2278 Organizer: noreply@norwegian.no
2279 Class: PUBLIC
2280 UID: RFCALITEM1
2281"
2282"&12/8/2014 18:30-22:55 Norwegian til Tromsoe-Langnes -
2283 Desc: Fly med Norwegian, reservasjon. Fra Stavanger til Troms&#248; 8. des 2014 18:30, DY545Fly med Norwegian, reservasjon . Fra Stavanger til Troms&#248; 8. des 2014 21:00, DY390
2284 Location: Stavanger-Sola
2285 Organizer: noreply@norwegian.no
2286 Class: PUBLIC
2287 UID: RFCALITEM1
2288"
2234) 2289)
2290 )
2235 2291
2236(provide 'icalendar-tests) 2292(provide 'icalendar-tests)
2237;;; icalendar-tests.el ends here 2293;;; icalendar-tests.el ends here
diff --git a/test/lisp/character-fold-tests.el b/test/lisp/character-fold-tests.el
index 2b1a15c9e76..c0568625649 100644
--- a/test/lisp/character-fold-tests.el
+++ b/test/lisp/character-fold-tests.el
@@ -37,13 +37,13 @@
37 37
38 38
39(ert-deftest character-fold--test-consistency () 39(ert-deftest character-fold--test-consistency ()
40 (dotimes (n 100) 40 (dotimes (n 30)
41 (let ((w (character-fold--random-word n))) 41 (let ((w (character-fold--random-word n)))
42 ;; A folded string should always match the original string. 42 ;; A folded string should always match the original string.
43 (character-fold--test-search-with-contents w w)))) 43 (character-fold--test-search-with-contents w w))))
44 44
45(ert-deftest character-fold--test-lax-whitespace () 45(ert-deftest character-fold--test-lax-whitespace ()
46 (dotimes (n 100) 46 (dotimes (n 40)
47 (let ((w1 (character-fold--random-word n)) 47 (let ((w1 (character-fold--random-word n))
48 (w2 (character-fold--random-word n)) 48 (w2 (character-fold--random-word n))
49 (search-spaces-regexp "\\s-+")) 49 (search-spaces-regexp "\\s-+"))
@@ -52,7 +52,73 @@
52 (concat w1 " " w2)) 52 (concat w1 " " w2))
53 (character-fold--test-search-with-contents 53 (character-fold--test-search-with-contents
54 (concat w1 "\s\n\s\t\f\t\n\r\t" w2) 54 (concat w1 "\s\n\s\t\f\t\n\r\t" w2)
55 (concat w1 (make-string 90 ?\s) w2))))) 55 (concat w1 (make-string 10 ?\s) w2)))))
56
57(defun character-fold--test-match-exactly (string &rest strings-to-match)
58 (let ((re (concat "\\`" (character-fold-to-regexp string) "\\'")))
59 (dolist (it strings-to-match)
60 (should (string-match re it)))
61 ;; Case folding
62 (let ((case-fold-search t))
63 (dolist (it strings-to-match)
64 (should (string-match (upcase re) (downcase it)))
65 (should (string-match (downcase re) (upcase it)))))))
66
67(ert-deftest character-fold--test-some-defaults ()
68 (dolist (it '(("ffl" . "ffl") ("ffi" . "ffi")
69 ("fi" . "fi") ("ff" . "ff")
70 ("ä" . "ä")))
71 (character-fold--test-search-with-contents (cdr it) (car it))
72 (let ((multi (char-table-extra-slot character-fold-table 0))
73 (character-fold-table (make-char-table 'character-fold-table)))
74 (set-char-table-extra-slot character-fold-table 0 multi)
75 (character-fold--test-match-exactly (car it) (cdr it)))))
76
77(ert-deftest character-fold--test-fold-to-regexp ()
78 (let ((character-fold-table (make-char-table 'character-fold-table))
79 (multi (make-char-table 'character-fold-table)))
80 (set-char-table-extra-slot character-fold-table 0 multi)
81 (aset character-fold-table ?a "xx")
82 (aset character-fold-table ?1 "44")
83 (aset character-fold-table ?\s "-!-")
84 (character-fold--test-match-exactly "a1a1" "xx44xx44")
85 (character-fold--test-match-exactly "a1 a 1" "xx44-!--!-xx-!-44")
86 (aset multi ?a '(("1" . "99")
87 ("2" . "88")
88 ("12" . "77")))
89 (character-fold--test-match-exactly "a" "xx")
90 (character-fold--test-match-exactly "a1" "xx44" "99")
91 (character-fold--test-match-exactly "a12" "77" "xx442" "992")
92 (character-fold--test-match-exactly "a2" "88")
93 (aset multi ?1 '(("2" . "yy")))
94 (character-fold--test-match-exactly "a1" "xx44" "99")
95 (character-fold--test-match-exactly "a12" "77" "xx442" "992")
96 ;; Support for this case is disabled. See function definition or:
97 ;; https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg02562.html
98 ;; (character-fold--test-match-exactly "a12" "xxyy")
99 ))
100
101(ert-deftest character-fold--speed-test ()
102 (dolist (string (append '("tty-set-up-initial-frame-face"
103 "tty-set-up-initial-frame-face-frame-faceframe-faceframe-faceframe-face")
104 (mapcar #'character-fold--random-word '(10 50 100
105 50 100))))
106 (message "Testing %s" string)
107 ;; Make sure we didn't just fallback on the trivial search.
108 (should-not (string= (regexp-quote string)
109 (character-fold-to-regexp string)))
110 (with-temp-buffer
111 (save-excursion (insert string))
112 (let ((time (time-to-seconds (current-time))))
113 ;; Our initial implementation of case-folding in char-folding
114 ;; created a lot of redundant paths in the regexp. Because of
115 ;; that, if a really long string "almost" matches, the regexp
116 ;; engine took a long time to realize that it doesn't match.
117 (should-not (character-fold-search-forward (concat string "c") nil 'noerror))
118 ;; Ensure it took less than a second.
119 (should (< (- (time-to-seconds (current-time))
120 time)
121 1))))))
56 122
57(provide 'character-fold-tests) 123(provide 'character-fold-tests)
58;;; character-fold-tests.el ends here 124;;; character-fold-tests.el ends here
diff --git a/test/lisp/emacs-lisp/package-tests.el b/test/lisp/emacs-lisp/package-tests.el
index 6b3069c2a54..7206084f324 100644
--- a/test/lisp/emacs-lisp/package-tests.el
+++ b/test/lisp/emacs-lisp/package-tests.el
@@ -242,6 +242,20 @@ Must called from within a `tar-mode' buffer."
242 (should (package-installed-p 'simple-single)) 242 (should (package-installed-p 'simple-single))
243 (should (package-installed-p 'simple-depend)))) 243 (should (package-installed-p 'simple-depend))))
244 244
245(ert-deftest package-test-macro-compilation ()
246 "Install a package which includes a dependency."
247 (with-package-test (:basedir "data/package")
248 (package-install-file (expand-file-name "macro-problem-package-1.0/"))
249 (require 'macro-problem)
250 ;; `macro-problem-func' uses a macro from `macro-aux'.
251 (should (equal (macro-problem-func) '(progn a b)))
252 (package-install-file (expand-file-name "macro-problem-package-2.0/"))
253 ;; After upgrading, `macro-problem-func' depends on a new version
254 ;; of the macro from `macro-aux'.
255 (should (equal (macro-problem-func) '(1 b)))
256 ;; `macro-problem-10-and-90' depends on an entirely new macro from `macro-aux'.
257 (should (equal (macro-problem-10-and-90) '(10 90)))))
258
245(ert-deftest package-test-install-two-dependencies () 259(ert-deftest package-test-install-two-dependencies ()
246 "Install a package which includes a dependency." 260 "Install a package which includes a dependency."
247 (with-package-test () 261 (with-package-test ()
diff --git a/test/lisp/faces-tests.el b/test/lisp/faces-tests.el
index 007bc805120..ff9dfc53fbe 100644
--- a/test/lisp/faces-tests.el
+++ b/test/lisp/faces-tests.el
@@ -38,6 +38,11 @@
38 (should (equal (background-color-at-point) "black")) 38 (should (equal (background-color-at-point) "black"))
39 (should (equal (foreground-color-at-point) "black"))) 39 (should (equal (foreground-color-at-point) "black")))
40 (with-temp-buffer 40 (with-temp-buffer
41 (insert (propertize "STRING" 'face '(:foreground "black" :background "black")))
42 (goto-char (point-min))
43 (should (equal (background-color-at-point) "black"))
44 (should (equal (foreground-color-at-point) "black")))
45 (with-temp-buffer
41 (emacs-lisp-mode) 46 (emacs-lisp-mode)
42 (setq-local font-lock-comment-face 'faces--test1) 47 (setq-local font-lock-comment-face 'faces--test1)
43 (setq-local font-lock-constant-face 'faces--test2) 48 (setq-local font-lock-constant-face 'faces--test2)
diff --git a/test/lisp/gnus/auth-source-tests.el b/test/lisp/gnus/auth-source-tests.el
index 0b49b9013f7..dd70d546d5c 100644
--- a/test/lisp/gnus/auth-source-tests.el
+++ b/test/lisp/gnus/auth-source-tests.el
@@ -174,5 +174,50 @@
174 (:search-function . auth-source-secrets-search) 174 (:search-function . auth-source-secrets-search)
175 (:create-function . auth-source-secrets-create))))) 175 (:create-function . auth-source-secrets-create)))))
176 176
177(defun auth-source--test-netrc-parse-entry (entry host user port)
178 "Parse a netrc entry from buffer."
179 (auth-source-forget-all-cached)
180 (setq port (auth-source-ensure-strings port))
181 (with-temp-buffer
182 (insert entry)
183 (goto-char (point-min))
184 (let* ((check (lambda(alist)
185 (and alist
186 (auth-source-search-collection
187 host
188 (or
189 (auth-source--aget alist "machine")
190 (auth-source--aget alist "host")
191 t))
192 (auth-source-search-collection
193 user
194 (or
195 (auth-source--aget alist "login")
196 (auth-source--aget alist "account")
197 (auth-source--aget alist "user")
198 t))
199 (auth-source-search-collection
200 port
201 (or
202 (auth-source--aget alist "port")
203 (auth-source--aget alist "protocol")
204 t)))))
205 (entries (auth-source-netrc-parse-entries check 1)))
206 entries)))
207
208(ert-deftest auth-source-test-netrc-parse-entry ()
209 (should (equal (auth-source--test-netrc-parse-entry
210 "machine mymachine1 login user1 password pass1\n" t t t)
211 '((("password" . "pass1")
212 ("login" . "user1")
213 ("machine" . "mymachine1")))))
214 (should (equal (auth-source--test-netrc-parse-entry
215 "machine mymachine1 login user1 password pass1 port 100\n"
216 t t t)
217 '((("port" . "100")
218 ("password" . "pass1")
219 ("login" . "user1")
220 ("machine" . "mymachine1"))))))
221
177(provide 'auth-source-tests) 222(provide 'auth-source-tests)
178;;; auth-source-tests.el ends here 223;;; auth-source-tests.el ends here
diff --git a/test/lisp/gnus/message-tests.el b/test/lisp/gnus/message-tests.el
index 49a72b0e67a..790b5c15125 100644
--- a/test/lisp/gnus/message-tests.el
+++ b/test/lisp/gnus/message-tests.el
@@ -40,9 +40,9 @@
40 "and here's a closer ") 40 "and here's a closer ")
41 (let ((last-command-event ?\))) 41 (let ((last-command-event ?\)))
42 (ert-simulate-command '(self-insert-command 1))) 42 (ert-simulate-command '(self-insert-command 1)))
43 ;; Syntax propertization doesn't kick in batch mode 43 ;; Auto syntax propertization doesn't kick in until
44 (when noninteractive 44 ;; parse-sexp-lookup-properties is set.
45 (syntax-propertize (point-max))) 45 (setq-local parse-sexp-lookup-properties t)
46 (backward-sexp) 46 (backward-sexp)
47 (should (string= "here's an opener " 47 (should (string= "here's an opener "
48 (buffer-substring-no-properties 48 (buffer-substring-no-properties
diff --git a/test/lisp/help-fns-tests.el b/test/lisp/help-fns-tests.el
index b8772eb84d6..79e90f7819c 100644
--- a/test/lisp/help-fns-tests.el
+++ b/test/lisp/help-fns-tests.el
@@ -57,4 +57,14 @@
57 (should (search-forward 57 (should (search-forward
58 "(defgh\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f X)")))) 58 "(defgh\\\\\\[universal-argument\\]b\\`c\\'d\\\\e\\\"f X)"))))
59 59
60(ert-deftest help-fns-test-describe-symbol ()
61 "Test the `describe-symbol' function."
62 ;; 'describe-symbol' would originally signal an error for
63 ;; 'font-lock-comment-face'.
64 (describe-symbol 'font-lock-comment-face)
65 (with-current-buffer "*Help*"
66 (should (> (point-max) 1))
67 (goto-char (point-min))
68 (should (looking-at "^font-lock-comment-face is "))))
69
60;;; help-fns.el ends here 70;;; help-fns.el ends here
diff --git a/test/lisp/json-tests.el b/test/lisp/json-tests.el
index 8f0cd6f0857..bb043dc4e05 100644
--- a/test/lisp/json-tests.el
+++ b/test/lisp/json-tests.el
@@ -22,6 +22,38 @@
22(require 'ert) 22(require 'ert)
23(require 'json) 23(require 'json)
24 24
25(defmacro json-tests--with-temp-buffer (content &rest body)
26 "Create a temporary buffer with CONTENT and evaluate BODY there.
27Point is moved to beginning of the buffer."
28 (declare (indent 1))
29 `(with-temp-buffer
30 (insert ,content)
31 (goto-char (point-min))
32 ,@body))
33
34;;; Utilities
35
36(ert-deftest test-json-join ()
37 (should (equal (json-join '() ", ") ""))
38 (should (equal (json-join '("a" "b" "c") ", ") "a, b, c")))
39
40(ert-deftest test-json-alist-p ()
41 (should (json-alist-p '()))
42 (should (json-alist-p '((a 1) (b 2) (c 3))))
43 (should (json-alist-p '((:a 1) (:b 2) (:c 3))))
44 (should (json-alist-p '(("a" 1) ("b" 2) ("c" 3))))
45 (should-not (json-alist-p '(:a :b :c)))
46 (should-not (json-alist-p '(:a 1 :b 2 :c 3)))
47 (should-not (json-alist-p '((:a 1) (:b 2) 3))))
48
49(ert-deftest test-json-plist-p ()
50 (should (json-plist-p '()))
51 (should (json-plist-p '(:a 1 :b 2 :c 3)))
52 (should-not (json-plist-p '(a 1 b 2 c 3)))
53 (should-not (json-plist-p '("a" 1 "b" 2 "c" 3)))
54 (should-not (json-plist-p '(:a :b :c)))
55 (should-not (json-plist-p '((:a 1) (:b 2) (:c 3)))))
56
25(ert-deftest test-json-plist-reverse () 57(ert-deftest test-json-plist-reverse ()
26 (should (equal (json--plist-reverse '()) '())) 58 (should (equal (json--plist-reverse '()) '()))
27 (should (equal (json--plist-reverse '(:a 1)) '(:a 1))) 59 (should (equal (json--plist-reverse '(:a 1)) '(:a 1)))
@@ -34,49 +66,32 @@
34 (should (equal (json--plist-to-alist '(:a 1 :b 2 :c 3)) 66 (should (equal (json--plist-to-alist '(:a 1 :b 2 :c 3))
35 '((:a . 1) (:b . 2) (:c . 3))))) 67 '((:a . 1) (:b . 2) (:c . 3)))))
36 68
37(ert-deftest test-json-encode-plist () 69(ert-deftest test-json-advance ()
38 (let ((plist '(:a 1 :b 2))) 70 (json-tests--with-temp-buffer "{ \"a\": 1 }"
39 (should (equal (json-encode plist) "{\"a\":1,\"b\":2}")))) 71 (json-advance 0)
40 72 (should (= (point) (point-min)))
41(ert-deftest json-encode-simple-alist () 73 (json-advance 3)
42 (should (equal (json-encode '((a . 1) 74 (should (= (point) (+ (point-min) 3)))))
43 (b . 2)))
44 "{\"a\":1,\"b\":2}")))
45
46(ert-deftest test-json-encode-hash-table ()
47 (let ((hash-table (make-hash-table))
48 (json-encoding-object-sort-predicate 'string<))
49 (puthash :a 1 hash-table)
50 (puthash :b 2 hash-table)
51 (puthash :c 3 hash-table)
52 (should (equal (json-encode hash-table)
53 "{\"a\":1,\"b\":2,\"c\":3}"))))
54
55(ert-deftest test-json-encode-alist-with-sort-predicate ()
56 (let ((alist '((:c . 3) (:a . 1) (:b . 2)))
57 (json-encoding-object-sort-predicate 'string<))
58 (should (equal (json-encode alist) "{\"a\":1,\"b\":2,\"c\":3}"))))
59 75
60(ert-deftest test-json-encode-plist-with-sort-predicate () 76(ert-deftest test-json-peek ()
61 (let ((plist '(:c 3 :a 1 :b 2)) 77 (json-tests--with-temp-buffer ""
62 (json-encoding-object-sort-predicate 'string<)) 78 (should (eq (json-peek) :json-eof)))
63 (should (equal (json-encode plist) "{\"a\":1,\"b\":2,\"c\":3}")))) 79 (json-tests--with-temp-buffer "{ \"a\": 1 }"
80 (should (equal (json-peek) ?{))))
64 81
65(ert-deftest json-read-simple-alist () 82(ert-deftest test-json-pop ()
66 (let ((json-object-type 'alist)) 83 (json-tests--with-temp-buffer ""
67 (should (equal (json-read-from-string "{\"a\": 1, \"b\": 2}") 84 (should-error (json-pop) :type 'json-end-of-file))
68 '((a . 1) 85 (json-tests--with-temp-buffer "{ \"a\": 1 }"
69 (b . 2)))))) 86 (should (equal (json-pop) ?{))
87 (should (= (point) (+ (point-min) 1)))))
70 88
71(ert-deftest json-encode-string-with-special-chars () 89(ert-deftest test-json-skip-whitespace ()
72 (should (equal (json-encode-string "a\n\fb") 90 (json-tests--with-temp-buffer "\t\r\n\f\b { \"a\": 1 }"
73 "\"a\\n\\fb\"")) 91 (json-skip-whitespace)
74 (should (equal (json-encode-string "\nasdфыв\u001f\u007ffgh\t") 92 (should (equal (char-after (point)) ?{))))
75 "\"\\nasdфыв\\u001f\u007ffgh\\t\"")))
76 93
77(ert-deftest json-read-string-with-special-chars () 94;;; Paths
78 (should (equal (json-read-from-string "\"\\nasd\\u0444\\u044b\\u0432fgh\\t\"")
79 "\nasdфывfgh\t")))
80 95
81(ert-deftest test-json-path-to-position-with-objects () 96(ert-deftest test-json-path-to-position-with-objects ()
82 (let* ((json-string "{\"foo\": {\"bar\": {\"baz\": \"value\"}}}") 97 (let* ((json-string "{\"foo\": {\"bar\": {\"baz\": \"value\"}}}")
@@ -97,5 +112,209 @@
97 (matched-path (json-path-to-position 5 json-string))) 112 (matched-path (json-path-to-position 5 json-string)))
98 (should (null matched-path)))) 113 (should (null matched-path))))
99 114
115;;; Keywords
116
117(ert-deftest test-json-read-keyword ()
118 (json-tests--with-temp-buffer "true"
119 (should (json-read-keyword "true")))
120 (json-tests--with-temp-buffer "true"
121 (should-error
122 (json-read-keyword "false") :type 'json-unknown-keyword))
123 (json-tests--with-temp-buffer "foo"
124 (should-error
125 (json-read-keyword "foo") :type 'json-unknown-keyword)))
126
127(ert-deftest test-json-encode-keyword ()
128 (should (equal (json-encode-keyword t) "true"))
129 (should (equal (json-encode-keyword json-false) "false"))
130 (should (equal (json-encode-keyword json-null) "null")))
131
132;;; Numbers
133
134(ert-deftest test-json-read-number ()
135 (json-tests--with-temp-buffer "3"
136 (should (= (json-read-number) 3)))
137 (json-tests--with-temp-buffer "-5"
138 (should (= (json-read-number) -5)))
139 (json-tests--with-temp-buffer "123.456"
140 (should (= (json-read-number) 123.456)))
141 (json-tests--with-temp-buffer "1e3"
142 (should (= (json-read-number) 1e3)))
143 (json-tests--with-temp-buffer "2e+3"
144 (should (= (json-read-number) 2e3)))
145 (json-tests--with-temp-buffer "3E3"
146 (should (= (json-read-number) 3e3)))
147 (json-tests--with-temp-buffer "1e-7"
148 (should (= (json-read-number) 1e-7)))
149 (json-tests--with-temp-buffer "abc"
150 (should-error (json-read-number) :type 'json-number-format)))
151
152(ert-deftest test-json-encode-number ()
153 (should (equal (json-encode-number 3) "3"))
154 (should (equal (json-encode-number -5) "-5"))
155 (should (equal (json-encode-number 123.456) "123.456")))
156
157;; Strings
158
159(ert-deftest test-json-read-escaped-char ()
160 (json-tests--with-temp-buffer "\\\""
161 (should (equal (json-read-escaped-char) ?\"))))
162
163(ert-deftest test-json-read-string ()
164 (json-tests--with-temp-buffer "\"foo \\\"bar\\\"\""
165 (should (equal (json-read-string) "foo \"bar\"")))
166 (json-tests--with-temp-buffer "\"abcαβγ\""
167 (should (equal (json-read-string) "abcαβγ")))
168 (json-tests--with-temp-buffer "\"\\nasd\\u0444\\u044b\\u0432fgh\\t\""
169 (should (equal (json-read-string) "\nasdфывfgh\t")))
170 (json-tests--with-temp-buffer "foo"
171 (should-error (json-read-string) :type 'json-string-format)))
172
173(ert-deftest test-json-encode-string ()
174 (should (equal (json-encode-string "foo") "\"foo\""))
175 (should (equal (json-encode-string "a\n\fb") "\"a\\n\\fb\""))
176 (should (equal (json-encode-string "\nasdфыв\u001f\u007ffgh\t")
177 "\"\\nasdфыв\\u001f\u007ffgh\\t\"")))
178
179(ert-deftest test-json-encode-key ()
180 (should (equal (json-encode-key "foo") "\"foo\""))
181 (should (equal (json-encode-key 'foo) "\"foo\""))
182 (should (equal (json-encode-key :foo) "\"foo\""))
183 (should-error (json-encode-key 5) :type 'json-key-format)
184 (should-error (json-encode-key ["foo"]) :type 'json-key-format)
185 (should-error (json-encode-key '("foo")) :type 'json-key-format))
186
187;;; Objects
188
189(ert-deftest test-json-new-object ()
190 (let ((json-object-type 'alist))
191 (should (equal (json-new-object) '())))
192 (let ((json-object-type 'plist))
193 (should (equal (json-new-object) '())))
194 (let* ((json-object-type 'hash-table)
195 (json-object (json-new-object)))
196 (should (hash-table-p json-object))
197 (should (= (hash-table-count json-object) 0))))
198
199(ert-deftest test-json-add-to-object ()
200 (let* ((json-object-type 'alist)
201 (json-key-type nil)
202 (obj (json-new-object)))
203 (setq obj (json-add-to-object obj "a" 1))
204 (setq obj (json-add-to-object obj "b" 2))
205 (should (equal (assq 'a obj) '(a . 1)))
206 (should (equal (assq 'b obj) '(b . 2))))
207 (let* ((json-object-type 'plist)
208 (json-key-type nil)
209 (obj (json-new-object)))
210 (setq obj (json-add-to-object obj "a" 1))
211 (setq obj (json-add-to-object obj "b" 2))
212 (should (= (plist-get obj :a) 1))
213 (should (= (plist-get obj :b) 2)))
214 (let* ((json-object-type 'hash-table)
215 (json-key-type nil)
216 (obj (json-new-object)))
217 (setq obj (json-add-to-object obj "a" 1))
218 (setq obj (json-add-to-object obj "b" 2))
219 (should (= (gethash "a" obj) 1))
220 (should (= (gethash "b" obj) 2))))
221
222(ert-deftest test-json-read-object ()
223 (json-tests--with-temp-buffer "{ \"a\": 1, \"b\": 2 }"
224 (let ((json-object-type 'alist))
225 (should (equal (json-read-object) '((a . 1) (b . 2))))))
226 (json-tests--with-temp-buffer "{ \"a\": 1, \"b\": 2 }"
227 (let ((json-object-type 'plist))
228 (should (equal (json-read-object) '(:a 1 :b 2)))))
229 (json-tests--with-temp-buffer "{ \"a\": 1, \"b\": 2 }"
230 (let* ((json-object-type 'hash-table)
231 (hash-table (json-read-object)))
232 (should (= (gethash "a" hash-table) 1))
233 (should (= (gethash "b" hash-table) 2))))
234 (json-tests--with-temp-buffer "{ \"a\": 1 \"b\": 2 }"
235 (should-error (json-read-object) :type 'json-object-format)))
236
237(ert-deftest test-json-encode-hash-table ()
238 (let ((hash-table (make-hash-table))
239 (json-encoding-object-sort-predicate 'string<)
240 (json-encoding-pretty-print nil))
241 (puthash :a 1 hash-table)
242 (puthash :b 2 hash-table)
243 (puthash :c 3 hash-table)
244 (should (equal (json-encode hash-table)
245 "{\"a\":1,\"b\":2,\"c\":3}"))))
246
247(ert-deftest json-encode-simple-alist ()
248 (let ((json-encoding-pretty-print nil))
249 (should (equal (json-encode '((a . 1) (b . 2)))
250 "{\"a\":1,\"b\":2}"))))
251
252(ert-deftest test-json-encode-plist ()
253 (let ((plist '(:a 1 :b 2))
254 (json-encoding-pretty-print nil))
255 (should (equal (json-encode plist) "{\"a\":1,\"b\":2}"))))
256
257(ert-deftest test-json-encode-plist-with-sort-predicate ()
258 (let ((plist '(:c 3 :a 1 :b 2))
259 (json-encoding-object-sort-predicate 'string<)
260 (json-encoding-pretty-print nil))
261 (should (equal (json-encode plist) "{\"a\":1,\"b\":2,\"c\":3}"))))
262
263(ert-deftest test-json-encode-alist-with-sort-predicate ()
264 (let ((alist '((:c . 3) (:a . 1) (:b . 2)))
265 (json-encoding-object-sort-predicate 'string<)
266 (json-encoding-pretty-print nil))
267 (should (equal (json-encode alist) "{\"a\":1,\"b\":2,\"c\":3}"))))
268
269(ert-deftest test-json-encode-list ()
270 (let ((json-encoding-pretty-print nil))
271 (should (equal (json-encode-list '(:a 1 :b 2))
272 "{\"a\":1,\"b\":2}"))
273 (should (equal (json-encode-list '((:a . 1) (:b . 2)))
274 "{\"a\":1,\"b\":2}"))
275 (should (equal (json-encode-list '(1 2 3 4)) "[1,2,3,4]"))))
276
277;;; Arrays
278
279(ert-deftest test-json-read-array ()
280 (let ((json-array-type 'vector))
281 (json-tests--with-temp-buffer "[1, 2, \"a\", \"b\"]"
282 (should (equal (json-read-array) [1 2 "a" "b"]))))
283 (let ((json-array-type 'list))
284 (json-tests--with-temp-buffer "[1, 2, \"a\", \"b\"]"
285 (should (equal (json-read-array) '(1 2 "a" "b")))))
286 (json-tests--with-temp-buffer "[1 2]"
287 (should-error (json-read-array) :type 'json-error)))
288
289(ert-deftest test-json-encode-array ()
290 (let ((json-encoding-pretty-print nil))
291 (should (equal (json-encode-array [1 2 "a" "b"])
292 "[1,2,\"a\",\"b\"]"))))
293
294;;; Reader
295
296(ert-deftest test-json-read ()
297 (json-tests--with-temp-buffer "{ \"a\": 1 }"
298 ;; We don't care exactly what the return value is (that is tested
299 ;; in `test-json-read-object'), but it should parse without error.
300 (should (json-read)))
301 (json-tests--with-temp-buffer ""
302 (should-error (json-read) :type 'json-end-of-file))
303 (json-tests--with-temp-buffer "xxx"
304 (should-error (json-read) :type 'json-readtable-error)))
305
306(ert-deftest test-json-read-from-string ()
307 (let ((json-string "{ \"a\": 1 }"))
308 (json-tests--with-temp-buffer json-string
309 (should (equal (json-read-from-string json-string)
310 (json-read))))))
311
312;;; JSON encoder
313
314(ert-deftest test-json-encode ()
315 (should (equal (json-encode "foo") "\"foo\""))
316 (with-temp-buffer
317 (should-error (json-encode (current-buffer)) :type 'json-error)))
318
100(provide 'json-tests) 319(provide 'json-tests)
101;;; json-tests.el ends here 320;;; json-tests.el ends here
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index c5cab7d5991..23171d6e983 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -1608,6 +1608,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
1608 (vc-handled-backends 1608 (vc-handled-backends
1609 (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil 1609 (with-parsed-tramp-file-name tramp-test-temporary-file-directory nil
1610 (cond 1610 (cond
1611 ((tramp-find-executable v vc-git-program (tramp-get-remote-path v))
1612 '(Git))
1613 ((tramp-find-executable v vc-hg-program (tramp-get-remote-path v))
1614 '(Hg))
1611 ((tramp-find-executable v vc-bzr-program (tramp-get-remote-path v)) 1615 ((tramp-find-executable v vc-bzr-program (tramp-get-remote-path v))
1612 (setq tramp-remote-process-environment 1616 (setq tramp-remote-process-environment
1613 (cons (format "BZR_HOME=%s" 1617 (cons (format "BZR_HOME=%s"
@@ -1618,10 +1622,6 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
1618 (tramp-dissect-file-name tramp-test-temporary-file-directory) 1622 (tramp-dissect-file-name tramp-test-temporary-file-directory)
1619 nil 'keep-password) 1623 nil 'keep-password)
1620 '(Bzr)) 1624 '(Bzr))
1621 ((tramp-find-executable v vc-git-program (tramp-get-remote-path v))
1622 '(Git))
1623 ((tramp-find-executable v vc-hg-program (tramp-get-remote-path v))
1624 '(Hg))
1625 (t nil))))) 1625 (t nil)))))
1626 (skip-unless vc-handled-backends) 1626 (skip-unless vc-handled-backends)
1627 (message "%s" vc-handled-backends) 1627 (message "%s" vc-handled-backends)
@@ -1637,7 +1637,11 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
1637 1637
1638 (let ((default-directory tmp-name1)) 1638 (let ((default-directory tmp-name1))
1639 ;; Create empty repository, and register the file. 1639 ;; Create empty repository, and register the file.
1640 (vc-create-repo (car vc-handled-backends)) 1640 ;; Sometimes, creation of repository fails (bzr!); we skip
1641 ;; the test then.
1642 (condition-case nil
1643 (vc-create-repo (car vc-handled-backends))
1644 (error (skip-unless nil)))
1641 ;; The structure of VC-FILESET is not documented. Let's 1645 ;; The structure of VC-FILESET is not documented. Let's
1642 ;; hope it won't change. 1646 ;; hope it won't change.
1643 (condition-case nil 1647 (condition-case nil
@@ -1772,6 +1776,14 @@ Several special characters do not work properly there."
1772 (file-truename tramp-test-temporary-file-directory) nil 1776 (file-truename tramp-test-temporary-file-directory) nil
1773 (string-match "^HP-UX" (tramp-get-connection-property v "uname" "")))) 1777 (string-match "^HP-UX" (tramp-get-connection-property v "uname" ""))))
1774 1778
1779(defun tramp--test-darwin-p ()
1780 "Check, whether the remote host runs Mac OS X.
1781Several special characters do not work properly there."
1782 ;; We must refill the cache. `file-truename' does it.
1783 (with-parsed-tramp-file-name
1784 (file-truename tramp-test-temporary-file-directory) nil
1785 (string-match "^Darwin" (tramp-get-connection-property v "uname" ""))))
1786
1775(defun tramp--test-check-files (&rest files) 1787(defun tramp--test-check-files (&rest files)
1776 "Run a simple but comprehensive test over every file in FILES." 1788 "Run a simple but comprehensive test over every file in FILES."
1777 ;; We must use `file-truename' for the temporary directory, because 1789 ;; We must use `file-truename' for the temporary directory, because
@@ -1987,7 +1999,10 @@ Use the `perl' command."
1987 (let ((tramp-connection-properties 1999 (let ((tramp-connection-properties
1988 (append 2000 (append
1989 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) 2001 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
1990 "stat" nil)) 2002 "stat" nil)
2003 ;; See `tramp-sh-handle-file-truename'.
2004 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2005 "readlink" nil))
1991 tramp-connection-properties))) 2006 tramp-connection-properties)))
1992 (tramp--test-special-characters))) 2007 (tramp--test-special-characters)))
1993 2008
@@ -2005,21 +2020,25 @@ Use the `ls' command."
2005 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) 2020 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2006 "perl" nil) 2021 "perl" nil)
2007 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) 2022 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2008 "stat" nil)) 2023 "stat" nil)
2024 ;; See `tramp-sh-handle-file-truename'.
2025 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2026 "readlink" nil))
2009 tramp-connection-properties))) 2027 tramp-connection-properties)))
2010 (tramp--test-special-characters))) 2028 (tramp--test-special-characters)))
2011 2029
2012(defun tramp--test-utf8 () 2030(defun tramp--test-utf8 ()
2013 "Perform the test in `tramp-test32-utf8*'." 2031 "Perform the test in `tramp-test32-utf8*'."
2032 (tramp--instrument-test-case 10
2014 (let ((coding-system-for-read 'utf-8) 2033 (let ((coding-system-for-read 'utf-8)
2015 (coding-system-for-write 'utf-8) 2034 (coding-system-for-write 'utf-8)
2016 (file-name-coding-system 'utf-8)) 2035 (file-name-coding-system 'utf-8))
2017 (tramp--test-check-files 2036 (tramp--test-check-files
2018 (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ") 2037 (unless (tramp--test-hpux-p) "Γυρίστε το Γαλαξία με Ώτο Στοπ")
2019 (unless (tramp--test-hpux-p) 2038 (unless (or (tramp--test-hpux-p) (tramp--test-darwin-p))
2020 "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت") 2039 "أصبح بوسعك الآن تنزيل نسخة كاملة من موسوعة ويكيبيديا العربية لتصفحها بلا اتصال بالإنترنت")
2021 "银河系漫游指南系列" 2040 "银河系漫游指南系列"
2022 "Автостопом по гала́ктике"))) 2041 "Автостопом по гала́ктике"))))
2023 2042
2024(ert-deftest tramp-test32-utf8 () 2043(ert-deftest tramp-test32-utf8 ()
2025 "Check UTF8 encoding in file names and file contents." 2044 "Check UTF8 encoding in file names and file contents."
@@ -2059,7 +2078,10 @@ Use the `perl' command."
2059 (let ((tramp-connection-properties 2078 (let ((tramp-connection-properties
2060 (append 2079 (append
2061 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) 2080 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2062 "stat" nil)) 2081 "stat" nil)
2082 ;; See `tramp-sh-handle-file-truename'.
2083 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2084 "readlink" nil))
2063 tramp-connection-properties))) 2085 tramp-connection-properties)))
2064 (tramp--test-utf8))) 2086 (tramp--test-utf8)))
2065 2087
@@ -2077,7 +2099,10 @@ Use the `ls' command."
2077 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) 2099 `((,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2078 "perl" nil) 2100 "perl" nil)
2079 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory)) 2101 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2080 "stat" nil)) 2102 "stat" nil)
2103 ;; See `tramp-sh-handle-file-truename'.
2104 (,(regexp-quote (file-remote-p tramp-test-temporary-file-directory))
2105 "readlink" nil))
2081 tramp-connection-properties))) 2106 tramp-connection-properties)))
2082 (tramp--test-utf8))) 2107 (tramp--test-utf8)))
2083 2108
diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index 97f86a969aa..2d0452f69d7 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -543,7 +543,7 @@ to (xref-elisp-test-descr-to-target xref)."
543;; FIXME: deftype 543;; FIXME: deftype
544 544
545(xref-elisp-deftest find-defs-defun-c-defvar-c 545(xref-elisp-deftest find-defs-defun-c-defvar-c
546 (elisp--xref-find-definitions 'system-name) 546 (xref-backend-definitions 'elisp "system-name")
547 (list 547 (list
548 (xref-make "(defvar system-name)" 548 (xref-make "(defvar system-name)"
549 (xref-make-elisp-location 'system-name 'defvar "src/editfns.c")) 549 (xref-make-elisp-location 'system-name 'defvar "src/editfns.c"))
@@ -552,7 +552,7 @@ to (xref-elisp-test-descr-to-target xref)."
552 ) 552 )
553 553
554(xref-elisp-deftest find-defs-defun-el-defvar-c 554(xref-elisp-deftest find-defs-defun-el-defvar-c
555 (elisp--xref-find-definitions 'abbrev-mode) 555 (xref-backend-definitions 'elisp "abbrev-mode")
556 ;; It's a minor mode, but the variable is defined in buffer.c 556 ;; It's a minor mode, but the variable is defined in buffer.c
557 (list 557 (list
558 (xref-make "(defvar abbrev-mode)" 558 (xref-make "(defvar abbrev-mode)"
diff --git a/test/lisp/simple-tests.el b/test/lisp/simple-tests.el
index 07b5eaa93e4..771241ad7ef 100644
--- a/test/lisp/simple-tests.el
+++ b/test/lisp/simple-tests.el
@@ -138,6 +138,12 @@
138 (open-line 1))) 138 (open-line 1)))
139 '("- - " . "\n(a b c d)")))) 139 '("- - " . "\n(a b c d)"))))
140 140
141;; For a while, from 24 Oct - 21 Nov 2015, `open-line' in the Emacs
142;; development tree became sensitive to `electric-indent-mode', which
143;; it had not been before. This sensitivity was reverted for the
144;; Emacs 25 release, so it could be discussed further (see thread
145;; "Questioning the new behavior of `open-line'." on the Emacs Devel
146;; mailing list, and bug #21884).
141(ert-deftest open-line-indent () 147(ert-deftest open-line-indent ()
142 (should (equal (simple-test--dummy-buffer 148 (should (equal (simple-test--dummy-buffer
143 (electric-indent-local-mode 1) 149 (electric-indent-local-mode 1)
@@ -145,29 +151,34 @@
145 '("(a b" . "\n c d)"))) 151 '("(a b" . "\n c d)")))
146 (should (equal (simple-test--dummy-buffer 152 (should (equal (simple-test--dummy-buffer
147 (electric-indent-local-mode 1) 153 (electric-indent-local-mode 1)
148 (open-line 1 'interactive)) 154 (open-line 1))
149 '("(a b" . "\n c d)"))) 155 '("(a b" . "\n c d)")))
150 (should (equal (simple-test--dummy-buffer 156 (should (equal (simple-test--dummy-buffer
151 (electric-indent-local-mode 1) 157 (electric-indent-local-mode 1)
152 (let ((current-prefix-arg nil)) 158 (let ((current-prefix-arg nil))
153 (call-interactively #'open-line) 159 (call-interactively #'open-line)
154 (call-interactively #'open-line))) 160 (call-interactively #'open-line)))
155 '("(a b" . "\n\n c d)"))) 161 '("(a b" . "\n\n c d)")))
156 (should (equal (simple-test--dummy-buffer 162 (should (equal (simple-test--dummy-buffer
157 (electric-indent-local-mode 1) 163 (electric-indent-local-mode 1)
158 (open-line 5 'interactive)) 164 (open-line 5))
159 '("(a b" . "\n\n\n\n\n c d)"))) 165 '("(a b" . "\n\n\n\n\n c d)")))
160 (should (equal (simple-test--dummy-buffer 166 (should (equal (simple-test--dummy-buffer
161 (electric-indent-local-mode 1) 167 (electric-indent-local-mode 1)
162 (let ((current-prefix-arg 5)) 168 (let ((current-prefix-arg 5))
163 (call-interactively #'open-line))) 169 (call-interactively #'open-line)))
164 '("(a b" . "\n\n\n\n\n c d)"))) 170 '("(a b" . "\n\n\n\n\n c d)")))
165 (should (equal (simple-test--dummy-buffer 171 (should (equal (simple-test--dummy-buffer
166 (forward-char 1) 172 (forward-char 1)
167 (electric-indent-local-mode 1) 173 (electric-indent-local-mode 1)
168 (open-line 1 'interactive)) 174 (open-line 1))
169 '("(a b" . "\n c d)")))) 175 '("(a b " . "\nc d)"))))
170 176
177;; From 24 Oct - 21 Nov 2015, `open-line' took a second argument
178;; INTERACTIVE and ran `post-self-insert-hook' if the argument was
179;; true. This test tested that. Currently, however, `open-line'
180;; does not run run `post-self-insert-hook' at all, so for now
181;; this test just makes sure that it doesn't.
171(ert-deftest open-line-hook () 182(ert-deftest open-line-hook ()
172 (let* ((x 0) 183 (let* ((x 0)
173 (inc (lambda () (setq x (1+ x))))) 184 (inc (lambda () (setq x (1+ x)))))
@@ -177,18 +188,18 @@
177 (should (= x 0)) 188 (should (= x 0))
178 (simple-test--dummy-buffer 189 (simple-test--dummy-buffer
179 (add-hook 'post-self-insert-hook inc nil 'local) 190 (add-hook 'post-self-insert-hook inc nil 'local)
180 (open-line 1 'interactive)) 191 (open-line 1))
181 (should (= x 1)) 192 (should (= x 0))
182 193
183 (unwind-protect 194 (unwind-protect
184 (progn 195 (progn
185 (add-hook 'post-self-insert-hook inc) 196 (add-hook 'post-self-insert-hook inc)
186 (simple-test--dummy-buffer 197 (simple-test--dummy-buffer
187 (open-line 1)) 198 (open-line 1))
188 (should (= x 1)) 199 (should (= x 0))
189 (simple-test--dummy-buffer 200 (simple-test--dummy-buffer
190 (open-line 10 'interactive)) 201 (open-line 10))
191 (should (= x 2))) 202 (should (= x 0)))
192 (remove-hook 'post-self-insert-hook inc)))) 203 (remove-hook 'post-self-insert-hook inc))))
193 204
194 205
@@ -215,9 +226,9 @@
215 226
216 227
217;;; auto-boundary tests 228;;; auto-boundary tests
218(ert-deftest undo-auto--boundary-timer () 229(ert-deftest undo-auto-boundary-timer ()
219 (should 230 (should
220 undo-auto--current-boundary-timer)) 231 undo-auto-current-boundary-timer))
221 232
222(ert-deftest undo-auto--boundaries-added () 233(ert-deftest undo-auto--boundaries-added ()
223 ;; The change in the buffer should have caused addition 234 ;; The change in the buffer should have caused addition
@@ -252,5 +263,53 @@
252 '("(s1) (s4)" . " (s2) (s3) (s5)")))) 263 '("(s1) (s4)" . " (s2) (s3) (s5)"))))
253 264
254 265
266;; Test for a regression introduced by undo-auto--boundaries changes.
267;; https://lists.gnu.org/archive/html/emacs-devel/2015-11/msg01652.html
268(defun undo-test-kill-c-a-then-undo ()
269 (with-temp-buffer
270 (switch-to-buffer (current-buffer))
271 (setq buffer-undo-list nil)
272 (insert "a\nb\n\c\n")
273 (goto-char (point-max))
274 ;; We use a keyboard macro because it adds undo events in the same
275 ;; way as if a user were involved.
276 (kmacro-call-macro nil nil nil
277 [left
278 ;; Delete "c"
279 backspace
280 left left left
281 ;; Delete "a"
282 backspace
283 ;; C-/ or undo
284 67108911
285 ])
286 (point)))
287
288(defun undo-test-point-after-forward-kill ()
289 (with-temp-buffer
290 (switch-to-buffer (current-buffer))
291 (setq buffer-undo-list nil)
292 (insert "kill word forward")
293 ;; Move to word "word".
294 (goto-char 6)
295 (kmacro-call-macro nil nil nil
296 [
297 ;; kill-word
298 C-delete
299 ;; undo
300 67108911
301 ])
302 (point)))
303
304(ert-deftest undo-point-in-wrong-place ()
305 (should
306 ;; returns 5 with the bug
307 (= 2
308 (undo-test-kill-c-a-then-undo)))
309 (should
310 (= 6
311 (undo-test-point-after-forward-kill))))
312
313
255(provide 'simple-test) 314(provide 'simple-test)
256;;; simple-test.el ends here 315;;; simple-test.el ends here
diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el
index ee8db593b49..3fcb7d346a3 100644
--- a/test/lisp/subr-tests.el
+++ b/test/lisp/subr-tests.el
@@ -103,5 +103,117 @@
103 (should (equal (macroexpand-all '(when a b c d)) 103 (should (equal (macroexpand-all '(when a b c d))
104 '(if a (progn b c d))))) 104 '(if a (progn b c d)))))
105 105
106(ert-deftest subr-test-version-parsing ()
107 (should (equal (version-to-list ".5") '(0 5)))
108 (should (equal (version-to-list "0.9 alpha1") '(0 9 -3 1)))
109 (should (equal (version-to-list "0.9 snapshot") '(0 9 -4)))
110 (should (equal (version-to-list "0.9-alpha1") '(0 9 -3 1)))
111 (should (equal (version-to-list "0.9-snapshot") '(0 9 -4)))
112 (should (equal (version-to-list "0.9.snapshot") '(0 9 -4)))
113 (should (equal (version-to-list "0.9_snapshot") '(0 9 -4)))
114 (should (equal (version-to-list "0.9alpha1") '(0 9 -3 1)))
115 (should (equal (version-to-list "0.9snapshot") '(0 9 -4)))
116 (should (equal (version-to-list "1.0 git") '(1 0 -4)))
117 (should (equal (version-to-list "1.0 pre2") '(1 0 -1 2)))
118 (should (equal (version-to-list "1.0-git") '(1 0 -4)))
119 (should (equal (version-to-list "1.0-pre2") '(1 0 -1 2)))
120 (should (equal (version-to-list "1.0.1-a") '(1 0 1 1)))
121 (should (equal (version-to-list "1.0.1-f") '(1 0 1 6)))
122 (should (equal (version-to-list "1.0.1.a") '(1 0 1 1)))
123 (should (equal (version-to-list "1.0.1.f") '(1 0 1 6)))
124 (should (equal (version-to-list "1.0.1_a") '(1 0 1 1)))
125 (should (equal (version-to-list "1.0.1_f") '(1 0 1 6)))
126 (should (equal (version-to-list "1.0.1a") '(1 0 1 1)))
127 (should (equal (version-to-list "1.0.1f") '(1 0 1 6)))
128 (should (equal (version-to-list "1.0.7.5") '(1 0 7 5)))
129 (should (equal (version-to-list "1.0.git") '(1 0 -4)))
130 (should (equal (version-to-list "1.0.pre2") '(1 0 -1 2)))
131 (should (equal (version-to-list "1.0_git") '(1 0 -4)))
132 (should (equal (version-to-list "1.0_pre2") '(1 0 -1 2)))
133 (should (equal (version-to-list "1.0git") '(1 0 -4)))
134 (should (equal (version-to-list "1.0pre2") '(1 0 -1 2)))
135 (should (equal (version-to-list "22.8 beta3") '(22 8 -2 3)))
136 (should (equal (version-to-list "22.8-beta3") '(22 8 -2 3)))
137 (should (equal (version-to-list "22.8.beta3") '(22 8 -2 3)))
138 (should (equal (version-to-list "22.8_beta3") '(22 8 -2 3)))
139 (should (equal (version-to-list "22.8beta3") '(22 8 -2 3)))
140 (should (equal (version-to-list "6.9.30 Beta") '(6 9 30 -2)))
141 (should (equal (version-to-list "6.9.30-Beta") '(6 9 30 -2)))
142 (should (equal (version-to-list "6.9.30.Beta") '(6 9 30 -2)))
143 (should (equal (version-to-list "6.9.30Beta") '(6 9 30 -2)))
144 (should (equal (version-to-list "6.9.30_Beta") '(6 9 30 -2)))
145
146 (should (equal
147 (error-message-string (should-error (version-to-list "OTP-18.1.5")))
148 "Invalid version syntax: `OTP-18.1.5' (must start with a number)"))
149 (should (equal
150 (error-message-string (should-error (version-to-list "")))
151 "Invalid version syntax: `' (must start with a number)"))
152 (should (equal
153 (error-message-string (should-error (version-to-list "1.0..7.5")))
154 "Invalid version syntax: `1.0..7.5'"))
155 (should (equal
156 (error-message-string (should-error (version-to-list "1.0prepre2")))
157 "Invalid version syntax: `1.0prepre2'"))
158 (should (equal
159 (error-message-string (should-error (version-to-list "22.8X3")))
160 "Invalid version syntax: `22.8X3'"))
161 (should (equal
162 (error-message-string (should-error (version-to-list "beta22.8alpha3")))
163 "Invalid version syntax: `beta22.8alpha3' (must start with a number)"))
164 (should (equal
165 (error-message-string (should-error (version-to-list "honk")))
166 "Invalid version syntax: `honk' (must start with a number)"))
167 (should (equal
168 (error-message-string (should-error (version-to-list 9)))
169 "Version must be a string"))
170
171 (let ((version-separator "_"))
172 (should (equal (version-to-list "_5") '(0 5)))
173 (should (equal (version-to-list "0_9 alpha1") '(0 9 -3 1)))
174 (should (equal (version-to-list "0_9 snapshot") '(0 9 -4)))
175 (should (equal (version-to-list "0_9-alpha1") '(0 9 -3 1)))
176 (should (equal (version-to-list "0_9-snapshot") '(0 9 -4)))
177 (should (equal (version-to-list "0_9.alpha1") '(0 9 -3 1)))
178 (should (equal (version-to-list "0_9.snapshot") '(0 9 -4)))
179 (should (equal (version-to-list "0_9alpha1") '(0 9 -3 1)))
180 (should (equal (version-to-list "0_9snapshot") '(0 9 -4)))
181 (should (equal (version-to-list "1_0 git") '(1 0 -4)))
182 (should (equal (version-to-list "1_0 pre2") '(1 0 -1 2)))
183 (should (equal (version-to-list "1_0-git") '(1 0 -4)))
184 (should (equal (version-to-list "1_0.pre2") '(1 0 -1 2)))
185 (should (equal (version-to-list "1_0_1-a") '(1 0 1 1)))
186 (should (equal (version-to-list "1_0_1-f") '(1 0 1 6)))
187 (should (equal (version-to-list "1_0_1.a") '(1 0 1 1)))
188 (should (equal (version-to-list "1_0_1.f") '(1 0 1 6)))
189 (should (equal (version-to-list "1_0_1_a") '(1 0 1 1)))
190 (should (equal (version-to-list "1_0_1_f") '(1 0 1 6)))
191 (should (equal (version-to-list "1_0_1a") '(1 0 1 1)))
192 (should (equal (version-to-list "1_0_1f") '(1 0 1 6)))
193 (should (equal (version-to-list "1_0_7_5") '(1 0 7 5)))
194 (should (equal (version-to-list "1_0_git") '(1 0 -4)))
195 (should (equal (version-to-list "1_0pre2") '(1 0 -1 2)))
196 (should (equal (version-to-list "22_8 beta3") '(22 8 -2 3)))
197 (should (equal (version-to-list "22_8-beta3") '(22 8 -2 3)))
198 (should (equal (version-to-list "22_8.beta3") '(22 8 -2 3)))
199 (should (equal (version-to-list "22_8beta3") '(22 8 -2 3)))
200 (should (equal (version-to-list "6_9_30 Beta") '(6 9 30 -2)))
201 (should (equal (version-to-list "6_9_30-Beta") '(6 9 30 -2)))
202 (should (equal (version-to-list "6_9_30.Beta") '(6 9 30 -2)))
203 (should (equal (version-to-list "6_9_30Beta") '(6 9 30 -2)))
204
205 (should (equal
206 (error-message-string (should-error (version-to-list "1_0__7_5")))
207 "Invalid version syntax: `1_0__7_5'"))
208 (should (equal
209 (error-message-string (should-error (version-to-list "1_0prepre2")))
210 "Invalid version syntax: `1_0prepre2'"))
211 (should (equal
212 (error-message-string (should-error (version-to-list "22.8X3")))
213 "Invalid version syntax: `22.8X3'"))
214 (should (equal
215 (error-message-string (should-error (version-to-list "beta22_8alpha3")))
216 "Invalid version syntax: `beta22_8alpha3' (must start with a number)"))))
217
106(provide 'subr-tests) 218(provide 'subr-tests)
107;;; subr-tests.el ends here 219;;; subr-tests.el ends here
diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index 9291d346769..245f6703adf 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -46,6 +46,7 @@ $user_comment_lc php-src/lce_functions.php 115
46($string,$flag,@string,@temp,@last perl-src/yagrip.pl 40 46($string,$flag,@string,@temp,@last perl-src/yagrip.pl 40
47(a-forth-constant forth-src/test-forth.fth /^constant (a-forth-constant$/ 47(a-forth-constant forth-src/test-forth.fth /^constant (a-forth-constant$/
48(another-forth-word forth-src/test-forth.fth /^: (another-forth-word) ( -- )$/ 48(another-forth-word forth-src/test-forth.fth /^: (another-forth-word) ( -- )$/
49+ ruby-src/test.rb /^ def +(y)$/
49+ tex-src/texinfo.tex /^\\def+{{\\tt \\char 43}}$/ 50+ tex-src/texinfo.tex /^\\def+{{\\tt \\char 43}}$/
50/.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ 51/.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/
51/.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/ 52/.notdef ps-src/rfc1245.ps /^\/.notdef \/.notdef \/.notdef \/.notdef \/.notdef \/.not/
@@ -177,6 +178,9 @@ $user_comment_lc php-src/lce_functions.php 115
177/yen ps-src/rfc1245.ps /^\/yen \/.notdef \/.notdef \/.notdef \/.notdef \/.notdef / 178/yen ps-src/rfc1245.ps /^\/yen \/.notdef \/.notdef \/.notdef \/.notdef \/.notdef /
178:a-forth-dictionary-entry forth-src/test-forth.fth /^create :a-forth-dictionary-entry$/ 179:a-forth-dictionary-entry forth-src/test-forth.fth /^create :a-forth-dictionary-entry$/
179< tex-src/texinfo.tex /^\\def<{{\\tt \\less}}$/ 180< tex-src/texinfo.tex /^\\def<{{\\tt \\less}}$/
181<< ruby-src/test.rb /^ def <<(y)$/
182<= ruby-src/test.rb /^ def <=(y)$/
183<=> ruby-src/test.rb /^ def <=>(y)$/
180= tex-src/texinfo.tex /^\\global\\let\\section = \\numberedsec$/ 184= tex-src/texinfo.tex /^\\global\\let\\section = \\numberedsec$/
181= tex-src/texinfo.tex /^\\global\\let\\subsection = \\numberedsubsec$/ 185= tex-src/texinfo.tex /^\\global\\let\\subsection = \\numberedsubsec$/
182= tex-src/texinfo.tex /^\\global\\let\\subsubsection = \\numberedsubsubsec$/ 186= tex-src/texinfo.tex /^\\global\\let\\subsubsection = \\numberedsubsubsec$/
@@ -191,6 +195,8 @@ $user_comment_lc php-src/lce_functions.php 115
191= tex-src/texinfo.tex /^\\global\\let\\subsubsection = \\numberedsubsubsec$/ 195= tex-src/texinfo.tex /^\\global\\let\\subsubsection = \\numberedsubsubsec$/
192= tex-src/texinfo.tex /^\\global\\def={{\\tt \\char 61}}}$/ 196= tex-src/texinfo.tex /^\\global\\def={{\\tt \\char 61}}}$/
193=/f ada-src/etags-test-for.ada /^ function "=" (L, R : System.Address) return Boo/ 197=/f ada-src/etags-test-for.ada /^ function "=" (L, R : System.Address) return Boo/
198== ruby-src/test.rb /^ def ==(y)$/
199=== ruby-src/test.rb /^ def ===(y)$/
194=\indexdummyfont tex-src/texinfo.tex /^\\let\\cite=\\indexdummyfont$/ 200=\indexdummyfont tex-src/texinfo.tex /^\\let\\cite=\\indexdummyfont$/
195=\relax tex-src/texinfo.tex /^\\let\\chapter=\\relax$/ 201=\relax tex-src/texinfo.tex /^\\let\\chapter=\\relax$/
196=\relax tex-src/texinfo.tex /^\\let\\section=\\relax$/ 202=\relax tex-src/texinfo.tex /^\\let\\section=\\relax$/
@@ -220,6 +226,7 @@ A cp-src/c.C 73
220A cp-src/c.C 117 226A cp-src/c.C 117
221A cp-src/fail.C 7 227A cp-src/fail.C 7
222A cp-src/fail.C 23 228A cp-src/fail.C 23
229A ruby-src/test1.ruby /^class A$/
223ADDRESS c-src/emacs/src/gmalloc.c /^#define ADDRESS(B) ((void *) (((B) - 1) * BLOCKSIZ/ 230ADDRESS c-src/emacs/src/gmalloc.c /^#define ADDRESS(B) ((void *) (((B) - 1) * BLOCKSIZ/
224ALIGNOF_STRUCT_LISP_VECTOR c-src/emacs/src/lisp.h 1378 231ALIGNOF_STRUCT_LISP_VECTOR c-src/emacs/src/lisp.h 1378
225ALLOCATED_BEFORE_DUMPING c-src/emacs/src/gmalloc.c /^#define ALLOCATED_BEFORE_DUMPING(P) \\$/ 232ALLOCATED_BEFORE_DUMPING c-src/emacs/src/gmalloc.c /^#define ALLOCATED_BEFORE_DUMPING(P) \\$/
@@ -306,6 +313,7 @@ BUFFERP c-src/emacs/src/lisp.h /^BUFFERP (Lisp_Object a)$/
306BUFFERSIZE objc-src/Subprocess.h 43 313BUFFERSIZE objc-src/Subprocess.h 43
307BUFFER_OBJFWDP c-src/emacs/src/lisp.h /^BUFFER_OBJFWDP (union Lisp_Fwd *a)$/ 314BUFFER_OBJFWDP c-src/emacs/src/lisp.h /^BUFFER_OBJFWDP (union Lisp_Fwd *a)$/
308BYTE_MARK_STACK c-src/emacs/src/lisp.h 3181 315BYTE_MARK_STACK c-src/emacs/src/lisp.h 3181
316Bar lua-src/test.lua /^function Square.something:Bar ()$/
309Bar perl-src/kai-test.pl /^package Bar;$/ 317Bar perl-src/kai-test.pl /^package Bar;$/
310Bar::f4 perl-src/kai-test.pl /^sub Bar::f4 {$/ 318Bar::f4 perl-src/kai-test.pl /^sub Bar::f4 {$/
311Bar::f5 perl-src/kai-test.pl /^sub f5 {$/ 319Bar::f5 perl-src/kai-test.pl /^sub f5 {$/
@@ -425,9 +433,12 @@ C_entries c-src/etags.c /^C_entries (int c_ext, FILE *inf)$/
425C_stab_entry c-src/etags.c 2271 433C_stab_entry c-src/etags.c 2271
426C_symtype c-src/etags.c /^C_symtype (char *str, int len, int c_ext)$/ 434C_symtype c-src/etags.c /^C_symtype (char *str, int len, int c_ext)$/
427ChangeFileType pas-src/common.pas /^function ChangeFileType; (*(FileName : NameString;/ 435ChangeFileType pas-src/common.pas /^function ChangeFileType; (*(FileName : NameString;/
436Circle.getPos lua-src/test.lua /^function Circle.getPos ()$/
428Cjava_entries c-src/etags.c /^Cjava_entries (FILE *inf)$/ 437Cjava_entries c-src/etags.c /^Cjava_entries (FILE *inf)$/
429Cjava_help c-src/etags.c 551 438Cjava_help c-src/etags.c 551
430Cjava_suffixes c-src/etags.c 549 439Cjava_suffixes c-src/etags.c 549
440ClassExample ruby-src/test.rb /^ class ClassExample$/
441ClassExample.singleton_class_method ruby-src/test.rb /^ def ClassExample.singleton_class_method$/
431Clear/p ada-src/2ataspri.adb /^ procedure Clear (Cell : in out TAS_Cell) is$/ 442Clear/p ada-src/2ataspri.adb /^ procedure Clear (Cell : in out TAS_Cell) is$/
432Clear/p ada-src/2ataspri.ads /^ procedure Clear (Cell : in out TAS_Cell)/ 443Clear/p ada-src/2ataspri.ads /^ procedure Clear (Cell : in out TAS_Cell)/
433Cobol_help c-src/etags.c 558 444Cobol_help c-src/etags.c 558
@@ -458,6 +469,7 @@ Create_LL_Task/p ada-src/2ataspri.adb /^ procedure Create_LL_Task$/
458Create_LL_Task/p ada-src/2ataspri.ads /^ procedure Create_LL_Task$/ 469Create_LL_Task/p ada-src/2ataspri.ads /^ procedure Create_LL_Task$/
459Cstar_entries c-src/etags.c /^Cstar_entries (FILE *inf)$/ 470Cstar_entries c-src/etags.c /^Cstar_entries (FILE *inf)$/
460Cstar_suffixes c-src/etags.c 562 471Cstar_suffixes c-src/etags.c 562
472Cube.data.getFoo lua-src/test.lua /^function Cube.data.getFoo ()$/
461D cp-src/fail.C 41 473D cp-src/fail.C 41
462D cp-src/fail.C /^ D() : ::A::T2::T(97), x(1066) {}$/ 474D cp-src/fail.C /^ D() : ::A::T2::T(97), x(1066) {}$/
463DAEMON_RUNNING c-src/emacs/src/lisp.h 4258 475DAEMON_RUNNING c-src/emacs/src/lisp.h 4258
@@ -926,6 +938,8 @@ Mconway.cpp cp-src/conway.cpp /^void main(void)$/
926Metags c-src/etags.c /^main (int argc, char **argv)$/ 938Metags c-src/etags.c /^main (int argc, char **argv)$/
927Mfail cp-src/fail.C /^main()$/ 939Mfail cp-src/fail.C /^main()$/
928Mkai-test.pl perl-src/kai-test.pl /^package main;$/ 940Mkai-test.pl perl-src/kai-test.pl /^package main;$/
941ModuleExample ruby-src/test.rb /^module ModuleExample$/
942ModuleExample.singleton_module_method ruby-src/test.rb /^ def ModuleExample.singleton_module_method$/
929More_Lisp_Bits c-src/emacs/src/lisp.h 801 943More_Lisp_Bits c-src/emacs/src/lisp.h 801
930MoveLayerAfter lua-src/allegro.lua /^function MoveLayerAfter (this_one)$/ 944MoveLayerAfter lua-src/allegro.lua /^function MoveLayerAfter (this_one)$/
931MoveLayerBefore lua-src/allegro.lua /^function MoveLayerBefore (this_one)$/ 945MoveLayerBefore lua-src/allegro.lua /^function MoveLayerBefore (this_one)$/
@@ -1193,6 +1207,7 @@ Range cp-src/Range.h /^ Range (double b, double l, double i)$/
1193ReadVacation cp-src/functions.cpp /^void ReadVacation ( char *filename ) {$/ 1207ReadVacation cp-src/functions.cpp /^void ReadVacation ( char *filename ) {$/
1194Read_Lock/p ada-src/2ataspri.adb /^ procedure Read_Lock (L : in out Lock; Ceiling_V/ 1208Read_Lock/p ada-src/2ataspri.adb /^ procedure Read_Lock (L : in out Lock; Ceiling_V/
1195Read_Lock/p ada-src/2ataspri.ads /^ procedure Read_Lock (L : in out Lock; Ceiling_V/ 1209Read_Lock/p ada-src/2ataspri.ads /^ procedure Read_Lock (L : in out Lock; Ceiling_V/
1210Rectangle.getPos lua-src/test.lua /^function Rectangle.getPos ()$/
1196ReleaseNameString pas-src/common.pas /^procedure ReleaseNameString; (* (var NSP: NameStri/ 1211ReleaseNameString pas-src/common.pas /^procedure ReleaseNameString; (* (var NSP: NameStri/
1197RemoveLayer lua-src/allegro.lua /^function RemoveLayer ()$/ 1212RemoveLayer lua-src/allegro.lua /^function RemoveLayer ()$/
1198RemoveUnderlineControl pas-src/common.pas /^function RemoveUnderlineControl; (*($/ 1213RemoveUnderlineControl pas-src/common.pas /^function RemoveUnderlineControl; (*($/
@@ -1309,6 +1324,7 @@ SimpleCalc objcpp-src/SimpleCalc.H /^@interface SimpleCalc:Object$/
1309SkipBlanks pas-src/common.pas /^function SkipBlanks; (*($/ 1324SkipBlanks pas-src/common.pas /^function SkipBlanks; (*($/
1310SkipChars pas-src/common.pas /^function SkipChars; (*($/ 1325SkipChars pas-src/common.pas /^function SkipChars; (*($/
1311SkipSpaces pas-src/common.pas /^procedure SkipSpaces; (* (Str : NameString; var I / 1326SkipSpaces pas-src/common.pas /^procedure SkipSpaces; (* (Str : NameString; var I /
1327Square.something:Bar lua-src/test.lua /^function Square.something:Bar ()$/
1312StartDay cp-src/functions.cpp /^Date StartDay(Date a,int days){\/\/Function to calcu/ 1328StartDay cp-src/functions.cpp /^Date StartDay(Date a,int days){\/\/Function to calcu/
1313StripPath pas-src/common.pas /^function StripPath; (*($/ 1329StripPath pas-src/common.pas /^function StripPath; (*($/
1314SubString pas-src/common.pas /^function SubString; (*($/ 1330SubString pas-src/common.pas /^function SubString; (*($/
@@ -1647,6 +1663,8 @@ Yacc_entries c-src/etags.c /^Yacc_entries (FILE *inf)$/
1647Yacc_help c-src/etags.c 693 1663Yacc_help c-src/etags.c 693
1648Yacc_suffixes c-src/etags.c 691 1664Yacc_suffixes c-src/etags.c 691
1649Z c-src/h.h 100 1665Z c-src/h.h 100
1666[] ruby-src/test.rb /^ def [](y)$/
1667[]= ruby-src/test.rb /^ def []=(y, val)$/
1650\ tex-src/texinfo.tex /^\\def\\ {{\\fontdimen2\\font=\\tclosesave{} }}%$/ 1668\ tex-src/texinfo.tex /^\\def\\ {{\\fontdimen2\\font=\\tclosesave{} }}%$/
1651\ tex-src/texinfo.tex /^\\gdef\\sepspaces{\\def {\\ }}}$/ 1669\ tex-src/texinfo.tex /^\\gdef\\sepspaces{\\def {\\ }}}$/
1652\' tex-src/texinfo.tex /^\\def\\'{{'}}$/ 1670\' tex-src/texinfo.tex /^\\def\\'{{'}}$/
@@ -2353,6 +2371,7 @@ _malloc_thread_enabled_p c-src/emacs/src/gmalloc.c 519
2353_realloc c-src/emacs/src/gmalloc.c /^_realloc (void *ptr, size_t size)$/ 2371_realloc c-src/emacs/src/gmalloc.c /^_realloc (void *ptr, size_t size)$/
2354_realloc_internal c-src/emacs/src/gmalloc.c /^_realloc_internal (void *ptr, size_t size)$/ 2372_realloc_internal c-src/emacs/src/gmalloc.c /^_realloc_internal (void *ptr, size_t size)$/
2355_realloc_internal_nolock c-src/emacs/src/gmalloc.c /^_realloc_internal_nolock (void *ptr, size_t size)$/ 2373_realloc_internal_nolock c-src/emacs/src/gmalloc.c /^_realloc_internal_nolock (void *ptr, size_t size)$/
2374` ruby-src/test.rb /^ def `(command)$/
2356a c.c 152 2375a c.c 152
2357a c.c 180 2376a c.c 180
2358a c.c /^a()$/ 2377a c.c /^a()$/
@@ -2360,6 +2379,7 @@ a c.c /^a ()$/
2360a c-src/h.h 40 2379a c-src/h.h 40
2361a c-src/h.h 103 2380a c-src/h.h 103
2362a cp-src/c.C 132 2381a cp-src/c.C 132
2382a ruby-src/test1.ruby /^ def a()$/
2363a-forth-constant! forth-src/test-forth.fth /^99 constant a-forth-constant!$/ 2383a-forth-constant! forth-src/test-forth.fth /^99 constant a-forth-constant!$/
2364a-forth-value? forth-src/test-forth.fth /^55 value a-forth-value?$/ 2384a-forth-value? forth-src/test-forth.fth /^55 value a-forth-value?$/
2365a-forth-word forth-src/test-forth.fth /^: a-forth-word ( a b c -- a*b+c ) + * ;$/ 2385a-forth-word forth-src/test-forth.fth /^: a-forth-word ( a b c -- a*b+c ) + * ;$/
@@ -2484,6 +2504,7 @@ b c-src/h.h 41
2484b c-src/h.h 103 2504b c-src/h.h 103
2485b c-src/h.h 104 2505b c-src/h.h 104
2486b cp-src/c.C 132 2506b cp-src/c.C 132
2507b ruby-src/test1.ruby /^ def b()$/
2487backslash=0 tex-src/texinfo.tex /^\\let\\indexbackslash=0 %overridden during \\printin/ 2508backslash=0 tex-src/texinfo.tex /^\\let\\indexbackslash=0 %overridden during \\printin/
2488bar c-src/c.c /^void bar() {while(0) {}}$/ 2509bar c-src/c.c /^void bar() {while(0) {}}$/
2489bar c.c 143 2510bar c.c 143
@@ -2599,6 +2620,10 @@ childDidExit objc-src/Subprocess.m /^- childDidExit$/
2599chunks_free c-src/emacs/src/gmalloc.c 313 2620chunks_free c-src/emacs/src/gmalloc.c 313
2600chunks_used c-src/emacs/src/gmalloc.c 311 2621chunks_used c-src/emacs/src/gmalloc.c 311
2601cjava c-src/etags.c 2936 2622cjava c-src/etags.c 2936
2623class_method ruby-src/test.rb /^ def class_method$/
2624class_method_equals= ruby-src/test.rb /^ def class_method_equals=$/
2625class_method_exclamation! ruby-src/test.rb /^ def class_method_exclamation!$/
2626class_method_question? ruby-src/test.rb /^ def class_method_question?$/
2602classifyLine php-src/lce_functions.php /^ function classifyLine($line)$/ 2627classifyLine php-src/lce_functions.php /^ function classifyLine($line)$/
2603clear cp-src/conway.hpp /^ void clear(void) { alive = 0; }$/ 2628clear cp-src/conway.hpp /^ void clear(void) { alive = 0; }$/
2604clear-abbrev-table c-src/abbrev.c /^DEFUN ("clear-abbrev-table", Fclear_abbrev_table, / 2629clear-abbrev-table c-src/abbrev.c /^DEFUN ("clear-abbrev-table", Fclear_abbrev_table, /
@@ -2988,8 +3013,11 @@ generic_object cp-src/clheir.cpp /^generic_object::generic_object(void)$/
2988generic_object cp-src/clheir.hpp 13 3013generic_object cp-src/clheir.hpp 13
2989getArchs objc-src/PackInsp.m /^-(void)getArchs$/ 3014getArchs objc-src/PackInsp.m /^-(void)getArchs$/
2990getDomainNames php-src/lce_functions.php /^ function getDomainNames()$/ 3015getDomainNames php-src/lce_functions.php /^ function getDomainNames()$/
3016getFoo lua-src/test.lua /^function Cube.data.getFoo ()$/
2991getPOReader php-src/lce_functions.php /^ function &getPOReader($domain)$/ 3017getPOReader php-src/lce_functions.php /^ function &getPOReader($domain)$/
2992getPath objc-src/PackInsp.m /^-(const char *)getPath:(char *)buf forType:(const / 3018getPath objc-src/PackInsp.m /^-(const char *)getPath:(char *)buf forType:(const /
3019getPos lua-src/test.lua /^function Rectangle.getPos ()$/
3020getPos lua-src/test.lua /^function Circle.getPos ()$/
2993getTextDomains php-src/lce_functions.php /^ function getTextDomains($lines)$/ 3021getTextDomains php-src/lce_functions.php /^ function getTextDomains($lines)$/
2994get_compressor_from_suffix c-src/etags.c /^get_compressor_from_suffix (char *file, char **ext/ 3022get_compressor_from_suffix c-src/etags.c /^get_compressor_from_suffix (char *file, char **ext/
2995get_contiguous_space c-src/emacs/src/gmalloc.c /^get_contiguous_space (ptrdiff_t size, void *positi/ 3023get_contiguous_space c-src/emacs/src/gmalloc.c /^get_contiguous_space (ptrdiff_t size, void *positi/
@@ -3397,6 +3425,8 @@ mcCSC cp-src/c.C 6
3397mcheck c-src/emacs/src/gmalloc.c /^mcheck (void (*func) (enum mcheck_status))$/ 3425mcheck c-src/emacs/src/gmalloc.c /^mcheck (void (*func) (enum mcheck_status))$/
3398mcheck_status c-src/emacs/src/gmalloc.c 283 3426mcheck_status c-src/emacs/src/gmalloc.c 283
3399mcheck_used c-src/emacs/src/gmalloc.c 2012 3427mcheck_used c-src/emacs/src/gmalloc.c 2012
3428me22b lua-src/test.lua /^ local function test.me22b (one)$/
3429me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/
3400memalign c-src/emacs/src/gmalloc.c /^memalign (size_t alignment, size_t size)$/ 3430memalign c-src/emacs/src/gmalloc.c /^memalign (size_t alignment, size_t size)$/
3401member prol-src/natded.prolog /^member(X,[X|_]).$/ 3431member prol-src/natded.prolog /^member(X,[X|_]).$/
3402memclear c-src/emacs/src/lisp.h /^memclear (void *p, ptrdiff_t nbytes)$/ 3432memclear c-src/emacs/src/lisp.h /^memclear (void *p, ptrdiff_t nbytes)$/
@@ -3420,6 +3450,7 @@ miti html-src/softwarelibero.html /^Sfatiamo alcuni miti$/
3420modifier_names c-src/emacs/src/keyboard.c 6319 3450modifier_names c-src/emacs/src/keyboard.c 6319
3421modifier_symbols c-src/emacs/src/keyboard.c 6327 3451modifier_symbols c-src/emacs/src/keyboard.c 6327
3422modify_event_symbol c-src/emacs/src/keyboard.c /^modify_event_symbol (ptrdiff_t symbol_num, int mod/ 3452modify_event_symbol c-src/emacs/src/keyboard.c /^modify_event_symbol (ptrdiff_t symbol_num, int mod/
3453module_method ruby-src/test.rb /^ def module_method$/
3423more_aligned_int c.c 165 3454more_aligned_int c.c 165
3424morecore_nolock c-src/emacs/src/gmalloc.c /^morecore_nolock (size_t size)$/ 3455morecore_nolock c-src/emacs/src/gmalloc.c /^morecore_nolock (size_t size)$/
3425morecore_recursing c-src/emacs/src/gmalloc.c 604 3456morecore_recursing c-src/emacs/src/gmalloc.c 604
@@ -4180,6 +4211,8 @@ test c-src/emacs/src/lisp.h 1871
4180test cp-src/c.C 86 4211test cp-src/c.C 86
4181test erl-src/gs_dialog.erl /^test() ->$/ 4212test erl-src/gs_dialog.erl /^test() ->$/
4182test php-src/ptest.php /^test $/ 4213test php-src/ptest.php /^test $/
4214test.me22b lua-src/test.lua /^ local function test.me22b (one)$/
4215test.me_22a lua-src/test.lua /^ function test.me_22a(one, two)$/
4183test_undefined c-src/emacs/src/keyboard.c /^test_undefined (Lisp_Object binding)$/ 4216test_undefined c-src/emacs/src/keyboard.c /^test_undefined (Lisp_Object binding)$/
4184texttreelist prol-src/natded.prolog /^texttreelist([]).$/ 4217texttreelist prol-src/natded.prolog /^texttreelist([]).$/
4185this c-src/a/b/b.c 1 4218this c-src/a/b/b.c 1
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index e1e0daf4872..2ae4ec41256 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2084,17 +2084,17 @@ void agent::move(move53,1353
2084 2084
2085cp-src/clheir.hpp,423 2085cp-src/clheir.hpp,423
2086class generic_object13,520 2086class generic_object13,520
2087 virtual void compute_next_state(21,842 2087 virtual void compute_next_state(21,843
2088 virtual void step(22,888 2088 virtual void step(22,889
2089const int max_num_directions 31,1219 2089const int max_num_directions 31,1220
2090class location:location33,1289 2090class location:location33,1290
2091 location(43,1642 2091 location(43,1643
2092class irregular_location:irregular_location47,1686 2092class irregular_location:irregular_location47,1687
2093 irregular_location(51,1762 2093 irregular_location(51,1763
2094class discrete_location:discrete_location56,1889 2094class discrete_location:discrete_location56,1890
2095 discrete_location(62,2044 2095 discrete_location(62,2045
2096 void assign_neighbor(66,2184 2096 void assign_neighbor(66,2185
2097class agent:agent75,2508 2097class agent:agent75,2509
2098 2098
2099cp-src/fail.C,294 2099cp-src/fail.C,294
2100struct A 7,263 2100struct A 7,263
@@ -2218,28 +2218,28 @@ el-src/emacs/lisp/progmodes/etags.el,5069
2218(defun next-file 1685,67976 2218(defun next-file 1685,67976
2219(defvar tags-loop-operate 1760,70890 2219(defvar tags-loop-operate 1760,70890
2220(defvar tags-loop-scan1763,70984 2220(defvar tags-loop-scan1763,70984
2221(defun tags-loop-eval 1771,71314 2221(defun tags-loop-eval 1771,71313
2222(defun tags-loop-continue 1782,71643 2222(defun tags-loop-continue 1782,71642
2223(defun tags-search 1850,73949 2223(defun tags-search 1850,73948
2224(defun tags-query-replace 1871,74775 2224(defun tags-query-replace 1871,74774
2225(defun tags-complete-tags-table-file 1896,75999 2225(defun tags-complete-tags-table-file 1896,75998
2226(defun list-tags 1906,76378 2226(defun list-tags 1906,76377
2227(defun tags-apropos 1934,77331 2227(defun tags-apropos 1934,77330
2228(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 2228(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78156
2229(defun select-tags-table 1964,78396 2229(defun select-tags-table 1964,78395
2230(defvar select-tags-table-mode-map 2019,80523 2230(defvar select-tags-table-mode-map 2019,80522
2231(define-derived-mode select-tags-table-mode 2030,80906 2231(define-derived-mode select-tags-table-mode 2030,80905
2232(defun select-tags-table-select 2034,81090 2232(defun select-tags-table-select 2034,81089
2233(defun select-tags-table-quit 2043,81456 2233(defun select-tags-table-quit 2043,81455
2234(defun complete-tag 2049,81611 2234(defun complete-tag 2049,81610
2235(defconst etags--xref-limit 2074,82552 2235(defconst etags--xref-limit 2074,82551
2236(defvar etags-xref-find-definitions-tag-order 2076,82587 2236(defvar etags-xref-find-definitions-tag-order 2076,82586
2237(defun etags-xref-find 2082,82877 2237(defun etags-xref-find 2082,82876
2238(defun etags--xref-find-definitions 2096,83406 2238(defun etags--xref-find-definitions 2096,83405
2239(defclass xref-etags-location 2129,85121 2239(defclass xref-etags-location 2129,85120
2240(defun xref-make-etags-location 2135,85344 2240(defun xref-make-etags-location 2135,85343
2241(cl-defmethod xref-location-marker 2139,85499 2241(cl-defmethod xref-location-marker 2139,85498
2242(cl-defmethod xref-location-line 2146,85743 2242(cl-defmethod xref-location-line 2146,85742
2243 2243
2244erl-src/gs_dialog.erl,98 2244erl-src/gs_dialog.erl,98
2245-define(VERSION2,32 2245-define(VERSION2,32
@@ -2336,49 +2336,63 @@ function MoveLayerBottom 223,5079
2336function MoveLayerBefore 236,5457 2336function MoveLayerBefore 236,5457
2337function MoveLayerAfter 258,6090 2337function MoveLayerAfter 258,6090
2338 2338
2339lua-src/test.lua,442
2340function Rectangle.getPos 2,15
2341function Rectangle.getPos getPos2,15
2342function Circle.getPos 6,61
2343function Circle.getPos getPos6,61
2344function Cube.data.getFoo 10,102
2345function Cube.data.getFoo getFoo10,102
2346function Square.something:Bar 14,148
2347function Square.something:Bar Bar14,148
2348 function test.me_22a(22,241
2349 function test.me_22a(me_22a22,241
2350 local function test.me22b 25,297
2351 local function test.me22b me22b25,297
2352
2339make-src/Makefile,1133 2353make-src/Makefile,1133
2340LATEST=1,0 2354LATEST=1,0
2341NONSRCS=35,1578 2355NONSRCS=35,1577
2342CPPFLAGS=49,2191 2356CPPFLAGS=49,2190
2343LDFLAGS=50,2260 2357LDFLAGS=50,2259
2344FASTCFLAGS=55,2531 2358FASTCFLAGS=55,2530
2345FILTER=58,2642 2359FILTER=58,2641
2346 @-$($72,3064 2360 @-$($72,3063
2347 @-$($73,3113 2361 @-$($73,3112
2348 @-$($74,3177 2362 @-$($74,3176
2349 @-$($75,3223 2363 @-$($75,3222
2350 @-$($76,3291 2364 @-$($76,3290
2351 @-$($77,3383 2365 @-$($77,3382
2352 @$(81,3466 2366 @$(81,3465
2353 @$(82,3514 2367 @$(82,3513
2354 @$(83,3577 2368 @$(83,3576
2355 @$(84,3622 2369 @$(84,3621
2356 @$(85,3689 2370 @$(85,3688
2357 @$(86,3780 2371 @$(86,3779
2358${CHECKOBJS}: CFLAGS=88,3806 2372${CHECKOBJS}: CFLAGS=88,3805
2359 @env CHECKEROPTS=92,3922 2373 @env CHECKEROPTS=92,3921
2360 @$(98,4094 2374 @$(98,4093
2361 @$(106,4250 2375 @$(106,4249
2362 @$(110,4374 2376 @$(110,4373
2363 @$(114,4500 2377 @$(114,4499
2364 @for i in $(SRCS); do echo $$i;140,5315 2378 @for i in $(SRCS); do echo $$i;140,5320
2365 $(160,6053 2379 $(160,6058
2366 $(163,6114 2380 $(163,6119
2367 $(166,6177 2381 $(166,6182
2368 $(169,6228 2382 $(169,6233
2369 $(172,6317 2383 $(172,6322
2370 sdiff --suppress-common-lines --width=width186,6614 2384 sdiff --suppress-common-lines --width=width186,6619
2371 sdiff --suppress-common-lines --width=width189,6703 2385 sdiff --suppress-common-lines --width=width189,6708
2372 sdiff --suppress-common-lines --width=width192,6791 2386 sdiff --suppress-common-lines --width=width192,6796
2373 sdiff --suppress-common-lines --width=width195,6880 2387 sdiff --suppress-common-lines --width=width195,6885
2374 TEXTAGS=204,7122 2388 TEXTAGS=204,7127
2375 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7122 2389 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
2376 ${RUN} etags12 --members -o $@ --regex=regex207,7239 2390 ${RUN} etags12 --members -o $@ --regex=regex207,7244
2377 ${RUN} ./ctags -o $@ --regex=regex213,7388 2391 ${RUN} ./ctags -o $@ --regex=regex213,7393
2378 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7464 2392 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
2379 TEXTAGS=219,7583 2393 TEXTAGS=219,7588
2380 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7583 2394 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
2381 ${RUN} ./extags -e --regex-c=c222,7710 2395 ${RUN} ./extags -e --regex-c=c222,7715
2382 2396
2383objc-src/Subprocess.h,98 2397objc-src/Subprocess.h,98
2384#define Subprocess 41,1217 2398#define Subprocess 41,1217
@@ -2963,6 +2977,31 @@ class Configure(760,24879
2963 def save(797,26022 2977 def save(797,26022
2964 def nosave(807,26310 2978 def nosave(807,26310
2965 2979
2980ruby-src/test.rb,594
2981module ModuleExample1,0
2982 class ClassExample2,21
2983 def class_method3,44
2984 def ClassExample.singleton_class_method6,116
2985 def class_method_exclamation!9,221
2986 def class_method_question?12,319
2987 def class_method_equals=class_method_equals=15,411
2988 def `(18,499
2989 def +(21,589
2990 def [](24,637
2991 def []=([]=27,687
2992 def <<(30,749
2993 def ==(==33,799
2994 def <=(<=36,869
2995 def <=>(<=>39,940
2996 def ===(===42,987
2997 def module_method46,1048
2998 def ModuleExample.singleton_module_method49,1110
2999
3000ruby-src/test1.ruby,37
3001class A1,0
3002 def a(2,8
3003 def b(5,38
3004
2966tex-src/testenv.tex,52 3005tex-src/testenv.tex,52
2967\newcommand{\nm}\nm4,77 3006\newcommand{\nm}\nm4,77
2968\section{blah}blah8,139 3007\section{blah}blah8,139
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index 8b0742241c7..3ec5b21d384 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -2642,24 +2642,24 @@ extern void step_everybody(11,485
2642class generic_object13,520 2642class generic_object13,520
2643 generic_object(17,582 2643 generic_object(17,582
2644 ~generic_object(19,724 2644 ~generic_object(19,724
2645 virtual void compute_next_state(21,842 2645 virtual void compute_next_state(21,843
2646 virtual void step(22,888 2646 virtual void step(22,889
2647const int max_num_directions 31,1219 2647const int max_num_directions 31,1220
2648class location:location33,1289 2648class location:location33,1290
2649 location(43,1642 2649 location(43,1643
2650 ~location(44,1661 2650 ~location(44,1662
2651class irregular_location:irregular_location47,1686 2651class irregular_location:irregular_location47,1687
2652 irregular_location(51,1762 2652 irregular_location(51,1763
2653 ~irregular_location(53,1854 2653 ~irregular_location(53,1855
2654class discrete_location:discrete_location56,1889 2654class discrete_location:discrete_location56,1890
2655 void clear_neighbors(60,2004 2655 void clear_neighbors(60,2005
2656 discrete_location(62,2044 2656 discrete_location(62,2045
2657 ~discrete_location(65,2154 2657 ~discrete_location(65,2155
2658 void assign_neighbor(66,2184 2658 void assign_neighbor(66,2185
2659class agent:agent75,2508 2659class agent:agent75,2509
2660 agent(79,2578 2660 agent(79,2579
2661 ~agent(80,2591 2661 ~agent(80,2592
2662 void move(81,2605 2662 void move(81,2606
2663 2663
2664cp-src/fail.C,315 2664cp-src/fail.C,315
2665struct A 7,263 2665struct A 7,263
@@ -2787,28 +2787,28 @@ el-src/emacs/lisp/progmodes/etags.el,5188
2787(defun next-file 1685,67976 2787(defun next-file 1685,67976
2788(defvar tags-loop-operate 1760,70890 2788(defvar tags-loop-operate 1760,70890
2789(defvar tags-loop-scan1763,70984 2789(defvar tags-loop-scan1763,70984
2790(defun tags-loop-eval 1771,71314 2790(defun tags-loop-eval 1771,71313
2791(defun tags-loop-continue 1782,71643 2791(defun tags-loop-continue 1782,71642
2792(defun tags-search 1850,73949 2792(defun tags-search 1850,73948
2793(defun tags-query-replace 1871,74775 2793(defun tags-query-replace 1871,74774
2794(defun tags-complete-tags-table-file 1896,75999 2794(defun tags-complete-tags-table-file 1896,75998
2795(defun list-tags 1906,76378 2795(defun list-tags 1906,76377
2796(defun tags-apropos 1934,77331 2796(defun tags-apropos 1934,77330
2797(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 2797(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78156
2798(defun select-tags-table 1964,78396 2798(defun select-tags-table 1964,78395
2799(defvar select-tags-table-mode-map 2019,80523 2799(defvar select-tags-table-mode-map 2019,80522
2800(define-derived-mode select-tags-table-mode 2030,80906 2800(define-derived-mode select-tags-table-mode 2030,80905
2801(defun select-tags-table-select 2034,81090 2801(defun select-tags-table-select 2034,81089
2802(defun select-tags-table-quit 2043,81456 2802(defun select-tags-table-quit 2043,81455
2803(defun complete-tag 2049,81611 2803(defun complete-tag 2049,81610
2804(defconst etags--xref-limit 2074,82552 2804(defconst etags--xref-limit 2074,82551
2805(defvar etags-xref-find-definitions-tag-order 2076,82587 2805(defvar etags-xref-find-definitions-tag-order 2076,82586
2806(defun etags-xref-find 2082,82877 2806(defun etags-xref-find 2082,82876
2807(defun etags--xref-find-definitions 2096,83406 2807(defun etags--xref-find-definitions 2096,83405
2808(defclass xref-etags-location 2129,85121 2808(defclass xref-etags-location 2129,85120
2809(defun xref-make-etags-location 2135,85344 2809(defun xref-make-etags-location 2135,85343
2810(cl-defmethod xref-location-marker 2139,85499 2810(cl-defmethod xref-location-marker 2139,85498
2811(cl-defmethod xref-location-line 2146,85743 2811(cl-defmethod xref-location-line 2146,85742
2812 2812
2813erl-src/gs_dialog.erl,98 2813erl-src/gs_dialog.erl,98
2814-define(VERSION2,32 2814-define(VERSION2,32
@@ -2905,50 +2905,64 @@ function MoveLayerBottom 223,5079
2905function MoveLayerBefore 236,5457 2905function MoveLayerBefore 236,5457
2906function MoveLayerAfter 258,6090 2906function MoveLayerAfter 258,6090
2907 2907
2908lua-src/test.lua,442
2909function Rectangle.getPos 2,15
2910function Rectangle.getPos getPos2,15
2911function Circle.getPos 6,61
2912function Circle.getPos getPos6,61
2913function Cube.data.getFoo 10,102
2914function Cube.data.getFoo getFoo10,102
2915function Square.something:Bar 14,148
2916function Square.something:Bar Bar14,148
2917 function test.me_22a(22,241
2918 function test.me_22a(me_22a22,241
2919 local function test.me22b 25,297
2920 local function test.me22b me22b25,297
2921
2908make-src/Makefile,1156 2922make-src/Makefile,1156
2909LATEST=1,0 2923LATEST=1,0
2910NONSRCS=35,1578 2924NONSRCS=35,1577
2911CPPFLAGS=49,2191 2925CPPFLAGS=49,2190
2912LDFLAGS=50,2260 2926LDFLAGS=50,2259
2913FASTCFLAGS=55,2531 2927FASTCFLAGS=55,2530
2914FILTER=58,2642 2928FILTER=58,2641
2915 @-$($72,3064 2929 @-$($72,3063
2916 @-$($73,3113 2930 @-$($73,3112
2917 @-$($74,3177 2931 @-$($74,3176
2918 @-$($75,3223 2932 @-$($75,3222
2919 @-$($76,3291 2933 @-$($76,3290
2920 @-$($77,3383 2934 @-$($77,3382
2921 @$(81,3466 2935 @$(81,3465
2922 @$(82,3514 2936 @$(82,3513
2923 @$(83,3577 2937 @$(83,3576
2924 @$(84,3622 2938 @$(84,3621
2925 @$(85,3689 2939 @$(85,3688
2926 @$(86,3780 2940 @$(86,3779
2927${CHECKOBJS}: CFLAGS=88,3806 2941${CHECKOBJS}: CFLAGS=88,3805
2928 @env CHECKEROPTS=92,3922 2942 @env CHECKEROPTS=92,3921
2929 @$(98,4094 2943 @$(98,4093
2930 @$(106,4250 2944 @$(106,4249
2931 @$(110,4374 2945 @$(110,4373
2932 @$(114,4500 2946 @$(114,4499
2933 @for i in $(140,5315 2947 @for i in $(140,5320
2934 @for i in $(SRCS); do echo $$i;140,5315 2948 @for i in $(SRCS); do echo $$i;140,5320
2935 $(160,6053 2949 $(160,6058
2936 $(163,6114 2950 $(163,6119
2937 $(166,6177 2951 $(166,6182
2938 $(169,6228 2952 $(169,6233
2939 $(172,6317 2953 $(172,6322
2940 sdiff --suppress-common-lines --width=width186,6614 2954 sdiff --suppress-common-lines --width=width186,6619
2941 sdiff --suppress-common-lines --width=width189,6703 2955 sdiff --suppress-common-lines --width=width189,6708
2942 sdiff --suppress-common-lines --width=width192,6791 2956 sdiff --suppress-common-lines --width=width192,6796
2943 sdiff --suppress-common-lines --width=width195,6880 2957 sdiff --suppress-common-lines --width=width195,6885
2944 TEXTAGS=204,7122 2958 TEXTAGS=204,7127
2945 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7122 2959 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
2946 ${RUN} etags12 --members -o $@ --regex=regex207,7239 2960 ${RUN} etags12 --members -o $@ --regex=regex207,7244
2947 ${RUN} ./ctags -o $@ --regex=regex213,7388 2961 ${RUN} ./ctags -o $@ --regex=regex213,7393
2948 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7464 2962 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
2949 TEXTAGS=219,7583 2963 TEXTAGS=219,7588
2950 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7583 2964 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
2951 ${RUN} ./extags -e --regex-c=c222,7710 2965 ${RUN} ./extags -e --regex-c=c222,7715
2952 2966
2953objc-src/Subprocess.h,98 2967objc-src/Subprocess.h,98
2954#define Subprocess 41,1217 2968#define Subprocess 41,1217
@@ -3534,6 +3548,31 @@ class Configure(760,24879
3534 def save(797,26022 3548 def save(797,26022
3535 def nosave(807,26310 3549 def nosave(807,26310
3536 3550
3551ruby-src/test.rb,594
3552module ModuleExample1,0
3553 class ClassExample2,21
3554 def class_method3,44
3555 def ClassExample.singleton_class_method6,116
3556 def class_method_exclamation!9,221
3557 def class_method_question?12,319
3558 def class_method_equals=class_method_equals=15,411
3559 def `(18,499
3560 def +(21,589
3561 def [](24,637
3562 def []=([]=27,687
3563 def <<(30,749
3564 def ==(==33,799
3565 def <=(<=36,869
3566 def <=>(<=>39,940
3567 def ===(===42,987
3568 def module_method46,1048
3569 def ModuleExample.singleton_module_method49,1110
3570
3571ruby-src/test1.ruby,37
3572class A1,0
3573 def a(2,8
3574 def b(5,38
3575
3537tex-src/testenv.tex,52 3576tex-src/testenv.tex,52
3538\newcommand{\nm}\nm4,77 3577\newcommand{\nm}\nm4,77
3539\section{blah}blah8,139 3578\section{blah}blah8,139
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 37eaafbab61..43b84eed5d2 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -2391,25 +2391,25 @@ void agent::move(move53,1353
2391cp-src/clheir.hpp,682 2391cp-src/clheir.hpp,682
2392class generic_object13,520 2392class generic_object13,520
2393 int where_in_registry;15,547 2393 int where_in_registry;15,547
2394 virtual void compute_next_state(21,842 2394 virtual void compute_next_state(21,843
2395 virtual void step(22,888 2395 virtual void step(22,889
2396const int max_num_directions 31,1219 2396const int max_num_directions 31,1220
2397class location:location33,1289 2397class location:location33,1290
2398 location(43,1642 2398 location(43,1643
2399class irregular_location:irregular_location47,1686 2399class irregular_location:irregular_location47,1687
2400 double x,49,1734 2400 double x,49,1735
2401 double x, y,49,1734 2401 double x, y,49,1735
2402 double x, y, z;49,1734 2402 double x, y, z;49,1735
2403 irregular_location(51,1762 2403 irregular_location(51,1763
2404class discrete_location:discrete_location56,1889 2404class discrete_location:discrete_location56,1890
2405 int x,58,1936 2405 int x,58,1937
2406 int x, y,58,1936 2406 int x, y,58,1937
2407 int x, y, z;58,1936 2407 int x, y, z;58,1937
2408 class location *neighbors[neighbors59,1953 2408 class location *neighbors[neighbors59,1954
2409 discrete_location(62,2044 2409 discrete_location(62,2045
2410 void assign_neighbor(66,2184 2410 void assign_neighbor(66,2185
2411class agent:agent75,2508 2411class agent:agent75,2509
2412 location *where;where77,2549 2412 location *where;where77,2550
2413 2413
2414cp-src/fail.C,330 2414cp-src/fail.C,330
2415struct A 7,263 2415struct A 7,263
@@ -2535,28 +2535,28 @@ el-src/emacs/lisp/progmodes/etags.el,5069
2535(defun next-file 1685,67976 2535(defun next-file 1685,67976
2536(defvar tags-loop-operate 1760,70890 2536(defvar tags-loop-operate 1760,70890
2537(defvar tags-loop-scan1763,70984 2537(defvar tags-loop-scan1763,70984
2538(defun tags-loop-eval 1771,71314 2538(defun tags-loop-eval 1771,71313
2539(defun tags-loop-continue 1782,71643 2539(defun tags-loop-continue 1782,71642
2540(defun tags-search 1850,73949 2540(defun tags-search 1850,73948
2541(defun tags-query-replace 1871,74775 2541(defun tags-query-replace 1871,74774
2542(defun tags-complete-tags-table-file 1896,75999 2542(defun tags-complete-tags-table-file 1896,75998
2543(defun list-tags 1906,76378 2543(defun list-tags 1906,76377
2544(defun tags-apropos 1934,77331 2544(defun tags-apropos 1934,77330
2545(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 2545(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78156
2546(defun select-tags-table 1964,78396 2546(defun select-tags-table 1964,78395
2547(defvar select-tags-table-mode-map 2019,80523 2547(defvar select-tags-table-mode-map 2019,80522
2548(define-derived-mode select-tags-table-mode 2030,80906 2548(define-derived-mode select-tags-table-mode 2030,80905
2549(defun select-tags-table-select 2034,81090 2549(defun select-tags-table-select 2034,81089
2550(defun select-tags-table-quit 2043,81456 2550(defun select-tags-table-quit 2043,81455
2551(defun complete-tag 2049,81611 2551(defun complete-tag 2049,81610
2552(defconst etags--xref-limit 2074,82552 2552(defconst etags--xref-limit 2074,82551
2553(defvar etags-xref-find-definitions-tag-order 2076,82587 2553(defvar etags-xref-find-definitions-tag-order 2076,82586
2554(defun etags-xref-find 2082,82877 2554(defun etags-xref-find 2082,82876
2555(defun etags--xref-find-definitions 2096,83406 2555(defun etags--xref-find-definitions 2096,83405
2556(defclass xref-etags-location 2129,85121 2556(defclass xref-etags-location 2129,85120
2557(defun xref-make-etags-location 2135,85344 2557(defun xref-make-etags-location 2135,85343
2558(cl-defmethod xref-location-marker 2139,85499 2558(cl-defmethod xref-location-marker 2139,85498
2559(cl-defmethod xref-location-line 2146,85743 2559(cl-defmethod xref-location-line 2146,85742
2560 2560
2561erl-src/gs_dialog.erl,98 2561erl-src/gs_dialog.erl,98
2562-define(VERSION2,32 2562-define(VERSION2,32
@@ -2653,49 +2653,63 @@ function MoveLayerBottom 223,5079
2653function MoveLayerBefore 236,5457 2653function MoveLayerBefore 236,5457
2654function MoveLayerAfter 258,6090 2654function MoveLayerAfter 258,6090
2655 2655
2656lua-src/test.lua,442
2657function Rectangle.getPos 2,15
2658function Rectangle.getPos getPos2,15
2659function Circle.getPos 6,61
2660function Circle.getPos getPos6,61
2661function Cube.data.getFoo 10,102
2662function Cube.data.getFoo getFoo10,102
2663function Square.something:Bar 14,148
2664function Square.something:Bar Bar14,148
2665 function test.me_22a(22,241
2666 function test.me_22a(me_22a22,241
2667 local function test.me22b 25,297
2668 local function test.me22b me22b25,297
2669
2656make-src/Makefile,1133 2670make-src/Makefile,1133
2657LATEST=1,0 2671LATEST=1,0
2658NONSRCS=35,1578 2672NONSRCS=35,1577
2659CPPFLAGS=49,2191 2673CPPFLAGS=49,2190
2660LDFLAGS=50,2260 2674LDFLAGS=50,2259
2661FASTCFLAGS=55,2531 2675FASTCFLAGS=55,2530
2662FILTER=58,2642 2676FILTER=58,2641
2663 @-$($72,3064 2677 @-$($72,3063
2664 @-$($73,3113 2678 @-$($73,3112
2665 @-$($74,3177 2679 @-$($74,3176
2666 @-$($75,3223 2680 @-$($75,3222
2667 @-$($76,3291 2681 @-$($76,3290
2668 @-$($77,3383 2682 @-$($77,3382
2669 @$(81,3466 2683 @$(81,3465
2670 @$(82,3514 2684 @$(82,3513
2671 @$(83,3577 2685 @$(83,3576
2672 @$(84,3622 2686 @$(84,3621
2673 @$(85,3689 2687 @$(85,3688
2674 @$(86,3780 2688 @$(86,3779
2675${CHECKOBJS}: CFLAGS=88,3806 2689${CHECKOBJS}: CFLAGS=88,3805
2676 @env CHECKEROPTS=92,3922 2690 @env CHECKEROPTS=92,3921
2677 @$(98,4094 2691 @$(98,4093
2678 @$(106,4250 2692 @$(106,4249
2679 @$(110,4374 2693 @$(110,4373
2680 @$(114,4500 2694 @$(114,4499
2681 @for i in $(SRCS); do echo $$i;140,5315 2695 @for i in $(SRCS); do echo $$i;140,5320
2682 $(160,6053 2696 $(160,6058
2683 $(163,6114 2697 $(163,6119
2684 $(166,6177 2698 $(166,6182
2685 $(169,6228 2699 $(169,6233
2686 $(172,6317 2700 $(172,6322
2687 sdiff --suppress-common-lines --width=width186,6614 2701 sdiff --suppress-common-lines --width=width186,6619
2688 sdiff --suppress-common-lines --width=width189,6703 2702 sdiff --suppress-common-lines --width=width189,6708
2689 sdiff --suppress-common-lines --width=width192,6791 2703 sdiff --suppress-common-lines --width=width192,6796
2690 sdiff --suppress-common-lines --width=width195,6880 2704 sdiff --suppress-common-lines --width=width195,6885
2691 TEXTAGS=204,7122 2705 TEXTAGS=204,7127
2692 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7122 2706 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
2693 ${RUN} etags12 --members -o $@ --regex=regex207,7239 2707 ${RUN} etags12 --members -o $@ --regex=regex207,7244
2694 ${RUN} ./ctags -o $@ --regex=regex213,7388 2708 ${RUN} ./ctags -o $@ --regex=regex213,7393
2695 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7464 2709 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
2696 TEXTAGS=219,7583 2710 TEXTAGS=219,7588
2697 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7583 2711 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
2698 ${RUN} ./extags -e --regex-c=c222,7710 2712 ${RUN} ./extags -e --regex-c=c222,7715
2699 2713
2700objc-src/Subprocess.h,98 2714objc-src/Subprocess.h,98
2701#define Subprocess 41,1217 2715#define Subprocess 41,1217
@@ -3307,6 +3321,31 @@ class Configure(760,24879
3307 def save(797,26022 3321 def save(797,26022
3308 def nosave(807,26310 3322 def nosave(807,26310
3309 3323
3324ruby-src/test.rb,594
3325module ModuleExample1,0
3326 class ClassExample2,21
3327 def class_method3,44
3328 def ClassExample.singleton_class_method6,116
3329 def class_method_exclamation!9,221
3330 def class_method_question?12,319
3331 def class_method_equals=class_method_equals=15,411
3332 def `(18,499
3333 def +(21,589
3334 def [](24,637
3335 def []=([]=27,687
3336 def <<(30,749
3337 def ==(==33,799
3338 def <=(<=36,869
3339 def <=>(<=>39,940
3340 def ===(===42,987
3341 def module_method46,1048
3342 def ModuleExample.singleton_module_method49,1110
3343
3344ruby-src/test1.ruby,37
3345class A1,0
3346 def a(2,8
3347 def b(5,38
3348
3310tex-src/testenv.tex,52 3349tex-src/testenv.tex,52
3311\newcommand{\nm}\nm4,77 3350\newcommand{\nm}\nm4,77
3312\section{blah}blah8,139 3351\section{blah}blah8,139
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index 2b631d1a165..434fe13cbd4 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -2248,17 +2248,17 @@ void agent::move(move53,1353
2248 2248
2249cp-src/clheir.hpp,423 2249cp-src/clheir.hpp,423
2250class generic_object13,520 2250class generic_object13,520
2251 virtual void compute_next_state(21,842 2251 virtual void compute_next_state(21,843
2252 virtual void step(22,888 2252 virtual void step(22,889
2253const int max_num_directions 31,1219 2253const int max_num_directions 31,1220
2254class location:location33,1289 2254class location:location33,1290
2255 location(43,1642 2255 location(43,1643
2256class irregular_location:irregular_location47,1686 2256class irregular_location:irregular_location47,1687
2257 irregular_location(51,1762 2257 irregular_location(51,1763
2258class discrete_location:discrete_location56,1889 2258class discrete_location:discrete_location56,1890
2259 discrete_location(62,2044 2259 discrete_location(62,2045
2260 void assign_neighbor(66,2184 2260 void assign_neighbor(66,2185
2261class agent:agent75,2508 2261class agent:agent75,2509
2262 2262
2263cp-src/fail.C,294 2263cp-src/fail.C,294
2264struct A 7,263 2264struct A 7,263
@@ -2382,28 +2382,28 @@ el-src/emacs/lisp/progmodes/etags.el,5069
2382(defun next-file 1685,67976 2382(defun next-file 1685,67976
2383(defvar tags-loop-operate 1760,70890 2383(defvar tags-loop-operate 1760,70890
2384(defvar tags-loop-scan1763,70984 2384(defvar tags-loop-scan1763,70984
2385(defun tags-loop-eval 1771,71314 2385(defun tags-loop-eval 1771,71313
2386(defun tags-loop-continue 1782,71643 2386(defun tags-loop-continue 1782,71642
2387(defun tags-search 1850,73949 2387(defun tags-search 1850,73948
2388(defun tags-query-replace 1871,74775 2388(defun tags-query-replace 1871,74774
2389(defun tags-complete-tags-table-file 1896,75999 2389(defun tags-complete-tags-table-file 1896,75998
2390(defun list-tags 1906,76378 2390(defun list-tags 1906,76377
2391(defun tags-apropos 1934,77331 2391(defun tags-apropos 1934,77330
2392(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 2392(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78156
2393(defun select-tags-table 1964,78396 2393(defun select-tags-table 1964,78395
2394(defvar select-tags-table-mode-map 2019,80523 2394(defvar select-tags-table-mode-map 2019,80522
2395(define-derived-mode select-tags-table-mode 2030,80906 2395(define-derived-mode select-tags-table-mode 2030,80905
2396(defun select-tags-table-select 2034,81090 2396(defun select-tags-table-select 2034,81089
2397(defun select-tags-table-quit 2043,81456 2397(defun select-tags-table-quit 2043,81455
2398(defun complete-tag 2049,81611 2398(defun complete-tag 2049,81610
2399(defconst etags--xref-limit 2074,82552 2399(defconst etags--xref-limit 2074,82551
2400(defvar etags-xref-find-definitions-tag-order 2076,82587 2400(defvar etags-xref-find-definitions-tag-order 2076,82586
2401(defun etags-xref-find 2082,82877 2401(defun etags-xref-find 2082,82876
2402(defun etags--xref-find-definitions 2096,83406 2402(defun etags--xref-find-definitions 2096,83405
2403(defclass xref-etags-location 2129,85121 2403(defclass xref-etags-location 2129,85120
2404(defun xref-make-etags-location 2135,85344 2404(defun xref-make-etags-location 2135,85343
2405(cl-defmethod xref-location-marker 2139,85499 2405(cl-defmethod xref-location-marker 2139,85498
2406(cl-defmethod xref-location-line 2146,85743 2406(cl-defmethod xref-location-line 2146,85742
2407 2407
2408erl-src/gs_dialog.erl,98 2408erl-src/gs_dialog.erl,98
2409-define(VERSION2,32 2409-define(VERSION2,32
@@ -2500,49 +2500,63 @@ function MoveLayerBottom 223,5079
2500function MoveLayerBefore 236,5457 2500function MoveLayerBefore 236,5457
2501function MoveLayerAfter 258,6090 2501function MoveLayerAfter 258,6090
2502 2502
2503lua-src/test.lua,442
2504function Rectangle.getPos 2,15
2505function Rectangle.getPos getPos2,15
2506function Circle.getPos 6,61
2507function Circle.getPos getPos6,61
2508function Cube.data.getFoo 10,102
2509function Cube.data.getFoo getFoo10,102
2510function Square.something:Bar 14,148
2511function Square.something:Bar Bar14,148
2512 function test.me_22a(22,241
2513 function test.me_22a(me_22a22,241
2514 local function test.me22b 25,297
2515 local function test.me22b me22b25,297
2516
2503make-src/Makefile,1133 2517make-src/Makefile,1133
2504LATEST=1,0 2518LATEST=1,0
2505NONSRCS=35,1578 2519NONSRCS=35,1577
2506CPPFLAGS=49,2191 2520CPPFLAGS=49,2190
2507LDFLAGS=50,2260 2521LDFLAGS=50,2259
2508FASTCFLAGS=55,2531 2522FASTCFLAGS=55,2530
2509FILTER=58,2642 2523FILTER=58,2641
2510 @-$($72,3064 2524 @-$($72,3063
2511 @-$($73,3113 2525 @-$($73,3112
2512 @-$($74,3177 2526 @-$($74,3176
2513 @-$($75,3223 2527 @-$($75,3222
2514 @-$($76,3291 2528 @-$($76,3290
2515 @-$($77,3383 2529 @-$($77,3382
2516 @$(81,3466 2530 @$(81,3465
2517 @$(82,3514 2531 @$(82,3513
2518 @$(83,3577 2532 @$(83,3576
2519 @$(84,3622 2533 @$(84,3621
2520 @$(85,3689 2534 @$(85,3688
2521 @$(86,3780 2535 @$(86,3779
2522${CHECKOBJS}: CFLAGS=88,3806 2536${CHECKOBJS}: CFLAGS=88,3805
2523 @env CHECKEROPTS=92,3922 2537 @env CHECKEROPTS=92,3921
2524 @$(98,4094 2538 @$(98,4093
2525 @$(106,4250 2539 @$(106,4249
2526 @$(110,4374 2540 @$(110,4373
2527 @$(114,4500 2541 @$(114,4499
2528 @for i in $(SRCS); do echo $$i;140,5315 2542 @for i in $(SRCS); do echo $$i;140,5320
2529 $(160,6053 2543 $(160,6058
2530 $(163,6114 2544 $(163,6119
2531 $(166,6177 2545 $(166,6182
2532 $(169,6228 2546 $(169,6233
2533 $(172,6317 2547 $(172,6322
2534 sdiff --suppress-common-lines --width=width186,6614 2548 sdiff --suppress-common-lines --width=width186,6619
2535 sdiff --suppress-common-lines --width=width189,6703 2549 sdiff --suppress-common-lines --width=width189,6708
2536 sdiff --suppress-common-lines --width=width192,6791 2550 sdiff --suppress-common-lines --width=width192,6796
2537 sdiff --suppress-common-lines --width=width195,6880 2551 sdiff --suppress-common-lines --width=width195,6885
2538 TEXTAGS=204,7122 2552 TEXTAGS=204,7127
2539 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7122 2553 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
2540 ${RUN} etags12 --members -o $@ --regex=regex207,7239 2554 ${RUN} etags12 --members -o $@ --regex=regex207,7244
2541 ${RUN} ./ctags -o $@ --regex=regex213,7388 2555 ${RUN} ./ctags -o $@ --regex=regex213,7393
2542 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7464 2556 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
2543 TEXTAGS=219,7583 2557 TEXTAGS=219,7588
2544 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7583 2558 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
2545 ${RUN} ./extags -e --regex-c=c222,7710 2559 ${RUN} ./extags -e --regex-c=c222,7715
2546 2560
2547objc-src/Subprocess.h,98 2561objc-src/Subprocess.h,98
2548#define Subprocess 41,1217 2562#define Subprocess 41,1217
@@ -3127,6 +3141,31 @@ class Configure(760,24879
3127 def save(797,26022 3141 def save(797,26022
3128 def nosave(807,26310 3142 def nosave(807,26310
3129 3143
3144ruby-src/test.rb,594
3145module ModuleExample1,0
3146 class ClassExample2,21
3147 def class_method3,44
3148 def ClassExample.singleton_class_method6,116
3149 def class_method_exclamation!9,221
3150 def class_method_question?12,319
3151 def class_method_equals=class_method_equals=15,411
3152 def `(18,499
3153 def +(21,589
3154 def [](24,637
3155 def []=([]=27,687
3156 def <<(30,749
3157 def ==(==33,799
3158 def <=(<=36,869
3159 def <=>(<=>39,940
3160 def ===(===42,987
3161 def module_method46,1048
3162 def ModuleExample.singleton_module_method49,1110
3163
3164ruby-src/test1.ruby,37
3165class A1,0
3166 def a(2,8
3167 def b(5,38
3168
3130tex-src/testenv.tex,52 3169tex-src/testenv.tex,52
3131\newcommand{\nm}\nm4,77 3170\newcommand{\nm}\nm4,77
3132\section{blah}blah8,139 3171\section{blah}blah8,139
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 544a166c6dd..425e2526f35 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -3113,32 +3113,32 @@ class generic_object13,520
3113 int where_in_registry;15,547 3113 int where_in_registry;15,547
3114 generic_object(17,582 3114 generic_object(17,582
3115 ~generic_object(19,724 3115 ~generic_object(19,724
3116 virtual void compute_next_state(21,842 3116 virtual void compute_next_state(21,843
3117 virtual void step(22,888 3117 virtual void step(22,889
3118const int max_num_directions 31,1219 3118const int max_num_directions 31,1220
3119class location:location33,1289 3119class location:location33,1290
3120 location(43,1642 3120 location(43,1643
3121 ~location(44,1661 3121 ~location(44,1662
3122class irregular_location:irregular_location47,1686 3122class irregular_location:irregular_location47,1687
3123 double x,49,1734 3123 double x,49,1735
3124 double x, y,49,1734 3124 double x, y,49,1735
3125 double x, y, z;49,1734 3125 double x, y, z;49,1735
3126 irregular_location(51,1762 3126 irregular_location(51,1763
3127 ~irregular_location(53,1854 3127 ~irregular_location(53,1855
3128class discrete_location:discrete_location56,1889 3128class discrete_location:discrete_location56,1890
3129 int x,58,1936 3129 int x,58,1937
3130 int x, y,58,1936 3130 int x, y,58,1937
3131 int x, y, z;58,1936 3131 int x, y, z;58,1937
3132 class location *neighbors[neighbors59,1953 3132 class location *neighbors[neighbors59,1954
3133 void clear_neighbors(60,2004 3133 void clear_neighbors(60,2005
3134 discrete_location(62,2044 3134 discrete_location(62,2045
3135 ~discrete_location(65,2154 3135 ~discrete_location(65,2155
3136 void assign_neighbor(66,2184 3136 void assign_neighbor(66,2185
3137class agent:agent75,2508 3137class agent:agent75,2509
3138 location *where;where77,2549 3138 location *where;where77,2550
3139 agent(79,2578 3139 agent(79,2579
3140 ~agent(80,2591 3140 ~agent(80,2592
3141 void move(81,2605 3141 void move(81,2606
3142 3142
3143cp-src/fail.C,351 3143cp-src/fail.C,351
3144struct A 7,263 3144struct A 7,263
@@ -3268,28 +3268,28 @@ el-src/emacs/lisp/progmodes/etags.el,5188
3268(defun next-file 1685,67976 3268(defun next-file 1685,67976
3269(defvar tags-loop-operate 1760,70890 3269(defvar tags-loop-operate 1760,70890
3270(defvar tags-loop-scan1763,70984 3270(defvar tags-loop-scan1763,70984
3271(defun tags-loop-eval 1771,71314 3271(defun tags-loop-eval 1771,71313
3272(defun tags-loop-continue 1782,71643 3272(defun tags-loop-continue 1782,71642
3273(defun tags-search 1850,73949 3273(defun tags-search 1850,73948
3274(defun tags-query-replace 1871,74775 3274(defun tags-query-replace 1871,74774
3275(defun tags-complete-tags-table-file 1896,75999 3275(defun tags-complete-tags-table-file 1896,75998
3276(defun list-tags 1906,76378 3276(defun list-tags 1906,76377
3277(defun tags-apropos 1934,77331 3277(defun tags-apropos 1934,77330
3278(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 3278(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78156
3279(defun select-tags-table 1964,78396 3279(defun select-tags-table 1964,78395
3280(defvar select-tags-table-mode-map 2019,80523 3280(defvar select-tags-table-mode-map 2019,80522
3281(define-derived-mode select-tags-table-mode 2030,80906 3281(define-derived-mode select-tags-table-mode 2030,80905
3282(defun select-tags-table-select 2034,81090 3282(defun select-tags-table-select 2034,81089
3283(defun select-tags-table-quit 2043,81456 3283(defun select-tags-table-quit 2043,81455
3284(defun complete-tag 2049,81611 3284(defun complete-tag 2049,81610
3285(defconst etags--xref-limit 2074,82552 3285(defconst etags--xref-limit 2074,82551
3286(defvar etags-xref-find-definitions-tag-order 2076,82587 3286(defvar etags-xref-find-definitions-tag-order 2076,82586
3287(defun etags-xref-find 2082,82877 3287(defun etags-xref-find 2082,82876
3288(defun etags--xref-find-definitions 2096,83406 3288(defun etags--xref-find-definitions 2096,83405
3289(defclass xref-etags-location 2129,85121 3289(defclass xref-etags-location 2129,85120
3290(defun xref-make-etags-location 2135,85344 3290(defun xref-make-etags-location 2135,85343
3291(cl-defmethod xref-location-marker 2139,85499 3291(cl-defmethod xref-location-marker 2139,85498
3292(cl-defmethod xref-location-line 2146,85743 3292(cl-defmethod xref-location-line 2146,85742
3293 3293
3294erl-src/gs_dialog.erl,98 3294erl-src/gs_dialog.erl,98
3295-define(VERSION2,32 3295-define(VERSION2,32
@@ -3386,50 +3386,64 @@ function MoveLayerBottom 223,5079
3386function MoveLayerBefore 236,5457 3386function MoveLayerBefore 236,5457
3387function MoveLayerAfter 258,6090 3387function MoveLayerAfter 258,6090
3388 3388
3389lua-src/test.lua,442
3390function Rectangle.getPos 2,15
3391function Rectangle.getPos getPos2,15
3392function Circle.getPos 6,61
3393function Circle.getPos getPos6,61
3394function Cube.data.getFoo 10,102
3395function Cube.data.getFoo getFoo10,102
3396function Square.something:Bar 14,148
3397function Square.something:Bar Bar14,148
3398 function test.me_22a(22,241
3399 function test.me_22a(me_22a22,241
3400 local function test.me22b 25,297
3401 local function test.me22b me22b25,297
3402
3389make-src/Makefile,1156 3403make-src/Makefile,1156
3390LATEST=1,0 3404LATEST=1,0
3391NONSRCS=35,1578 3405NONSRCS=35,1577
3392CPPFLAGS=49,2191 3406CPPFLAGS=49,2190
3393LDFLAGS=50,2260 3407LDFLAGS=50,2259
3394FASTCFLAGS=55,2531 3408FASTCFLAGS=55,2530
3395FILTER=58,2642 3409FILTER=58,2641
3396 @-$($72,3064 3410 @-$($72,3063
3397 @-$($73,3113 3411 @-$($73,3112
3398 @-$($74,3177 3412 @-$($74,3176
3399 @-$($75,3223 3413 @-$($75,3222
3400 @-$($76,3291 3414 @-$($76,3290
3401 @-$($77,3383 3415 @-$($77,3382
3402 @$(81,3466 3416 @$(81,3465
3403 @$(82,3514 3417 @$(82,3513
3404 @$(83,3577 3418 @$(83,3576
3405 @$(84,3622 3419 @$(84,3621
3406 @$(85,3689 3420 @$(85,3688
3407 @$(86,3780 3421 @$(86,3779
3408${CHECKOBJS}: CFLAGS=88,3806 3422${CHECKOBJS}: CFLAGS=88,3805
3409 @env CHECKEROPTS=92,3922 3423 @env CHECKEROPTS=92,3921
3410 @$(98,4094 3424 @$(98,4093
3411 @$(106,4250 3425 @$(106,4249
3412 @$(110,4374 3426 @$(110,4373
3413 @$(114,4500 3427 @$(114,4499
3414 @for i in $(140,5315 3428 @for i in $(140,5320
3415 @for i in $(SRCS); do echo $$i;140,5315 3429 @for i in $(SRCS); do echo $$i;140,5320
3416 $(160,6053 3430 $(160,6058
3417 $(163,6114 3431 $(163,6119
3418 $(166,6177 3432 $(166,6182
3419 $(169,6228 3433 $(169,6233
3420 $(172,6317 3434 $(172,6322
3421 sdiff --suppress-common-lines --width=width186,6614 3435 sdiff --suppress-common-lines --width=width186,6619
3422 sdiff --suppress-common-lines --width=width189,6703 3436 sdiff --suppress-common-lines --width=width189,6708
3423 sdiff --suppress-common-lines --width=width192,6791 3437 sdiff --suppress-common-lines --width=width192,6796
3424 sdiff --suppress-common-lines --width=width195,6880 3438 sdiff --suppress-common-lines --width=width195,6885
3425 TEXTAGS=204,7122 3439 TEXTAGS=204,7127
3426 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7122 3440 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
3427 ${RUN} etags12 --members -o $@ --regex=regex207,7239 3441 ${RUN} etags12 --members -o $@ --regex=regex207,7244
3428 ${RUN} ./ctags -o $@ --regex=regex213,7388 3442 ${RUN} ./ctags -o $@ --regex=regex213,7393
3429 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7464 3443 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
3430 TEXTAGS=219,7583 3444 TEXTAGS=219,7588
3431 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7583 3445 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
3432 ${RUN} ./extags -e --regex-c=c222,7710 3446 ${RUN} ./extags -e --regex-c=c222,7715
3433 3447
3434objc-src/Subprocess.h,98 3448objc-src/Subprocess.h,98
3435#define Subprocess 41,1217 3449#define Subprocess 41,1217
@@ -4042,6 +4056,31 @@ class Configure(760,24879
4042 def save(797,26022 4056 def save(797,26022
4043 def nosave(807,26310 4057 def nosave(807,26310
4044 4058
4059ruby-src/test.rb,594
4060module ModuleExample1,0
4061 class ClassExample2,21
4062 def class_method3,44
4063 def ClassExample.singleton_class_method6,116
4064 def class_method_exclamation!9,221
4065 def class_method_question?12,319
4066 def class_method_equals=class_method_equals=15,411
4067 def `(18,499
4068 def +(21,589
4069 def [](24,637
4070 def []=([]=27,687
4071 def <<(30,749
4072 def ==(==33,799
4073 def <=(<=36,869
4074 def <=>(<=>39,940
4075 def ===(===42,987
4076 def module_method46,1048
4077 def ModuleExample.singleton_module_method49,1110
4078
4079ruby-src/test1.ruby,37
4080class A1,0
4081 def a(2,8
4082 def b(5,38
4083
4045tex-src/testenv.tex,52 4084tex-src/testenv.tex,52
4046\newcommand{\nm}\nm4,77 4085\newcommand{\nm}\nm4,77
4047\section{blah}blah8,139 4086\section{blah}blah8,139
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index f3d17b10a3e..39522dbdb9b 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -3113,32 +3113,32 @@ class generic_object13,520
3113 int where_in_registry;generic_object::where_in_registry15,547 3113 int where_in_registry;generic_object::where_in_registry15,547
3114 generic_object(generic_object::generic_object17,582 3114 generic_object(generic_object::generic_object17,582
3115 ~generic_object(generic_object::~generic_object19,724 3115 ~generic_object(generic_object::~generic_object19,724
3116 virtual void compute_next_state(generic_object::compute_next_state21,842 3116 virtual void compute_next_state(generic_object::compute_next_state21,843
3117 virtual void step(generic_object::step22,888 3117 virtual void step(generic_object::step22,889
3118const int max_num_directions 31,1219 3118const int max_num_directions 31,1220
3119class location:location33,1289 3119class location:location33,1290
3120 location(location::location43,1642 3120 location(location::location43,1643
3121 ~location(location::~location44,1661 3121 ~location(location::~location44,1662
3122class irregular_location:irregular_location47,1686 3122class irregular_location:irregular_location47,1687
3123 double x,irregular_location::x49,1734 3123 double x,irregular_location::x49,1735
3124 double x, y,irregular_location::y49,1734 3124 double x, y,irregular_location::y49,1735
3125 double x, y, z;irregular_location::z49,1734 3125 double x, y, z;irregular_location::z49,1735
3126 irregular_location(irregular_location::irregular_location51,1762 3126 irregular_location(irregular_location::irregular_location51,1763
3127 ~irregular_location(irregular_location::~irregular_location53,1854 3127 ~irregular_location(irregular_location::~irregular_location53,1855
3128class discrete_location:discrete_location56,1889 3128class discrete_location:discrete_location56,1890
3129 int x,discrete_location::x58,1936 3129 int x,discrete_location::x58,1937
3130 int x, y,discrete_location::y58,1936 3130 int x, y,discrete_location::y58,1937
3131 int x, y, z;discrete_location::z58,1936 3131 int x, y, z;discrete_location::z58,1937
3132 class location *neighbors[discrete_location::neighbors59,1953 3132 class location *neighbors[discrete_location::neighbors59,1954
3133 void clear_neighbors(discrete_location::clear_neighbors60,2004 3133 void clear_neighbors(discrete_location::clear_neighbors60,2005
3134 discrete_location(discrete_location::discrete_location62,2044 3134 discrete_location(discrete_location::discrete_location62,2045
3135 ~discrete_location(discrete_location::~discrete_location65,2154 3135 ~discrete_location(discrete_location::~discrete_location65,2155
3136 void assign_neighbor(discrete_location::assign_neighbor66,2184 3136 void assign_neighbor(discrete_location::assign_neighbor66,2185
3137class agent:agent75,2508 3137class agent:agent75,2509
3138 location *where;agent::where77,2549 3138 location *where;agent::where77,2550
3139 agent(agent::agent79,2578 3139 agent(agent::agent79,2579
3140 ~agent(agent::~agent80,2591 3140 ~agent(agent::~agent80,2592
3141 void move(agent::move81,2605 3141 void move(agent::move81,2606
3142 3142
3143cp-src/fail.C,438 3143cp-src/fail.C,438
3144struct A 7,263 3144struct A 7,263
@@ -3268,28 +3268,28 @@ el-src/emacs/lisp/progmodes/etags.el,5188
3268(defun next-file 1685,67976 3268(defun next-file 1685,67976
3269(defvar tags-loop-operate 1760,70890 3269(defvar tags-loop-operate 1760,70890
3270(defvar tags-loop-scan1763,70984 3270(defvar tags-loop-scan1763,70984
3271(defun tags-loop-eval 1771,71314 3271(defun tags-loop-eval 1771,71313
3272(defun tags-loop-continue 1782,71643 3272(defun tags-loop-continue 1782,71642
3273(defun tags-search 1850,73949 3273(defun tags-search 1850,73948
3274(defun tags-query-replace 1871,74775 3274(defun tags-query-replace 1871,74774
3275(defun tags-complete-tags-table-file 1896,75999 3275(defun tags-complete-tags-table-file 1896,75998
3276(defun list-tags 1906,76378 3276(defun list-tags 1906,76377
3277(defun tags-apropos 1934,77331 3277(defun tags-apropos 1934,77330
3278(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78157 3278(define-button-type 'tags-select-tags-tabletags-select-tags-table1957,78156
3279(defun select-tags-table 1964,78396 3279(defun select-tags-table 1964,78395
3280(defvar select-tags-table-mode-map 2019,80523 3280(defvar select-tags-table-mode-map 2019,80522
3281(define-derived-mode select-tags-table-mode 2030,80906 3281(define-derived-mode select-tags-table-mode 2030,80905
3282(defun select-tags-table-select 2034,81090 3282(defun select-tags-table-select 2034,81089
3283(defun select-tags-table-quit 2043,81456 3283(defun select-tags-table-quit 2043,81455
3284(defun complete-tag 2049,81611 3284(defun complete-tag 2049,81610
3285(defconst etags--xref-limit 2074,82552 3285(defconst etags--xref-limit 2074,82551
3286(defvar etags-xref-find-definitions-tag-order 2076,82587 3286(defvar etags-xref-find-definitions-tag-order 2076,82586
3287(defun etags-xref-find 2082,82877 3287(defun etags-xref-find 2082,82876
3288(defun etags--xref-find-definitions 2096,83406 3288(defun etags--xref-find-definitions 2096,83405
3289(defclass xref-etags-location 2129,85121 3289(defclass xref-etags-location 2129,85120
3290(defun xref-make-etags-location 2135,85344 3290(defun xref-make-etags-location 2135,85343
3291(cl-defmethod xref-location-marker 2139,85499 3291(cl-defmethod xref-location-marker 2139,85498
3292(cl-defmethod xref-location-line 2146,85743 3292(cl-defmethod xref-location-line 2146,85742
3293 3293
3294erl-src/gs_dialog.erl,98 3294erl-src/gs_dialog.erl,98
3295-define(VERSION2,32 3295-define(VERSION2,32
@@ -3386,50 +3386,64 @@ function MoveLayerBottom 223,5079
3386function MoveLayerBefore 236,5457 3386function MoveLayerBefore 236,5457
3387function MoveLayerAfter 258,6090 3387function MoveLayerAfter 258,6090
3388 3388
3389lua-src/test.lua,442
3390function Rectangle.getPos 2,15
3391function Rectangle.getPos getPos2,15
3392function Circle.getPos 6,61
3393function Circle.getPos getPos6,61
3394function Cube.data.getFoo 10,102
3395function Cube.data.getFoo getFoo10,102
3396function Square.something:Bar 14,148
3397function Square.something:Bar Bar14,148
3398 function test.me_22a(22,241
3399 function test.me_22a(me_22a22,241
3400 local function test.me22b 25,297
3401 local function test.me22b me22b25,297
3402
3389make-src/Makefile,1156 3403make-src/Makefile,1156
3390LATEST=1,0 3404LATEST=1,0
3391NONSRCS=35,1578 3405NONSRCS=35,1577
3392CPPFLAGS=49,2191 3406CPPFLAGS=49,2190
3393LDFLAGS=50,2260 3407LDFLAGS=50,2259
3394FASTCFLAGS=55,2531 3408FASTCFLAGS=55,2530
3395FILTER=58,2642 3409FILTER=58,2641
3396 @-$($72,3064 3410 @-$($72,3063
3397 @-$($73,3113 3411 @-$($73,3112
3398 @-$($74,3177 3412 @-$($74,3176
3399 @-$($75,3223 3413 @-$($75,3222
3400 @-$($76,3291 3414 @-$($76,3290
3401 @-$($77,3383 3415 @-$($77,3382
3402 @$(81,3466 3416 @$(81,3465
3403 @$(82,3514 3417 @$(82,3513
3404 @$(83,3577 3418 @$(83,3576
3405 @$(84,3622 3419 @$(84,3621
3406 @$(85,3689 3420 @$(85,3688
3407 @$(86,3780 3421 @$(86,3779
3408${CHECKOBJS}: CFLAGS=88,3806 3422${CHECKOBJS}: CFLAGS=88,3805
3409 @env CHECKEROPTS=92,3922 3423 @env CHECKEROPTS=92,3921
3410 @$(98,4094 3424 @$(98,4093
3411 @$(106,4250 3425 @$(106,4249
3412 @$(110,4374 3426 @$(110,4373
3413 @$(114,4500 3427 @$(114,4499
3414 @for i in $(140,5315 3428 @for i in $(140,5320
3415 @for i in $(SRCS); do echo $$i;140,5315 3429 @for i in $(SRCS); do echo $$i;140,5320
3416 $(160,6053 3430 $(160,6058
3417 $(163,6114 3431 $(163,6119
3418 $(166,6177 3432 $(166,6182
3419 $(169,6228 3433 $(169,6233
3420 $(172,6317 3434 $(172,6322
3421 sdiff --suppress-common-lines --width=width186,6614 3435 sdiff --suppress-common-lines --width=width186,6619
3422 sdiff --suppress-common-lines --width=width189,6703 3436 sdiff --suppress-common-lines --width=width189,6708
3423 sdiff --suppress-common-lines --width=width192,6791 3437 sdiff --suppress-common-lines --width=width192,6796
3424 sdiff --suppress-common-lines --width=width195,6880 3438 sdiff --suppress-common-lines --width=width195,6885
3425 TEXTAGS=204,7122 3439 TEXTAGS=204,7127
3426 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7122 3440 TEXTAGS=def:newcommand:newenvironment ${RUN} etags$* --regex=regex204,7127
3427 ${RUN} etags12 --members -o $@ --regex=regex207,7239 3441 ${RUN} etags12 --members -o $@ --regex=regex207,7244
3428 ${RUN} ./ctags -o $@ --regex=regex213,7388 3442 ${RUN} ./ctags -o $@ --regex=regex213,7393
3429 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7464 3443 ${RUN} ctags$* -wtTd --globals --members -o $@ --regex=regex216,7469
3430 TEXTAGS=219,7583 3444 TEXTAGS=219,7588
3431 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7583 3445 TEXTAGS=def:newcommand:newenvironment ${RUN} ctags$* -wt -o $@ --regex=regex219,7588
3432 ${RUN} ./extags -e --regex-c=c222,7710 3446 ${RUN} ./extags -e --regex-c=c222,7715
3433 3447
3434objc-src/Subprocess.h,98 3448objc-src/Subprocess.h,98
3435#define Subprocess 41,1217 3449#define Subprocess 41,1217
@@ -4042,6 +4056,31 @@ class Configure(760,24879
4042 def save(797,26022 4056 def save(797,26022
4043 def nosave(807,26310 4057 def nosave(807,26310
4044 4058
4059ruby-src/test.rb,594
4060module ModuleExample1,0
4061 class ClassExample2,21
4062 def class_method3,44
4063 def ClassExample.singleton_class_method6,116
4064 def class_method_exclamation!9,221
4065 def class_method_question?12,319
4066 def class_method_equals=class_method_equals=15,411
4067 def `(18,499
4068 def +(21,589
4069 def [](24,637
4070 def []=([]=27,687
4071 def <<(30,749
4072 def ==(==33,799
4073 def <=(<=36,869
4074 def <=>(<=>39,940
4075 def ===(===42,987
4076 def module_method46,1048
4077 def ModuleExample.singleton_module_method49,1110
4078
4079ruby-src/test1.ruby,37
4080class A1,0
4081 def a(2,8
4082 def b(5,38
4083
4045tex-src/testenv.tex,52 4084tex-src/testenv.tex,52
4046\newcommand{\nm}\nm4,77 4085\newcommand{\nm}\nm4,77
4047\section{blah}blah8,139 4086\section{blah}blah8,139
diff --git a/test/manual/etags/Makefile b/test/manual/etags/Makefile
index f5cf2aeb3b5..4d9f358c8ed 100644
--- a/test/manual/etags/Makefile
+++ b/test/manual/etags/Makefile
@@ -13,7 +13,7 @@ FORTHSRC=$(addprefix ./forth-src/,test-forth.fth)
13FSRC=$(addprefix ./f-src/,entry.for entry.strange_suffix entry.strange) 13FSRC=$(addprefix ./f-src/,entry.for entry.strange_suffix entry.strange)
14HTMLSRC=$(addprefix ./html-src/,softwarelibero.html index.shtml algrthms.html software.html) 14HTMLSRC=$(addprefix ./html-src/,softwarelibero.html index.shtml algrthms.html software.html)
15#JAVASRC=$(addprefix ./java-src/, ) 15#JAVASRC=$(addprefix ./java-src/, )
16LUASRC=$(addprefix ./lua-src/,allegro.lua) 16LUASRC=$(addprefix ./lua-src/,allegro.lua test.lua)
17MAKESRC=$(addprefix ./make-src/,Makefile) 17MAKESRC=$(addprefix ./make-src/,Makefile)
18OBJCSRC=$(addprefix ./objc-src/,Subprocess.h Subprocess.m PackInsp.h PackInsp.m) 18OBJCSRC=$(addprefix ./objc-src/,Subprocess.h Subprocess.m PackInsp.h PackInsp.m)
19OBJCPPSRC=$(addprefix ./objcpp-src/,SimpleCalc.H SimpleCalc.M) 19OBJCPPSRC=$(addprefix ./objcpp-src/,SimpleCalc.H SimpleCalc.M)
@@ -23,12 +23,13 @@ PHPSRC=$(addprefix ./php-src/,lce_functions.php ptest.php sendmail.php)
23PSSRC=$(addprefix ./ps-src/,rfc1245.ps) 23PSSRC=$(addprefix ./ps-src/,rfc1245.ps)
24PROLSRC=$(addprefix ./prol-src/,ordsets.prolog natded.prolog) 24PROLSRC=$(addprefix ./prol-src/,ordsets.prolog natded.prolog)
25PYTSRC=$(addprefix ./pyt-src/,server.py) 25PYTSRC=$(addprefix ./pyt-src/,server.py)
26RBSRC=$(addprefix ./ruby-src/,test.rb test1.ruby)
26TEXSRC=$(addprefix ./tex-src/,testenv.tex gzip.texi texinfo.tex nonewline.tex) 27TEXSRC=$(addprefix ./tex-src/,testenv.tex gzip.texi texinfo.tex nonewline.tex)
27YSRC=$(addprefix ./y-src/,parse.y parse.c atest.y cccp.c cccp.y) 28YSRC=$(addprefix ./y-src/,parse.y parse.c atest.y cccp.c cccp.y)
28SRCS=${ADASRC} ${ASRC} ${CSRC} ${CPSRC} ${ELSRC} ${ERLSRC} ${FSRC}\ 29SRCS=${ADASRC} ${ASRC} ${CSRC} ${CPSRC} ${ELSRC} ${ERLSRC} ${FSRC}\
29 ${FORTHSRC} ${HTMLSRC} ${JAVASRC} ${LUASRC} ${MAKESRC} ${OBJCSRC}\ 30 ${FORTHSRC} ${HTMLSRC} ${JAVASRC} ${LUASRC} ${MAKESRC} ${OBJCSRC}\
30 ${OBJCPPSRC} ${PASSRC} ${PHPSRC} ${PERLSRC} ${PSSRC} ${PROLSRC} ${PYTSRC}\ 31 ${OBJCPPSRC} ${PASSRC} ${PHPSRC} ${PERLSRC} ${PSSRC} ${PROLSRC} ${PYTSRC}\
31 ${TEXSRC} ${YSRC} 32 ${RBSRC} ${TEXSRC} ${YSRC}
32NONSRCS=./f-src/entry.strange ./erl-src/lists.erl ./cp-src/clheir.hpp.gz 33NONSRCS=./f-src/entry.strange ./erl-src/lists.erl ./cp-src/clheir.hpp.gz
33 34
34ETAGS_PROG=../../../lib-src/etags 35ETAGS_PROG=../../../lib-src/etags
diff --git a/test/manual/indent/js.js b/test/manual/indent/js.js
index d897b9f81e7..9a1e0dc7ad5 100644
--- a/test/manual/indent/js.js
+++ b/test/manual/indent/js.js
@@ -76,6 +76,20 @@ class A {
76 } 76 }
77} 77}
78 78
79if (true)
80 1
81else
82 2
83
84Foobar
85 .find()
86 .catch((err) => {
87 return 2;
88 })
89 .then((num) => {
90 console.log(num);
91 });
92
79// Local Variables: 93// Local Variables:
80// indent-tabs-mode: nil 94// indent-tabs-mode: nil
81// js-indent-level: 2 95// js-indent-level: 2
diff --git a/test/src/keymap-tests.el b/test/src/keymap-tests.el
index 973b2407391..524563fea50 100644
--- a/test/src/keymap-tests.el
+++ b/test/src/keymap-tests.el
@@ -23,7 +23,7 @@
23 23
24(require 'ert) 24(require 'ert)
25 25
26(ert-deftest keymap-store_in_keymap-FASTINT-on-nonchars () 26(ert-deftest keymap-store_in_keymap-XFASTINT-on-non-characters ()
27 "Check for bug fixed in \"Fix assertion violation in define-key\", 27 "Check for bug fixed in \"Fix assertion violation in define-key\",
28commit 86c19714b097aa477d339ed99ffb5136c755a046." 28commit 86c19714b097aa477d339ed99ffb5136c755a046."
29 (let ((def (lookup-key Buffer-menu-mode-map [32]))) 29 (let ((def (lookup-key Buffer-menu-mode-map [32])))
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-07 22:45:56 +0000