auto upstream

16 files changed, 160 insertions, 120 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3dea3ed0380..5a9af8c42a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,61 @@
+2013-02-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (buffer-file-type, default-buffer-file-type): Remove.
+
+        * net/ange-ftp.el (ange-ftp-insert-file-contents): Don't reference
+        buffer-file-type.
+
+        * mail/feedmail.el (feedmail-force-binary-write): Doc fix.
+        (feedmail-run-the-queue, feedmail-dump-message-to-queue)
+        (feedmail-send-it-immediately): Don't bind buffer-file-type, bind
+        coding-system-for-write instead.
+
+        * jka-compr.el (jka-compr-write-region): Don't bind
+        buffer-file-type.
+
+        * emacs-lisp/bytecomp.el (byte-compile-file): Don't bind
+        buffer-file-type.
+
+        * files.el (file-name-buffer-file-type-alist): Remove defvar.
+        (insert-file-contents-literally): Remove reference to
+        file-name-buffer-file-type-alist.
+
+        * dos-w32.el (file-name-buffer-file-type-alist): Deprecate and
+        make-obsolete.
+        (find-buffer-file-type-match, find-buffer-file-type): Remove.
+        (find-buffer-file-type-coding-system): Remove references to
+        find-buffer-file-type-match, find-buffer-file-type, and
+        buffer-file-type.
+        Don't put find-buffer-file-type-coding-system into
+        file-coding-system-alist.
+        (find-file-binary, find-file-text): Bind coding-system-for-read
+        instead of file-name-buffer-file-type-alist.
+
+2013-02-09  Tassilo Horn  <tsdh@gnu.org>
+
+        * doc-view.el: Use (and prefer) soffice as default ODF->PDF
+        converter (Bug#13622).  Patch provided by Jambunathan K
+        <kjambunathan@gmail.com>.
+        (doc-view-unoconv-program): Make obsolete variable.
+        (doc-view-odf->pdf-converter-program): New variable.
+        (doc-view-odf->pdf-converter-function): New variable.
+        (doc-view-mode-p): Use it.
+        (doc-view-odf->pdf-converter-unoconv): Rename from
+        `doc-view-odf->pdf-converter-unoconv'.
+        (doc-view-odf->pdf-converter-soffice): New function.
+        (doc-view-convert-current-doc): Use
+        `doc-view-odf->pdf-converter-function'.
+
+2013-02-09  Chong Yidong  <cyd@gnu.org>
+
+        * minibuffer.el (minibuffer-inactive-mode-map): Bind mouse-1 to
+        view-echo-area-messages (Bug#13340).
+
+        * help.el (view-echo-area-messages): Use display-buffer.
+
+        * dired-x.el (dired-do-run-mail): Prompt for confirmation
+        (Bug#13561).
+
 2013-02-08  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * emacs-lisp/byte-run.el (eval-when-compile, eval-and-compile):
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index 8849fb85244..4fc04b706b5 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -975,11 +975,6 @@ using `make-temp-file', and the generated name is returned."
                     (save-excursion
                       (funcall set-auto-coding-function
                                filename (- (point-max) (point-min)))))
-               ;; dos-w32.el defines the function
-               ;; find-buffer-file-type-coding-system for DOS/Windows
-               ;; systems which preserves the coding-system of existing files.
-               ;; (That function is called via file-coding-system-alist.)
-               ;; Here, we want it to act as if the extracted file existed.
                ;; The following let-binding of file-name-handler-alist forces
                ;; find-file-not-found-set-buffer-file-coding-system to ignore
                ;; the file's name (see dos-w32.el).
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index a2c13033cd1..3cf6654da2b 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -1344,13 +1344,20 @@ Otherwise obeys the value of `dired-vm-read-only-folders'."
   (rmail (dired-get-filename)))
 
 (defun dired-do-run-mail ()
-  "If `dired-bind-vm' is non-nil, call `dired-vm', else call `dired-rmail'."
+  "Visit the current file as a mailbox, using VM or RMAIL.
+Prompt for confirmation first; if the user says yes, call
+`dired-vm' if `dired-bind-vm' is non-nil, `dired-rmail'
+otherwise."
   (interactive)
-  (if dired-bind-vm
-      ;; Read mail folder using vm.
-      (dired-vm)
-    ;; Read mail folder using rmail.
-    (dired-rmail)))
+  (let ((file (dired-get-filename t)))
+    (if dired-bind-vm
+        (if (y-or-n-p (concat "Visit `" file
+                              "' as a mail folder with VM?"))
+            (dired-vm))
+      ;; Read mail folder using rmail.
+      (if (y-or-n-p (concat "Visit `" file
+                            "' as a mailbox with RMAIL?"))
+          (dired-rmail)))))
 
 
 ;;; MISCELLANEOUS INTERNAL FUNCTIONS.
diff --git a/lisp/dired.el b/lisp/dired.el
index 30069488586..b5fc46eb78d 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -4297,7 +4297,7 @@ instead.
 ;;;***
 
 ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "dired-x" "dired-x.el" "cdaacce7c861256289ba48493dd6d0ec")
