Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

12 files changed, 106 insertions, 84 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index e8b14319549..9f7011353cf 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -87,9 +87,15 @@ WRITE_LOG = > $@ 2>&1 || { stat=ERROR; cat $@; }; echo $$stat: $@
 ## to change this; bug#17848 - if that gets done, this can be simplified).
 ##
 ## Beware: it approximates 'no-byte-compile', so watch out for false-positives!
-SELECTOR_DEFAULT=(quote (not (tag :expensive-test)))
-SELECTOR_EXPENSIVE=nil
-SELECTOR=
+SELECTOR_DEFAULT = (quote (not (tag :expensive-test)))
+SELECTOR_EXPENSIVE = nil
+ifndef SELECTOR
+SELECTOR_ACTUAL=$(SELECTOR_DEFAULT)
+else
+SELECTOR_ACTUAL=$(SELECTOR)
+endif
+
+
 %.log: %.el
         @if grep '^;.*no-byte-compile: t' $< > /dev/null; then \
           loadfile=$<; \
@@ -101,7 +107,7 @@ SELECTOR=
         stat=OK ; \
         mkdir --parents $(dir $@) ; \
         $(emacs) -l ert -l $$loadfile \
-          --eval "(ert-run-tests-batch-and-exit ${SELECTOR})" ${WRITE_LOG}
+          --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG}
 
 ELFILES = $(shell find ${srcdir} -path "${srcdir}/manual" -prune -o \
                 -path "*resources" -prune -o -name "*el" -print)
@@ -136,29 +142,31 @@ $(foreach test,${TESTS},$(eval $(call test_template,${test})))
 ## have to run Emacs for every make invocation, and it might not be
 ## available during clean.
 -include make-test-deps.mk
-## Rerun default tests.
-check:
-        @${MAKE} check-doit SELECTOR="${SELECTOR_DEFAULT}"
+## Rerun all default tests.
+check: mostlyclean
+        @${MAKE} check-doit SELECTOR="${SELECTOR_ACTUAL}"
 
-## Rerun also expensive tests.
+## Rerun all default and expensive tests.
 .PHONY: check-expensive
-check-expensive:
+check-expensive: mostlyclean
         @${MAKE} check-doit SELECTOR="${SELECTOR_EXPENSIVE}"
 
-## Re-run all the tests every time.
-.PHONY: check-doit
-check-doit:
-        -@for f in $(LOGFILES); do test ! -f $$f || mv $$f $$f~; done
-        @${MAKE} check-maybe
-
-## Only re-run tests whose .log is older than the test.
+## Only re-run default tests whose .log is older than the test.
 .PHONY: check-maybe
-check-maybe: ${LOGFILES}
+check-maybe:
+        @${MAKE} check-doit SELECTOR="${SELECTOR_ACTUAL}"
+
+## Run the tests.
+.PHONY: check-doit
+check-doit: ${LOGFILES}
         $(emacs) -l ert -f ert-summarize-tests-batch-and-exit $^
 
 .PHONY: mostlyclean clean bootstrap-clean distclean maintainer-clean
 
-clean mostlyclean:
+mostlyclean:
+        -@for f in *.log; do test ! -f $$f || mv $$f $$f~; done
+
+clean:
         -rm -f ${LOGFILES} ${LOGSAVEFILES}
         -rm make-test-deps.mk
 
