(decode_env_path): Don't add /: if file name handler

has a `safe-magic' property.

diff --git a/src/emacs.c b/src/emacs.c
index 62bcf1d78ffbeee1211ffac40fda6d0c1ad39f95..274c151d180d8f19a8dd9ffe23c67492206d35ce 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -2135,6 +2135,17 @@ decode_env_path (evarname, defalt)
       /* Add /: to the front of the name
         if it would otherwise be treated as magic.  */
       tem = Ffind_file_name_handler (element, Qt);
+
+      /* However, if the handler says "I'm safe",
+        don't bother adding /:.  */
+      if (SYMBOLP (tem))
+       {
+         Lisp_Object prop;
+         prop = Fget (tem, intern ("safe-magic"));
+         if (! NILP (prop))
+           tem = Qnil;
+       }
+
       if (! NILP (tem))
        element = concat2 (build_string ("/:"), element);