X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/b046ee9f70ed6b5b21073654da48b243c4bfeaa6..1e539d255bef9e76a8eaa781f69db71f57b636f5:/lisp/dos-w32.el diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el index 3fb8a83b28..d7b411fab3 100644 --- a/lisp/dos-w32.el +++ b/lisp/dos-w32.el @@ -1,4 +1,4 @@ -;;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms +;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms ;; Copyright (C) 1996 Free Software Foundation, Inc. @@ -38,10 +38,6 @@ ;; Set the null device (for compile.el). (setq null-device "NUL") -;; Set the grep regexp to match entries with drive letters. -(setq grep-regexp-alist - '(("^\\(\\([a-zA-Z]:\\)?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 3))) - ;; For distinguishing file types based upon suffixes. (defvar file-name-buffer-file-type-alist '( @@ -50,16 +46,15 @@ ; 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 ("\\.\\(a\\|o\\|tar\\|z\\|gz\\|taz\\|jar\\)$" . t) ; Unix stuff - ("\\.tp[ulpw]$" . t) - ; Borland Pascal stuff - ("[:/]tags$" . nil) - ; Emacs TAGS file + ("\\.sx[dmicw]$" . t) ; OpenOffice.org + ("\\.tp[ulpw]$" . t) ; borland Pascal stuff + ("[:/]tags$" . nil) ; emacs TAGS file ) "*Alist for distinguishing text files from binary files. Each element has the form (REGEXP . TYPE), where REGEXP is matched @@ -98,8 +93,8 @@ upon the filename, the contents of `untranslated-filesystem-list' and `file-name-buffer-file-type-alist', and whether the file exists: If it matches in `untranslated-filesystem-list': - If the file exists: `no-conversion' - If the file does not exist: `undecided' + If the file exists: `undecided' + If the file does not exist: `undecided-unix' If it matches in `file-name-buffer-file-type-alist': If the match is t (for binary): `no-conversion' If the match is nil (for dos-text): `undecided-dos' @@ -128,7 +123,7 @@ set to the appropriate coding system, and the value of (target) (binary nil) (text nil) (undecided nil) (undecided-unix nil)) - (cond ((eq op 'insert-file-contents) + (cond ((eq op 'insert-file-contents) (setq target (nth 1 command)) ;; First check for a file name that indicates ;; it is truly binary. @@ -162,13 +157,13 @@ set to the appropriate coding system, and the value of (modify-coding-system-alist 'file "" 'find-buffer-file-type-coding-system) -(defun find-file-binary (filename) +(defun find-file-binary (filename) "Visit file FILENAME and treat it as binary." (interactive "FFind file binary: ") (let ((file-name-buffer-file-type-alist '(("" . t)))) (find-file filename))) -(defun find-file-text (filename) +(defun find-file-text (filename) "Visit file FILENAME and treat it as a text file." (interactive "FFind file text: ") (let ((file-name-buffer-file-type-alist '(("" . nil)))) @@ -177,31 +172,37 @@ set to the appropriate coding system, and the value of (defun find-file-not-found-set-buffer-file-coding-system () (save-excursion (set-buffer (current-buffer)) - (let* ((dummy-insert-op (list 'insert-file-contents (buffer-file-name))) - (coding-system-pair - (find-buffer-file-type-coding-system dummy-insert-op))) - (setq buffer-file-coding-system (car coding-system-pair)) + (let ((coding buffer-file-coding-system)) + ;; buffer-file-coding-system is already set by + ;; find-operation-coding-system, which was called from + ;; insert-file-contents. All that's left is to change + ;; the EOL conversion, if required by the user. + (when (and (null coding-system-for-read) + (or inhibit-eol-conversion + (untranslated-file-p (buffer-file-name)))) + (setq coding (coding-system-change-eol-conversion coding 0)) + (setq buffer-file-coding-system coding)) (setq buffer-file-type (eq buffer-file-coding-system 'no-conversion))))) ;;; To set the default coding system on new files. -(add-hook 'find-file-not-found-hooks +(add-hook 'find-file-not-found-hooks 'find-file-not-found-set-buffer-file-coding-system) ;;; To accomodate filesystems that do not require CR/LF translation. (defvar untranslated-filesystem-list nil - "List of filesystems that require no CR/LF translation when reading + "List of filesystems that require no CR/LF translation when reading and writing files. Each filesystem in the list is a string naming the directory prefix corresponding to the filesystem.") (defun untranslated-canonical-name (filename) "Return FILENAME in a canonicalized form for use with the functions dealing with untranslated filesystems." - (if (memq system-type '(ms-dos windows-nt)) + (if (memq system-type '(ms-dos windows-nt cygwin)) ;; The canonical form for DOS/W32 is with A-Z downcased and all ;; directory separators changed to directory-sep-char. (let ((name nil)) - (setq name (mapconcat - '(lambda (char) + (setq name (mapconcat + '(lambda (char) (if (and (<= ?A char) (<= char ?Z)) (char-to-string (+ (- char ?A) ?a)) (char-to-string char))) @@ -217,7 +218,7 @@ dealing with untranslated filesystems." filename)) (defun untranslated-file-p (filename) - "Return t if FILENAME is on a filesystem that does not require + "Return t if FILENAME is on a filesystem that does not require CR/LF translation, and nil otherwise." (let ((fs (untranslated-canonical-name filename)) (ufs-list untranslated-filesystem-list) @@ -231,9 +232,12 @@ CR/LF translation, and nil otherwise." (defun add-untranslated-filesystem (filesystem) "Add FILESYSTEM to the list of filesystems that do not require CR/LF translation. FILESYSTEM is a string containing the directory -prefix corresponding to the filesystem. For example, for a Unix +prefix corresponding to the filesystem. For example, for a Unix filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"." - (interactive "fUntranslated file system: ") + ;; We use "D", not "f", to avoid confusing the user: "f" prompts + ;; with a directory, but RET returns the current buffer's file, not + ;; its directory. + (interactive "DUntranslated file system: ") (let ((fs (untranslated-canonical-name filesystem))) (if (member fs untranslated-filesystem-list) untranslated-filesystem-list @@ -241,12 +245,12 @@ filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"." (cons fs untranslated-filesystem-list))))) (defun remove-untranslated-filesystem (filesystem) - "Remove FILESYSTEM from the list of filesystems that do not require + "Remove FILESYSTEM from the list of filesystems that do not require CR/LF translation. FILESYSTEM is a string containing the directory -prefix corresponding to the filesystem. For example, for a Unix +prefix corresponding to the filesystem. For example, for a Unix filesystem mounted on drive Z:, FILESYSTEM could be \"Z:\"." (interactive "fUntranslated file system: ") - (setq untranslated-filesystem-list + (setq untranslated-filesystem-list (delete (untranslated-canonical-name filesystem) untranslated-filesystem-list))) @@ -374,7 +378,8 @@ indicates a specific program should be invoked." (printer (or (and (boundp 'dos-printer) (stringp (symbol-value 'dos-printer)) (symbol-value 'dos-printer)) - printer-name))) + printer-name + (default-printer-name)))) (or (eq coding-system-for-write 'no-conversion) (setq coding-system-for-write (aref eol-type 1))) ; force conversion to DOS EOLs @@ -407,7 +412,8 @@ indicates a specific program should be invoked." (let ((printer (or (and (boundp 'dos-ps-printer) (stringp (symbol-value 'dos-ps-printer)) (symbol-value 'dos-ps-printer)) - ps-printer-name))) + ps-printer-name + (default-printer-name)))) (direct-print-region-helper printer start end lpr-prog delete-text buf display rest))) @@ -420,4 +426,5 @@ indicates a specific program should be invoked." (provide 'dos-w32) +;;; arch-tag: dcfefdd2-362f-4fbc-9141-9634f5f4d6a7 ;;; dos-w32.el ends here