Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 824-831)

   - Update from CVS
   - Merge from emacs--rel--22

 * emacs--rel--22  (patch 70-74)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238

diff --cc admin/README
Simple merge

diff --cc configure.in
Simple merge

diff --cc etc/HELLO
Simple merge

diff --cc etc/MORE.STUFF
Simple merge

diff --cc etc/PROBLEMS
Simple merge

diff --cc etc/TODO
Simple merge

diff --cc etc/vipcard.tex
index 6bd0fab,6bd0fab..667a8e9
--- 1/etc/vipcard.tex
--- 2/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@@ -12,20 -12,20 +12,20 @@@
  
  % This file is part of GNU Emacs.
  
--% This file is distributed in the hope that it will be useful,
--% but WITHOUT ANY WARRANTY.  No author or distributor
--% accepts responsibility to anyone for the consequences of using it
--% or for whether it serves any particular purpose or describes
--% any piece of software unless they say so in writing.  Refer to the
--% GNU Emacs General Public License for full details.
--%
--% Permission is granted to copy, modify and redistribute this source
--% file provided the copyright notice and permission notices are
--% preserved on all copies.
--%
--% Permission is granted to process this file through TeX and print the
--% results, provided the printed document carries copyright and
--% permission notices identical to the ones below.
++% GNU Emacs is free software; you can redistribute it and/or modify
++% it under the terms of the GNU General Public License as published by
++% the Free Software Foundation; either version 3, or (at your option)
++% any later version.
++
++% GNU Emacs is distributed in the hope that it will be useful,
++% but WITHOUT ANY WARRANTY; without even the implied warranty of
++% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++% GNU General Public License for more details.
++
++% You should have received a copy of the GNU General Public License
++% along with GNU Emacs; see the file COPYING.  If not, write to
++% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++% Boston, MA 02110-1301, USA.
  
  % This file is intended to be processed by plain TeX (TeX82).
  %

diff --cc etc/viperCard.tex
index a4d80fc,a4d80fc..71996e9
--- 1/etc/viperCard.tex
--- 2/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@@ -12,20 -12,20 +12,20 @@@
  
  % This file is part of GNU Emacs.
  
--% This file is distributed in the hope that it will be useful,
--% but WITHOUT ANY WARRANTY.  No author or distributor
--% accepts responsibility to anyone for the consequences of using it
--% or for whether it serves any particular purpose or describes
--% any piece of software unless they say so in writing.  Refer to the
--% GNU Emacs General Public License for full details.
--%
--% Permission is granted to copy, modify and redistribute this source
--% file provided the copyright notice and permission notices are
--% preserved on all copies.
--%
--% Permission is granted to process this file through TeX and print the
--% results, provided the printed document carries copyright and
--% permission notices identical to the ones below.
++% GNU Emacs is free software; you can redistribute it and/or modify
++% it under the terms of the GNU General Public License as published by
++% the Free Software Foundation; either version 3, or (at your option)
++% any later version.
++
++% GNU Emacs is distributed in the hope that it will be useful,
++% but WITHOUT ANY WARRANTY; without even the implied warranty of
++% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++% GNU General Public License for more details.
++
++% You should have received a copy of the GNU General Public License
++% along with GNU Emacs; see the file COPYING.  If not, write to
++% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
++% Boston, MA 02110-1301, USA.
  
  % This file is intended to be processed by plain TeX (TeX82).
  %

diff --cc leim/Makefile.in
Simple merge

diff --cc leim/quail/cyrillic.el
Simple merge

diff --cc leim/quail/hangul3.el
Simple merge

diff --cc leim/quail/indian.el
Simple merge

diff --cc leim/quail/latin-alt.el
Simple merge

diff --cc leim/quail/latin-post.el
Simple merge

diff --cc leim/quail/latin-pre.el
Simple merge

diff --cc leim/quail/pypunct-b5.el
Simple merge

diff --cc leim/quail/symbol-ksc.el
Simple merge

diff --cc leim/quail/thai.el
Simple merge

diff --cc leim/quail/tibetan.el
Simple merge

diff --cc leim/quail/uni-input.el
Simple merge

diff --cc leim/quail/welsh.el
Simple merge

diff --cc lib-src/makefile.w32-in
Simple merge

diff --cc lisp/ChangeLog.12
Simple merge

diff --cc lisp/Makefile.in
Simple merge

diff --cc lisp/arc-mode.el
Simple merge

diff --cc lisp/bindings.el
Simple merge

diff --cc lisp/case-table.el
Simple merge

diff --cc lisp/composite.el
Simple merge

diff --cc lisp/cus-start.el
Simple merge

diff --cc lisp/descr-text.el
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/disp-table.el
Simple merge

diff --cc lisp/dnd.el
Simple merge

diff --cc lisp/edmacro.el
Simple merge

diff --cc lisp/emacs-lisp/autoload.el
Simple merge

diff --cc lisp/emacs-lisp/byte-opt.el
Simple merge

diff --cc lisp/emacs-lisp/bytecomp.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/emacs-lisp/copyright.el
Simple merge

diff --cc lisp/emacs-lisp/generic.el
Simple merge

diff --cc lisp/emacs-lisp/regexp-opt.el
Simple merge

diff --cc lisp/emulation/keypad.el
Simple merge

diff --cc lisp/eshell/esh-mode.el
Simple merge

diff --cc lisp/eshell/esh-opt.el
Simple merge

diff --cc lisp/faces.el
Simple merge

diff --cc lisp/font-lock.el
Simple merge

diff --cc lisp/format.el
Simple merge

diff --cc lisp/gnus/gnus-start.el
Simple merge

diff --cc lisp/gnus/mm-bodies.el
Simple merge

diff --cc lisp/gnus/mm-util.el
Simple merge

diff --cc lisp/gnus/mml.el
Simple merge

diff --cc lisp/gnus/rfc2047.el
Simple merge

diff --cc lisp/gnus/rfc2104.el
Simple merge

diff --cc lisp/info.el
Simple merge

diff --cc lisp/international/ccl.el
Simple merge

diff --cc lisp/international/characters.el
Simple merge

diff --cc lisp/international/codepage.el
Simple merge

diff --cc lisp/international/encoded-kb.el
Simple merge

diff --cc lisp/international/fontset.el
Simple merge

diff --cc lisp/international/ja-dic-cnv.el
Simple merge

diff --cc lisp/international/ja-dic-utl.el
Simple merge

diff --cc lisp/international/mule-cmds.el
Simple merge

diff --cc lisp/international/mule-conf.el
Simple merge

diff --cc lisp/international/mule-diag.el
Simple merge

diff --cc lisp/international/mule-util.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/international/quail.el
Simple merge

diff --cc lisp/international/titdic-cnv.el
Simple merge

diff --cc lisp/international/utf-7.el
Simple merge

diff --cc lisp/isearch.el
Simple merge

diff --cc lisp/language/china-util.el
Simple merge

diff --cc lisp/language/chinese.el
Simple merge

diff --cc lisp/language/cyril-util.el
Simple merge

diff --cc lisp/language/cyrillic.el
Simple merge

diff --cc lisp/language/czech.el
Simple merge

diff --cc lisp/language/devan-util.el
Simple merge

diff --cc lisp/language/devanagari.el
Simple merge

diff --cc lisp/language/english.el
Simple merge

diff --cc lisp/language/ethio-util.el
Simple merge

diff --cc lisp/language/ethiopic.el
Simple merge

diff --cc lisp/language/european.el
Simple merge

diff --cc lisp/language/georgian.el
Simple merge

diff --cc lisp/language/greek.el
Simple merge

diff --cc lisp/language/hebrew.el
Simple merge

diff --cc lisp/language/ind-util.el
Simple merge

diff --cc lisp/language/indian.el
Simple merge

diff --cc lisp/language/japanese.el
Simple merge

diff --cc lisp/language/kannada.el
Simple merge

diff --cc lisp/language/knd-util.el
Simple merge

diff --cc lisp/language/korean.el
Simple merge

diff --cc lisp/language/lao-util.el
Simple merge

diff --cc lisp/language/lao.el
Simple merge

diff --cc lisp/language/malayalam.el
Simple merge

diff --cc lisp/language/misc-lang.el
Simple merge

diff --cc lisp/language/mlm-util.el
Simple merge

diff --cc lisp/language/romanian.el
Simple merge

diff --cc lisp/language/slovak.el
Simple merge

diff --cc lisp/language/tamil.el
Simple merge

diff --cc lisp/language/thai-util.el
Simple merge

diff --cc lisp/language/thai.el
Simple merge

diff --cc lisp/language/tibet-util.el
Simple merge

diff --cc lisp/language/tibetan.el
Simple merge

diff --cc lisp/language/tml-util.el
Simple merge

diff --cc lisp/language/utf-8-lang.el
Simple merge

diff --cc lisp/language/viet-util.el
Simple merge

diff --cc lisp/language/vietnamese.el
Simple merge

diff --cc lisp/loadup.el
Simple merge

diff --cc lisp/mail/emacsbug.el
Simple merge

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/mail/sendmail.el
Simple merge

diff --cc lisp/makefile.w32-in
Simple merge

diff --cc lisp/obsolete/swedish.el
Simple merge

diff --cc lisp/progmodes/perl-mode.el
Simple merge

diff --cc lisp/progmodes/sh-script.el
Simple merge

diff --cc lisp/ps-bdf.el
Simple merge

diff --cc lisp/ps-mule.el
Simple merge

diff --cc lisp/ps-print.el
Simple merge

diff --cc lisp/ruler-mode.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc lisp/startup.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc lisp/tar-mode.el
Simple merge

diff --cc lisp/term.el
Simple merge

diff --cc lisp/term/mac-win.el
Simple merge

diff --cc lisp/term/w32-win.el
Simple merge

diff --cc lisp/term/x-win.el
Simple merge

