Merge remote-tracking branch 'savannah/master' into HEAD

diff --cc etc/NEWS
Simple merge

diff --cc lisp/emacs-lisp/byte-run.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/package.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/w32.c
Simple merge

diff --cc test/Makefile.in
index 3b6c18d9410ef0c36cf957cea238fb69b63acedf,48bbe8712b4d08101a709ca910b33e6c256c62c4..c7501fa358b8188033628ec8b41d6830995d5493
--- 1/test/Makefile.in
--- 2/test/Makefile.in
+++ b/test/Makefile.in
@@@ -70,8 -70,16 +70,17 @@@ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@
  am__v_at_0 = @
  am__v_at_1 =
  
 +HAVE_NATIVE_COMP = @HAVE_NATIVE_COMP@
  
+ # Load any GNU ELPA dependencies that are present, for optional tests.
+ GNU_ELPA_DIRECTORY ?= $(srcdir)/../../elpa
+ # Keep elpa_dependencies dependency-ordered.
+ elpa_dependencies = \
+       url-http-ntlm/url-http-ntlm.el \
+       web-server/web-server.el
+ elpa_els = $(addprefix $(GNU_ELPA_DIRECTORY)/packages/,$(elpa_dependencies))
+ elpa_opts = $(foreach el,$(elpa_els),$(and $(wildcard $(el)),-L $(dir $(el)) -l $(el)))
+ 
  # We never change directory before running Emacs, so a relative file
  # name is fine, and makes life easier.  If we need to change
  # directory, we can use emacs --chdir.