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

diff --cc configure.ac
index 9c8a6e3a9fc73fb56b8687f724f99cd00f4b3c5e,94f0bf36fb5783878d313fa9e85d781cf6b0fe0a..e406ae4f1ec3fe635c060469439ac85d8e5c7722
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -461,9 -461,8 +461,9 @@@ OPTION_DEFAULT_ON([gsettings],[don't co
  OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support])
  OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support])
  OPTION_DEFAULT_ON([zlib],[don't compile with zlib decompression support])
- OPTION_DEFAULT_ON([modules],[compile with dynamic modules support])
+ OPTION_DEFAULT_ON([modules],[don't compile with dynamic modules support])
  OPTION_DEFAULT_ON([threads],[don't compile with elisp threading support])
 +OPTION_DEFAULT_OFF([nativecomp],[don't compile with emacs lisp native compiler support])
  
  AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB],
   [use a file notification library (LIB one of: yes, inotify, kqueue, gfile, w32, no)])],

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

diff --cc lisp/help-fns.el
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/alloc.c
index faa8e703937a489f4f25d280eee9f33c4e2d9f8c,a35b48cfb22307acebf2235a49e509719d0472a3..354c6f09cc57ff897881bec60cdd7d462a5c2a26
--- 1/src/alloc.c
--- 2/src/alloc.c
+++ b/src/alloc.c
@@@ -3023,14 -3107,14 +3107,22 @@@ cleanup_vector (struct Lisp_Vector *vec
        if (uptr->finalizer)
        uptr->finalizer (uptr->p);
      }
+ #ifdef HAVE_MODULES
+   else if (PSEUDOVECTOR_TYPEP (&vector->header, PVEC_MODULE_FUNCTION))
+     {
+       ATTRIBUTE_MAY_ALIAS struct Lisp_Module_Function *function
+         = (struct Lisp_Module_Function *) vector;
+       module_finalize_function (function);
+     }
+ #endif
 +  else if (NATIVE_COMP_FLAG
 +         && PSEUDOVECTOR_TYPEP (&vector->header, PVEC_NATIVE_COMP_UNIT))
 +    {
 +      struct Lisp_Native_Comp_Unit *cu =
 +      PSEUDOVEC_STRUCT (vector, Lisp_Native_Comp_Unit);
 +      eassert (cu->handle);
 +      dynlib_close (cu->handle);
 +    }
  }
  
  /* Reclaim space used by unmarked vectors.  */

diff --cc src/data.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/lisp.h
index 04489959ed8060fd7fdd66e69dccc026f32bd64c,0bd375658e21255c58cc7a9d1b1efbae57febc5b..3ee6187ce9eac4d50eaf86b4595b88faddecbac7
--- 1/src/lisp.h
--- 2/src/lisp.h
+++ b/src/lisp.h
@@@ -1093,9 -1093,8 +1093,9 @@@ enum pvec_typ
    PVEC_MUTEX,
    PVEC_CONDVAR,
    PVEC_MODULE_FUNCTION,
 +  PVEC_NATIVE_COMP_UNIT,
  
-   /* These should be last, check internal_equal to see why.  */
+   /* These should be last, for internal_equal and sxhash_obj.  */
    PVEC_COMPILED,
    PVEC_CHAR_TABLE,
    PVEC_SUB_CHAR_TABLE,

diff --cc src/lread.c
Simple merge

diff --cc src/pdumper.c
Simple merge

diff --cc src/print.c
Simple merge