[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110960: Partial fix for bug #12989 with buffer-file-type annoyances.

[Eli Zaretskii]

------------------------------------------------------------
revno: 110960
fixes bug: http://debbugs.gnu.org/12989
committer: Eli Zaretskii <address@hidden>
branch nick: emacs-24
timestamp: Mon 2012-11-26 19:09:04 +0200
message:
  Partial fix for bug #12989 with buffer-file-type annoyances.
  
   lisp/subr.el (buffer-file-type): Declare with defvar-local.  Doc fix.
   lisp/dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
   Don't set buffer-file-type.  Return nil.
modified:
  lisp/ChangeLog
  lisp/dos-w32.el
  lisp/subr.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-26 01:41:00 +0000
+++ b/lisp/ChangeLog    2012-11-26 17:09:04 +0000
@@ -1,3 +1,10 @@
+2012-11-26  Eli Zaretskii  <address@hidden>
+
+       * subr.el (buffer-file-type): Declare with defvar-local.  Doc fix.
+
+       * dos-w32.el (find-file-not-found-set-buffer-file-coding-system):
+       Don't set buffer-file-type.  (Bug#12989)
+
 2012-11-26  Glenn Morris  <address@hidden>
 
        * hippie-exp.el (hippie-expand-try-functions-list):

=== modified file 'lisp/dos-w32.el'
--- a/lisp/dos-w32.el   2012-07-29 08:18:29 +0000
+++ b/lisp/dos-w32.el   2012-11-26 17:09:04 +0000
@@ -210,7 +210,7 @@
                     (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)))))
+      nil)))
 
 ;;; To set the default coding system on new files.
 (add-hook 'find-file-not-found-functions

=== modified file 'lisp/subr.el'
--- a/lisp/subr.el      2012-11-17 02:03:58 +0000
+++ b/lisp/subr.el      2012-11-26 17:09:04 +0000
@@ -2632,13 +2632,14 @@
 This hook is normally set up with a function to put the buffer in Help
 mode.")
 
-;; Avoid compiler warnings about this variable,
-;; which has a special meaning on certain system types.
-(defvar buffer-file-type nil
+(defvar-local buffer-file-type nil
   "Non-nil if the visited file is a binary file.
-This variable is meaningful on MS-DOG and Windows NT.
+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.")
+On other systems, this variable is normally always nil.
+
+WARNING: This variable is obsolete and will disapper Real Soon Now.
+Don't use it!")
 
 ;; The `assert' macro from the cl package signals
 ;; `cl-assertion-failed' at runtime so always define it.