Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 773)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-211

1 files changed, 6 insertions, 6 deletions

diff --git a/lisp/composite.el b/lisp/composite.el
index b5da251bb85..99cbd85cf01 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -214,7 +214,7 @@ adjust the composition when it gets invalid because of a change of
 text in the composition."
   (interactive "r")
   (let ((modified-p (buffer-modified-p))
-	(buffer-read-only nil))
+	(inhibit-read-only t))
     (if (or (vectorp components) (listp components))
 	(setq components (encode-composition-components components)))
     (compose-region-internal start end components modification-func)
@@ -227,9 +227,9 @@ When called from a program, expects two arguments,
 positions (integers or markers) specifying the region."
   (interactive "r")
   (let ((modified-p (buffer-modified-p))
-	(buffer-read-only nil))
+	(inhibit-read-only t))
     (remove-text-properties start end '(composition nil))
-    (set-buffer-modified-p modified-p)))
+    (restore-buffer-modified-p modified-p)))
 
 (defun compose-string (string &optional start end components modification-func)
   "Compose characters in string STRING.
@@ -648,8 +648,8 @@ With arg, enable it iff arg is positive."
       (set-buffer-modified-p modified-p))))
 
 
-;;; The following codes are only for backward compatibility with Emacs
-;;; 20.4 and earlier.
+;; The following codes are only for backward compatibility with Emacs
+;; 20.4 and earlier.
 
 (defun decompose-composite-char (char &optional type with-composition-rule)
   "Convert CHAR to string.
@@ -666,5 +666,5 @@ Optional 3rd arg WITH-COMPOSITION-RULE is ignored."
 
 
 
-;;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33
+;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33
 ;;; composite.el ends here