]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Mon, 26 Feb 2007 23:03:45 +0000 (23:03 +0000)
committerMiles Bader <miles@gnu.org>
Mon, 26 Feb 2007 23:03:45 +0000 (23:03 +0000)
Patches applied:

 * emacs--devo--0  (patch 638-652)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 202)

   - Update from CVS

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

41 files changed:
1  2 
configure
configure.in
etc/MORE.STUFF
etc/NEWS
etc/PROBLEMS
lib-src/makefile.w32-in
lisp/ChangeLog
lisp/descr-text.el
lisp/disp-table.el
lisp/emacs-lisp/bytecomp.el
lisp/faces.el
lisp/font-lock.el
lisp/international/mule-cmds.el
lisp/isearch.el
lisp/language/european.el
lisp/ldefs-boot.el
lisp/mail/rmail.el
lisp/ps-print.el
lisp/simple.el
lisp/startup.el
lisp/textmodes/ispell.el
lisp/textmodes/sgml-mode.el
lisp/wid-edit.el
src/.gdbinit
src/ChangeLog
src/Makefile.in
src/callproc.c
src/dispnew.c
src/doc.c
src/doprnt.c
src/editfns.c
src/frame.c
src/macterm.c
src/minibuf.c
src/print.c
src/process.c
src/w32fns.c
src/w32term.c
src/w32term.h
src/xfaces.c
src/xterm.c

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc etc/MORE.STUFF
Simple merge
diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
Simple merge
diff --cc lisp/ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/faces.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/isearch.el
Simple merge
index b7532eb1a47420b597e31d6c80a590d4aac5dc65,75d9d1fb33714059024c8dea3911e63b4a29c115..400bbe829c00c5df486d1b06da22f3ee5a53f0a0
@@@ -281,109 -259,6 +281,122 @@@ character set which supports the same l
  addition of the Euro sign and some additional French and Finnish letters.
  Latin-9 is sometimes nicknamed `Latin-0'."))
   '("European"))
++
++(set-language-info-alist
++ "Esperanto" '((tutorial . "TUTORIAL.eo")
++             (charset ascii latin-iso8859-3)
++             (coding-system iso-latin-3)
++             (coding-priority iso-latin-3)
++             (nonascii-translation . latin-iso8859-3)
++             (unibyte-syntax . "latin-3")
++             (unibyte-display . iso-latin-3)
++             (input-method . "latin-3-prefix")
++             (documentation . "Support for Esperanto with ISO-8859-3 character set."))
++ '("European"))
++
 +\f
 +(define-coding-system 'windows-1250
 +  "windows-1250 (Central European) encoding (MIME: WINDOWS-1250)"
 +  :coding-type 'charset
 +  :mnemonic ?*
 +  :charset-list '(windows-1250)
 +  :mime-charset 'windows-1250)
 +(define-coding-system-alias 'cp1250 'windows-1250)
 +
 +(define-coding-system 'windows-1252
 +  "windows-1252 (Western European) encoding (MIME: WINDOWS-1252)"
 +  :coding-type 'charset
 +  :mnemonic ?*
 +  :charset-list '(windows-1252)
 +  :mime-charset 'windows-1252)
 +(define-coding-system-alias 'cp1252 'windows-1252)
 +
 +(define-coding-system 'windows-1254
 +  "windows-1254 (Turkish) encoding (MIME: WINDOWS-1254)"
 +  :coding-type 'charset
 +  :mnemonic ?*
 +  :charset-list '(windows-1254)
 +  :mime-charset 'windows-1254)
 +(define-coding-system-alias 'cp1254 'windows-1254)
 +
 +(define-coding-system 'windows-1257
 +  "windows-1257 (Baltic) encoding (MIME: WINDOWS-1257)"
 +  :coding-type 'charset
 +  :mnemonic ?*
 +  :charset-list '(windows-1257)
 +  :mime-charset 'windows-1257)
 +(define-coding-system-alias 'cp1257 'windows-1257)
 +
 +(define-coding-system 'cp850
 +  "DOS codepage 850 (Western European)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp850)
 +  :mime-charset 'cp850)
 +(define-coding-system-alias 'ibm850 'cp850)
 +
 +(define-coding-system 'cp852
 +  "DOS codepage 852 (Slavic)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp852)
 +  :mime-charset 'cp852)
 +(define-coding-system-alias 'ibm852 'cp852)
 +
 +(define-coding-system 'cp857
 +  "DOS codepage 857 (Turkish)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp857)
 +  :mime-charset 'cp857)
 +(define-coding-system-alias 'ibm857 'cp857)
 +
 +(define-coding-system 'cp858
 +  "Codepage 858 (Multilingual Latin I + Euro)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp858)
 +  :mime-charset 'cp858)
 +
 +(define-coding-system 'cp860
 +  "DOS codepage 860 (Portuguese)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp860)
 +  :mime-charset 'cp860)
 +(define-coding-system-alias 'ibm860 'cp860)
 +
 +(define-coding-system 'cp861
 +  "DOS codepage 861 (Icelandic)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp861)
 +  :mime-charset 'cp861)
 +(define-coding-system-alias 'ibm861 'cp861)
 +
 +(define-coding-system 'cp863
 +  "DOS codepage 863 (French Canadian)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp863)
 +  :mime-charset 'cp863)
 +(define-coding-system-alias 'ibm863 'cp863)
 +
 +(define-coding-system 'cp865
 +  "DOS codepage 865 (Norwegian/Danish)"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp865)
 +  :mime-charset 'cp865)
 +(define-coding-system-alias 'ibm865 'cp865)
 +
 +(define-coding-system 'cp437
 +  "DOS codepage 437"
 +  :coding-type 'charset
 +  :mnemonic ?D
 +  :charset-list '(cp437)
 +  :mime-charset 'cp437)
 +(define-coding-system-alias 'ibm437 'cp437)
  \f
  (set-language-info-alist
   "Dutch" '((tutorial . "TUTORIAL.nl")
Simple merge
Simple merge
Simple merge
diff --cc lisp/simple.el
Simple merge
diff --cc lisp/startup.el
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/.gdbinit
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/Makefile.in
Simple merge
diff --cc src/callproc.c
Simple merge
diff --cc src/dispnew.c
Simple merge
diff --cc src/doc.c
Simple merge
diff --cc src/doprnt.c
Simple merge
diff --cc src/editfns.c
Simple merge
diff --cc src/frame.c
Simple merge
diff --cc src/macterm.c
Simple merge
diff --cc src/minibuf.c
Simple merge
diff --cc src/print.c
Simple merge
diff --cc src/process.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/w32term.c
Simple merge
diff --cc src/w32term.h
Simple merge
diff --cc src/xfaces.c
Simple merge
diff --cc src/xterm.c
Simple merge