(bad-packages-alist): Revert previous change.

[gnu-emacs] / lisp / composite.el

diff --git a/lisp/composite.el b/lisp/composite.el
index 4f9faf2ccfa895e3e62aa576782ec20910b5f964..a2457ab75143936e39456c0f093ecc5ce9ac0bbd 100644 (file)
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -1,7 +1,8 @@
 ;;; composite.el --- support character composition
 
 ;;; composite.el --- support character composition
 

-;; Copyright (C) 1999 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021

 
 ;; Keywords: mule, multilingual, character composition
 
 
 ;; Keywords: mule, multilingual, character composition
 


@@ -9,7 +10,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)

 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,


@@ -19,8 +20,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the

-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -82,7 +83,7 @@ follows (the point `*' corresponds to both reference points):
 (defun encode-composition-rule (rule)
   "Encode composition rule RULE into an integer value.
 RULE is a cons of global and new reference point symbols
 (defun encode-composition-rule (rule)
   "Encode composition rule RULE into an integer value.
 RULE is a cons of global and new reference point symbols

-\(see reference-point-alist)."
+\(see `reference-point-alist')."

 
   ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE
   ;; defined in composite.h.
 
   ;; This must be compatible with C macro COMPOSITION_ENCODE_RULE
   ;; defined in composite.h.


@@ -193,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))
 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)
     (if (or (vectorp components) (listp components))
        (setq components (encode-composition-components components)))
     (compose-region-internal start end components modification-func)


@@ -207,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))
 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))
     (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)
 
 ;;;###autoload
 (defun compose-string (string &optional start end components modification-func)


@@ -219,7 +220,7 @@ The return value is STRING where `composition' property is put on all
 the characters in it.
 
 Optional 2nd and 3rd arguments START and END specify the range of
 the characters in it.
 
 Optional 2nd and 3rd arguments START and END specify the range of

-STRING to be composed.  They defaults to the beginning and the end of
+STRING to be composed.  They default to the beginning and the end of

 STRING respectively.
 
 Optional 4th argument COMPONENTS, if non-nil, is a character or a
 STRING respectively.
 
 Optional 4th argument COMPONENTS, if non-nil, is a character or a


@@ -355,11 +356,11 @@ The argument is a parameterized event of the form
 where N is the number of characters before point to compose,
 COMPONENTS, if non-nil, is the same as the argument to `compose-region'
 \(which see).  If it is nil, `compose-chars-after' is called,
 where N is the number of characters before point to compose,
 COMPONENTS, if non-nil, is the same as the argument to `compose-region'
 \(which see).  If it is nil, `compose-chars-after' is called,

-and that function find a proper rule to compose the target characters.
+and that function finds a proper rule to compose the target characters.

 This function is intended to be used from input methods.
 The global keymap binds special event `compose-last-chars' to this
 function.  Input method may generate an event (compose-last-chars N COMPONENTS)
 This function is intended to be used from input methods.
 The global keymap binds special event `compose-last-chars' to this
 function.  Input method may generate an event (compose-last-chars N COMPONENTS)

-after a sequence character events."
+after a sequence of character events."

   (interactive "e")
   (let ((chars (nth 1 args)))
     (if (and (numberp chars)
   (interactive "e")
   (let ((chars (nth 1 args)))
     (if (and (numberp chars)


@@ -371,8 +372,8 @@ after a sequence character events."
 ;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars)
 
 \f
 ;;;###autoload(global-set-key [compose-last-chars] 'compose-last-chars)
 
 \f

-;;; 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)
 
 ;;;###autoload
 (defun decompose-composite-char (char &optional type with-composition-rule)


@@ -391,5 +392,5 @@ Optional 3rd arg WITH-COMPOSITION-RULE is ignored."
 
 \f
 
 
 \f
 

-;;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33
+;; arch-tag: ee703d77-1723-45d4-a31f-e9f0f867aa33

 ;;; composite.el ends here
 ;;; composite.el ends here