[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp info.el
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] emacs/lisp info.el |
Date: |
Sat, 10 Jan 2009 10:42:08 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Eli Zaretskii <eliz> 09/01/10 10:42:08
Modified files:
lisp : info.el
Log message:
Fix Bug #876:
(info-insert-file-contents, Info-insert-dir): Bind
inhibit-null-byte-detection
to non-nil.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/info.el?cvsroot=emacs&r1=1.556&r2=1.557
Patches:
Index: info.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/info.el,v
retrieving revision 1.556
retrieving revision 1.557
diff -u -b -r1.556 -r1.557
--- info.el 5 Jan 2009 03:19:25 -0000 1.556
+++ info.el 10 Jan 2009 10:42:08 -0000 1.557
@@ -461,13 +461,15 @@
(insert-file-contents-literally fullname visit)
(let ((inhibit-read-only t)
(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 (consp decoder)
(setq decoder (list decoder)))
(apply 'call-process-region (point-min) (point-max)
(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)
"Return non-nil value if FILE supports Info index cookies.
@@ -1094,7 +1096,10 @@
(or buffers
(message "Composing main Info directory..."))
(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)
(set (make-local-variable 'Info-dir-file-name)
file)
- [Emacs-diffs] emacs/lisp info.el,
Eli Zaretskii <=