Sync to HEAD.

3 files changed, 14 insertions, 3 deletions

diff --git a/src/charset.c b/src/charset.c
index 8f044f1e1ad..a4967c65a9a 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1310,9 +1310,11 @@ check_iso_charset_parameter (dimension, chars, final_char)
 
 DEFUN ("declare-equiv-charset", Fdeclare_equiv_charset, Sdeclare_equiv_charset,
        4, 4, 0,
-       doc: /*
-Declare a charset of DIMENSION, CHARS, FINAL-CHAR is the same as CHARSET.
-CHARSET should be defined by `define-charset' in advance.  */)
+       doc: /* Declare an equivalent charset for ISO-2022 decoding.
+
+On decoding by an ISO-2022 base coding system, when a charset
+specified by DIMENSION, CHARS, and FINAL-CHAR is designated, behave as
+if CHARSET is designated instead.  */)
      (dimension, chars, final_char, charset)
      Lisp_Object dimension, chars, final_char, charset;
 {
@@ -2156,3 +2158,6 @@ syms_of_charset ()
 }
 
 #endif /* emacs */
+
+/* arch-tag: 66a89b8d-4c28-47d3-9ca1-56f78440d69f
+   (do not change this comment) */
diff --git a/src/charset.h b/src/charset.h
index a8e162d1a30..9213853ea5c 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -544,3 +544,6 @@ extern void map_charset_chars P_ ((void (*) (Lisp_Object, Lisp_Object),
 EXFUN (Funify_charset, 3);
 
 #endif /* EMACS_CHARSET_H */
+
+/* arch-tag: 3b96db55-4961-481d-ac3e-219f46a2b3aa
+   (do not change this comment) */
diff --git a/src/coding.h b/src/coding.h
index f5aae3467a0..83f6e0cbf28 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -775,3 +775,6 @@ extern char emacs_mule_bytes[256];
 extern int emacs_mule_string_char P_ ((unsigned char *));
 
 #endif /* EMACS_CODING_H */
+
+/* arch-tag: 2bc3b4fa-6870-4f64-8135-b962b2d290e4
+   (do not change this comment) */