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 @@
 2015-03-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * international/quail.el (quail-input-method):
+        Use with-silent-modifications.
+
         * simple.el (goto-history-element): Don't burp on t history.
 
 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."
 See also the documentation of `quail-define-package'."
   (nth 11 quail-current-package))
 (defsubst quail-overlay-plist ()
-  "Return property list of an overly used in the current Quail package."
+  "Return property list of an overlay used in the current Quail package."
   (nth 12 quail-current-package))
 (defsubst quail-update-translation-function ()
   "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:
           overriding-local-map)
       (list key)
     (quail-setup-overlays (quail-conversion-keymap))
-    (let ((modified-p (buffer-modified-p))
-          (buffer-undo-list t)
-          (inhibit-modification-hooks t))
+    (with-silent-modifications
       (unwind-protect
           (let ((input-string (if (quail-conversion-keymap)
                                   (quail-start-conversion key)
@@ -1349,7 +1347,6 @@ If STR has `advice' text property, append the following special event:
                   (list (aref input-string 0))
                 (quail-input-string-to-events input-string))))
         (quail-delete-overlays)
-        (set-buffer-modified-p modified-p)
         ;; Run this hook only when the current input method doesn't require
         ;; conversion.  When conversion is required, the conversion function
         ;; should run this hook at a proper timing.