From: Andrea Corallo <akrl@sdf.org>
Date: Sun, 1 Mar 2020 19:21:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~810
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6664f98821d46347a328337c7bcccac3f75c05e3;p=emacs.git

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

6664f98821d46347a328337c7bcccac3f75c05e3
diff --cc src/lread.c
index fc56944f937,eabf3b938c2..005528782d0
--- a/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)