HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged from emacs@sv.gnu.org
[bpt/emacs.git]
/
lisp
/
international
/
mule.el
diff --git
a/lisp/international/mule.el
b/lisp/international/mule.el
index
1cce13c
..
9ddb666
100644
(file)
--- a/
lisp/international/mule.el
+++ b/
lisp/international/mule.el
@@
-1871,7
+1871,13
@@
The optional second arg VISIT non-nil means that we are visiting a file."
(let ((pos-marker (copy-marker (+ (point) inserted)))
;; Prevent locking.
(buffer-file-name nil))
(let ((pos-marker (copy-marker (+ (point) inserted)))
;; Prevent locking.
(buffer-file-name nil))
- (set-buffer-multibyte nil)
+ (if visit
+ ;; If we're doing this for find-file,
+ ;; don't record undo info; this counts as
+ ;; part of producing the buffer's initial contents.
+ (let ((buffer-undo-list t))
+ (set-buffer-multibyte nil))
+ (set-buffer-multibyte nil))
(setq inserted (- pos-marker (point)))))
(set-buffer-modified-p modified-p))))
inserted)
(setq inserted (- pos-marker (point)))))
(set-buffer-modified-p modified-p))))
inserted)