Merged from emacs@sv.gnu.org

[gnu-emacs] / lisp / international / mule-util.el

diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 1d1fe5391164d8cdd8e05c1caf7c7e99dfbb093f..78ef30a56de7749269ebb62365776935340a02ed 100644 (file)
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -1,8 +1,11 @@
 ;;; mule-util.el --- utility functions for mulitilingual environment (mule)
 
-;; Copyright (C) 1995 Electrotechnical Laboratory, JAPAN.
-;; Licensed to the Free Software Foundation.
-;; Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007
+;;   National Institute of Advanced Industrial Science and Technology (AIST)
+;;   Registration Number H14PRO021
 
 ;; Keywords: mule, multilingual
 
@@ -20,8 +23,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
-;; 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:
 
@@ -61,7 +64,7 @@ TYPE should be `list' or `vector'."
 ;;;###autoload
 (make-obsolete 'string-to-sequence
               "use `string-to-list' or `string-to-vector'."
-              "21.4")
+              "22.1")
 
 ;;;###autoload
 (defsubst string-to-list (string)
@@ -208,12 +211,6 @@ defaults to \"...\"."
 ;;                      (prin1-to-string (cdr ret)))
 ;;            (prin1-to-string ret))))))
 
-;;; For backward compatibility ...
-;;;###autoload
-(defalias 'truncate-string 'truncate-string-to-width)
-
-;;;###autoload
-(make-obsolete 'truncate-string 'truncate-string-to-width "20.1")
 \f
 ;;; Nested alist handler.  Nested alist is alist whose elements are
 ;;; also nested alist.
@@ -314,19 +311,6 @@ Optional 3rd argument NIL-FOR-TOO-LONG non-nil means return nil
   "Return the value of CODING-SYSTEM's `translation-table-for-encode' property."
   (coding-system-get coding-system 'translation-table-for-encode))
 
-;;;###autoload
-(defun coding-system-equal (coding-system-1 coding-system-2)
-  "Return t if and only if CODING-SYSTEM-1 and CODING-SYSTEM-2 are identical.
-Two coding systems are identical if two symbols are equal
-or one is an alias of the other."
-  (or (eq coding-system-1 coding-system-2)
-      (and (equal (coding-system-spec coding-system-1)
-                 (coding-system-spec coding-system-2))
-          (let ((eol-type-1 (coding-system-eol-type coding-system-1))
-                (eol-type-2 (coding-system-eol-type coding-system-2)))
-            (or (eq eol-type-1 eol-type-2)
-                (and (vectorp eol-type-1) (vectorp eol-type-2)))))))
-
 ;;;###autoload
 (defmacro detect-coding-with-priority (from to priority-list)
   "Detect a coding system of the text between FROM and TO with PRIORITY-LIST.
@@ -340,6 +324,8 @@ coding systems ordered by priority."
         (mapc (function (lambda (x) (set (car x) (cdr x))))
               prio-list)
         (set-coding-priority (mapcar #'car prio-list))
+        ;; Changing the binding of a coding category requires this call.
+        (update-coding-systems-internal)
         (detect-coding-region ,from ,to))
      ;; We must restore the internal database.
      (set-coding-priority coding-category-list)
@@ -369,6 +355,9 @@ basis, this may not be accurate."
   (cond ((< char 256)
         ;; Single byte characters are always displayable.
         t)
+       ((not enable-multibyte-characters)
+        ;; Maybe there's a font for it, but we can't put it in the buffer.
+        nil)
        ((display-multi-font-p)
         ;; On a window system, a character is displayable if we have
         ;; a font for that character in the default face of the
@@ -390,5 +379,5 @@ basis, this may not be accurate."
 ;; coding: iso-2022-7bit
 ;; End:
 
-;;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
+;; arch-tag: 5bdb52b6-a3a5-4529-b7a0-37d01b0e570b
 ;;; mule-util.el ends here