Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-14

Update unicode-branch version numbers and ChangeLog file names

2005-02-12  Miles Bader  <miles@gnu.org>

   * etc/TODO, etc/PROBLEMS, etc/NEWS: Replace references to Emacs version "22"
   with "23".

2005-02-12  Miles Bader  <miles@gnu.org>

   * lisp/version.el (emacs-version): Change to "23.0.0".

   * lisp/descr-text.el (describe-char-unidata-list):
   Replace references to Emacs version "22" with "23".
   * lisp/emacs-lisp/bytecomp.el (byte-compile-fix-header)
   (byte-compile-insert-header): Likewise.
   * lisp/international/mule.el (charset-list, set-coding-priority)
   (ignore-relative-composition): Likewise.
   * lisp/international/mule-util.el (detect-coding-with-priority): Likewise.
   * lisp/international/mule-diag.el: Likewise.
   * lisp/international/mule-cmds.el (language-info-custom-alist): Likewise.
   * lisp/international/codepage.el (codepage-setup): Likewise.

2005-02-13  Miles Bader  <miles@gnu.org>

   Rename unicode-branch-specific ChangeLog files to
   "ChangeLog.unicode" from "ChangeLog.22"

16 files changed, 48 insertions, 33 deletions

diff --git a/lisp/ChangeLog.22 b/lisp/ChangeLog.unicode
index 70e3c6af16e..4b21ba2503e 100644
--- a/lisp/ChangeLog.22
+++ b/lisp/ChangeLog.unicode
@@ -1,3 +1,18 @@
+2005-02-12  Miles Bader  <miles@gnu.org>
+
+        * version.el (emacs-version): Change to "23.0.0".
+
+        * descr-text.el (describe-char-unidata-list):
+        Replace references to Emacs version "22" with "23".
+        * emacs-lisp/bytecomp.el (byte-compile-fix-header)
+        (byte-compile-insert-header): Likewise.
+        * international/mule.el (charset-list, set-coding-priority)
+        (ignore-relative-composition): Likewise.
+        * international/mule-util.el (detect-coding-with-priority): Likewise.
+        * international/mule-diag.el: Likewise.
+        * international/mule-cmds.el (language-info-custom-alist): Likewise.
+        * international/codepage.el (codepage-setup): Likewise.
+
 2005-02-13  Kenichi Handa  <handa@m17n.org>
 
         * case-table.el: Adjust code merged from trunk for unicode
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 88eac3f0a14..d8ef9be6f81 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -217,7 +217,7 @@ otherwise."
 (defcustom describe-char-unidata-list nil
   "List of Unicode-based character property names shown by `describe-char'."
   :group 'mule
-  :version "22.1"
+  :version "23.1"
   :type '(set
           (const :tag "Unicode Name" name)
           (const :tag "Unicode general category " general-category)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 217f28f2a81..3c5a1d14d72 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,7 +1,7 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
-;;   2003, 2004  Free Software Foundation, Inc.
+;;   2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;      Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -1845,9 +1845,9 @@ With argument, insert value in current buffer after the form."
                 ";;; and therefore cannot be loaded into Emacs 21 or earlier.\n")
         ;; Replace "19" or "19.29" with "22", twice.
         (re-search-forward "19\\(\\.[0-9]+\\)")
-        (replace-match "22")
+        (replace-match "23")
         (re-search-forward "19\\(\\.[0-9]+\\)")
-        (replace-match "22")
+        (replace-match "23")
         ;; Now compensate for the change in size,
         ;; to make sure all positions in the file remain valid.
         (setq delta (- (point-max) old-header-end))
@@ -1862,7 +1862,7 @@ With argument, insert value in current buffer after the form."
     (set-buffer outbuffer)
     (goto-char 1)
     ;; The magic number of .elc files is ";ELC", or 0x3B454C43.  After
