Now on revision 112030. ------------------------------------------------------------ revno: 112030 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 22:04:46 -0700 message: * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out. Include unconditionally, as that works elsewhere and is simpler here. Include if DARWIN_OS || __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin and FreeBSD now. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-11 16:31:55 +0000 +++ src/ChangeLog 2013-03-13 05:04:46 +0000 @@ -1,3 +1,11 @@ +2013-03-13 Paul Eggert + + * sysdep.c: Remove a use of BSD_SYSTEM, which I'm trying to phase out. + Include unconditionally, as that works elsewhere and + is simpler here. Include if DARWIN_OS || + __FreeBSD__, not if BSD_SYSTEM, since it's needed only for Darwin + and FreeBSD now. + 2013-03-11 Paul Eggert * insdel.c (adjust_after_replace): Use bool for boolean. === modified file 'src/sysdep.c' --- src/sysdep.c 2013-03-06 08:01:47 +0000 +++ src/sysdep.c 2013-03-13 05:04:46 +0000 @@ -38,9 +38,8 @@ #include "sysselect.h" #include "blockinput.h" -#ifdef BSD_SYSTEM -#include -#include +#if defined DARWIN_OS || defined __FreeBSD__ +# include #endif #ifdef __FreeBSD__ @@ -69,9 +68,9 @@ #ifdef MSDOS /* Demacs 1.1.2 91/10/20 Manabu Higashida, MW Aug 1993 */ #include "msdos.h" -#include #endif +#include #include #include ------------------------------------------------------------ revno: 112029 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13929 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2013-03-12 22:19:31 -0400 message: * lisp/emacs-lisp/byte-run.el (defun-declarations-alist): Don't use backquotes for `obsolete'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-13 02:08:33 +0000 +++ lisp/ChangeLog 2013-03-13 02:19:31 +0000 @@ -1,5 +1,8 @@ 2013-03-13 Stefan Monnier + * emacs-lisp/byte-run.el (defun-declarations-alist): Don't use + backquotes for `obsolete' (bug#13929). + * international/mule.el (find-auto-coding): Include file name in obsolescence warning (bug#13922). === modified file 'lisp/emacs-lisp/byte-run.el' --- lisp/emacs-lisp/byte-run.el 2013-03-10 21:40:55 +0000 +++ lisp/emacs-lisp/byte-run.el 2013-03-13 02:19:31 +0000 @@ -79,7 +79,8 @@ (list 'quote f) (list 'quote arglist) (list 'quote when)))) (list 'obsolete #'(lambda (f _args new-name when) - `(make-obsolete ',f ',new-name ,when))) + (list 'make-obsolete + (list 'quote f) (list 'quote new-name) (list 'quote when)))) (list 'compiler-macro #'(lambda (f args compiler-function) ;; FIXME: Make it possible to just reuse `args'. ------------------------------------------------------------ revno: 112028 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13922 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2013-03-12 22:08:33 -0400 message: * lisp/international/mule.el (find-auto-coding): Include file name in obsolescence warning. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-12 15:49:26 +0000 +++ lisp/ChangeLog 2013-03-13 02:08:33 +0000 @@ -1,3 +1,8 @@ +2013-03-13 Stefan Monnier + + * international/mule.el (find-auto-coding): Include file name in + obsolescence warning (bug#13922). + 2013-03-12 Teodor Zlatanov * progmodes/cfengine.el (cfengine-parameters-indent): New variable === modified file 'lisp/international/mule.el' --- lisp/international/mule.el 2013-02-10 03:08:21 +0000 +++ lisp/international/mule.el 2013-03-13 02:08:33 +0000 @@ -1844,8 +1844,11 @@ (re-search-forward "\\(.*;\\)?[ \t]*unibyte:[ \t]*\\([^ ;]+\\)" head-end t)) - (display-warning 'mule "`unibyte: t' is obsolete; \ -use \"coding: 'raw-text\" instead." :warning) + (display-warning 'mule + (format "\"unibyte: t\" (in %s) is obsolete; \ +use \"coding: 'raw-text\" instead." + (file-relative-name filename)) + :warning) (setq coding-system 'raw-text)) (when (and (not coding-system) (re-search-forward ------------------------------------------------------------ revno: 112027 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 18:05:40 -0700 message: * movemail.c: Don't grant more read permissions than necessary. The old 0333 dates back to before we called setuid, so it was needed back then to ensure user-readability, but 0377 should suffice now. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2013-03-13 00:54:47 +0000 +++ lib-src/ChangeLog 2013-03-13 01:05:40 +0000 @@ -2,6 +2,10 @@ * movemail.c (main): Call umask on all systems. This is OK since Emacs already assumes umask elsewhere. + Don't grant more read permissions than necessary. + The old 0333 dates back to before we called setuid, + so it was needed back then to ensure user-readability, + but 0377 should suffice now. 2013-02-08 Paul Eggert === modified file 'lib-src/movemail.c' --- lib-src/movemail.c 2013-03-13 00:54:47 +0000 +++ lib-src/movemail.c 2013-03-13 01:05:40 +0000 @@ -380,9 +380,9 @@ if (indesc < 0) pfatal_with_name (inname); - /* In case movemail is setuid to root, make sure the user can - read the output file. */ - umask (umask (0) & 0333); + /* Make sure the user can read the output file. */ + umask (umask (0) & 0377); + outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666); if (outdesc < 0) pfatal_with_name (outname); ------------------------------------------------------------ revno: 112026 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 17:54:47 -0700 message: * movemail.c (main): Call umask on all systems. This is OK since Emacs already assumes umask elsewhere. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2013-03-11 16:31:55 +0000 +++ lib-src/ChangeLog 2013-03-13 00:54:47 +0000 @@ -1,3 +1,8 @@ +2013-03-13 Paul Eggert + + * movemail.c (main): Call umask on all systems. + This is OK since Emacs already assumes umask elsewhere. + 2013-02-08 Paul Eggert * movemail.c (getenv): Remove decl (unused since 1994). === modified file 'lib-src/movemail.c' --- lib-src/movemail.c 2013-02-08 23:28:29 +0000 +++ lib-src/movemail.c 2013-03-13 00:54:47 +0000 @@ -380,13 +380,9 @@ if (indesc < 0) pfatal_with_name (inname); -#ifdef BSD_SYSTEM /* In case movemail is setuid to root, make sure the user can read the output file. */ - /* This is desirable for all systems - but I don't want to assume all have the umask system call */ umask (umask (0) & 0333); -#endif /* BSD_SYSTEM */ outdesc = open (outname, O_WRONLY | O_CREAT | O_EXCL, 0666); if (outdesc < 0) pfatal_with_name (outname); ------------------------------------------------------------ revno: 112025 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 17:38:42 -0700 message: Merge from gnulib. This incorporates: 2013-03-12 mktime: fix configure typo 2013-03-11 regex: port to mingw's recent addition of undeclared alarm 2013-03-11 putenv: avoid compilation warning on mingw 2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod. diff: === modified file 'ChangeLog' --- ChangeLog 2013-03-11 16:31:55 +0000 +++ ChangeLog 2013-03-13 00:38:42 +0000 @@ -1,3 +1,11 @@ +2013-03-13 Paul Eggert + + Merge from gnulib, incorporating: + 2013-03-12 mktime: fix configure typo + 2013-03-11 regex: port to mingw's recent addition of undeclared alarm + 2013-03-11 putenv: avoid compilation warning on mingw + 2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod. + 2013-03-06 Paul Eggert * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872). === modified file 'lib/putenv.c' --- lib/putenv.c 2013-03-01 15:16:43 +0000 +++ lib/putenv.c 2013-03-13 00:38:42 +0000 @@ -62,7 +62,9 @@ _unsetenv (const char *name) { size_t len; +#if !HAVE__PUTENV char **ep; +#endif if (name == NULL || *name == '\0' || strchr (name, '=') != NULL) { @@ -126,45 +128,45 @@ } #if HAVE__PUTENV - /* Rely on _putenv to allocate the new environment. If other - parts of the application use _putenv, the !HAVE__PUTENV code - would fight over who owns the environ vector, causing a crash. */ - if (name_end[1]) - return _putenv (string); - else + /* Rely on _putenv to allocate the new environment. If other + parts of the application use _putenv, the !HAVE__PUTENV code + would fight over who owns the environ vector, causing a crash. */ + if (name_end[1]) + return _putenv (string); + else + { + /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ") + to allocate the environ vector and then replace the new + entry with "NAME=". */ + int putenv_result, putenv_errno; + char *name_x = malloc (name_end - string + sizeof "= "); + if (!name_x) + return -1; + memcpy (name_x, string, name_end - string + 1); + name_x[name_end - string + 1] = ' '; + name_x[name_end - string + 2] = 0; + putenv_result = _putenv (name_x); + putenv_errno = errno; + for (ep = environ; *ep; ep++) + if (strcmp (*ep, name_x) == 0) + { + *ep = string; + break; + } +# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ + if (putenv_result == 0) { - /* _putenv ("NAME=") unsets NAME, so invoke _putenv ("NAME= ") - to allocate the environ vector and then replace the new - entry with "NAME=". */ - int putenv_result, putenv_errno; - char *name_x = malloc (name_end - string + sizeof "= "); - if (!name_x) - return -1; - memcpy (name_x, string, name_end - string + 1); - name_x[name_end - string + 1] = ' '; - name_x[name_end - string + 2] = 0; - putenv_result = _putenv (name_x); - putenv_errno = errno; - for (ep = environ; *ep; ep++) - if (strcmp (*ep, name_x) == 0) - { - *ep = string; - break; - } -# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ - if (putenv_result == 0) - { - /* _putenv propagated "NAME= " into the subprocess environment; - fix that by calling SetEnvironmentVariable directly. */ - name_x[name_end - string] = 0; - putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1; - putenv_errno = ENOMEM; /* ENOMEM is the only way to fail. */ - } -# endif - free (name_x); - __set_errno (putenv_errno); - return putenv_result; + /* _putenv propagated "NAME= " into the subprocess environment; + fix that by calling SetEnvironmentVariable directly. */ + name_x[name_end - string] = 0; + putenv_result = SetEnvironmentVariable (name_x, "") ? 0 : -1; + putenv_errno = ENOMEM; /* ENOMEM is the only way to fail. */ } +# endif + free (name_x); + __set_errno (putenv_errno); + return putenv_result; + } #else for (ep = environ; *ep; ep++) if (strncmp (*ep, string, name_end - string) == 0 === modified file 'lib/unistd.in.h' --- lib/unistd.in.h 2013-02-08 23:37:17 +0000 +++ lib/unistd.in.h 2013-03-13 00:38:42 +0000 @@ -61,8 +61,10 @@ /* mingw, MSVC, BeOS, Haiku declare environ in , not in . */ /* Solaris declares getcwd not only in but also in . */ +/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system is + included here. */ /* But avoid namespace pollution on glibc systems. */ -#ifndef __GLIBC__ +#if !defined __GLIBC__ && !defined __osf__ # define __need_system_stdlib_h # include # undef __need_system_stdlib_h === modified file 'm4/mktime.m4' --- m4/mktime.m4 2013-01-01 09:11:05 +0000 +++ m4/mktime.m4 2013-03-13 00:38:42 +0000 @@ -1,4 +1,4 @@ -# serial 24 +# serial 25 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -14,7 +14,7 @@ dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained dnl in Autoconf and because it invokes AC_LIBOBJ. AC_CHECK_HEADERS_ONCE([unistd.h]) - AC_CHECK_FUNCS_ONCE([alarm]) + AC_CHECK_DECLS_ONCE([alarm]) AC_REQUIRE([gl_MULTIARCH]) if test $APPLE_UNIVERSAL_BUILD = 1; then # A universal build on Apple Mac OS X platforms. @@ -34,8 +34,8 @@ # include #endif -#ifndef HAVE_ALARM -# define alarm(X) /* empty */ +#if HAVE_DECL_ALARM +# include #endif /* Work around redefinition to rpl_putenv by other config tests. */ @@ -171,10 +171,13 @@ int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; int time_t_signed = ! ((time_t) 0 < (time_t) -1); +#if HAVE_DECL_ALARM /* This test makes some buggy mktime implementations loop. Give up after 60 seconds; a mktime slower than that isn't worth using anyway. */ + signal (SIGALRM, SIG_DFL); alarm (60); +#endif time_t_max = (! time_t_signed ? (time_t) -1 ------------------------------------------------------------ revno: 112024 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 16:53:35 -0700 message: Mention etc/HELLO. diff: === modified file 'admin/notes/unicode' --- admin/notes/unicode 2013-03-12 20:54:53 +0000 +++ admin/notes/unicode 2013-03-12 23:53:35 +0000 @@ -192,6 +192,11 @@ * iso-2022-7bit + This file contains significant charset information, which is not + encoded in UTF-8. + + etc/HELLO + These files contain characters that cannot be encoded in UTF-8. leim/quail/tibetan.el ------------------------------------------------------------ revno: 112023 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 13:54:53 -0700 message: Remove incorrect comment about hanja3.el. diff: === modified file 'admin/notes/unicode' --- admin/notes/unicode 2013-03-11 22:35:04 +0000 +++ admin/notes/unicode 2013-03-12 20:54:53 +0000 @@ -201,10 +201,6 @@ lisp/language/tibet-util.el lisp/language/ind-util.el - Converting this file to UTF-8 loses non-character information. - - leim/quail/hanja3.el - This file is part of GNU Emacs. ------------------------------------------------------------ revno: 112022 committer: Paul Eggert branch nick: trunk timestamp: Tue 2013-03-12 09:53:31 -0700 message: Add coding tags for iso-2022-7bit files that are not already tagged. * HELLO, tutorials/TUTORIAL.ko, tutorials/TUTORIAL.th: Add coding tag. For TUTORIAL.th this prevents Emacs from misinterpreting the file. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2013-03-12 01:14:08 +0000 +++ etc/ChangeLog 2013-03-12 16:53:31 +0000 @@ -1,5 +1,10 @@ 2013-03-12 Paul Eggert + Add coding tags for iso-2022-7bit files that are not already tagged. + * HELLO, tutorials/TUTORIAL.ko, tutorials/TUTORIAL.th: + Add coding tag. For TUTORIAL.th this prevents Emacs from + misinterpreting the file. + Switch encodings of tutorials, thai-word to UTF-8 (Bug#13880). * refcards/ru-refcard.tex: * tutorials/TUTORIAL.bg, tutorials/TUTORIAL.bg, tutorials/TUTORIAL.cn: === modified file 'etc/HELLO' --- etc/HELLO 2013-01-01 09:11:05 +0000 +++ etc/HELLO 2013-03-12 16:53:31 +0000 @@ -93,4 +93,5 @@ ;;; Local Variables: ;;; tab-width: 32 ;;; bidi-display-reordering: t +;;; coding: iso-2022-7bit ;;; End: === modified file 'etc/tutorials/TUTORIAL.ko' --- etc/tutorials/TUTORIAL.ko 2013-01-01 09:11:05 +0000 +++ etc/tutorials/TUTORIAL.ko 2013-03-12 16:53:31 +0000 @@ -997,3 +997,6 @@ $(CAV=J=C?@(B. $(C@Z@/(B $(Cn8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(Cn(B $(C9fGX8&(B ("$(C branch nick: quickfixes timestamp: Tue 2013-03-12 11:49:26 -0400 message: * progmodes/cfengine.el: add CFEngine 3-specific indentation. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-12 02:08:21 +0000 +++ lisp/ChangeLog 2013-03-12 15:49:26 +0000 @@ -1,3 +1,10 @@ +2013-03-12 Teodor Zlatanov + + * progmodes/cfengine.el (cfengine-parameters-indent): New variable + for CFEngine 3-specific indentation. + (cfengine3-indent-line): Use it. Fix up category regex. + (cfengine3-font-lock-keywords): Add bundle and namespace characters. + 2013-03-12 Stefan Monnier * type-break.el (type-break-file-name): === modified file 'lisp/progmodes/cfengine.el' --- lisp/progmodes/cfengine.el 2013-03-11 17:17:13 +0000 +++ lisp/progmodes/cfengine.el 2013-03-12 15:49:26 +0000 @@ -58,6 +58,70 @@ :group 'cfengine :type 'integer) +(defcustom cfengine-parameters-indent '(promise pname 0) + "*Indentation of CFEngine3 promise parameters (hanging indent). + +For example, say you have this code: + +bundle x y +{ + section: + class:: + promise ... + promiseparameter => ... +} + +You can choose to indent promiseparameter from the beginning of +the line (absolutely) or from the word \"promise\" (relatively). + +You can also choose to indent the start of the word +\"promiseparameter\" or the arrow that follows it. + +Finally, you can choose the amount of the indent. + +The default is to anchor at promise, indent parameter name, and offset 0: + +bundle agent rcfiles +{ + files: + any:: + \"/tmp/netrc\" + comment => \"my netrc\", + perms => mog(\"600\", \"tzz\", \"tzz\"); +} + +Here we anchor at beginning of line, indent arrow, and offset 10: + +bundle agent rcfiles +{ + files: + any:: + \"/tmp/netrc\" + comment => \"my netrc\", + perms => mog(\"600\", \"tzz\", \"tzz\"); +} + +Some, including cfengine_stdlib.cf, like to anchor at promise, indent +arrow, and offset 16 or so: + +bundle agent rcfiles +{ + files: + any:: + \"/tmp/netrc\" + comment => \"my netrc\", + perms => mog(\"600\", \"tzz\", \"tzz\"); +} +" + + :group 'cfengine + :type '(list + (choice (const :tag "Anchor at beginning of promise" promise) + (const :tag "Anchor at beginning of line" bol)) + (choice (const :tag "Indent parameter name" pname) + (const :tag "Indent arrow" arrow)) + (integer :tag "Indentation amount from anchor"))) + (defvar cfengine-mode-debug nil "Whether `cfengine-mode' should print debugging info.") @@ -126,8 +190,8 @@ ;; Defuns. This happens early so they don't get caught by looser ;; patterns. (,(concat "\\<" cfengine3-defuns-regex "\\>" - "[ \t]+\\<\\([[:alnum:]_]+\\)\\>" - "[ \t]+\\<\\([[:alnum:]_:]+\\)" + "[ \t]+\\<\\([[:alnum:]_.:]+\\)\\>" + "[ \t]+\\<\\([[:alnum:]_.:]+\\)" ;; Optional parentheses with variable names inside. "\\(?:(\\([^)]*\\))\\)?") (1 font-lock-builtin-face) @@ -305,10 +369,10 @@ ((looking-at (concat cfengine3-defuns-regex "\\>")) (indent-line-to 0)) ;; Categories are indented one step. - ((looking-at (concat cfengine3-category-regex "[ \t]*$")) + ((looking-at (concat cfengine3-category-regex "[ \t]*\\(#.*\\)*$")) (indent-line-to cfengine-indent)) ;; Class selectors are indented two steps. - ((looking-at (concat cfengine3-class-selector-regex "[ \t]*$")) + ((looking-at (concat cfengine3-class-selector-regex "[ \t]*\\(#.*\\)*$")) (indent-line-to (* 2 cfengine-indent))) ;; Outdent leading close brackets one step. ((or (eq ?\} (char-after)) @@ -333,7 +397,23 @@ ;; plus 2. That way, promises indent deeper than class ;; selectors, which in turn are one deeper than categories. ((= 1 (nth 0 parse)) - (indent-line-to (* (+ 2 (nth 0 parse)) cfengine-indent))) + (let ((p-anchor (nth 0 cfengine-parameters-indent)) + (p-what (nth 1 cfengine-parameters-indent)) + (p-indent (nth 2 cfengine-parameters-indent))) + ;; Do we have the parameter anchor and location and indent + ;; defined, and are we looking at a promise parameter? + (if (and p-anchor p-what p-indent + (looking-at "\\([[:alnum:]_]+[ \t]*\\)=>")) + (let* ((arrow-offset (* -1 (length (match-string 1)))) + (extra-offset (if (eq p-what 'arrow) arrow-offset 0)) + (base-offset (if (eq p-anchor 'promise) + (* (+ 2 (nth 0 parse)) cfengine-indent) + 0))) + (indent-line-to (max 0 (+ p-indent base-offset extra-offset)))) + ;; Else, indent to cfengine-indent times the nested depth + ;; plus 2. That way, promises indent deeper than class + ;; selectors, which in turn are one deeper than categories. + (indent-line-to (* (+ 2 (nth 0 parse)) cfengine-indent))))) ;; Inside brackets/parens: indent to start column of non-comment ;; token on line following open bracket or by one step from open ;; bracket's column. ------------------------------------------------------------ revno: 112020 committer: Paul Eggert branch nick: trunk timestamp: Mon 2013-03-11 19:40:08 -0700 message: Prefer UTF-8 in documentation. diff: === modified file 'etc/refcards/pt-br-refcard.tex' --- etc/refcards/pt-br-refcard.tex 2013-01-01 09:11:05 +0000 +++ etc/refcards/pt-br-refcard.tex 2013-03-12 02:40:08 +0000 @@ -296,7 +296,7 @@ \section{Ajuda (Help)} -Tecle \kbd{C-h} (ou \kbd{F1}) e siga as instru{\c{c}}{\~o}es. +Tecle \kbd{C-h} (ou \kbd{F1}) e siga as instru{\c{c}}{\~o}es. \key{remove a janela de ajuda}{C-x 1} \key{rola a janela de ajuda}{C-M-v} @@ -676,6 +676,5 @@ % Local variables: % compile-command: "pdftex pt-br-refcard" -% coding: iso-latin-1 +% coding: utf-8 % End: - === modified file 'lisp/language/chinese.el' --- lisp/language/chinese.el 2013-01-01 09:11:05 +0000 +++ lisp/language/chinese.el 2013-03-12 02:40:08 +0000 @@ -1,4 +1,4 @@ -;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*- +;;; chinese.el --- support for Chinese -*- coding: utf-8; -*- ;; Copyright (C) 2001-2013 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -114,7 +114,7 @@ iso-2022-cn) (input-method . "chinese-py-punct") (features china-util) - (sample-text . "Chinese ($AVPND(B,$AFUM(;0(B,$A::So(B) $ADc:C(B") + (sample-text . "Chinese (中文,普通话,汉语) 你好") (documentation . "Support for Chinese GB2312 character set.") (tutorial . "TUTORIAL.cn")) '("Chinese")) @@ -146,7 +146,7 @@ (input-method . "chinese-py-punct-b5") (ctext-non-standard-encodings "big5-0") (features china-util) - (sample-text . "Cantonese ($(0GnM$(B,$(0N]0*Hd(B) $(0*/=((B, $(0+$)p(B") + (sample-text . "Cantonese (粵語,廣東話) 早晨, 你好") (documentation . "Support for Chinese Big5 character set.") (tutorial . "TUTORIAL.zh")) '("Chinese")) @@ -251,7 +251,7 @@ chinese-iso-8bit) ; fixme? (ctext-non-standard-encodings "gbk-0") (input-method . "chinese-py-punct") ; fixme? - (sample-text . "Chinese ($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D95$B9%(B") + (sample-text . "Chinese (中文,普通话,汉语) 妳好") (features china-util) (documentation . "Support for Chinese GBK character set.") (tutorial . "TUTORIAL.cn")) @@ -277,7 +277,7 @@ (coding-priority gb18030 gbk iso-2022-cn chinese-big5 chinese-iso-8bit) ; fixme? (input-method . "chinese-py-punct") ; fixme? - (sample-text . "Chinese ($BCfJ8(B,$BIaDL$A;0(B,$A::So(B) $(D0_$B9%(B") + (sample-text . "Chinese (中文,普通话,汉语) 你好") (features china-util) (documentation . "Support for Chinese GB18030 character set.") === modified file 'lisp/language/cyrillic.el' --- lisp/language/cyrillic.el 2013-01-01 09:11:05 +0000 +++ lisp/language/cyrillic.el 2013-03-12 02:40:08 +0000 @@ -1,4 +1,4 @@ -;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*- +;;; cyrillic.el --- support for Cyrillic -*- coding: utf-8; -*- ;; Copyright (C) 1997-1998, 2001-2013 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -74,7 +74,7 @@ (nonascii-translation . iso-8859-5) (unibyte-display . cyrillic-iso-8bit) (features cyril-util) - (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") + (sample-text . "Russian (Русский) Здравствуйте!") (documentation . "Support for Cyrillic ISO-8859-5.")) '("Cyrillic")) @@ -103,7 +103,7 @@ (input-method . "russian-typewriter") (features cyril-util) (unibyte-display . cyrillic-koi8) - (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") + (sample-text . "Russian (Русский) Здравствуйте!") (documentation . "Support for Cyrillic KOI8-R.")) '("Cyrillic")) @@ -117,7 +117,7 @@ (input-method . "russian-computer") (features cyril-util) (unibyte-display . cyrillic-koi8) - (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") + (sample-text . "Russian (Русский) Здравствуйте!") (documentation . "\ Support for Russian using koi8-r and the russian-computer input method.") (tutorial . "TUTORIAL.ru")) @@ -158,7 +158,7 @@ (input-method . "russian-typewriter") (features cyril-util) (unibyte-display . cyrillic-alternativnyj) - (sample-text . "Russian (,L@caaZXY(B) ,L7T`PRabRcYbU(B!") + (sample-text . "Russian (Русский) Здравствуйте!") (documentation . "Support for Cyrillic ALTERNATIVNYJ.")) '("Cyrillic")) === modified file 'lisp/language/czech.el' --- lisp/language/czech.el 2013-01-01 09:11:05 +0000 +++ lisp/language/czech.el 2013-03-12 02:40:08 +0000 @@ -1,9 +1,9 @@ -;;; czech.el --- support for Czech -*- coding: iso-2022-7bit -*- +;;; czech.el --- support for Czech -*- coding: utf-8 -*- ;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc. ;; Author: Milan Zamazal -;; Maintainer: Pavel Jan,Am(Bk +;; Maintainer: Pavel Janík ;; Keywords: multilingual, Czech ;; This file is part of GNU Emacs. @@ -35,7 +35,7 @@ (nonascii-translation . iso-8859-2) (unibyte-display . iso-8859-2) (tutorial . "TUTORIAL.cs") - (sample-text . "P,Bx(Bejeme v,Ba(Bm hezk,B}(B den!") + (sample-text . "Přejeme vám hezký den!") (documentation . "\ This language environment is almost the same as Latin-2, but sets the default input method to \"czech\", === modified file 'lisp/language/korean.el' --- lisp/language/korean.el 2013-01-01 09:11:05 +0000 +++ lisp/language/korean.el 2013-03-12 02:40:08 +0000 @@ -1,4 +1,4 @@ -;;; korean.el --- support for Korean -*- coding: iso-2022-7bit -*- +;;; korean.el --- support for Korean -*- coding: utf-8 -*- ;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -74,7 +74,7 @@ (input-method . "korean-hangul") (features korea-util) (coding-priority korean-iso-8bit korean-cp949 iso-2022-kr) - (sample-text . "Hangul ($(CGQ1[(B) $(C>H3gGO<H3gGO=J4O1n(B") + (sample-text . "Hangul (한글) 안녕하세요, 안녕하십니까") (documentation . "\ The following key bindings are available for controlling Korean input methods: Shift-SPC, Hangul: toggle-korean-input-method === modified file 'lisp/language/slovak.el' --- lisp/language/slovak.el 2013-01-01 09:11:05 +0000 +++ lisp/language/slovak.el 2013-03-12 02:40:08 +0000 @@ -1,10 +1,10 @@ -;;; slovak.el --- support for Slovak -*- coding: iso-2022-7bit -*- +;;; slovak.el --- support for Slovak -*- coding: utf-8 -*- ;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc. -;; Authors: Tibor ,B)(Bimko , +;; Authors: Tibor Šimko , ;; Milan Zamazal -;; Maintainer: Pavel Jan,Am(Bk +;; Maintainer: Pavel Janík ;; Keywords: multilingual, Slovak ;; This file is part of GNU Emacs. @@ -36,7 +36,7 @@ (input-method . "slovak") (unibyte-display . iso-8859-2) (tutorial . "TUTORIAL.sk") - (sample-text . "Prajeme V,Ba(Bm pr,Bm(Bjemn,B}(B de,Br(B!") + (sample-text . "Prajeme Vám príjemný deň!") (documentation . "\ This language environment is almost the same as Latin-2, but sets the default input method to \"slovak\", === modified file 'lisp/language/vietnamese.el' --- lisp/language/vietnamese.el 2013-01-01 09:11:05 +0000 +++ lisp/language/vietnamese.el 2013-03-12 02:40:08 +0000 @@ -1,4 +1,4 @@ -;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*- +;;; vietnamese.el --- support for Vietnamese -*- coding: utf-8; -*- ;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc. ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -80,7 +80,7 @@ (input-method . "vietnamese-viqr") (unibyte-display . vietnamese-viscii) (features viet-util) - (sample-text . "Vietnamese (Ti,1*(Bng Vi,1.(Bt) Ch,1`(Bo b,1U(Bn") + (sample-text . "Vietnamese (Tiếng Việt) Chào bạn") (documentation . "\ For Vietnamese, Emacs uses special charsets internally. They can be decoded from and encoded to VISCII, VSCII, TCVN-5712, VIQR