]> git.eshelyaron.com Git - emacs.git/commitdiff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-56
authorMiles Bader <miles@gnu.org>
Mon, 17 Apr 2006 08:41:12 +0000 (08:41 +0000)
committerMiles Bader <miles@gnu.org>
Mon, 17 Apr 2006 08:41:12 +0000 (08:41 +0000)
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 204-225)

   - Update from CVS
   - Sync from erc--emacs--0
   - Merge from gnus--rel--5.10
   - Improve tq.el.
   - Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.

 * gnus--rel--5.10  (patch 81-85)

   - Update from CVS
   - Merge from emacs--devo--0

34 files changed:
1  2 
etc/NEWS
etc/PROBLEMS
etc/TODO
leim/Makefile.in
leim/quail/cyrillic.el
leim/quail/latin-alt.el
leim/quail/latin-post.el
leim/quail/latin-pre.el
leim/quail/pypunct-b5.el
leim/quail/tibetan.el
lisp/ChangeLog
lisp/emacs-lisp/bytecomp.el
lisp/gnus/rfc2047.el
lisp/international/mule-cmds.el
lisp/mail/rmail.el
lisp/progmodes/perl-mode.el
lisp/simple.el
lisp/startup.el
lisp/subr.el
lisp/time-stamp.el
src/ChangeLog
src/data.c
src/dispnew.c
src/fns.c
src/keyboard.c
src/lisp.h
src/macfns.c
src/macterm.c
src/print.c
src/process.c
src/search.c
src/window.c
src/xdisp.c
src/xfaces.c

diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
diff --cc etc/TODO
Simple merge
Simple merge
Simple merge
index 3b9dc0518ae4a53e12208292e357c8963ff69731,d7a8af61d8cb31fcbdaaabb4ad8c3c2479e67214..f52467a5d64791dd545a5b98dcd989be2ef46eb3
@@@ -1,7 -1,7 +1,7 @@@
 -;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: iso-2022-7bit;-*-
 +;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: utf-8;-*-
  
  ;; Copyright (C) 1997, 1998, 2001, 2002  Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1999
+ ;; Copyright (C) 1999
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  
index 1f4d2414a76be97667f534da100a9e6259c31443,a6c2e5e8fd524303b22b2355730c04af896b22c5..428910bcdd5c5aa0b1b44e7050da6c24496e6f6c
@@@ -1,14 -1,11 +1,14 @@@
 -;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 +;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
  
  ;; Copyright (C) 1997, 1998, 2001, 2002 Free Software Foundation, Inc.
- ;; Copyright (C) 1997
+ ;; Copyright (C) 1997, 1999
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
 +;; Copyright (C) 2003
 +;;   National Institute of Advanced Industrial Science and Technology (AIST)
 +;;   Registration Number H13PRO009
  
 -;; Keywords: multilingual, input method, latin
 +;; Keywords: multilingual, input method, latin, i18n
  
  ;; This file is part of GNU Emacs.
  
index 80690c8ce1e170888c7935fb4e802637f4de5e1c,ca9d0560dbf8a834a4ca3d2544fc6273155515ec..92ed76b591554ff87ff2023e33642d83e00bd58c
@@@ -1,8 -1,8 +1,8 @@@
 -;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 +;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: utf-8;-*-
  
- ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
  ;;   Free Software Foundation, Inc.
- ;; Copyright (C) 1997, 1999, 2005
+ ;; Copyright (C) 1997, 1998, 1999, 2000, 2005
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  
index ee053c67f138295e7474385e51a78f8ac68f7562,4eff95a7a6ca95cc59fa733be81b0010b413095e..f8fc747ba03fb5ddd4a962639b286516c8de9795
@@@ -1,6 -1,6 +1,6 @@@
 -;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols)
 +;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols) -*-coding: iso-2022-7bit;-*-
  
- ;; Copyright (C) 1997, 2000
+ ;; Copyright (C) 1997, 2000, 2003
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  
index e9d998525c3665340c43eb7c54e380d44f51cf21,c065c1b69e4da2d292653dd59f7c3e837046ef59..921b3732c6fff8ddc1dee753e0340f3cf130f960
@@@ -1,7 -1,7 +1,7 @@@
 -;;; tibetan.el --- Quail package for inputting Tibetan characters
 +;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*-
  
- ;; Copyright (C) 1995  Free Software Foundation, Inc.
- ;; Copyright (C) 1995, 1998, 1999, 2000
+ ;; Copyright (C) 1997  Free Software Foundation, Inc.
+ ;; Copyright (C) 1997, 1998, 1999, 2000
  ;;   National Institute of Advanced Industrial Science and Technology (AIST)
  ;;   Registration Number H14PRO021
  
diff --cc lisp/ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
Simple merge
diff --cc lisp/subr.el
Simple merge
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/fns.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/lisp.h
index 2356c40b731c136a247b7379d433336c6dbb9218,4cf2a4fd5395cfafa86fac824919691c7f64daa6..0792bdf89b0126c0beed3dcf796579faa54fc1d6
@@@ -3235,11 -3198,14 +3236,15 @@@ extern void syms_of_dired P_ ((void))
  extern void syms_of_term P_ ((void));
  extern void fatal () NO_RETURN;
  
- #ifdef HAVE_X_WINDOWS
+ #ifdef HAVE_WINDOW_SYSTEM
  /* Defined in fontset.c */
  extern void syms_of_fontset P_ ((void));
 -EXFUN (Fset_fontset_font, 4);
 +EXFUN (Fset_fontset_font, 5);
 +EXFUN (Fnew_fontset, 2);
+ /* Defined in xfns.c, w32fns.c, or macfns.c */
+ EXFUN (Fxw_display_color_p, 1);
+ EXFUN (Fx_file_dialog, 5);
  #endif
  
  /* Defined in xfaces.c */
diff --cc src/macfns.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/print.c
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/search.c
index dfde32802403a759df9fd3d2e7a8bf61f4ba8df0,dfbf66fc7edce9b5fcaff77edfa42e3995ffd0f1..f613630eaf9885dce21c691c2924f711b66a6f91
@@@ -1699,8 -1720,8 +1699,8 @@@ boyer_moore (n, base_pat, len, len_byte
                ch = -1;
            }
  
-         if (ch > 0400)
+         if (ch >= 0400)
 -          j = ((unsigned char) ch) | 0200;
 +          j = (ch & 0x3F) | 0200;
          else
            j = *ptr;
  
              while (1)
                {
                  TRANSLATE (ch, inverse_trt, ch);
-                 if (ch > 0400)
+                 if (ch >= 0400)
 -                  j = ((unsigned char) ch) | 0200;
 +                  j = (ch & 0x3F) | 0200;
                  else
 -                  j = (unsigned char) ch;
 +                  j = ch;
  
                  /* For all the characters that map into CH,
                     set up simple_translate to map the last byte
diff --cc src/window.c
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc src/xfaces.c
Simple merge