Merge from trunk and resolve conflicts.

3 files changed, 18 insertions, 6 deletions

diff --git a/test/indent/octave.m b/test/indent/octave.m
index 4c2fa6c8435..bc7784f1ba2 100644
--- a/test/indent/octave.m
+++ b/test/indent/octave.m
@@ -1,4 +1,4 @@
-## -*- octave -*-
+## -*- mode: octave; coding: utf-8 -*-
 
 function res = tcomp (fn)
   %% res = tcomp (fn)
@@ -35,7 +35,7 @@ function res = tcomp (fn)
 
 endfunction
 
-## Copyright (C) 2005, 2006, 2007, 2008, 2009 S�ren Hauberg
+## Copyright (C) 2005, 2006, 2007, 2008, 2009 Søren Hauberg
 ##
 ## This file is part of Octave.
 ##
diff --git a/test/indent/pascal.pas b/test/indent/pascal.pas
index 07a21f23c3c..0dda0c47fef 100644
--- a/test/indent/pascal.pas
+++ b/test/indent/pascal.pas
@@ -1,6 +1,6 @@
 { GPC demo program for the CRT unit.
 
-Copyright (C) 1999-2006 Free Software Foundation, Inc.
+Copyright (C) 1999-2006, 2013 Free Software Foundation, Inc.
 
 Author: Frank Heckenbach <frank@pascal.gnu.de>
 
@@ -14,9 +14,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 As a special exception, if you incorporate even large parts of the
 code of this demo program into another program with substantially
@@ -27,6 +25,8 @@ by the GNU General Public License. }
 
 {$gnu-pascal,I+}
 
+// Free-pascal style comment.
+
 program CRTDemo;
 
 uses GPC, CRT;
diff --git a/test/indent/shell.sh b/test/indent/shell.sh
index 6f3447c3aa9..790656501d1 100755
--- a/test/indent/shell.sh
+++ b/test/indent/shell.sh
@@ -5,6 +5,18 @@ setlock -n /tmp/getmail.lock && echo getmail isn\'t running
 
 # adsgsdg
 
+case $X in
+    foo)
+        do_something
+        ;;
+    arg=*)                      # bug#12953
+        do_something_else_based_on_arg
+        ;;
+    *)
+        default
+        ;;
+esac
+
 echo -n $(( 5 << 2 ))
 # This should not be treated as a heredoc (bug#12770).
 2