Commit 8b5e8b42 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

Fix Bug #876:

(info-insert-file-contents, Info-insert-dir): Bind inhibit-null-byte-detection
to non-nil.
parent 97b1b294
2009-01-10 Eli Zaretskii <eliz@gnu.org>
Fix Bug #876:
* info.el (info-insert-file-contents, Info-insert-dir): Bind
inhibit-null-byte-detection to non-nil.
2009-01-10 Martin Rudalics <rudalics@gmx.at> 2009-01-10 Martin Rudalics <rudalics@gmx.at>
   
* tool-bar.el (tool-bar-mode): Modify all frame parameters when * tool-bar.el (tool-bar-mode): Modify all frame parameters when
......
...@@ -461,13 +461,15 @@ Do the right thing if the file has been compressed or zipped." ...@@ -461,13 +461,15 @@ Do the right thing if the file has been compressed or zipped."
(insert-file-contents-literally fullname visit) (insert-file-contents-literally fullname visit)
(let ((inhibit-read-only t) (let ((inhibit-read-only t)
(coding-system-for-write 'no-conversion) (coding-system-for-write 'no-conversion)
(inhibit-null-byte-detection t) ; Index nodes include null bytes
(default-directory (or (file-name-directory fullname) (default-directory (or (file-name-directory fullname)
default-directory))) default-directory)))
(or (consp decoder) (or (consp decoder)
(setq decoder (list decoder))) (setq decoder (list decoder)))
(apply 'call-process-region (point-min) (point-max) (apply 'call-process-region (point-min) (point-max)
(car decoder) t t nil (cdr decoder)))) (car decoder) t t nil (cdr decoder))))
(insert-file-contents fullname visit)))) (let ((inhibit-null-byte-detection t)) ; Index nodes include null bytes
(insert-file-contents fullname visit)))))
(defun Info-file-supports-index-cookies (&optional file) (defun Info-file-supports-index-cookies (&optional file)
"Return non-nil value if FILE supports Info index cookies. "Return non-nil value if FILE supports Info index cookies.
...@@ -1094,7 +1096,10 @@ a case-insensitive match is tried." ...@@ -1094,7 +1096,10 @@ a case-insensitive match is tried."
(or buffers (or buffers
(message "Composing main Info directory...")) (message "Composing main Info directory..."))
(condition-case nil (condition-case nil
(progn ;; Index nodes include null bytes. DIR
;; files should not have indices, but who
;; knows...
(let ((inhibit-null-byte-detection t))
(insert-file-contents file) (insert-file-contents file)
(set (make-local-variable 'Info-dir-file-name) (set (make-local-variable 'Info-dir-file-name)
file) file)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment