Kenichi Handa | 1 Oct 2003 01:28
Picon

Changes to emacs/src/ChangeLog.22 [emacs-unicode-2]

Index: emacs/src/ChangeLog.22
diff -c emacs/src/ChangeLog.22:1.1.2.8 emacs/src/ChangeLog.22:1.1.2.9
*** emacs/src/ChangeLog.22:1.1.2.8	Tue Sep 30 07:10:17 2003
--- emacs/src/ChangeLog.22	Tue Sep 30 19:28:01 2003
***************
*** 1,5 ****
--- 1,10 ----
  2003-09-30  Kenichi Handa  <handa <at> m17n.org>

+ 	* character.c (char_string): Use ASCII_CHAR_P instead of
+ 	SINGLE_BYTE_CHAR_P.
+ 
+ 2003-09-30  Kenichi Handa  <handa <at> m17n.org>
+ 
  	* xdisp.c (handle_auto_composed_prop): Check if the last
  	characters of auto-composed region is newly composed with the
  	following characters.
***************
*** 63,68 ****
--- 68,74 ----
  	* window.c (Fdisplay_buffer, Fframe_selected_window): Remove
  	unsued vars.

+ >>>>>>> 1.1.2.8
  2003-09-26  Dave Love  <fx <at> gnu.org>

  	* xterm.c (x_bitmap_mask): Declare.
Miles Bader | 1 Oct 2003 03:38
Picon
Gravatar

Changes to emacs/admin/quick-install-emacs

Index: emacs/admin/quick-install-emacs
diff -c emacs/admin/quick-install-emacs:1.11 emacs/admin/quick-install-emacs:1.12
*** emacs/admin/quick-install-emacs:1.11	Sat Sep 27 19:08:14 2003
--- emacs/admin/quick-install-emacs	Tue Sep 30 21:38:40 2003
***************
*** 133,139 ****
  fi

  CONFIG_STATUS="$BUILD/config.status"
