diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-05-25 16:14:21 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2007-05-25 16:14:21 +0000 |
| commit | 09d524014399810482bcc6268af18aaeb4de0cb5 (patch) | |
| tree | a1adfaeffde6001135beedf6d900bb3a0d0a517a /lisp | |
| parent | 6ab93c85b827be908a86135d8f303cfea79d1e4b (diff) | |
| download | emacs-09d524014399810482bcc6268af18aaeb4de0cb5.tar.gz | |
(compose-region, decompose-region):
Use inhibit-read-only and restore-buffer-modified-p.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/composite.el | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a2976615ad1..8c38ef07b0a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2007-05-25 Stefan Monnier <monnier@iro.umontreal.ca> + * composite.el (compose-region, decompose-region): + Use inhibit-read-only and restore-buffer-modified-p. + * xt-mouse.el (xterm-mouse-truncate-wrap): New function. (xterm-mouse-event): Use it. diff --git a/lisp/composite.el b/lisp/composite.el index ede7d023e87..f22c6b52da0 100644 --- a/lisp/composite.el +++ b/lisp/composite.el @@ -194,7 +194,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) @@ -208,9 +208,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))) ;;;###autoload (defun compose-string (string &optional start end components modification-func) @@ -372,8 +372,8 @@ after a sequence of character events." ;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars) -;;; 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. ;;;###autoload (defun decompose-composite-char (char &optional type with-composition-rule) @@ -392,5 +392,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 |