-    ;; that is the file-format version number (18, 19, 20, or 22) as a
+    ;; that is the file-format version number (18, 19, 20, or 23) as a
     ;; byte, followed by some nulls.  The primary motivation for doing
     ;; this is to get some binary characters up in the first line of
     ;; the file so that `diff' will simply say "Binary files differ"
@@ -1874,7 +1874,7 @@ With argument, insert value in current buffer after the form."
 
     (insert
      ";ELC"
-     (if (byte-compile-version-cond byte-compile-compatibility) 18 22)
+     (if (byte-compile-version-cond byte-compile-compatibility) 18 23)
      "\000\000\000\n"
      )
     (insert ";;; Compiled by "
diff --git a/lisp/gnus/ChangeLog.22 b/lisp/gnus/ChangeLog.unicode
index 4fcde1f3c09..4fcde1f3c09 100644
--- a/lisp/gnus/ChangeLog.22
+++ b/lisp/gnus/ChangeLog.unicode
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index e30e9a6b123..c894d87904d 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3582,8 +3582,8 @@ It should typically alter the sending method in some way or other."
           (when (let ((char (char-after)))
                   (or (< (mm-char-int char) 128)
                       (and (mm-multibyte-p)
-                           ;; Fixme: Wrong for Emacs 22 and for things
-                           ;; like undecable utf-8.  Should at least
+                           ;; Fixme: Wrong for Emacs 23 and for things
+                           ;; like undectable utf-8.  Should at least
                            ;; use find-coding-systems-region.
                            (memq (char-charset char)
                                  '(eight-bit-control eight-bit-graphic
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index bfda1591a2e..3cccf0f4049 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1,5 +1,5 @@
 ;;; mm-util.el --- Utility functions for Mule and low level things
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -288,7 +288,7 @@ with Mule charsets.  It is completely useless for Emacs."
           cs mime mule alist)
       (while css
         (setq cs (pop css)
-              mime (or (coding-system-get cs :mime-charset) ; Emacs 22
+              mime (or (coding-system-get cs :mime-charset) ; Emacs 23
                        (coding-system-get cs 'mime-charset)))
         (when (and mime
                    (not (eq t (setq mule
@@ -648,7 +648,7 @@ charset, and a longer list means no appropriate charset."
         ;; Otherwise, we'll get nil, and the next setq will get invoked.
         (setq charsets (mm-xemacs-find-mime-charset b e))
 
-        ;; Fixme: won't work for unibyte Emacs 22:
+        ;; Fixme: won't work for unibyte Emacs 23:
 
         ;; We're not multibyte, or a single coding system won't cover it.
         (setq charsets
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index 6a27b20eb1e..67ee8883f08 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -1,6 +1,6 @@
 ;;; qp.el --- Quoted-Printable functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
@@ -102,7 +102,7 @@ encode lines starting with \"From\"."
   (interactive "r")
   (save-excursion
     (goto-char from)
-    (if (fboundp 'string-to-multibyte)  ; Emacs 22
+    (if (fboundp 'string-to-multibyte)  ; Emacs 23
         (if (re-search-forward (string-to-multibyte "[^\x0-\x7f\x80-\xff]")
                                to t)
             ;; Fixme: This is somewhat misleading.
@@ -122,7 +122,7 @@ encode lines starting with \"From\"."
                   (not (eobp)))
         (insert
          (prog1
-             ;; To unibyte in case of Emacs 22 eight-bit.
+             ;; To unibyte in case of Emacs 23 eight-bit.
              (format "=%02X" (mm-multibyte-char-to-unibyte (char-after)))
            (delete-char 1))))
       ;; Encode white space at the end of lines.
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index e6461bf2627..e5022897aaf 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -1,5 +1,5 @@
 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
-;; Copyright (C) 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2002, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;      MORIOKA Tomohiko <morioka@jaist.ac.jp>
@@ -277,7 +277,7 @@ The buffer may be narrowed."
   ;; (make-char-table 'syntax-table '(2)) only works in Emacs.
   (let ((table (make-syntax-table)))
     ;; The following is done to work for setting all elements of the table
-    ;; in Emacs 21 and 22 and XEmacs; it appears to be the cleanest way.
+    ;; in Emacs 21-23 and XEmacs; it appears to be the cleanest way.
     ;; Play safe and don't assume the form of the word syntax entry --
     ;; copy it from ?a.
     (if (fboundp 'set-char-table-range) ; Emacs
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index 65f364acfbb..82e1bf3dfd6 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -1,5 +1,5 @@
 ;;; utf7.el --- UTF-7 encoding/decoding for Emacs   -*-coding: iso-8859-1;-*-
-;; Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2003, 2005 Free Software Foundation, Inc.
 
 ;; Author: Jon K Hellan <hellan@acm.org>
 ;; Maintainer: bugs@gnus.org
@@ -78,7 +78,7 @@
 (defconst utf7-utf-16-coding-system
   (cond ((mm-coding-system-p 'utf-16-be-no-signature) ; Mule-UCS
          'utf-16-be-no-signature)
-        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 22.1
+        ((and (mm-coding-system-p 'utf-16-be) ; Emacs 23.1
               ;; Avoid versions with BOM.
               (= 2 (length (encode-coding-string "a" 'utf-16-be))))
          'utf-16-be)
diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el
index e4880bd56ac..b9c819b7524 100644
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -1,6 +1,6 @@
 ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems
 
-;; Copyright (C) 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2005 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF
@@ -137,7 +137,7 @@
 (defun codepage-setup (&optional codepage)
   "Obsolete.  All coding systems are set up initially."
   (interactive))
-(make-obsolete 'codepage-setup "no longer relevant" "22.1")
+(make-obsolete 'codepage-setup "no longer relevant" "23.1")
 
 (provide 'codepage)
 
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index acebb3b8d70..74bcfdefc2b 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1800,7 +1800,7 @@ remove them from the language info until you next restart Emacs.
 Setting this variable directly does not take effect.  See
 `set-language-info-alist' for use in programs."
   :group 'mule