! function get_config_var () {
    if ! sed -n "s/^s\(.\) <at> $1 <at> \1\(.*\)\1.*$/\2/p" $CONFIG_STATUS | sed q | grep ''
    then
      echo 1>&2 "$me: $1: Configuration variable not found in $CONFIG_STATUS"
--- 133,140 ----
  fi

  CONFIG_STATUS="$BUILD/config.status"
! get_config_var ()
! {
    if ! sed -n "s/^s\(.\) <at> $1 <at> \1\(.*\)\1.*$/\2/p" $CONFIG_STATUS | sed q | grep ''
    then
      echo 1>&2 "$me: $1: Configuration variable not found in $CONFIG_STATUS"
***************
*** 153,159 ****
  DST_LIBEXEC="$prefix/libexec/emacs/$VERSION/$ARCH"
  DST_INFO="$prefix/info"

! function maybe_mkdir () {
    if ! test -d "$1"; then
      $MKDIR "$1" 2>&1 | sed "s/^mkdir:/$me:/" 1>&2
(Continue reading)

Miles Bader | 1 Oct 2003 03:38
Picon
Gravatar

Changes to emacs/admin/ChangeLog

Index: emacs/admin/ChangeLog
diff -c emacs/admin/ChangeLog:1.39 emacs/admin/ChangeLog:1.40
*** emacs/admin/ChangeLog:1.39	Sat Sep 27 19:08:14 2003
--- emacs/admin/ChangeLog	Tue Sep 30 21:38:40 2003
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-10-01  Miles Bader  <miles <at> gnu.org>
+ 
+ 	* quick-install-emacs: Don't use "function" keyword when defining
+ 	shell functions.
+ 
  2003-09-27  Miles Bader  <miles <at> gnu.ai.mit.edu>

  	* quick-install-emacs: Remove fns-* pruning, since that file no
Miles Bader | 1 Oct 2003 04:09
Picon
Gravatar

Changes to emacs/INSTALL-CVS

Index: emacs/INSTALL-CVS
diff -c emacs/INSTALL-CVS:1.3 emacs/INSTALL-CVS:1.4
*** emacs/INSTALL-CVS:1.3	Mon Sep 22 13:40:14 2003
--- emacs/INSTALL-CVS	Tue Sep 30 22:09:47 2003
***************
*** 25,44 ****
  (If you want to install the Emacs binary, type "make install" instead
  of "make" in the last command.)

! If the above procedure fails, try "make bootstrap".

  Users of non-Posix systems (MS-Windows etc.) should run the
  platform-specific configuration scripts (nt/configure.bat, config.bat,
  etc.) before "make bootstrap" or "make"; the rest of the procedure is
  applicable to those systems as well.
- 
- Note that "make bootstrap" overwrites some files that are under CVS
- control, such as lisp/loaddefs.el.  This could produce CVS conflicts
- next time that you resync with the CVS.  If you see such conflicts,
- overwrite your local copy of the file with the clean version from the
- CVS repository.  For example:
- 
-     cvs update -C lisp/loaddefs.el

  Questions, requests, and bug reports about the CVS versions of Emacs
  should be sent to emacs-pretest-bug <at> gnu.org rather than gnu.emacs.help
--- 25,48 ----
  (If you want to install the Emacs binary, type "make install" instead
  of "make" in the last command.)

(Continue reading)

Kenichi Handa | 1 Oct 2003 06:40
Picon

Changes to emacs/src/coding.c [emacs-unicode-2]

Index: emacs/src/coding.c
diff -c emacs/src/coding.c:1.289.2.3 emacs/src/coding.c:1.289.2.4
*** emacs/src/coding.c:1.289.2.3	Mon Sep 29 13:59:52 2003
--- emacs/src/coding.c	Wed Oct  1 00:40:19 2003
***************
*** 6019,6032 ****
    /* Note: composition handling is not yet implemented.  */
    coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK;

!   if (coding->common_flags & CODING_ANNOTATE_COMPOSITION_MASK)
!     stop = stop_composition = pos;
    else
!     stop = stop_composition = end_pos;
!   if (coding->common_flags & CODING_ANNOTATE_CHARSET_MASK)
!     stop = stop_charset = pos;
!   else
!     stop_charset = end_pos;

    /* Compensate for CRLF and annotation.  */
    buf_end -= 1 + MAX_ANNOTATION_LENGTH;
--- 6019,6037 ----
    /* Note: composition handling is not yet implemented.  */
    coding->common_flags &= ~CODING_ANNOTATE_COMPOSITION_MASK;

!   if (NILP (coding->src_object))
!     stop = stop_composition = stop_charset = end_pos;
    else
!     {
!       if (coding->common_flags & CODING_ANNOTATE_COMPOSITION_MASK)
! 	stop = stop_composition = pos;
(Continue reading)

Kenichi Handa | 1 Oct 2003 06:45
Picon

Changes to emacs/src/ChangeLog.22 [emacs-unicode-2]

Index: emacs/src/ChangeLog.22
diff -c emacs/src/ChangeLog.22:1.1.2.9 emacs/src/ChangeLog.22:1.1.2.10
*** emacs/src/ChangeLog.22:1.1.2.9	Tue Sep 30 19:28:01 2003
--- emacs/src/ChangeLog.22	Wed Oct  1 00:45:44 2003
***************
*** 1,3 ****
--- 1,18 ----
+ 2003-10-01  Kenichi Handa  <handa <at> m17n.org>
+ 
+ 	* term.c (terminal_encode_buffer, terminal_encode_buf_size): New
+ 	variables.
+ 	(encode_terminal_code): Argument changed.  Encode multiple
+ 	characters at once.  Store the result of encoding in
+ 	terminal_encode_buffer.
+ 	(write_glyphs): Adjusted for the change of encode_terminal_code.
+ 	(insert_glyphs): Likewise.
+ 	(term_init): Initialize terminal_encode_buffer and
+ 	terminal_encode_buf_size.
+ 
+ 	* coding.c (consume_chars): If coding->src_object is nil, don't
+ 	check annotation.
+ 
  2003-09-30  Kenichi Handa  <handa <at> m17n.org>

  	* character.c (char_string): Use ASCII_CHAR_P instead of
Kenichi Handa | 1 Oct 2003 06:43
Picon

Changes to emacs/src/term.c [emacs-unicode-2]

Index: emacs/src/term.c
diff -c emacs/src/term.c:1.146.4.1 emacs/src/term.c:1.146.4.2
*** emacs/src/term.c:1.146.4.1	Mon Sep  8 08:48:12 2003
--- emacs/src/term.c	Wed Oct  1 00:43:53 2003
***************
*** 789,815 ****
      }
  }
  
  /* Encode SRC_LEN glyphs starting at SRC to terminal output codes and
!    store them at DST.  Do not write more than DST_LEN bytes.  That may
!    require stopping before all SRC_LEN input glyphs have been
!    converted.

     We store the number of glyphs actually converted in *CONSUMED.  The
!    return value is the number of bytes store in DST.  */

  int
! encode_terminal_code (src, dst, src_len, dst_len, consumed)
       struct glyph *src;
       int src_len;
!      unsigned char *dst;
!      int dst_len, *consumed;
  {
    struct glyph *src_start = src, *src_end = src + src_len;
-   unsigned char *dst_start = dst, *dst_end = dst + dst_len;
    register GLYPH g;
!   unsigned char workbuf[MAX_MULTIBYTE_LENGTH];
!   const unsigned char *buf;
!   int len;
(Continue reading)

Kenichi Handa | 1 Oct 2003 06:48
Picon

Changes to emacs/lisp/language/japanese.el [emacs-unicode-2]

Index: emacs/lisp/language/japanese.el
diff -c emacs/lisp/language/japanese.el:1.31.4.1 emacs/lisp/language/japanese.el:1.31.4.2
*** emacs/lisp/language/japanese.el:1.31.4.1	Mon Sep  8 08:53:41 2003
--- emacs/lisp/language/japanese.el	Wed Oct  1 00:48:03 2003
***************
*** 40,47 ****
  		       latin-jisx0201 japanese-jisx0212)
  		nil nil nil]
    :flags '(short ascii-at-eol ascii-at-cntl 7-bit designation)
!   :charset-list '(ascii japanese-jisx0208-1978 japanese-jisx0208
! 			   latin-jisx0201 japanese-jisx0212)
    :mime-charset 'iso-2022-jp)

  (define-coding-system-alias 'junet 'iso-2022-jp)
