Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Sun, 16 Dec 2007 05:08:49 +0000 (05:08 +0000)
committerMiles Bader <miles@gnu.org>
Sun, 16 Dec 2007 05:08:49 +0000 (05:08 +0000)
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-300

21 files changed:
1  2 
configure
configure.in
etc/TODO
leim/quail/latin-post.el
lisp/ChangeLog
lisp/bindings.el
lisp/gnus/gnus-start.el
lisp/gnus/mm-bodies.el
lisp/gnus/mm-util.el
lisp/gnus/mml.el
lisp/international/ja-dic-cnv.el
lisp/isearch.el
lisp/makefile.w32-in
lisp/progmodes/perl-mode.el
lisp/startup.el
lisp/term/mac-win.el
src/buffer.c
src/dispextern.h
src/keyboard.c
src/w32fns.c
src/w32term.c

diff --cc configure
Simple merge
diff --cc configure.in
Simple merge
diff --cc etc/TODO
Simple merge
@@@ -1256,14 -1253,14 +1256,14 @@@ Doubling the postfix separates the lett
  (quail-define-package
   "scandinavian-postfix" "Latin-1" "SC<" t
   "Scandinavian input method with postfix modifiers
- Supported languages are Swidish, Norwegian, Danish, and Finnish.
+ Supported languages are Swedish, Norwegian, Danish, and Finnish.
  
 -ae -> \e,Af\e(B
 -oe -> \e,Ax\e(B
 -aa -> \e,Ae\e(B
 -a\" -> \e,Ad\e(B
 -o\" -> \e,Av\e(B
 -e' -> \e,Ai\e(B
 +ae -> æ
 +oe -> ø
 +aa -> å
 +a\" -> ä
 +o\" -> ö
 +e' -> é
  
  Doubling the postfix separates the letter and postfix:
  aee -> ae   o\"\" -> o\"   etc.
diff --cc lisp/ChangeLog
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc lisp/isearch.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/startup.el
Simple merge
Simple merge
diff --cc src/buffer.c
Simple merge
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/w32fns.c
Simple merge
diff --cc src/w32term.c
Simple merge