Mercurial > emacs
changeset 108341:7361123c71e3
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Wed, 21 Apr 2010 22:57:48 +0000 |
| parents | 486e3cc1b3a6 (current diff) 5568d8fe0e20 (diff) |
| children | a0e9f0a5c5a1 |
| files | |
| diffstat | 4 files changed, 16 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/emacs/ChangeLog Tue Apr 20 22:41:29 2010 +0000 +++ b/doc/emacs/ChangeLog Wed Apr 21 22:57:48 2010 +0000 @@ -1,3 +1,8 @@ +2010-04-21 Glenn Morris <rgm@gnu.org> + + * calendar.texi (Displaying the Diary, Format of Diary File): + Fix external cross-references for TeX format output. + 2010-04-18 Chong Yidong <cyd@stupidchicken.com> * programs.texi (Semantic): New node.
--- a/doc/emacs/calendar.texi Tue Apr 20 22:41:29 2010 +0000 +++ b/doc/emacs/calendar.texi Wed Apr 21 22:57:48 2010 +0000 @@ -1082,7 +1082,7 @@ shown either in the buffer or in the mode line, depending on the display method you choose @iftex -(@pxref{Diary Display,, emacs-xtra}). +(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}). @end iftex @ifnottex (@pxref{Diary Display}). @@ -1186,7 +1186,7 @@ This entry will have a different appearance if you use the simple diary display @iftex -(@pxref{Diary Display,, emacs-xtra}). +(@pxref{Diary Display,,, emacs-xtra, Specialized Emacs Features}). @end iftex @ifnottex (@pxref{Diary Display}).
--- a/lisp/ChangeLog Tue Apr 20 22:41:29 2010 +0000 +++ b/lisp/ChangeLog Wed Apr 21 22:57:48 2010 +0000 @@ -1,3 +1,9 @@ +2010-04-20 Kenichi Handa <handa@m17n.org> + + * language/indian.el (oriya-composable-pattern) + (tamil-composable-pattern, malayalam-composable-pattern): Add + two-part vowels to "v" (vowel sign). + 2010-04-20 Chong Yidong <cyd@stupidchicken.com> * files.el (copy-directory): Handle symlinks (Bug#5982).
--- a/lisp/language/indian.el Tue Apr 20 22:41:29 2010 +0000 +++ b/lisp/language/indian.el Wed Apr 21 22:57:48 2010 +0000 @@ -258,7 +258,7 @@ ("B" . "[\u0B15-\u0B17\u0B1B-\u0B1D\u0B1F-\u0B21\u0B23-\u0B24\u0B27-\u0B30\u0B32-\u0B35\u0B38-\u0B39]") ; consonant with below form ("R" . "\u0B30") ; RA ("n" . "\u0B3C") ; NUKTA - ("v" . "[\u0B3E-\u0B44\u0B47\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign + ("v" . "[\u0B3E-\u0B4C\u0B56-\u0B57\u0B62-\u0B63]") ; vowel sign ("H" . "\u0B4D") ; VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ @@ -281,7 +281,7 @@ '(("a" . "\u0B82") ; SIGN ANUSVARA ("V" . "[\u0B85-\u0B94]") ; independent vowel ("C" . "[\u0B95-\u0BB9]") ; consonant - ("v" . "[\u0BBE-\u0BC8\u0BD7]") ; vowel sign + ("v" . "[\u0BBE-\u0BCC\u0BD7]") ; vowel sign ("H" . "\u0BCD") ; VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ @@ -351,7 +351,7 @@ ("V" . "[\u0D05-\u0D14\u0D60-\u0D61]") ; independent vowel ("C" . "[\u0D15-\u0D39]") ; consonant ("Y" . "[\u0D2F-\u0D30\u0D32\u0D35]") ; YA, RA, LA, VA - ("v" . "[\u0D3E-\u0D48\u0D57\u0D62-\u0D63]") ; postbase matra + ("v" . "[\u0D3E-\u0D4C\u0D57\u0D62-\u0D63]") ; postbase matra ("H" . "\u0D4D") ; SIGN VIRAMA ("N" . "\u200C") ; ZWNJ ("J" . "\u200D") ; ZWJ