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

diff --cc src/lread.c
index fc56944f937485f8b33f1c074d10a852bc1a8556,eabf3b938c2287ec77e0c7f8ee2dbdcb2c82dea7..005528782d03f377f6970070cdd0bc959b39b45f
--- 1/src/lread.c
--- 2/src/lread.c
+++ b/src/lread.c
@@@ -1432,13 -1422,8 +1425,10 @@@ Return t if the file exists and loads s
  
    if (NILP (nomessage) || force_load_messages)
      {
-       if (!safe_p)
-       message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...",
-                file, 1);
-       else if (is_module)
+       if (is_module)
          message_with_string ("Loading %s (module)...", file, 1);
 +      else if (is_native_elisp)
 +        message_with_string ("Loading %s (native compiled elisp)...", file, 1);
        else if (!compiled)
        message_with_string ("Loading %s (source)...", file, 1);
        else if (newer)
@@@ -1510,13 -1482,8 +1500,10 @@@
  
    if (!noninteractive && (NILP (nomessage) || force_load_messages))
      {
-       if (!safe_p)
-       message_with_string ("Loading %s (compiled; note unsafe, not compiled in Emacs)...done",
-                file, 1);
-       else if (is_module)
+       if (is_module)
          message_with_string ("Loading %s (module)...done", file, 1);
 +      else if (is_native_elisp)
 +      message_with_string ("Loading %s (native compiled elisp)...done", file, 1);
        else if (!compiled)
        message_with_string ("Loading %s (source)...done", file, 1);
        else if (newer)

diff --cc src/pdumper.c
Simple merge