;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;; 2006, 2007, 2008 Free Software Foundation, Inc.
+;; 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>
;; Keywords: internal
(setq alist (cdr alist)))
found)))
-;; Silence compiler. Defined in src/buffer.c on DOS_NT.
-(defvar default-buffer-file-type)
-
;; Don't check for untranslated file systems here.
(defun find-buffer-file-type (filename)
(let ((match (find-buffer-file-type-match filename))
(code))
(if (not match)
- default-buffer-file-type
+ (default-value 'buffer-file-type)
(setq code (cdr match))
(cond ((memq code '(nil t)) code)
((and (symbolp code) (fboundp code))
If the match is nil (for dos-text): `undecided-dos'
Otherwise:
If the file exists: `undecided'
- If the file does not exist: default-buffer-file-coding-system
+ If the file does not exist default value of `buffer-file-coding-system'
Note that the CAR of arguments to `insert-file-contents' operation could
be a cons cell of the form \(FILENAME . BUFFER\), where BUFFER is a buffer
`buffer-file-coding-system' will be used when writing the file."
(let ((op (nth 0 command))
- (target)
(binary nil) (text nil)
- (undecided nil) (undecided-unix nil))
+ (undecided nil) (undecided-unix nil)
+ target target-buf)
(cond ((eq op 'insert-file-contents)
(setq target (nth 1 command))
;; If TARGET is a cons cell, it has the form (FILENAME . BUFFER),
;; arguments is used, e.g., in arc-mode.el.) This function
;; doesn't care about the contents, it only looks at the file's
;; name, which is the CAR of the cons cell.
- (if (consp target) (setq target (car target)))
+ (when (consp target)
+ (setq target-buf
+ (and (bufferp (cdr target))
+ (buffer-name (cdr target))))
+ (setq target (car target)))
;; First check for a file name that indicates
;; it is truly binary.
(setq binary (find-buffer-file-type target))
((find-buffer-file-type-match target)
(setq text t))
;; For any other existing file, decide based on contents.
- ((file-exists-p target)
+ ((or
+ (file-exists-p target)
+ ;; If TARGET does not exist as a file, replace its
+ ;; base name with TARGET-BUF and try again. This
+ ;; is for jka-compr's sake, which strips the
+ ;; compression (.gz etc.) extension from the
+ ;; FILENAME, but leaves it in the BUFFER's name.
+ (and (stringp target-buf)
+ (file-exists-p
+ (expand-file-name target-buf
+ (file-name-directory target)))))
(setq undecided t))
;; Next check for a non-DOS file system.
((untranslated-file-p target)
(text '(undecided-dos . undecided-dos))
(undecided-unix '(undecided-unix . undecided-unix))
(undecided '(undecided . undecided))
- (t (cons default-buffer-file-coding-system
- default-buffer-file-coding-system))))
+ (t (cons (default-value 'buffer-file-coding-system)
+ (default-value 'buffer-file-coding-system)))))
((eq op 'write-region)
(if buffer-file-coding-system
(cons buffer-file-coding-system
(find-file filename)))
(defun find-file-not-found-set-buffer-file-coding-system ()
- (save-excursion
- (set-buffer (current-buffer))
+ (with-current-buffer (current-buffer)
(let ((coding buffer-file-coding-system))
;; buffer-file-coding-system is already set by
;; find-operation-coding-system, which was called from