diff options
| author | David Kastrup | 2004-12-29 10:06:44 +0000 |
|---|---|---|
| committer | David Kastrup | 2004-12-29 10:06:44 +0000 |
| commit | f4b483aa362dcb2b1ebc821eec258022bc4d6fa3 (patch) | |
| tree | 3782b123352cc0ea7af72c6379771d511a811ab1 | |
| parent | a2db4c6b3b55b2581f32523c698026308a3a5fad (diff) | |
| download | emacs-f4b483aa362dcb2b1ebc821eec258022bc4d6fa3.tar.gz emacs-f4b483aa362dcb2b1ebc821eec258022bc4d6fa3.zip | |
(decode-coding-inserted-region): Don't
barf if `buffer-undo-list' is already set to `t'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/international/mule.el | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 206063923b0..fb0c46c9a61 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2004-12-29 David Kastrup <dak@gnu.org> | ||
| 2 | |||
| 3 | * international/mule.el (decode-coding-inserted-region): Don't | ||
| 4 | barf if `buffer-undo-list' is already set to `t'. | ||
| 5 | |||
| 1 | 2004-12-29 Jay Belanger <belanger@truman.edu> | 6 | 2004-12-29 Jay Belanger <belanger@truman.edu> |
| 2 | 7 | ||
| 3 | * calc/calc-prog.el (calc-user-define-formula): Put default values | 8 | * calc/calc-prog.el (calc-user-define-formula): Put default values |
diff --git a/lisp/international/mule.el b/lisp/international/mule.el index ea227ea7e9f..3a8560f29fb 100644 --- a/lisp/international/mule.el +++ b/lisp/international/mule.el | |||
| @@ -1893,7 +1893,7 @@ Part of the job of this function is setting `buffer-undo-list' appropriately." | |||
| 1893 | ;; Otherwise, if we can recognize the undo elt for the insertion, | 1893 | ;; Otherwise, if we can recognize the undo elt for the insertion, |
| 1894 | ;; remove it and get ready to replace it later. | 1894 | ;; remove it and get ready to replace it later. |
| 1895 | ;; In the mean time, turn off undo recording. | 1895 | ;; In the mean time, turn off undo recording. |
| 1896 | (let ((last (car buffer-undo-list))) | 1896 | (let ((last (car-safe buffer-undo-list))) |
| 1897 | (if (and (consp last) (eql (car last) from) (eql (cdr last) to)) | 1897 | (if (and (consp last) (eql (car last) from) (eql (cdr last) to)) |
| 1898 | (setq undo-list-saved (cdr buffer-undo-list) | 1898 | (setq undo-list-saved (cdr buffer-undo-list) |
| 1899 | buffer-undo-list t)))) | 1899 | buffer-undo-list t)))) |