mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(format-insert-file): Make sure that at most one undo

Browse source 
entry is recorded for the insertion.  Inhibit point-motion and
modification hooks around call to insert-file-contents.
This commit is contained in:
Martin Rudalics 2007-08-07 12:43:40 +00:00
parent 6f2528d8d8
commit f70aa678ca
2 changed files with 34 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,3 +1,9 @@
2007-08-07 Martin Rudalics <rudalics@gmx.at>
* format.el (format-insert-file): Make sure that at most one undo
entry is recorded for the insertion. Inhibit point-motion and
modification hooks around call to insert-file-contents.
2007-08-07 Stefan Monnier <monnier@iro.umontreal.ca>
* vc.el (vc-annotate): Select temp-buffer before running vc-exec-after.

35
lisp/format.el
View file

@ -429,13 +429,34 @@ a list (ABSOLUTE-FILE-NAME SIZE)."
(fmt (format-read (format "Read file `%s' in format: "
(file-name-nondirectory file)))))
(list file fmt)))
(let (value size)
(let ((format-alist nil))
(setq value (insert-file-contents filename nil beg end))
(setq size (nth 1 value)))
(if format
(setq size (format-decode format size)
value (list (car value) size)))
(let (value size old-undo)
;; Record only one undo entry for the insertion. Inhibit point-motion and
;; modification hooks as with `insert-file-contents'.
(let ((inhibit-point-motion-hooks t)
(inhibit-modification-hooks t))
;; Don't bind `buffer-undo-list' to t here to assert that
;; `insert-file-contents' may record whether the buffer was unmodified
;; before.
(let ((format-alist nil))
(setq value (insert-file-contents filename nil beg end))
(setq size (nth 1 value)))
(when (consp buffer-undo-list)
(let ((head (car buffer-undo-list)))
(when (and (consp head)
(equal (car head) (point))
(equal (cdr head) (+ (point) size)))
;; Remove first entry from `buffer-undo-list', we shall insert
;; another one below.
(setq old-undo (cdr buffer-undo-list)))))
(when format
(let ((buffer-undo-list t))
(setq size (format-decode format size)
value (list (car value) size)))
(unless (eq buffer-undo-list t)
(setq buffer-undo-list
(cons (cons (point) (+ (point) size)) old-undo)))))
(unless inhibit-modification-hooks
(run-hook-with-args 'after-change-functions (point) (+ (point) size) 0))
value))
(defun format-read (&optional prompt)