-  :version "22.1"
+  :version "23.1"
   :set (lambda (s v)
          (custom-set-default s v)
          ;; Can't do this before language environments are set up.
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 2ce49981cf2..a4423a67181 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -203,14 +203,14 @@ SORT-KEY should be `name' or `iso-spec' (default `name')."
 
 (defvar non-iso-charset-alist nil
   "Obsolete.")
-(make-obsolete-variable 'non-iso-charset-alist "no longer relevant" "22.1")
+(make-obsolete-variable 'non-iso-charset-alist "no longer relevant" "23.1")
 
 (defun decode-codepage-char (codepage code)
   "Decode a character that has code CODE in CODEPAGE.
 Return a decoded character string.  Each CODEPAGE corresponds to a
 coding system cpCODEPAGE.  This function is obsolete."
   (decode-char (intern (format "cp%d" codepage)) code))
-(make-obsolete 'decode-codepage-char 'decode-char "22.1")
+(make-obsolete 'decode-codepage-char 'decode-char "23.1")
 
 ;; A variable to hold charset input history.
 (defvar charset-history nil)
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index 14358926968..bfaffba230d 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -340,7 +340,7 @@ coding systems ordered by priority."
   `(with-coding-priority (mapcar #'cdr ,priority-list)
      (detect-coding-region ,from ,to)))
 (make-obsolete 'detect-coding-with-priority
-               "Use with-coding-priority and detect-coding-region" "22.1")
+               "Use with-coding-priority and detect-coding-region" "23.1")
 
 ;;;###autoload
 (defun detect-coding-with-language-environment (from to lang-env)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 70840654b40..93e64e447c0 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -467,17 +467,17 @@ Return -1 if charset isn't an ISO 2022 one."
 This function is provided for backward compatibility.
 Now we have the variable `charset-list'."
   charset-list)
-(make-obsolete 'charset-list "Use variable `charset-list'" "22.1")
+(make-obsolete 'charset-list "Use variable `charset-list'" "23.1")
 
 
 ;;; CHARACTER
 (defalias 'char-valid-p 'characterp)
-(make-obsolete 'char-valid-p 'characterp "22.1")
+(make-obsolete 'char-valid-p 'characterp "23.1")
 
 (defun generic-char-p (char)
   "Always return nil.  This is provided for backward compatibility."
   nil)
-(make-obsolete 'generic-char-p "Generic characters no longer exist" "22.1")
+(make-obsolete 'generic-char-p "Generic characters no longer exist" "23.1")
 
 (defun make-char-internal (charset-id &optional code1 code2)
   (let ((charset (aref emacs-mule-charset-table charset-id)))
@@ -1311,7 +1311,7 @@ This function is provided for backward compatibility.
 Now we have more convenient function `set-coding-system-priority'."
   (apply 'set-coding-system-priority
          (mapcar #'(lambda (x) (symbol-value x)) arg)))
-(make-obsolete 'set-coding-priority 'set-coding-system-priority "22.1")
+(make-obsolete 'set-coding-priority 'set-coding-system-priority "23.1")
 
 ;;; X selections
 
@@ -2136,7 +2136,7 @@ Analogous to `define-translation-table', but updates
       (make-char-table 'ignore-relative-composition))
 
 (make-obsolete 'set-char-table-default
-               "Generic characters no longer exist" "22.1")
+               "Generic characters no longer exist" "23.1")
 
 ;;; Built-in auto-coding-functions:
 
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index f574144f4b0..c0ba69f80c2 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -1,6 +1,6 @@
 ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
 
-;; Copyright 1989, 1993, 1994, 1995, 1997, 2000, 2001
+;; Copyright 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2005
 ;;;     Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -687,7 +687,7 @@ around literals."
 ;;; Some functions used in time-stamp-format
 
 ;;; These functions have been obsolete since 1995
-;;; and will be removed in Emacs 22.
+;;; and will be removed in Emacs 23.
 ;;; Meanwhile, discourage other packages from using them.
 (let ((obsolete-functions '(time-stamp-month-dd-yyyy
                             time-stamp-dd/mm/yyyy
diff --git a/lisp/version.el b/lisp/version.el
index dbd6142641e..43b2c90f74f 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,6 +1,6 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
-;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001
+;;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2005
 ;;;   Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
@@ -27,7 +27,7 @@
 
 ;;; Code:
 
-(defconst emacs-version "22.0.0" "\
+(defconst emacs-version "23.0.0" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version