merge upstream

5 files changed, 28 insertions, 12 deletions

diff --git a/test/ChangeLog b/test/ChangeLog
index 969bc3c4939..7b39097d3b5 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,14 @@
+2013-09-01  Glenn Morris  <rgm@gnu.org>
+
+        * automated/Makefile.in (setwins): Avoid leading space in $wins.
+        Otherwise the sed command used by eg compile-main ends up
+        containing "/*.el".  (Bug#15170)
+
+2013-08-28  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * Makefile.in (SHELL): Now @SHELL@, not /bin/sh,
+        for portability to hosts where /bin/sh has problems.
+
 2013-08-21  David Engster  <deng@randomsample.de>
 
         * automated/eieio-tests.el, automated/eieio-test-persist.el:
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index d4bfcc12130..bf8e62f77cd 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -17,7 +17,7 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -52,7 +52,7 @@ emacs = EMACSLOADPATH=$(lispsrc):$(test) LC_ALL=C $(EMACS) $(EMACSOPT)
 setwins=subdirs=`find . -type d -print`; \
         for file in $$subdirs; do \
            case $$file in */.* | */.*/* | */=* | ./data* ) ;; \
-                *) wins="$$wins $$file" ;; \
+                *) wins="$$wins$${wins:+ }$$file" ;; \
            esac; \
         done
 
diff --git a/test/automated/eieio-test-methodinvoke.el b/test/automated/eieio-test-methodinvoke.el
index 76a28919f21..db8618c811e 100644
--- a/test/automated/eieio-test-methodinvoke.el
+++ b/test/automated/eieio-test-methodinvoke.el
@@ -1,4 +1,4 @@
-;;; eieio-testsinvoke.el -- eieio tests for method invokation
+;;; eieio-testsinvoke.el -- eieio tests for method invocation
 
 ;; Copyright (C) 2005, 2008, 2010, 2013 Free Software Foundation, Inc.
 
@@ -136,7 +136,7 @@
     (setq eieio-test-method-order-list (nreverse eieio-test-method-order-list))
     (eieio-test-match ans)))
 
-;;; Test static invokation
+;;; Test static invocation
 ;;
 (defmethod eitest-H :STATIC ((class eitest-A))
   "No need to do work in here."
diff --git a/test/automated/eieio-tests.el b/test/automated/eieio-tests.el
index 2d8ae4c7d43..144f0bc919d 100644
--- a/test/automated/eieio-tests.el
+++ b/test/automated/eieio-tests.el
@@ -21,7 +21,7 @@
 ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
 ;;; Commentary:
-;;  
+;;
 ;; Test the various features of EIEIO.
 
 (require 'ert)
@@ -66,7 +66,7 @@
            :initform moose
            :type symbol
            :allocation :instance
-           :documentation "Fisrt slot testing slot arguments."
+           :documentation "First slot testing slot arguments."
            :custom symbol
            :label "Wild Animal"
            :group borg
@@ -166,7 +166,7 @@
   (defun anormalfunction () "A plain function for error testing." nil)
   (should-error
    (progn
-     (defgeneric anormalfunction () 
+     (defgeneric anormalfunction ()
        "Attempt to turn it into a generic.")))
 
   ;; Check that generic-p works
@@ -589,7 +589,7 @@ METHOD is the method that was attempting to be called."
   ;;; HACK ALERT: The new value of a class slot is inherited by the
   ;; subclass!  This is probably a bug.  We should either share the slot
   ;; so sets on the baseclass change the subclass, or we should inherit
-  ;; the original value. 
+  ;; the original value.
 ;;  (should (eq (get-slot-3 eitest-t2) 'emu))
 ;;  (should (eq (get-slot-3 class-subc) 'emu))
 ;;  (setf (get-slot-3 eitest-t2) 'setf-emu)
@@ -604,7 +604,7 @@ METHOD is the method that was attempting to be called."
   "Try to access slot-2 from this class which doesn't have it.
 The object S2 passed in will be of class prot-1, which does have
 the slot.  This could be allowed, and currently is in EIEIO.
-Needed by the eieio persistant base class."
+Needed by the eieio persistent base class."
   (oref s2 slot-2))
 
 (defclass prot-1 (prot-0)
@@ -662,7 +662,7 @@ Do not override for `prot-2'."
   (prot0-slot-2 eitest-p1)
   ;; Accessing private slot out of context must fail
   (should-error (oref eitest-p1 slot-3) :type 'invalid-slot-name)
-  ;; Access private slot in ethod
+  ;; Access private slot in method
   (prot1-slot-3 eitest-p1)
   ;; Access private slot in subclass method must fail
   (should-error (prot1-slot-3 eitest-p2) :type 'invalid-slot-name)
@@ -713,7 +713,7 @@ Do not override for `prot-2'."
 Subclasses to override slot attributes.")
 
 (defclass slotattr-ok (slotattr-base)
-  ((initform :initform no-init)   
+  ((initform :initform no-init)
    (initarg :initarg :initblarg)
    (custom :custom string
            :label "One String"
@@ -767,7 +767,7 @@ Subclasses to override slot attributes.")
 Subclasses to override slot attributes.")
 
 (defclass slotattr-class-ok (slotattr-class-base)
-  ((initform :initform no-init)   
+  ((initform :initform no-init)
    (initarg :initarg :initblarg)
    (custom :custom string
            :label "One String"
diff --git a/test/indent/ruby.rb b/test/indent/ruby.rb
index 853f4dbf992..af1bbb9d8ab 100644
--- a/test/indent/ruby.rb
+++ b/test/indent/ruby.rb
@@ -66,3 +66,8 @@ end
 Given /toto/ do
   print "hello"
 end
+
+# Bug#15208
+if something == :==
+  do_something
+end