Merge branch 'stable-2.0'

Conflicts:
	libguile/read.c
	test-suite/tests/web-response.test

diff --cc doc/ref/api-macros.texi
Simple merge

diff --cc doc/ref/srfi-modules.texi
Simple merge

diff --cc libguile/r6rs-ports.c
Simple merge

diff --cc libguile/read.c
index 980769b,419ad12..bcb40ee
--- 1/libguile/read.c
--- 2/libguile/read.c
+++ b/libguile/read.c
@@@ -2022,20 -2046,20 +2022,29 @@@ scm_get_hash_procedure (int c
      }
  }
  
- #define SCM_ENCODING_SEARCH_SIZE (500)
- 
 +static int
 +is_encoding_char (char c)
 +{
 +  if (c >= 'a' && c <= 'z') return 1;
 +  if (c >= 'A' && c <= 'Z') return 1;
 +  if (c >= '0' && c <= '9') return 1;
 +  return strchr ("_-.:/,+=()", c) != NULL;
 +}
 +
- /* Search the first few hundred characters of a file for an Emacs-like coding
-    declaration.  Returns either NULL or a string whose storage has been
-    allocated with `scm_gc_malloc ()'.  */
+ /* Maximum size of an encoding name.  This is a bit more than the
+    longest name listed at
+    <http://www.iana.org/assignments/character-sets> ("ISO-2022-JP-2", 13
+    characters.)  */
+ #define ENCODING_NAME_MAX_SIZE 20
+ 
+ /* Number of bytes at the beginning or end of a file that are scanned
+    for a "coding:" declaration.  */
+ #define SCM_ENCODING_SEARCH_SIZE (500 + ENCODING_NAME_MAX_SIZE)
+ 
+ 
+ /* Search the SCM_ENCODING_SEARCH_SIZE bytes of a file for an Emacs-like
+    coding declaration.  Returns either NULL or a string whose storage
+    has been allocated with `scm_gc_malloc'.  */
  char *
  scm_i_scan_for_encoding (SCM port)
  {

diff --cc module/ice-9/boot-9.scm
Simple merge

diff --cc test-suite/tests/r6rs-ports.test
Simple merge

diff --cc test-suite/tests/syntax.test
Simple merge

diff --cc test-suite/tests/web-response.test
index 4f88aa6,99b1293..3c1894e
--- 1/test-suite/tests/web-response.test
--- 2/test-suite/tests/web-response.test
+++ b/test-suite/tests/web-response.test
@@@ -1,6 -1,6 +1,6 @@@
  ;;;; web-response.test --- HTTP responses       -*- mode: scheme; coding: utf-8; -*-
  ;;;;
- ;;;;   Copyright (C) 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
 -;;;;   Copyright (C) 2010, 2011, 2012, 2014 Free Software Foundation, Inc.
++;;;;   Copyright (C) 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  ;;;;
  ;;;; This library is free software; you can redistribute it and/or
  ;;;; modify it under the terms of the GNU Lesser General Public