diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0712f9a1fc8..5a9af8c42a0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 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. 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)) |