diff --cc lisp/textmodes/fill.el
Simple merge

diff --cc lisp/textmodes/ispell.el
Simple merge

diff --cc lisp/textmodes/sgml-mode.el
Simple merge

diff --cc lisp/time-stamp.el
Simple merge

diff --cc lisp/version.el
Simple merge

diff --cc lisp/w32-fns.el
Simple merge

diff --cc lisp/wid-edit.el
Simple merge

diff --cc make-dist
Simple merge

diff --cc nt/configure.bat
Simple merge

diff --cc oldXMenu/insque.c
index 66b442e,66b442e..ec7aa88
--- 1/oldXMenu/insque.c
--- 2/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@@ -3,7 -3,7 +3,7 @@@
  
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
--the Free Software Foundation; either version 2, or (at your option)
++the Free Software Foundation; either version 3, or (at your option)
  any later version.
  
  This program is distributed in the hope that it will be useful,

diff --cc src/.gdbinit
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/Makefile.in
Simple merge

diff --cc src/abbrev.c
Simple merge

diff --cc src/alloc.c
Simple merge

diff --cc src/buffer.c
Simple merge

diff --cc src/buffer.h
Simple merge

diff --cc src/bytecode.c
Simple merge

diff --cc src/callproc.c
Simple merge

diff --cc src/casefiddle.c
Simple merge

diff --cc src/casetab.c
Simple merge

diff --cc src/category.c
Simple merge

diff --cc src/category.h
Simple merge

diff --cc src/ccl.c
Simple merge

diff --cc src/ccl.h
Simple merge

diff --cc src/charset.c
Simple merge

diff --cc src/charset.h
Simple merge

diff --cc src/cmds.c
Simple merge

diff --cc src/coding.c
Simple merge

diff --cc src/coding.h
Simple merge

diff --cc src/composite.c
Simple merge

diff --cc src/composite.h
Simple merge

diff --cc src/config.in
Simple merge

diff --cc src/data.c
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc src/dispextern.h
Simple merge

diff --cc src/dispnew.c
Simple merge

diff --cc src/disptab.h
Simple merge

diff --cc src/doc.c
Simple merge

diff --cc src/doprnt.c
Simple merge

diff --cc src/dosfns.c
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/fileio.c
Simple merge

diff --cc src/filelock.c
Simple merge

diff --cc src/fns.c
Simple merge

diff --cc src/fontset.c
Simple merge

diff --cc src/fontset.h
Simple merge

diff --cc src/frame.c
Simple merge

diff --cc src/frame.h
Simple merge

diff --cc src/fringe.c
Simple merge

diff --cc src/indent.c
Simple merge

diff --cc src/insdel.c
Simple merge

diff --cc src/intervals.c
Simple merge

diff --cc src/intervals.h
Simple merge

diff --cc src/keyboard.c
Simple merge

diff --cc src/keymap.c
Simple merge

diff --cc src/lisp.h
Simple merge

diff --cc src/lread.c
Simple merge

diff --cc src/macfns.c
Simple merge

diff --cc src/macgui.h
Simple merge

diff --cc src/macterm.c
Simple merge

diff --cc src/makefile.w32-in
Simple merge

diff --cc src/marker.c
Simple merge

diff --cc src/minibuf.c
Simple merge

diff --cc src/msdos.c
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/process.c
Simple merge

diff --cc src/regex.c
index 48f0dd9,1e80b9b..c6d6c36
--- 1/src/regex.c
--- 2/src/regex.c
+++ b/src/regex.c
@@@ -3,11 -3,11 +3,12 @@@
     internationalization features.)
  
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
--                 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
++                 2002, 2003, 2004, 2005, 2006, 2007
++                 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--   the Free Software Foundation; either version 2, or (at your option)
++   the Free Software Foundation; either version 3, or (at your option)
     any later version.
  
     This program is distributed in the hope that it will be useful,

diff --cc src/regex.h
index baf4124,dd57ba3..69127ef
--- 1/src/regex.h
--- 2/src/regex.h
+++ b/src/regex.h
@@@ -7,7 -7,7 +7,7 @@@
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--   the Free Software Foundation; either version 2, or (at your option)
++   the Free Software Foundation; either version 3, or (at your option)
     any later version.
  
     This program is distributed in the hope that it will be useful,

diff --cc src/search.c
Simple merge

diff --cc src/syntax.c
Simple merge

diff --cc src/syntax.h
Simple merge

diff --cc src/term.c
Simple merge

diff --cc src/w16select.c
Simple merge

diff --cc src/w32bdf.c
Simple merge

diff --cc src/w32console.c
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32menu.c
Simple merge

diff --cc src/w32proc.c
Simple merge

diff --cc src/w32select.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/w32term.h
Simple merge

diff --cc src/window.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfaces.c
Simple merge

diff --cc src/xfns.c
Simple merge

diff --cc src/xmenu.c
Simple merge

diff --cc src/xrdb.c
Simple merge

diff --cc src/xterm.c
Simple merge

diff --cc src/xterm.h
Simple merge