--- 40,47 ----
  		       latin-jisx0201 japanese-jisx0212)
  		nil nil nil]
    :flags '(short ascii-at-eol ascii-at-cntl 7-bit designation)
!   :charset-list '(ascii japanese-jisx0208 japanese-jisx0212
! 			japanese-jisx0208-1978 latin-jisx0201)
    :mime-charset 'iso-2022-jp)

  (define-coding-system-alias 'junet 'iso-2022-jp)
***************
*** 58,65 ****
  		nil]
    :flags '(short ascii-at-eol ascii-at-cntl 7-bit designation single-shift
  		 init-at-bol)
!   :charset-list '(ascii japanese-jisx0208-1978 japanese-jisx0208
! 			latin-jisx0201 japanese-jisx0212
(Continue reading)

Kenichi Handa | 1 Oct 2003 06:48
Picon

Changes to emacs/lisp/ChangeLog.22 [emacs-unicode-2]

Index: emacs/lisp/ChangeLog.22
diff -c emacs/lisp/ChangeLog.22:1.1.2.5 emacs/lisp/ChangeLog.22:1.1.2.6
*** emacs/lisp/ChangeLog.22:1.1.2.5	Tue Sep 30 07:09:47 2003
--- emacs/lisp/ChangeLog.22	Wed Oct  1 00:48:18 2003
***************
*** 1,3 ****
--- 1,8 ----
+ 2003-10-01  Kenichi Handa  <handa <at> m17n.org>
+ 
+ 	* language/japanese.el (iso-2022-jp, iso-2022-jp-2)
+ 	(japanese-iso-8bit): Fix the order of charsets in :charset-list.
+ 
  2003-09-30  Kenichi Handa  <handa <at> m17n.org>

  	* composite.el (auto-composition-chunk-size): Variable deleted.
Dave Love | 1 Oct 2003 20:08
Picon

Changes to emacs/lisp/ChangeLog

Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.5434 emacs/lisp/ChangeLog:1.5435
*** emacs/lisp/ChangeLog:1.5434	Wed Oct  1 11:13:52 2003
--- emacs/lisp/ChangeLog	Wed Oct  1 14:08:48 2003
***************
*** 1,5 ****
--- 1,7 ----
  2003-10-01  Dave Love  <fx <at> gnu.org>

+ 	* language/cyrillic.el (cp1251): Alias for windows-1251.
+ 
  	* vc-cvs.el (vc-cvs-parse-entry): Revert last change to allow
  	bootstrap.

Gmane