Unicode branch version updates

[Miles Bader]

I'd like to commit the following patch to the Emacs unicode branch.

It changes unicode-branch version references from "22" to "23", and renames
the unicode-branch-specific ChangeLog files to "ChangeLog.unicode" (from
"ChangeLog.22").

OK?

Thanks,

-Miles


Patch:

M  etc/NEWS
M  etc/ChangeLog.unicode
M  etc/PROBLEMS
M  lisp/international/mule-util.el
M  lisp/international/codepage.el
M  lisp/time-stamp.el
M  lisp/gnus/message.el
M  lisp/gnus/mm-util.el
M  lisp/gnus/utf7.el
M  lisp/international/mule.el
M  lisp/emacs-lisp/bytecomp.el
M  lisp/gnus/rfc2047.el
M  etc/TODO
M  lisp/international/mule-cmds.el
M  lisp/international/mule-diag.el
M  lisp/ChangeLog.unicode
M  lisp/gnus/qp.el
M  lisp/version.el
M  lisp/descr-text.el
=> admin/ChangeLog.22   admin/ChangeLog.unicode
=> etc/ChangeLog.22     etc/ChangeLog.unicode
=> leim/ChangeLog.22    leim/ChangeLog.unicode
=> lisp/ChangeLog.22    lisp/ChangeLog.unicode
=> lisp/gnus/ChangeLog.22       lisp/gnus/ChangeLog.unicode
=> src/ChangeLog.22     src/ChangeLog.unicode

* modified files

--- orig/etc/ChangeLog.22
+++ mod/etc/ChangeLog.unicode
@@ -1,3 +1,8 @@
+2005-02-12  Miles Bader  <address@hidden>
+
+       * TODO, PROBLEMS, NEWS: Replace references to Emacs version "22"
+       with "23".
+
 2004-02-12  Kenichi Handa  <address@hidden>
 
        * charsets/CNS-[234567].map: Regenerated.


--- orig/etc/NEWS
+++ mod/etc/NEWS
@@ -14,10 +14,10 @@
 When you add a new item, please add it without either +++ or ---
 so we will look at it and add it to the manual.
 
-Fixme: The notes about Emacs 22 are quite incomplete.
+Fixme: The notes about Emacs 23 are quite incomplete.
 
 
-* Changes in Emacs 22.1
+* Changes in Emacs 23.1
 
 ** The Emacs character set is now a superset of Unicode.  
 (It has about four times the code space, which should be plenty).
@@ -35,12 +35,12 @@
 Since the internal encoding is also used by default for byte-compiled
 files -- i.e. the normal coding system for byte-compiled Lisp files is
 now utf-8-Emacs -- Lisp containing non-ASCII characters which is
-compiled by Emacs 22 can't be read by earlier versions of Emacs.
-Files compiled by Emacs 20 or 21 are loaded correctly as emacs-mule
-(whether or not they contain multibyte characters), which makes
-loading them somewhat slower than Emacs 22-compiled files.  Thus it
-may be worth recompiling existing .elc files which don't need to be
-shared with older Emacsen.
+compiled by Emacs 23 can't be read by earlier versions of Emacs.  Files
+compiled by Emacs 20, 21, or 22 are loaded correctly as emacs-mule
+(whether or not they contain multibyte characters), which makes loading
+them somewhat slower than Emacs 23-compiled files.  Thus it may be worth
+recompiling existing .elc files which don't need to be shared with older
+Emacsen.
 
 ** There are assorted new coding systems/aliases -- see
 M-x list-coding-systems.
@@ -62,7 +62,7 @@
 Minor modes: unify-8859-on-encoding-mode, unify-8859-on-decoding-mode
 
 
-* Lisp changes in Emacs 22.1
+* Lisp changes in Emacs 23.1
 
 map-char-table's behaviour has changed.
 


--- orig/etc/PROBLEMS
+++ mod/etc/PROBLEMS
@@ -2,7 +2,7 @@
 in compiling, installing and running GNU Emacs.  Try doing Ctl-C Ctl-t
 and browsing through the outline headers.
 
-* Mule-UCS doesn't work in Emacs 22.
+* Mule-UCS doesn't work in Emacs 23.
 
 It's completely redundant now, as far as we know.
 


--- orig/etc/TODO
+++ mod/etc/TODO
@@ -31,7 +31,7 @@
 
 ** Provide user-friendly ways to list all available font families,
   display a font as a sample, etc.  [fx is looking at multilingual
-  font selection for Emacs 22.]
+  font selection for Emacs 23.]
 
 ** Program Enriched mode to read and save in RTF.  [Is there actually a
   decent single definition of RTF?  Maybe see info at
@@ -233,7 +233,7 @@
   (with ASCIIfied fallback via latin1-disp).  Examples include
   box-drawing graphics in Custom buffers, W3 rules and tables, and
   tree displays generally, mode-line mail indicator.  [See work done
-  already for Emacs 22 and consult fx.]
+  already for Emacs 23 and consult fx.]
 
 ** Do something to make rms happy with fx's dynamic loading, and use it
   to implement things like auto-loaded buffer parsers and database


--- orig/lisp/ChangeLog.22
+++ mod/lisp/ChangeLog.unicode
@@ -1,3 +1,18 @@
+2005-02-12  Miles Bader  <address@hidden>
+
+       * 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  <address@hidden>
 
        * case-table.el: Adjust code merged from trunk for unicode


--- orig/lisp/descr-text.el
+++ mod/lisp/descr-text.el
@@ -217,7 +217,7 @@
 (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)


--- orig/lisp/emacs-lisp/bytecomp.el
+++ mod/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 <address@hidden>
 ;;     Hallvard Furuseth <address@hidden>
@@ -1845,9 +1845,9 @@
                ";;; 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 @@
     (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 @@
 
     (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 "


--- orig/lisp/gnus/message.el
+++ mod/lisp/gnus/message.el
@@ -3582,8 +3582,8 @@
          (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


--- orig/lisp/gnus/mm-util.el
+++ mod/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 <address@hidden>
@@ -288,7 +288,7 @@
          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 @@
        ;; 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


--- orig/lisp/gnus/qp.el
+++ mod/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 <address@hidden>
 ;; Keywords: mail, extensions
@@ -102,7 +102,7 @@
   (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 @@
                  (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.


--- orig/lisp/gnus/rfc2047.el
+++ mod/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 <address@hidden>
 ;;     MORIOKA Tomohiko <address@hidden>
@@ -277,7 +277,7 @@
   ;; (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


--- orig/lisp/gnus/utf7.el
+++ mod/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 <address@hidden>
 ;; Maintainer: address@hidden
@@ -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)


--- orig/lisp/international/codepage.el
+++ mod/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)
 


--- orig/lisp/international/mule-cmds.el
+++ mod/lisp/international/mule-cmds.el
@@ -1800,7 +1800,7 @@
 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.


--- orig/lisp/international/mule-diag.el
+++ mod/lisp/international/mule-diag.el
@@ -203,14 +203,14 @@
 
 (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)


--- orig/lisp/international/mule-util.el
+++ mod/lisp/international/mule-util.el
@@ -340,7 +340,7 @@
   `(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)


--- orig/lisp/international/mule.el
+++ mod/lisp/international/mule.el
@@ -467,17 +467,17 @@
 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 @@
 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 @@
       (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:
 


--- orig/lisp/time-stamp.el
+++ mod/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 @@
 ;;; 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


--- orig/lisp/version.el
+++ mod/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