+;;;;;;  "dired-x" "dired-x.el" "90ba5245f6f5df3bdbda6303c725ef45")
 ;;; Generated autoloads from dired-x.el
 
 (autoload 'dired-jump "dired-x" "\
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 30aa3a09bf2..e7d1ebc35ff 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -231,14 +231,37 @@ If this and `doc-view-dvipdfm-program' are set,
   :type 'file
   :group 'doc-view)
 
-(defcustom doc-view-unoconv-program "unoconv"
+(define-obsolete-variable-alias 'doc-view-unoconv-program
+                                'doc-view-odf->pdf-converter-program
+                                "24.4")
+
+(defcustom doc-view-odf->pdf-converter-program
+  (cond
+   ((executable-find "soffice") "soffice")
+   ((executable-find "unoconv") "unoconv")
+   (t "soffice"))
   "Program to convert any file type readable by OpenOffice.org to PDF.
 
 Needed for viewing OpenOffice.org (and MS Office) files."
-  :version "24.1"
+  :version "24.4"
   :type 'file
   :group 'doc-view)
 
+(defcustom doc-view-odf->pdf-converter-function
+  (cond
+   ((string-match "unoconv\\'" doc-view-odf->pdf-converter-program)
+    #'doc-view-odf->pdf-converter-unoconv)
+   ((string-match "soffice\\'" doc-view-odf->pdf-converter-program)
+    #'doc-view-odf->pdf-converter-soffice))
+  "Function to call to convert a ODF file into a PDF file."
+  :type '(radio
+          (function-item doc-view-odf->pdf-converter-unoconv
+                         :doc "Use unoconv")
+          (function-item doc-view-odf->pdf-converter-soffice
+                         :doc "Use LibreOffice")
+          function)
+  :version "24.4")
+
 (defcustom doc-view-ps2pdf-program "ps2pdf"
   "Program to convert PS files to PDF.
 
@@ -700,8 +723,8 @@ OpenDocument format)."
          (and doc-view-ghostscript-program
               (executable-find doc-view-ghostscript-program)))
         ((eq type 'odf)
-         (and doc-view-unoconv-program
-              (executable-find doc-view-unoconv-program)
+         (and doc-view-odf->pdf-converter-program
+              (executable-find doc-view-odf->pdf-converter-program)
               (doc-view-mode-p 'pdf)))
         ((eq type 'djvu)
          (executable-find "ddjvu"))
@@ -903,14 +926,23 @@ If PAGE is nil, convert the whole document."
      ,@(if page `(,(format "%d" page))))
    callback))
 
-(defun doc-view-odf->pdf (odf callback)
+(defun doc-view-odf->pdf-converter-unoconv (odf callback)
   "Convert ODF to PDF asynchronously and call CALLBACK when finished.
 The converted PDF is put into the current cache directory, and it
 is named like ODF with the extension turned to pdf."
-  (doc-view-start-process "odf->pdf" doc-view-unoconv-program
+  (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
                           (list "-f" "pdf" "-o" (doc-view-current-cache-dir) odf)
                           callback))
 
+(defun doc-view-odf->pdf-converter-soffice (odf callback)
+  "Convert ODF to PDF asynchronously and call CALLBACK when finished.
+The converted PDF is put into the current cache directory, and it
+is named like ODF with the extension turned to pdf."
+  (doc-view-start-process "odf->pdf" doc-view-odf->pdf-converter-program
+                          (list "--headless" "--convert-to" "pdf"
+                                "--outdir" (doc-view-current-cache-dir) odf)
+                          callback))
+
 (defun doc-view-pdf/ps->png (pdf-ps png)
   ;; FIXME: Fix name and docstring to account for djvu&tiff.
   "Convert PDF-PS to PNG asynchronously."
@@ -1058,7 +1090,7 @@ Those files are saved in the directory given by the function
          ;; The unoconv tool only supports an output directory, but no
          ;; file name.  It's named like the input file with the
          ;; extension replaced by pdf.
-         (doc-view-odf->pdf doc-view-buffer-file-name
+         (funcall doc-view-odf->pdf-converter-function doc-view-buffer-file-name
                             (lambda ()
                               ;; Rename to doc.pdf
                               (rename-file opdf pdf)
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index 5866edfc3d6..d6788ffe028 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -37,7 +37,7 @@
 ;; Set the null device (for compile.el).
 (setq null-device "NUL")
 
-;; For distinguishing file types based upon suffixes.
+;; For distinguishing file types based upon suffixes.  DEPRECATED, DO NOT USE!
 (defcustom file-name-buffer-file-type-alist
   '(("[:/].*config.sys$" . nil)         ; config.sys text
     ("\\.\\(obj\\|exe\\|com\\|lib\\|sys\\|bin\\|ico\\|pif\\|class\\)$" . t)
@@ -54,36 +54,18 @@
     ("\\.tp[ulpw]$" . t)                ; borland Pascal stuff
     ("[:/]tags$" . nil)                 ; emacs TAGS file
     )
-  "Alist for distinguishing text files from binary files.
+  "Alist used in the past for distinguishing text files from binary files.
 Each element has the form (REGEXP . TYPE), where REGEXP is matched
-against the file name, and TYPE is nil for text, t for binary."
+against the file name, and TYPE is nil for text, t for binary.
+
+This variable is deprecated, not used anywhere, and will soon be deleted."
   :type '(repeat (cons regexp boolean))
   :group 'dos-fns
   :group 'w32)
 
-;; Return the pair matching filename on file-name-buffer-file-type-alist,
-;; or nil otherwise.
-(defun find-buffer-file-type-match (filename)
-  (let ((alist file-name-buffer-file-type-alist)
-        (found nil))
-    (let ((case-fold-search t))
-      (setq filename (file-name-sans-versions filename))
-      (while (and (not found) alist)
-        (if (string-match (car (car alist)) filename)
-            (setq found (car alist)))
-        (setq alist (cdr alist)))
-      found)))
-
-;; 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-value 'buffer-file-type)
-      (setq code (cdr match))
-      (cond ((memq code '(nil t)) code)
-            ((and (symbolp code) (fboundp code))
-             (funcall code filename))))))
+(make-obsolete-variable 'file-name-buffer-file-type-alist
+                        'file-coding-system-alist
+                        "24.4")
 
 (setq-default buffer-file-coding-system 'undecided-dos)
 
@@ -99,9 +81,6 @@ and whether the file exists:
   If it matches in `untranslated-filesystem-list':
     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'
   Otherwise:
     If the file exists:                                 `undecided'
     If the file does not exist   default value of `buffer-file-coding-system'
@@ -110,25 +89,23 @@ 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
 into which the file's contents were already read, but not yet decoded.
 
-If operation is `write-region', the coding system is chosen based upon
-the value of `buffer-file-coding-system' and `buffer-file-type'. If
-`buffer-file-coding-system' is non-nil, its value is used.  If it is
-nil and `buffer-file-type' is t, the coding system is `no-conversion'.
+If operation is `write-region', the coding system is chosen based
+upon the value of `buffer-file-coding-system'.  If
+`buffer-file-coding-system' is non-nil, its value is used.
 Otherwise, it is `undecided-dos'.
 
-The two most common situations are when DOS and Unix files are read
-and written, and their names do not match in
-`untranslated-filesystem-list' and `file-name-buffer-file-type-alist'.
-In these cases, the coding system initially will be `undecided'.  As
-the file is read in the DOS case, the coding system will be changed to
-`undecided-dos' as CR/LFs are detected.  As the file is read in the
-Unix case, the coding system will be changed to `undecided-unix' as
-LFs are detected.  In both cases, `buffer-file-coding-system' will be
-set to the appropriate coding system, and the value of
-`buffer-file-coding-system' will be used when writing the file."
+The most common situation is when DOS and Unix files are read and
+written, and their names do not match in `untranslated-filesystem-list'.
+In these cases, the coding system initially will be `undecided'.
+As the file is read in the DOS case, the coding system will be
+changed to `undecided-dos' as CR/LFs are detected.  As the file
+is read in the Unix case, the coding system will be changed to
+`undecided-unix' as LFs are detected.  In both cases,
+`buffer-file-coding-system' will be set to the appropriate coding
+system, and the value of `buffer-file-coding-system' will be used
+when writing the file."
 
   (let ((op (nth 0 command))
-        (binary nil) (text nil)
         (undecided nil) (undecided-unix nil)
         target target-buf)
     (cond ((eq op 'insert-file-contents)
@@ -144,15 +121,8 @@ set to the appropriate coding system, and the value of
                    (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))
-           (cond (binary)
-                 ;; Next check for files that MUST use DOS eol conversion.
-                 ((find-buffer-file-type-match target)
-                  (setq text t))
-                 ;; For any other existing file, decide based on contents.
-                 ((or
+           (cond ((or
+                   ;; For any existing file, decide based on contents.
                    (file-exists-p target)
                    ;; If TARGET does not exist as a file, replace its
                    ;; base name with TARGET-BUF and try again.  This
@@ -167,9 +137,7 @@ set to the appropriate coding system, and the value of
                  ;; Next check for a non-DOS file system.
                  ((untranslated-file-p target)
                   (setq undecided-unix t)))
-           (cond (binary '(no-conversion . no-conversion))
-                 (text '(undecided-dos . undecided-dos))
-                 (undecided-unix '(undecided-unix . undecided-unix))
+           (cond (undecided-unix '(undecided-unix . undecided-unix))
                  (undecided '(undecided . undecided))
                  (t (cons (default-value 'buffer-file-coding-system)
                           (default-value 'buffer-file-coding-system)))))
@@ -180,22 +148,18 @@ set to the appropriate coding system, and the value of
              ;; Normally this is used only in a non-file-visiting
              ;; buffer, because normally buffer-file-coding-system is non-nil
              ;; in a file-visiting buffer.
-             (if buffer-file-type
-                 '(no-conversion . no-conversion)
-               '(undecided-dos . undecided-dos)))))))
-
-(modify-coding-system-alist 'file "" 'find-buffer-file-type-coding-system)
+             '(undecided-dos . undecided-dos))))))
 
 (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))))
+  (let ((coding-system-for-read 'no-conversion))
     (find-file 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))))
+  (let ((coding-system-for-read 'undecided-dos))
     (find-file filename)))
 
 (defun find-file-not-found-set-buffer-file-coding-system ()
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 4e002cfc8cb..280a1bbc2dd 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1795,8 +1795,6 @@ The value is non-nil if there were no errors, nil if errors."
                      (kill-emacs-hook
                       (cons (lambda () (ignore-errors (delete-file tempfile)))
                             kill-emacs-hook)))
-                (if (memq system-type '(ms-dos 'windows-nt))
-                    (setq buffer-file-type t))
                 (write-region (point-min) (point-max) tempfile nil 1)
                 ;; This has the intentional side effect that any
                 ;; hard-links to target-file continue to
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index bbe551c735d..cc7624dee03 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2013-02-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * erc-dcc.el (erc-dcc-get-file): Don't reference buffer-file-type.
+
 2013-01-11  Dmitry Antipov  <dmantipov@yandex.ru>
 
         * erc-dcc.el (erc-dcc-send-file): Use point-min-marker.
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index c27bb629f9d..acb8febea80 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -942,7 +942,6 @@ filter and a process sentinel, and making the connection."
         (set-buffer-multibyte nil))
 
       (setq mode-line-process '(":%s")
-            buffer-file-type t
             buffer-read-only t)
       (setq erc-dcc-file-name file)
 
diff --git a/lisp/files.el b/lisp/files.el
index 3bc3059c68f..9fca70d36f7 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1983,8 +1983,6 @@ Do you want to revisit the file normally now? ")
         (after-find-file error (not nowarn)))
       (current-buffer))))
 
-(defvar file-name-buffer-file-type-alist) ;From dos-w32.el.
-
 (defun insert-file-contents-literally (filename &optional visit beg end replace)
   "Like `insert-file-contents', but only reads in the file literally.
 A buffer may be modified in several ways after reading into the buffer,
@@ -1996,7 +1994,6 @@ This function ensures that none of these modifications will take place."
         (after-insert-file-functions nil)
         (coding-system-for-read 'no-conversion)
         (coding-system-for-write 'no-conversion)
-        (file-name-buffer-file-type-alist '(("" . t)))
         (inhibit-file-name-handlers
          ;; FIXME: Yuck!!  We should turn insert-file-contents-literally
          ;; into a file operation instead!
diff --git a/lisp/help.el b/lisp/help.el
index 4219dd86986..25bc9c4b7c6 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -412,7 +412,9 @@ With argument, display info only for the selected version."
 The number of messages retained in that buffer
 is specified by the variable `message-log-max'."
   (interactive)
-  (switch-to-buffer (get-buffer-create "*Messages*")))
+  (with-current-buffer (get-buffer-create "*Messages*")
+    (goto-char (point-max))
+    (display-buffer (current-buffer))))
 
 (defun view-order-manuals ()
   "Display the Emacs ORDERS file."
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index ac81cf0d52d..5664a890cb1 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -332,8 +332,6 @@ There should be no more than seven characters after the final `/'."
 
           (with-current-buffer temp-buffer
             (let ((coding-system-for-write 'no-conversion))
-              (if (memq system-type '(ms-dos windows-nt))
-                  (setq buffer-file-type t) )
               (jka-compr-run-real-handler 'write-region
                                           (list (point-min) (point-max)
                                                 filename
diff --git a/lisp/mail/feedmail.el b/lisp/mail/feedmail.el
index 4305094611a..0502e7f9487 100644
--- a/lisp/mail/feedmail.el
+++ b/lisp/mail/feedmail.el
@@ -590,7 +590,7 @@ header is fiddled after the From: header is fiddled."
 (defcustom feedmail-force-binary-write t
   "If non-nil, force writing file as binary (this applies to queues and Fcc:).
 On systems where there is a difference between binary and text files,
-feedmail will temporarily manipulate the value of `buffer-file-type'
+feedmail will temporarily manipulate the value of `coding-system-for-write'
 to make the writing as binary.  If nil, writing will be in text mode.
 On systems where there is no distinction or where it is controlled by other
 variables or other means, this option has no effect."
@@ -2016,7 +2016,6 @@ backup file names and the like)."
               (setq buffer-offer-save nil)
               (buffer-disable-undo blobby-buffer)
               (insert-file-contents-literally maybe-file)
-              (setq buffer-file-type t) ; binary
               (goto-char (point-min))
               ;; if at least two line-endings with CRLF, translate the file
               (if (looking-at ".*\r\n.*\r\n")
@@ -2334,7 +2333,10 @@ mapped to mostly alphanumerics for safety."
         (setq filename buffer-file-name)
       (setq filename (feedmail-create-queue-filename queue-directory)))
     ;; make binary file on DOS/Windows 95/Windows NT, etc
-    (let ((buffer-file-type feedmail-force-binary-write))
+    (let ((coding-system-for-write
+           (if feedmail-force-binary-write
+               'no-conversion
+             coding-system-for-write)))
       (write-file filename))
     ;; convenient for moving from draft to q, for example
     (if (and previous-buffer-file-name (or (not is-fqm) (not is-in-this-dir))
@@ -2571,26 +2573,27 @@ mapped to mostly alphanumerics for safety."
                   ;; Re-insert and handle any Fcc fields (and, optionally,
                   ;; any Bcc).
                   (when fcc
-                    (let ((old (default-value 'buffer-file-type)))
+                    (let ((coding-system-for-write
+                           (if (and (memq system-type '(ms-dos windows-nt))
+                                    feedmail-force-binary-write)
+                               'no-conversion
+                             coding-system-for-write)))
                       (unwind-protect
                           (progn
-                            (setq-default buffer-file-type 
-                                          feedmail-force-binary-write)
                             (insert fcc)
                             (unless feedmail-nuke-bcc-in-fcc
                               (if bcc-holder (insert bcc-holder))
                               (if resent-bcc-holder
                                   (insert resent-bcc-holder)))
-                          
+
                             (run-hooks 'feedmail-before-fcc-hook)
-                          
+
                             (when feedmail-nuke-body-in-fcc
                               (goto-char eoh-marker)
                               (if (natnump feedmail-nuke-body-in-fcc)
                                   (forward-line feedmail-nuke-body-in-fcc))
                               (delete-region (point) (point-max)))
-                            (mail-do-fcc eoh-marker))
-                        (setq-default buffer-file-type old)))))
+                            (mail-do-fcc eoh-marker))))))
               ;; User bailed out of one-last-look.
               (if feedmail-queue-runner-is-active
                   (throw 'skip-me-q 'skip-me-q)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 0d2815e535e..e18f4c9c77f 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -2045,10 +2045,7 @@ with `minibuffer-local-must-match-map'.")
     (define-key map "i" 'info)
     (define-key map "m" 'mail)
     (define-key map "n" 'make-frame)
-    (define-key map [mouse-1] (lambda () (interactive)
-                                (with-current-buffer "*Messages*"
-                                  (goto-char (point-max))
-                                  (display-buffer (current-buffer)))))
+    (define-key map [mouse-1] 'view-echo-area-messages)
     ;; So the global down-mouse-1 binding doesn't clutter the execution of the
     ;; above mouse-1 binding.
     (define-key map [down-mouse-1] #'ignore)
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 4f7d8092891..ea318ec3250 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -3297,7 +3297,6 @@ system TYPE.")
                      (name (ange-ftp-quote-string (nth 2 parsed)))
                      (temp (ange-ftp-make-tmp-name host))
                      (binary (ange-ftp-binary-file filename))
-                     (buffer-file-type buffer-file-type)
                      (abbr (ange-ftp-abbreviate-filename filename))
                      (coding-system-used last-coding-system-used)
                      size)
@@ -3322,10 +3321,7 @@ system TYPE.")
                            size
                            (nth 1 (ange-ftp-real-insert-file-contents
                                    temp visit beg end replace))
-                           coding-system-used last-coding-system-used
-                           ;; override autodetection of buffer file type
-                           ;; to ensure buffer is saved in DOS format
-                           buffer-file-type binary)
+                           coding-system-used last-coding-system-used)
                         (signal 'ftp-error
                                 (list
                                  "Opening input file:"
diff --git a/lisp/subr.el b/lisp/subr.el
index 31cbb9a0a8a..db2b6a8eaad 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1229,7 +1229,6 @@ is converted into a string by expressing it in decimal."
 (make-obsolete-variable 'default-scroll-down-aggressively 'scroll-down-aggressively "23.2")
 (make-obsolete-variable 'default-fill-column 'fill-column "23.2")
 (make-obsolete-variable 'default-cursor-type 'cursor-type "23.2")
-(make-obsolete-variable 'default-buffer-file-type 'buffer-file-type "23.2")
 (make-obsolete-variable 'default-cursor-in-non-selected-windows 'cursor-in-non-selected-windows "23.2")
 (make-obsolete-variable 'default-buffer-file-coding-system 'buffer-file-coding-system "23.2")
 (make-obsolete-variable 'default-major-mode 'major-mode "23.2")
@@ -2622,15 +2621,6 @@ When the hook runs, the temporary buffer is current.
 This hook is normally set up with a function to put the buffer in Help
 mode.")
 
-(defvar-local buffer-file-type nil
-  "Non-nil if the visited file is a binary file.
-This variable is meaningful on MS-DOG and MS-Windows.
-On those systems, it is automatically local in every buffer.
-On other systems, this variable is normally always nil.
-
-WARNING: This variable is obsolete and will disappear Real Soon Now.
-Don't use it!")
-
 ;; The `assert' macro from the cl package signals
 ;; `cl-assertion-failed' at runtime so always define it.
 (put 'cl-assertion-failed 'error-conditions '(error))