diff options
| author | Stefan Monnier | 2015-03-11 11:06:11 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2015-03-11 11:06:11 -0400 |
| commit | 2401274b239e837ec274b373ba0f2848faaea7b2 (patch) | |
| tree | a1dbcdcadfffffb23f2d720d19aad12332966fe5 | |
| parent | b90f502cc18b60644ce3898699589ecd9653b397 (diff) | |
| download | emacs-2401274b239e837ec274b373ba0f2848faaea7b2.tar.gz emacs-2401274b239e837ec274b373ba0f2848faaea7b2.zip | |
* international/quail.el (quail-input-method): Use with-silent-modifications
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/international/quail.el | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c5d2e6c95fd..35689c1e8d2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2015-03-11 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2015-03-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * international/quail.el (quail-input-method): | ||
| 4 | Use with-silent-modifications. | ||
| 5 | |||
| 3 | * simple.el (goto-history-element): Don't burp on t history. | 6 | * simple.el (goto-history-element): Don't burp on t history. |
| 4 | 7 | ||
| 5 | 2015-03-10 Paul Eggert <eggert@cs.ucla.edu> | 8 | 2015-03-10 Paul Eggert <eggert@cs.ucla.edu> |
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 2755fd68bef..5e422bf5fdb 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el | |||
| @@ -202,7 +202,7 @@ It is an alist of translations and corresponding keys." | |||
| 202 | See also the documentation of `quail-define-package'." | 202 | See also the documentation of `quail-define-package'." |
| 203 | (nth 11 quail-current-package)) | 203 | (nth 11 quail-current-package)) |
| 204 | (defsubst quail-overlay-plist () | 204 | (defsubst quail-overlay-plist () |
| 205 | "Return property list of an overly used in the current Quail package." | 205 | "Return property list of an overlay used in the current Quail package." |
| 206 | (nth 12 quail-current-package)) | 206 | (nth 12 quail-current-package)) |
| 207 | (defsubst quail-update-translation-function () | 207 | (defsubst quail-update-translation-function () |
| 208 | "Return a function for updating translation in the current Quail package." | 208 | "Return a function for updating translation in the current Quail package." |
| @@ -1335,9 +1335,7 @@ If STR has `advice' text property, append the following special event: | |||
| 1335 | overriding-local-map) | 1335 | overriding-local-map) |
| 1336 | (list key) | 1336 | (list key) |
| 1337 | (quail-setup-overlays (quail-conversion-keymap)) | 1337 | (quail-setup-overlays (quail-conversion-keymap)) |
| 1338 | (let ((modified-p (buffer-modified-p)) | 1338 | (with-silent-modifications |
| 1339 | (buffer-undo-list t) | ||
| 1340 | (inhibit-modification-hooks t)) | ||
| 1341 | (unwind-protect | 1339 | (unwind-protect |
| 1342 | (let ((input-string (if (quail-conversion-keymap) | 1340 | (let ((input-string (if (quail-conversion-keymap) |
| 1343 | (quail-start-conversion key) | 1341 | (quail-start-conversion key) |
| @@ -1349,7 +1347,6 @@ If STR has `advice' text property, append the following special event: | |||
| 1349 | (list (aref input-string 0)) | 1347 | (list (aref input-string 0)) |
| 1350 | (quail-input-string-to-events input-string)))) | 1348 | (quail-input-string-to-events input-string)))) |
| 1351 | (quail-delete-overlays) | 1349 | (quail-delete-overlays) |
| 1352 | (set-buffer-modified-p modified-p) | ||
| 1353 | ;; Run this hook only when the current input method doesn't require | 1350 | ;; Run this hook only when the current input method doesn't require |
| 1354 | ;; conversion. When conversion is required, the conversion function | 1351 | ;; conversion. When conversion is required, the conversion function |
| 1355 | ;; should run this hook at a proper timing. | 1352 | ;; should run this hook at a proper timing. |