Fix make-obsolete for internal-get-face.

[gnu-emacs] / lisp / dos-w32.el

diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index 612191c75aaec8ae822cb6a8300d8e482672b189..83eb895dc80e1ea66a85138a13c3653214869020 100644 (file)
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -50,7 +50,7 @@
                                        ; MS-Dos stuff
     ("\\.\\(dll\\|drv\\|386\\|vxd\\|fon\\|fnt\\|fot\\|ttf\\|grp\\)$" . t)
                                        ; Windows stuff
-    ("\\.\\(bmp\\|wav\\|avi\\|mpg\\|jpg\\|tif\\|mov\\|au\\)" . t)
+    ("\\.\\(bmp\\|wav\\|avi\\|mpg\\|jpg\\|tif\\|mov\\|au\\)$" . t)
                                        ; known binary data files
     ("\\.\\(arc\\|zip\\|pak\\|lzh\\|zoo\\)$" . t)
                                        ; Packers
@@ -208,7 +208,10 @@ dealing with untranslated filesystems."
                    filename nil))
        ;; Use expand-file-name to canonicalize directory separators, except
        ;; with bare drive letters (which would have the cwd appended).
-       (if (string-match "^.:$" name)
+       ;; Avoid expanding names that could trigger ange-ftp to prompt
+       ;; for passwords, though.
+       (if (or (string-match "^.:$" name)
+               (string-match "^/[^/:]+:" name))
            name
          (expand-file-name name)))
     filename))
@@ -276,7 +279,7 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"."
          (subst-char-in-string
           ?/ ?\\
           (make-temp-name
-           (expand-file-name "EP" (getenv "TMPDIR")))))
+           (expand-file-name "EP" temporary-file-directory))))
         ;; capture output for diagnosis
         (errbuf (list (get-buffer-create " *print-region-helper*") t)))
     ;; It seems that we must be careful about the directory name that