diff --git a/test/lisp/legacy/core-elisp-tests.el b/test/lisp/legacy/core-elisp-tests.el
index 76985331566..b44bb37cc4f 100644
--- a/test/lisp/legacy/core-elisp-tests.el
+++ b/test/lisp/legacy/core-elisp-tests.el
@@ -32,7 +32,7 @@
     (should (equal (list (let ((c-e-x 1)) (defvar c-e-x 2) c-e-x) c-e-x)
                    '(1 2)))
     (should (equal (list (let ((c-e-x 1))
-                           (defcustom c-e-x 2 "doc" :group 'blah) c-e-x)
+                           (defcustom c-e-x 2 "doc" :group 'blah :type 'integer) c-e-x)
                          c-e-x)
                    '(1 2)))))
 
diff --git a/test/manual/etags/CTAGS.good b/test/manual/etags/CTAGS.good
index 245f6703adf..86b019a2b4c 100644
--- a/test/manual/etags/CTAGS.good
+++ b/test/manual/etags/CTAGS.good
@@ -438,7 +438,7 @@ Cjava_entries	c-src/etags.c	/^Cjava_entries (FILE *inf)$/
 Cjava_help      c-src/etags.c   551
 Cjava_suffixes  c-src/etags.c   549
 ClassExample    ruby-src/test.rb        /^    class ClassExample$/
-ClassExample.singleton_class_method     ruby-src/test.rb        /^        def ClassExample.singleton_class_method$/
+ClassExample.class_method       ruby-src/test.rb        /^        def ClassExample.class_method$/
 Clear/p ada-src/2ataspri.adb    /^   procedure Clear (Cell : in out TAS_Cell) is$/
 Clear/p ada-src/2ataspri.ads    /^   procedure Clear        (Cell : in out TAS_Cell)/
 Cobol_help      c-src/etags.c   558
@@ -939,7 +939,7 @@ Metags	c-src/etags.c	/^main (int argc, char **argv)$/
 Mfail   cp-src/fail.C   /^main()$/
 Mkai-test.pl    perl-src/kai-test.pl    /^package main;$/
 ModuleExample   ruby-src/test.rb        /^module ModuleExample$/
-ModuleExample.singleton_module_method   ruby-src/test.rb        /^    def ModuleExample.singleton_module_method$/
+ModuleExample.module_class_method       ruby-src/test.rb        /^    def ModuleExample.module_class_method$/
 More_Lisp_Bits  c-src/emacs/src/lisp.h  801
 MoveLayerAfter  lua-src/allegro.lua     /^function MoveLayerAfter (this_one)$/
 MoveLayerBefore lua-src/allegro.lua     /^function MoveLayerBefore (this_one)$/
@@ -2620,10 +2620,10 @@ childDidExit	objc-src/Subprocess.m	/^- childDidExit$/
 chunks_free     c-src/emacs/src/gmalloc.c       313
 chunks_used     c-src/emacs/src/gmalloc.c       311
 cjava   c-src/etags.c   2936
-class_method    ruby-src/test.rb        /^        def class_method$/
-class_method_equals=    ruby-src/test.rb        /^        def class_method_equals=$/
-class_method_exclamation!       ruby-src/test.rb        /^        def class_method_exclamation!$/
-class_method_question?  ruby-src/test.rb        /^        def class_method_question?$/
+instance_method ruby-src/test.rb        /^        def instance_method$/
+instance_method_equals= ruby-src/test.rb        /^        def instance_method_equals=$/
+instance_method_exclamation!    ruby-src/test.rb        /^        def instance_method_exclamation!$/
+instance_method_question?       ruby-src/test.rb        /^        def instance_method_question?$/
 classifyLine    php-src/lce_functions.php       /^      function classifyLine($line)$/
 clear   cp-src/conway.hpp       /^    void clear(void) { alive = 0; }$/
 clear-abbrev-table      c-src/abbrev.c  /^DEFUN ("clear-abbrev-table", Fclear_abbrev_table, /
@@ -3450,7 +3450,7 @@ miti	html-src/softwarelibero.html	/^Sfatiamo alcuni miti$/
 modifier_names  c-src/emacs/src/keyboard.c      6319
 modifier_symbols        c-src/emacs/src/keyboard.c      6327
 modify_event_symbol     c-src/emacs/src/keyboard.c      /^modify_event_symbol (ptrdiff_t symbol_num, int mod/
-module_method   ruby-src/test.rb        /^    def module_method$/
+module_instance_method  ruby-src/test.rb        /^    def module_instance_method$/
 more_aligned_int        c.c     165
 morecore_nolock c-src/emacs/src/gmalloc.c       /^morecore_nolock (size_t size)$/
 morecore_recursing      c-src/emacs/src/gmalloc.c       604
diff --git a/test/manual/etags/ETAGS.good_1 b/test/manual/etags/ETAGS.good_1
index 2ae4ec41256..dac20910347 100644
--- a/test/manual/etags/ETAGS.good_1
+++ b/test/manual/etags/ETAGS.good_1
@@ -2980,11 +2980,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -2994,8 +2994,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/manual/etags/ETAGS.good_2 b/test/manual/etags/ETAGS.good_2
index 3ec5b21d384..e5dbefbbd0d 100644
--- a/test/manual/etags/ETAGS.good_2
+++ b/test/manual/etags/ETAGS.good_2
@@ -3551,11 +3551,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -3565,8 +3565,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/manual/etags/ETAGS.good_3 b/test/manual/etags/ETAGS.good_3
index 43b84eed5d2..804440aad6d 100644
--- a/test/manual/etags/ETAGS.good_3
+++ b/test/manual/etags/ETAGS.good_3
@@ -3324,11 +3324,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -3338,8 +3338,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/manual/etags/ETAGS.good_4 b/test/manual/etags/ETAGS.good_4
index 434fe13cbd4..3b904ebe37c 100644
--- a/test/manual/etags/ETAGS.good_4
+++ b/test/manual/etags/ETAGS.good_4
@@ -3144,11 +3144,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -3158,8 +3158,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/manual/etags/ETAGS.good_5 b/test/manual/etags/ETAGS.good_5
index 425e2526f35..c3a277829f0 100644
--- a/test/manual/etags/ETAGS.good_5
+++ b/test/manual/etags/ETAGS.good_5
@@ -4059,11 +4059,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -4073,8 +4073,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/manual/etags/ETAGS.good_6 b/test/manual/etags/ETAGS.good_6
index 39522dbdb9b..2014283a89c 100644
--- a/test/manual/etags/ETAGS.good_6
+++ b/test/manual/etags/ETAGS.good_6
@@ -4059,11 +4059,11 @@ class Configure(760,24879
 ruby-src/test.rb,594
 module ModuleExample1,0
     class ClassExample2,21
-        def class_method3,44
-        def ClassExample.singleton_class_method6,116
-        def class_method_exclamation!9,221
-        def class_method_question?12,319
-        def class_method_equals=class_method_equals=
15,411
+        def instance_method3,44
+        def ClassExample.class_method6,116
+        def instance_method_exclamation!9,221
+        def instance_method_question?12,319
+        def instance_method_equals=class_method_equals=
15,411
         def `(18,499
         def +(21,589
         def [](24,637
@@ -4073,8 +4073,8 @@ module ModuleExample1,0
         def <=(<=
36,869
         def <=>(<=>
39,940
         def ===(===
42,987
-    def module_method46,1048
-    def ModuleExample.singleton_module_method49,1110
+    def module_instance_method46,1048
+    def ModuleExample.module_class_method49,1110
 
 ruby-src/test1.ruby,37
 class A1,0
diff --git a/test/manual/etags/html-src/softwarelibero.html b/test/manual/etags/html-src/softwarelibero.html
index 159432908d2..b374273c969 100644
--- a/test/manual/etags/html-src/softwarelibero.html
+++ b/test/manual/etags/html-src/softwarelibero.html
@@ -302,7 +302,7 @@
 Local variables:
 fill-column: 72
 time-stamp-active: t
-time-stamp-time-zone: "GMT"
+time-stamp-time-zone: "UTC0"
 time-stamp-format: "%:y-%02m-%02d"
 time-stamp-line-limit: 30
 time-stamp-start: "ultima\\s-+modifica\\s-+è\\s-+del\\s-+"
diff --git a/test/manual/etags/ruby-src/test.rb b/test/manual/etags/ruby-src/test.rb
index 9254c5bffa9..adb2cb1d0bc 100644
--- a/test/manual/etags/ruby-src/test.rb
+++ b/test/manual/etags/ruby-src/test.rb
@@ -1,19 +1,19 @@
 module ModuleExample
     class ClassExample
-        def class_method
-            puts "in class_method"
+        def instance_method
+            puts "in instane_method"
         end
-        def ClassExample.singleton_class_method
-            puts "in singleton_class_method"
+        def ClassExample.class_method
+            puts "in class_method"
         end
-        def class_method_exclamation!
-            puts "in class_method_exclamation!"
+        def instance_method_exclamation!
+            puts "in instance_method_exclamation!"
         end
-        def class_method_question?
-            puts "in class_method_question?"
+        def instance_method_question?
+            puts "in instance_method_question?"
         end
-        def class_method_equals=
-            puts "in class_method_equals="
+        def instance_method_equals=
+            puts "in instance_method_equals="
         end
         def `(command)
             return "just testing a backquote override"
@@ -43,12 +43,16 @@ module ModuleExample
             self == y
         end
     end
-    def module_method
-        puts "in module_method"
+    def module_instance_method
+        puts "in module_instance_method"
     end
-    def ModuleExample.singleton_module_method
-        puts "in singleton_module_method"
+    def ModuleExample.module_class_method
+        puts "in module_class_method"
     end
 end
 
-ModuleExample::ClassExample.singleton_class_method
+ModuleExample::ClassExample.class_method
+
+# Local Variables:
+# ruby-indent-level: 4
+# End:
diff --git a/test/manual/indent/scss-mode.scss b/test/manual/indent/scss-mode.scss
index 7a29929efca..02a4a98a8c5 100644
--- a/test/manual/indent/scss-mode.scss
+++ b/test/manual/indent/scss-mode.scss
@@ -55,3 +55,13 @@ article[role="main"] {
 }
 
 .box { @include border-radius(10px); }
+
+// bug:21230
+$list: (
+   ('a', #000000, #fff)
+   ('b', #000000, #fff)
+   ('c', #000000, #fff)
+   ('d', #000000, #fff)
+   ('e', #000000, #fff)
+   ('f', #000000, #fff)
+);