merge from trunk; clean up some issues

This commit is contained in:
Tom Tromey 2013-06-03 12:25:05 -06:00
commit 68359abba9
690 changed files with 49789 additions and 109280 deletions

229
ChangeLog
View file

@ -1,3 +1,218 @@
2013-06-03 Michael Albinus <michael.albinus@gmx.de>
* configure.ac (file-notification): New option, replaces inotify option.
(HAVE_W32): Remove w32notify.o.
(with_file_notification): Add checks for glib and w32. Adapt check
for inotify.
(Summary): Add entry for file notification.
* autogen/config.in: Add entries for HAVE_GFILENOTIFY,
HAVE_W32NOTIFY and USE_FILE_NOTIFY.
2013-06-02 Juanma Barranquero <lekktu@gmail.com>
* .bzrignore: Ignore dirs libexec/, share/ and var/.
2013-05-29 Xue Fuqiao <xfq.free@gmail.com>
* INSTALL: Fix description.
2013-05-27 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.ac (HAVE_XRANDR): Check availability of
XRRGetScreenResources rather than that of XRRQueryExtension.
2013-05-18 Eli Zaretskii <eliz@gnu.org>
* make-dist (files): Add nt/msysconfig.sh, nt/mingw-cfg.site,
nt/epaths.nt, and nt/INSTALL.MSYS.
2013-05-18 Paul Eggert <eggert@cs.ucla.edu>
Port --enable-gcc-warnings to clang.
* configure.ac (nw): Remove obsolescent warnings.
These aren't needed for clang, or for gcc for that matter.
(emacs_cv_clang): New var, which tests for clang.
Omit warnings that clang is too picky about.
(GLIB_DISABLE_DEPRECATION_WARNINGS): Define this;
needed for Ubuntu 13.04 + clang + --enable-gcc-warnings.
* make-dist (files): Add nt/Makefile.in, nt/gnulib.mk.
Otherwise, 'configure; make' fails on non-Windows builds.
2013-05-16 Eli Zaretskii <eliz@gnu.org>
* lib/Makefile.am: If building for MS-Windows, include
nt/gnulib.mk instead of lib/gnulib.mk.
* configure.ac: Adapt to MSYS build on MS-Windows.
* Makefile.in (NTDIR): New variable, for the MSYS build on
MS-Windows.
(SUBDIR): Add $(NTDIR).
(.PHONY): Add epaths-force-w32.
(msys_to_w32): New variable.
(epaths-force-w32, install-nt, uninstall-nt): New targets.
(lib-src src): Add $(NTLIB) to prerequisites.
(lib lib-src lisp leim nt): Add 'nt'.
(config.status): Use $(CFG).
(.PHONY): Add install-$(NTDIR) and uninstall-$(NTDIR).
(install, install-arch-dep): Add install-$(NTDIR).
(uninstall): Depend on uninstall-$(NTDIR).
(mostlyclean, clean, distclean, bootstrap-clean): Add 'nt'.
* GNUmakefile (CFG): New variable, uses mingw-cfg.site as
CONFIG_SITE for the MSYS build on MS-Windows.
(Makefile): Use $(CFG).
* .bzrignore: Ignore *.res, *.tmp, and *.map. Remove
src/emacs.res.
2013-05-16 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-05-15 manywarnings: update for GCC 4.8.0
2013-05-15 stdio: use __REDIRECT for fwrite, fwrite_unlocked
2013-05-15 sig2str, stdio, warnings: port to clang
2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
* Makefile.in (install-doc): DOC file is not version specific any more.
* .bzrignore: Don't ignore DOC-* any more.
2013-05-13 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie.
Reported privately by Han Boetes <han@boetes.org>.
2013-05-08 Juanma Barranquero <lekktu@gmail.com>
* lib/makefile.w32-in (ACL_H): New macro.
($(BLD)/acl-errno-valid.$(O)): Update dependencies.
2013-05-07 Paul Eggert <eggert@cs.ucla.edu>
Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
* configure.ac: Remove -with-acl option, since Gnulib does that for
us now.
(LIBACL_LIBS): Remove; no longer needed.
* lib/Makefile.am (CLEANFILES, SUFFIXES): New (empty) macros,
for the benefit of the new ACL implementation.
* lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/acl-errno-valid.$(O).
($(BLD)/acl-errno-valid.$(O)): New rule.
* lib/acl-errno-valid.c, lib/acl-internal.h, lib/acl.h:
* lib/acl_entries.c, lib/errno.in.h, lib/file-has-acl.c:
* lib/qcopy-acl.c, lib/qset-acl.c, m4/acl.m4, m4/errno_h.m4:
New files, taken from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
2013-05-07 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac (HAVE_XRANDR, HAVE_XINERAMA): Define if available.
(XRANDR_LIBS, XINERAMA_LIBS): New AC_SUBSTs.
2013-05-06 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-04-30 utimens, utimensat: work around Solaris UTIME_OMIT bug
2013-05-01 Paul Eggert <eggert@cs.ucla.edu>
* make-dist: Keep necessary restrictions on file access.
2013-04-29 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-04-28 extern-inline: work around bug in Sun c99
2013-04-27 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-04-27 alignof, intprops, malloca: port better to IBM's C compiler
2013-04-26 Paul Eggert <eggert@cs.ucla.edu>
Port better to AIX (Bug#14258).
* configure.ac (CFLAGS): Append -O if the user did not specify CFLAGS,
we did not already infer an optimization option, and -O works.
AIX xlc needs -O, otherwise garbage collection doesn't work.
2013-04-22 Paul Eggert <eggert@cs.ucla.edu>
* make-dist: Do not distribute admin/unidata/Makefile.
It is generated by 'configure'.
* build-aux/update-subdirs: Don't leave subdirs.el~ behind.
It messes up 'make distclean', and contains no useful information
because it's a copy of subdirs.el.
2013-04-18 John Marino <gnugcc@marino.st> (tiny change)
* configure.ac: Add DragonFly BSD, mostly same as FreeBSD. (Bug#14068)
2013-04-18 Glenn Morris <rgm@gnu.org>
* configure.ac (AC_PROG_LN_S): Remove, too restrictive.
(LN_S_FILEONLY): New output variable.
* Makefile.in (LN_S): Remove.
(LN_S_FILEONLY): New, set by configure.
(install-arch-dep): Use LN_S_FILEONLY rather than LN_S.
2013-04-12 Ken Brown <kbrown@cornell.edu>
* configure.ac (canonical): Adapt to 64-bit Cygwin, for which
`canonical' is `x86_64-unknown-cygwin'.
2013-04-09 Ken Brown <kbrown@cornell.edu>
* configure.ac (W32_RES_LINK): Remove unneeded linker directive
`-Wl,-bpe-i386', which is confusing in the 64-bit case.
(Bug#12993)
2013-04-07 Paul Eggert <eggert@cs.ucla.edu>
Fix --enable-profiling bug introduced by 2013-02-25 change (Bug#13783).
* configure.ac (LD_SWITCH_SYSTEM_TEMACS): Append -pg if profiling
and if not on GNU/Linux or FreeBSD.
* lib/Makefile.am (AM_CFLAGS): Add $(PROFILING_CFLAGS), so that
lib/*.o is profiled too.
2013-03-30 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-03-29 stdalign: port to stricter ISO C11
This helps to run 'configure' on MS-Windows; see Eli Zaretskii in
<http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00999.html>.
2013-03-27 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (HAVE_XKBGETKEYBOARD): Remove.
Subsumed by HAVE_XKB. All uses changed.
2013-03-25 Jan Djärv <jan.h.d@swipnet.se>
* configure.ac (HAVE_XKB): Define if Xkb is present.
2013-03-24 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-03-21 sys_select, sys_time: port 2013-01-30 fix to Cygwin
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
Fix bug when building Emacs with a GNU Make submake (Bug#13962).
* Makefile.in (QUIET_SUBMAKE): New macro.
(install-info, uninstall): Use it.
Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
* configure.ac (IMAGEMAGICK_MODULE): Reject 6.8.2.
We want to reject 6.8.2-3 through 6.8.3-9, but there seems to be
no way to do this in pkg-config, so make do with a reasonable
approximation.
Automate the build of ja-dic.el (Bug#13984).
* .bzrignore: Add leim/ja-dic/.
2013-03-13 Paul Eggert <eggert@cs.ucla.edu>
File synchronization fixes (Bug#13944).
@ -14,6 +229,10 @@
2013-03-11 putenv: avoid compilation warning on mingw
2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
2013-03-11 Glenn Morris <rgm@gnu.org>
* Merge in all changes up to version 24.3 release.
2013-03-06 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).
@ -47,11 +266,6 @@
not always needed.
(HAVE_DATA_START): New macro.
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* lisp/eshell/em-cmpl.el: Corrected "context-related help"
keybinding in commentary.
2013-02-21 Paul Eggert <eggert@cs.ucla.edu>
Parallelize documentation builds.
@ -64,11 +278,6 @@
(info-real): Depend on $(INFOS) rather than doing it sequentially.
(dvi): Depend on $(DVIS) rather than doing it sequentially.
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* doc/misc/eshell.texi: Added documentation for Eshell insert
output redirection operator, >>>.
2013-02-15 Paul Eggert <eggert@cs.ucla.edu>
Fix AIX port (Bug#13650).

View file

@ -32,6 +32,11 @@
# run "configure" by hand. But run autogen.sh first, if the source
# was checked out directly from the repository.
ifneq ($(MSYSTEM),)
CFG = CONFIG_SITE=$(CURDIR)/nt/mingw-cfg.site
else
CFG =
endif
# If a Makefile already exists, just use it.
@ -70,7 +75,7 @@ configure:
Makefile: configure
@echo >&2 'There seems to be no Makefile in this directory.'
@echo >&2 'Running ./configure ...'
./configure
$(CFG) ./configure
@echo >&2 'Makefile built.'
endif

View file

@ -212,7 +212,7 @@ The names of the packages that you need varies according to the
GNU/Linux distribution that you use, and the options that you want to
configure Emacs with. On Debian-based systems, you can install all the
packages needed to build the installed version of Emacs with a command
like `apt-get build-dep emacs23'. On Red Hat systems, the
like `apt-get build-dep emacs24'. On Red Hat systems, the
corresponding command is `yum-builddep emacs'.

View file

@ -67,6 +67,10 @@ CDPATH=
# If Make doesn't predefine MAKE, set it here.
@SET_MAKE@
# Prevent submakes from outputting "Entering directory ..." and
# "Leaving directory..." diagnostics that would mess up 'make echo-info'.
QUIET_SUBMAKE = MAKELEVEL=0
# ==================== Things `configure' Might Edit ====================
cache_file = @cache_file@
@ -89,6 +93,9 @@ version=@version@
### for, like `mips-dec-ultrix' or `sparc-sun-sunos'.
configuration=@configuration@
### The nt/ subdirectory gets built only for MinGW
NTDIR=@NTDIR@
# ==================== Where To Install Things ====================
# Location to install Emacs.app under GNUstep / Mac OS X.
@ -249,7 +256,8 @@ INSTALL_INFO = @INSTALL_INFO@
# By default, we uphold the dignity of our programs.
INSTALL_STRIP =
MKDIR_P = @MKDIR_P@
LN_S = @LN_S@
# Create a link to a file in the same directory as the target.
LN_S_FILEONLY = @LN_S_FILEONLY@
# We use gzip to compress installed .el files.
GZIP_PROG = @GZIP_PROG@
@ -267,23 +275,23 @@ EMACS = ${EMACS_NAME}${EXEEXT}
EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
# Subdirectories to make recursively.
SUBDIR = lib lib-src src lisp leim
SUBDIR = $(NTDIR) lib lib-src src lisp leim
# The subdir makefiles created by config.status.
SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
# Subdirectories to install, and where they'll go.
# lib-src's makefile knows how to install it, so we don't do that here.
# Directories that cannot simply be copied, eg info,
# are treated separately.
# quail appears twice because in out-of-tree builds, it exists twice.
# Subdirectories to install, and where they'll go. lib-src's and nt's
# makefiles know how to install them, so we don't do that here.
# Directories that cannot simply be copied, eg info, are treated
# separately. quail appears twice because in out-of-tree builds, it
# exists twice.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp ${srcdir}/leim/ja-dic ${srcdir}/leim/quail leim/quail
COPYDESTS = $(DESTDIR)${etcdir} $(DESTDIR)${lispdir} $(DESTDIR)${leimdir}/ja-dic $(DESTDIR)${leimdir}/quail $(DESTDIR)${leimdir}/quail
all: ${SUBDIR}
.PHONY: all ${SUBDIR} blessmail epaths-force FRC
.PHONY: all ${SUBDIR} blessmail epaths-force epaths-force-w32 FRC
removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g'
@ -310,7 +318,20 @@ epaths-force: FRC
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
lib-src src: lib
# Convert MSYS-style /x/foo file name into x:/foo that Windows can grok.
msys_to_w32=sed -e 's,^/\([A-Za-z]\)/,\1:/,'
# The w32 build needs a slightly different editing, and it uses
# nt/epaths.nt as the template.
epaths-force-w32: FRC
@(w32srcdir=`echo "${srcdir}" | ${msys_to_w32}` ; \
sed < ${srcdir}/nt/epaths.nt > epaths.h.$$$$ \
-e '/^.*#/s/@VER@/${version}/g' \
-e '/^.*#/s/@CFG@/${configuration}/g' \
-e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \
${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
lib-src src: $(NTDIR) lib
src: lib-src FRC
@ -319,7 +340,7 @@ src: lib-src FRC
lisp leim: src
# These targets should be "${SUBDIR} without `src'".
lib lib-src lisp leim: Makefile FRC
lib lib-src lisp leim nt: Makefile FRC
cd $@ && $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@ -373,9 +394,9 @@ $(MAKEFILE_NAME): config.status $(srcdir)/src/config.in \
config.status: ${srcdir}/configure ${srcdir}/lisp/version.el
if [ -x ./config.status ]; then \
./config.status --recheck; \
$(CFG) ./config.status --recheck; \
else \
$(srcdir)/configure $(CONFIGURE_FLAGS); \
$(CFG) $(srcdir)/configure $(CONFIGURE_FLAGS); \
fi
AUTOCONF_INPUTS = $(srcdir)/configure.ac $(srcdir)/aclocal.m4
@ -412,13 +433,14 @@ $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS)
# ==================== Installation ====================
.PHONY: install install-arch-dep install-arch-indep install-doc install-info
.PHONY: install-man install-etc install-strip uninstall
.PHONY: install-man install-etc install-strip install-$(NTDIR)
.PHONY: uninstall uninstall-$(NTDIR)
## If we let lib-src do its own installation, that means we
## don't have to duplicate the list of utilities to install in
## this Makefile as well.
install: all install-arch-indep install-doc install-arch-dep blessmail
install: all install-arch-indep install-doc install-arch-dep install-$(NTDIR) blessmail
@true
## Ensure that $subdir contains a subdirs.el file.
@ -439,7 +461,7 @@ write_subdir=if [ -f $${subdir}/subdirs.el ]; \
### Install the executables that were compiled specifically for this machine.
### We do install-arch-indep first because the executable needs the
### Lisp files and DOC file to work properly.
install-arch-dep: src install-arch-indep install-doc
install-arch-dep: src install-arch-indep install-doc install-$(NTDIR)
umask 022; ${MKDIR_P} $(DESTDIR)${bindir}
cd lib-src && \
$(MAKE) install $(MFLAGS) prefix=${prefix} \
@ -451,7 +473,7 @@ install-arch-dep: src install-arch-indep install-doc
chmod 1755 $(DESTDIR)${bindir}/$(EMACSFULL) || true; \
if test "x${NO_BIN_LINK}" = x; then \
rm -f $(DESTDIR)${bindir}/$(EMACS) ; \
cd $(DESTDIR)${bindir} && $(LN_S) $(EMACSFULL) $(EMACS); \
cd $(DESTDIR)${bindir} && $(LN_S_FILEONLY) $(EMACSFULL) $(EMACS); \
fi; \
else \
subdir=${ns_appresdir}/site-lisp; \
@ -459,6 +481,16 @@ install-arch-dep: src install-arch-indep install-doc
rm -rf ${ns_appresdir}/share; \
fi
### Windows-specific install target for installing programs produced
### in nt/, and its Posix do-nothing shadow.
install-:
install-nt:
cd $(NTDIR) && \
$(MAKE) install $(MFLAGS) prefix=${prefix} \
exec_prefix=${exec_prefix} bindir=${bindir} \
libexecdir=${libexecdir} archlibdir=${archlibdir} \
INSTALL_STRIP=${INSTALL_STRIP}
## In the share directory, we are deleting:
## applications (with emacs.desktop, also found in etc/)
## emacs (basically empty except for unneeded site-lisp directories)
@ -576,10 +608,6 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
## guaranteed to do the right thing; eg if we are root and tar is
## preserving source permissions.
## We install only the relevant DOC file if possible
## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
## (Note "otherwise" is inaccurate since 2009-08-23.)
## Note that install-arch-indep deletes and recreates the entire
## installed etc/ directory, so we need it to run before this does.
install-doc: src install-arch-indep
@ -587,13 +615,7 @@ install-doc: src install-arch-indep
umask 022; ${MKDIR_P} $(DESTDIR)${docdir} ; \
if [ `cd ./etc; /bin/pwd` != `cd $(DESTDIR)${docdir}; /bin/pwd` ]; \
then \
fullversion=`./src/emacs --version | sed -n '1 s/GNU Emacs *//p'`; \
if [ -f "./etc/DOC-$${fullversion}" ]; \
then \
docfile="DOC-$${fullversion}"; \
else \
docfile="DOC"; \
fi; \
docfile="DOC"; \
echo "Copying etc/$${docfile} to $(DESTDIR)${docdir} ..." ; \
${INSTALL_DATA} etc/$${docfile} $(DESTDIR)${docdir}/$${docfile}; \
$(set_installuser); \
@ -609,7 +631,9 @@ install-info: info
[ -f dir ] || \
(cd $${thisdir}; \
${INSTALL_DATA} ${srcdir}/info/dir $(DESTDIR)${infodir}/dir) ; \
info_misc=`cd $${thisdir}/doc/misc; ${MAKE} -s echo-info`; \
info_misc=`cd $${thisdir}/doc/misc && \
$(QUIET_SUBMAKE) $(MAKE) -s echo-info \
`; \
cd ${srcdir}/info ; \
for elt in ${INFO_NONMISC} $${info_misc}; do \
test "$(HAVE_MAKEINFO)" = "no" && test ! -f $$elt && continue; \
@ -681,11 +705,12 @@ install-strip:
### create (but not the noninstalled files such as `make all' would create).
###
### Don't delete the lisp and etc directories if they're in the source tree.
uninstall:
uninstall: uninstall-$(NTDIR)
cd lib-src && \
$(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
-unset CDPATH; \
for dir in $(DESTDIR)${lispdir} $(DESTDIR)${etcdir} ; do \
if [ -d $${dir} ]; then \
@ -702,7 +727,7 @@ uninstall:
done
-rm -rf $(DESTDIR)${libexecdir}/emacs/${version}
thisdir=`/bin/pwd`; \
(info_misc=`cd doc/misc; ${MAKE} -s echo-info`; \
(info_misc=`cd doc/misc && $(QUIET_SUBMAKE) $(MAKE) -s echo-info`; \
if cd $(DESTDIR)${infodir}; then \
for elt in ${INFO_NONMISC} $${info_misc}; do \
(cd $${thisdir}; \
@ -730,6 +755,15 @@ uninstall:
[ -s $${file} ] || rm -f $$file; \
done
### Windows-specific uninstall target for removing programs produced
### in nt/, and its Posix do-nothing shadow.
uninstall-:
uninstall-nt:
cd $(NTDIR) && \
$(MAKE) $(MFLAGS) uninstall \
prefix=${prefix} exec_prefix=${exec_prefix} \
bindir=${bindir} libexecdir=${libexecdir} archlibdir=${archlibdir}
FRC:
# ==================== Cleaning up and miscellanea ====================
@ -747,6 +781,7 @@ mostlyclean: FRC
(cd lwlib; $(MAKE) $(MFLAGS) mostlyclean)
(cd lib; $(MAKE) $(MFLAGS) mostlyclean)
(cd lib-src; $(MAKE) $(MFLAGS) mostlyclean)
(cd nt; $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/emacs && $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean)
-(cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean)
@ -768,6 +803,7 @@ clean: FRC
(cd lwlib; $(MAKE) $(MFLAGS) clean)
(cd lib; $(MAKE) $(MFLAGS) clean)
(cd lib-src; $(MAKE) $(MFLAGS) clean)
(cd nt; $(MAKE) $(MFLAGS) clean)
-(cd doc/emacs && $(MAKE) $(MFLAGS) clean)
-(cd doc/misc && $(MAKE) $(MFLAGS) clean)
-(cd doc/lispref && $(MAKE) $(MFLAGS) clean)
@ -794,6 +830,7 @@ distclean: FRC
(cd lwlib; $(MAKE) $(MFLAGS) distclean)
(cd lib; $(MAKE) $(MFLAGS) distclean)
(cd lib-src; $(MAKE) $(MFLAGS) distclean)
(cd nt; $(MAKE) $(MFLAGS) distclean)
(cd doc/emacs && $(MAKE) $(MFLAGS) distclean)
(cd doc/misc && $(MAKE) $(MFLAGS) distclean)
(cd doc/lispref && $(MAKE) $(MFLAGS) distclean)
@ -812,6 +849,7 @@ bootstrap-clean: FRC
(cd lwlib; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lib; $(MAKE) $(MFLAGS) maintainer-clean)
(cd lib-src; $(MAKE) $(MFLAGS) maintainer-clean)
(cd nt; $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/emacs && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean)
-(cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean)

View file

@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H
HAVE_XAW3D
HAVE_XFT
HAVE_XIM
HAVE_XKBGETKEYBOARD
HAVE_XPM
HAVE_XRMSETDATABASE
HAVE_XSCREENNUMBEROFSCREEN

View file

@ -1,3 +1,76 @@
2013-06-02 Eric Ludlam <zappo@gnu.org>
* grammars/srecode-template.wy (variable): Accept a single number
as a variable value. Allows the 'priority' to be set to a number.
(wisent-srecode-template-lexer): Move number up so it can be
created.
2013-05-16 Glenn Morris <rgm@gnu.org>
* cus-test.el (cus-test-cus-load-groups): New function.
(cus-test-get-options): Add option to return groups.
(cus-test-noloads): Also check custom groups.
2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
* quick-install-emacs: Don't prune DOC-* files a any more.
2013-05-14 Glenn Morris <rgm@gnu.org>
* cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
(cus-test-libs): Fix let-binding of default-directory.
(cus-test-noloads): Load all libs for the comparison.
2013-05-11 Glenn Morris <rgm@gnu.org>
* cus-test.el (cus-test-libs-noloads): Add a few more files.
(cus-test-load-libs, cus-test-opts):
Add option to load more/all Lisp files.
(cus-test-get-lisp-files): Ignore .*.el files.
2013-05-10 Glenn Morris <rgm@gnu.org>
* cus-test.el (cus-test-libs-noloads): Add some files.
(cus-test-get-lisp-files): New function.
(cus-test-libs): Add option to load more/all Lisp files.
2013-05-09 Glenn Morris <rgm@gnu.org>
* cus-test.el: No need to provide bbdb, bbdb-com any more.
(cus-test-libs-noloads): Add dunnet in the defvar.
(dunnet): Don't always load it.
(viper-mode): Only set if interactive.
(cus-test-load-custom-loads): Load dunnet if necessary.
(cus-test-load-1): New macro, with common code from cus-test-load-libs
and cus-test-libs.
(cus-test-load-libs, cus-test-libs): Use cus-test-load-1 macro.
Update for cus-test-get-autoload-deps changed result.
(cus-test-get-autoload-deps): Simplify. Return file names as they
appear in loaddefs.el (directory parts are needed now that not all
lisp subdirs are in load-path).
(cus-test-deps): Explicitly skip dunnet.
2013-05-07 Paul Eggert <eggert@cs.ucla.edu>
Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
* merge-gnulib (GNULIB_MODULES): Add qacl.
(GNULIB_TOOL_FLAGS): Do not avoid errno.
2013-04-01 Paul Eggert <eggert@cs.ucla.edu>
Use UTF-8 for most files with non-ASCII characters (Bug#13936).
* notes/unicode (etc/tutorials/TUTORIAL.ko, leim/quail/hanja.el)
(leim/quail/hanja3.el, leim/quail/symbol-ksc.el):
Now utf-8, not iso-2022-7bit. Also, files that contain non-UTF-8
characters are now encoded in utf-8-emacs, not iso-2022-7bit.
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
* notes/unicode: Mention some more iso-2022-7bit files (Bug#13936).
Automate the build of ja-dic.el (Bug#13984).
* notes/unicode: ja-dic.el is now UTF-8.
2013-03-16 Glenn Morris <rgm@gnu.org>
* admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi.

View file

@ -30,11 +30,11 @@
;;
;; The basic tests can be run in batch mode. Invoke them with
;;
;; src/emacs -batch -l admin/cus-test.el -f cus-test-opts
;; src/emacs -batch -l admin/cus-test.el -f cus-test-opts [all]
;;
;; src/emacs -batch -l admin/cus-test.el -f cus-test-deps
;;
;; src/emacs -batch -l admin/cus-test.el -f cus-test-libs
;; src/emacs -batch -l admin/cus-test.el -f cus-test-libs [all]
;;
;; src/emacs -batch -l admin/cus-test.el -f cus-test-noloads
;;
@ -87,43 +87,6 @@
;; The command `cus-test-noloads' returns a list of variables which
;; are somewhere declared as custom options, but not loaded by
;; `custom-load-symbol'.
;;
;; Some results from October 2002:
;;
;; 4523 options tested
;; The following variables might have problems:
;; ps-mule-font-info-database-default
;; grep-tree-command
;; grep-find-command
;;
;; 288 features required
;; 10 files loaded
;; The following load problems appeared:
;; (killing x-win (file-error Cannot open load file x-win))
;; Symbol faces has loaddefs as custom dependency
;; (reftex-index-support reftex-vars (void-function reftex-set-dirty))
;; (eshell-script em-script (void-variable eshell-directory-name))
;; (pcomplete em-cmpl (void-function eshell-under-windows-p))
;; (eshell-ext esh-ext (void-function eshell-under-windows-p))
;; ...
;;
;; 422 libraries had no load errors
;; The following load problems appeared:
;; (eudc-export error 255)
;; (ada-xref error 255)
;; (ada-stmt error 255)
;;
;; The following options were not loaded by custom-load-symbol:
;; edt-bottom-scroll-margin
;; edt-keep-current-page-delimiter
;; edt-top-scroll-margin
;; edt-use-EDT-control-key-bindings
;; edt-word-entities
;; grep-find-use-xargs
;; master-mode-hook
;; outline-level
;; outline-minor-mode-hook
;; refill-mode-hook
;;; Code:
@ -136,24 +99,23 @@
(defvar cus-test-skip-list nil
"List of variables to disregard by `cus-test-apropos'.")
(defvar cus-test-libs-noloads nil
"List of libraries not to load by `cus-test-load-libs'.")
;; The file eudc-export.el loads libraries "bbdb" and "bbdb-com" which
;; are not part of GNU Emacs: (locate-library "bbdb") => nil
;; We avoid the resulting errors from loading eudc-export.el:
(provide 'bbdb)
(provide 'bbdb-com)
(defvar cus-test-libs-noloads
;; Loading dunnet in batch mode leads to a Dead end.
;; blessmail writes a file.
;; characters cannot be loaded twice ("Category `a' is already defined").
'("play/dunnet.el" "emulation/edt-mapper.el"
"loadup.el" "mail/blessmail.el" "international/characters.el"
"cedet/ede/loaddefs.el" "cedet/semantic/loaddefs.el"
"net/tramp-loaddefs.el")
"List of files not to load by `cus-test-load-libs'.
Names should be as they appear in loaddefs.el.")
;; This avoids a hang of `cus-test-apropos' in 21.2.
;; (add-to-list 'cus-test-skip-list 'sh-alias-alist)
;; Loading dunnet in batch mode leads to a Dead end.
(let (noninteractive) (load "dunnet"))
(add-to-list 'cus-test-libs-noloads "dunnet")
;; Never Viperize.
(setq viper-mode nil)
(or noninteractive
;; Never Viperize.
(setq viper-mode nil))
;; Don't create a file `save-place-file'.
(eval-after-load "saveplace"
@ -270,17 +232,38 @@ The detected problematic options are stored in `cus-test-errors'."
(length cus-test-tested-variables))
(cus-test-errors-display))
(defun cus-test-get-options (regexp)
"Return a list of custom options matching REGEXP."
(let (found)
(defun cus-test-cus-load-groups (&optional cus-load)
"Return a list of current custom groups.
If CUS-LOAD is non-nil, include groups from cus-load.el."
(append (mapcar 'cdr custom-current-group-alist)
(if cus-load
(with-temp-buffer
(insert-file-contents (locate-library "cus-load.el"))
(search-forward "(put '")
(beginning-of-line)
(let (res)
(while (and (looking-at "^(put '\\(\\S-+\\)")
(zerop (forward-line 1)))
(push (intern (match-string 1)) res))
res)))))
(defun cus-test-get-options (regexp &optional group)
"Return a list of custom options matching REGEXP.
If GROUP is non-nil, return groups rather than options.
If GROUP is `cus-load', include groups listed in cus-loads as well as
currently defined groups."
(let ((groups (if group (cus-test-cus-load-groups (eq group 'cus-load))))
found)
(mapatoms
(lambda (symbol)
(and
(or
;; (user-variable-p symbol)
(get symbol 'standard-value)
;; (get symbol 'saved-value)
(get symbol 'custom-type))
(if group
(memq symbol groups)
(or
;; (user-variable-p symbol)
(get symbol 'standard-value)
;; (get symbol 'saved-value)
(get symbol 'custom-type)))
(string-match regexp (symbol-name symbol))
(not (member symbol cus-test-skip-list))
(push symbol found))))
@ -302,49 +285,71 @@ The detected problematic options are stored in `cus-test-errors'."
(defun cus-test-load-custom-loads ()
"Call `custom-load-symbol' on all atoms."
(interactive)
(if noninteractive (let (noninteractive) (require 'dunnet)))
(mapatoms 'custom-load-symbol)
(run-hooks 'cus-test-after-load-libs-hook))
(defun cus-test-load-libs ()
(defmacro cus-test-load-1 (&rest body)
`(progn
(setq cus-test-libs-errors nil
cus-test-libs-loaded nil)
,@body
(message "%s libraries loaded successfully"
(length cus-test-libs-loaded))
(if (not cus-test-libs-errors)
(message "No load problems encountered")
(message "The following load problems appeared:")
(cus-test-message cus-test-libs-errors))
(run-hooks 'cus-test-after-load-libs-hook)))
;; This is just cus-test-libs, but loading in the current Emacs process.
(defun cus-test-load-libs (&optional more)
"Load the libraries with autoloads.
Don't load libraries in `cus-test-libs-noloads'."
Don't load libraries in `cus-test-libs-noloads'.
If optional argument MORE is \"defcustom\", load all files with defcustoms.
If it is \"all\", load all Lisp files."
(interactive)
(setq cus-test-libs-errors nil)
(setq cus-test-libs-loaded nil)
(mapc
(lambda (file)
(condition-case alpha
(unless (member file cus-test-libs-noloads)
(load file)
(push file cus-test-libs-loaded))
(error
(push (cons file alpha) cus-test-libs-errors)
(message "Error for %s: %s" file alpha))))
(cus-test-get-autoload-deps))
(message "%s libraries loaded successfully"
(length cus-test-libs-loaded))
(if (not cus-test-libs-errors)
(message "No load problems encountered")
(message "The following load problems appeared:")
(cus-test-message cus-test-libs-errors))
(run-hooks 'cus-test-after-load-libs-hook))
(cus-test-load-1
(let ((lispdir (file-name-directory (locate-library "loaddefs"))))
(mapc
(lambda (file)
(condition-case alpha
(unless (member file cus-test-libs-noloads)
(load (file-name-sans-extension (expand-file-name file lispdir)))
(push file cus-test-libs-loaded))
(error
(push (cons file alpha) cus-test-libs-errors)
(message "Error for %s: %s" file alpha))))
(if more
(cus-test-get-lisp-files (equal more "all"))
(cus-test-get-autoload-deps))))))
(defun cus-test-get-autoload-deps ()
"Return the list of libraries with autoloads."
"Return the list of files with autoloads."
(with-temp-buffer
(insert-file-contents (locate-library "loaddefs"))
;; This is from `customize-option'.
(let (deps file)
(while
(search-forward "\n;;; Generated autoloads from " nil t)
(goto-char (match-end 0))
(setq file (buffer-substring (point)
(progn (end-of-line) (point))))
(setq file (file-name-nondirectory file))
(string-match "\\.el\\'" file)
(setq file (substring file 0 (match-beginning 0)))
(setq deps (nconc deps (list file))))
deps)))
(let (files)
(while (search-forward "\n;;; Generated autoloads from " nil t)
(push (buffer-substring (match-end 0) (line-end-position)) files))
files)))
(defun cus-test-get-lisp-files (&optional all)
"Return list of all Lisp files with defcustoms.
Optional argument ALL non-nil means list all (non-obsolete) Lisp files."
(let ((default-directory (expand-file-name "lisp/" source-directory))
(msg "Finding files..."))
(message "%s" msg)
(prog1
;; Hack to remove leading "./".
(mapcar (lambda (e) (substring e 2))
(apply 'process-lines find-program
"-name" "obsolete" "-prune" "-o"
"-name" "[^.]*.el" ; ignore .dir-locals.el
(if all
'("-print")
(list "-exec" grep-program
"-l" "^[ \t]*(defcustom" "{}" "+"))))
(message "%sdone" msg))))
(defun cus-test-message (list)
"Print the members of LIST line by line."
@ -353,16 +358,21 @@ Don't load libraries in `cus-test-libs-noloads'."
;;; The routines for batch mode:
(defun cus-test-opts ()
(defun cus-test-opts (&optional all)
"Test custom options.
This function is suitable for batch mode. E.g., invoke
src/emacs -batch -l admin/cus-test.el -f cus-test-opts
in the Emacs source directory."
in the Emacs source directory.
Normally only tests options belonging to files in loaddefs.el.
If optional argument ALL is non-nil, test all files with defcustoms."
(interactive)
(and noninteractive
command-line-args-left
(setq all (pop command-line-args-left)))
(message "Running %s" 'cus-test-load-libs)
(cus-test-load-libs)
(cus-test-load-libs (if all "defcustom"))
(message "Running %s" 'cus-test-load-custom-loads)
(cus-test-load-custom-loads)
(message "Running %s" 'cus-test-apropos)
@ -392,7 +402,8 @@ in the Emacs source directory."
((symbolp load)
;; (condition-case nil (require load) (error nil))
(condition-case alpha
(unless (featurep load)
(unless (or (featurep load)
(and noninteractive (eq load 'dunnet)))
(require load)
(push (list symbol load) cus-test-deps-required))
(error
@ -444,47 +455,54 @@ in the Emacs source directory."
(cus-test-message cus-test-deps-errors))
(run-hooks 'cus-test-after-load-libs-hook))
(defun cus-test-libs ()
(defun cus-test-libs (&optional more)
"Load the libraries with autoloads in separate processes.
This function is useful to detect load problems of libraries.
It is suitable for batch mode. E.g., invoke
src/emacs -batch -l admin/cus-test.el -f cus-test-libs
./src/emacs -batch -l admin/cus-test.el -f cus-test-libs
in the Emacs source directory."
in the Emacs source directory.
If optional argument MORE is \"defcustom\", load all files with defcustoms.
If it is \"all\", load all Lisp files."
(interactive)
(with-temp-buffer
(setq cus-test-libs-errors nil)
(setq cus-test-libs-loaded nil)
(cd source-directory)
(if (not (file-executable-p "src/emacs"))
(error "No Emacs executable in %ssrc" default-directory))
(mapc
(lambda (file)
(condition-case alpha
(let (fn cmd status)
(setq fn (locate-library file))
(if (not fn)
(error "Library %s not found" file))
(setq cmd (concat "src/emacs -batch -l " fn))
(setq status (call-process shell-file-name nil nil nil
shell-command-switch cmd))
(if (equal status 0)
(message "%s" file)
(error "%s" status))
(push file cus-test-libs-loaded))
(error
(push (cons file alpha) cus-test-libs-errors)
(message "Error for %s: %s" file alpha))))
(cus-test-get-autoload-deps))
(message "Default Directory: %s" default-directory)
(message "%s libraries had no load errors"
(length cus-test-libs-loaded))
(if (not cus-test-libs-errors)
(message "No load problems encountered")
(message "The following load problems appeared:")
(cus-test-message cus-test-libs-errors))
(run-hooks 'cus-test-after-load-libs-hook)))
(and noninteractive
command-line-args-left
(setq more (pop command-line-args-left)))
(cus-test-load-1
(let* ((default-directory source-directory)
(emacs (expand-file-name "src/emacs"))
skipped)
(or (file-executable-p emacs)
(error "No such executable `%s'" emacs))
(mapc
(lambda (file)
(if (member file cus-test-libs-noloads)
(push file skipped)
(condition-case alpha
(let* ((fn (expand-file-name file "lisp/"))
(elc (concat fn "c"))
status)
(if (file-readable-p elc) ; load compiled if present (faster)
(setq fn elc)
(or (file-readable-p fn)
(error "Library %s not found" file)))
(if (equal 0 (setq status (call-process emacs nil nil nil
"-batch" "-l" fn)))
(message "%s" file)
(error "%s" status))
(push file cus-test-libs-loaded))
(error
(push (cons file alpha) cus-test-libs-errors)
(message "Error for %s: %s" file alpha)))))
(if more
(cus-test-get-lisp-files (equal more "all"))
(cus-test-get-autoload-deps)))
(message "Default directory: %s" default-directory)
(when skipped
(message "The following libraries were skipped:")
(cus-test-message skipped)))))
(defun cus-test-noloads ()
"Find custom options not loaded by `custom-load-symbol'.
@ -495,17 +513,17 @@ It is suitable for batch mode. E.g., invoke
in the Emacs source directory."
(interactive)
(let (cus-loaded)
(let ((groups-loaded (cus-test-get-options "" 'cus-load))
cus-loaded groups-not-loaded)
(message "Running %s" 'cus-test-load-custom-loads)
(cus-test-load-custom-loads)
(setq cus-loaded
(cus-test-get-options ""))
(setq cus-loaded (cus-test-get-options ""))
(message "Running %s" 'cus-test-load-libs)
(cus-test-load-libs)
(setq cus-test-vars-not-cus-loaded
(cus-test-get-options ""))
(cus-test-load-libs "all")
(setq cus-test-vars-not-cus-loaded (cus-test-get-options "")
groups-not-loaded (cus-test-get-options "" t))
(dolist (o cus-loaded)
(setq cus-test-vars-not-cus-loaded
@ -515,12 +533,15 @@ in the Emacs source directory."
(message "No options not loaded by custom-load-symbol found")
(message "The following options were not loaded by custom-load-symbol:")
(cus-test-message
(sort cus-test-vars-not-cus-loaded 'string<)))))
(sort cus-test-vars-not-cus-loaded 'string<)))
;; And last but not least a quiz:
;;
;; Evaluation of the form (customize-option 'debug-on-error) yields a
;; *Customize* buffer with a mismatch mess. Why?
(dolist (o groups-loaded)
(setq groups-not-loaded (delete o groups-not-loaded)))
(if (not groups-not-loaded)
(message "No groups not in cus-load.el found")
(message "The following groups are not in cus-load.el:")
(cus-test-message (sort groups-not-loaded 'string<)))))
(provide 'cus-test)

View file

@ -125,6 +125,10 @@ opt-read-fcn
variable
: SET symbol insertable-string-list newline
(VARIABLE-TAG $2 nil $3)
| SET symbol number newline
;; This so a common error w/ priority works.
;; Note that "number" still has a string value in the lexer.
(VARIABLE-TAG $2 nil (list $3))
| SHOW symbol newline
(VARIABLE-TAG $2 nil t)
;
@ -260,8 +264,8 @@ It ignores whitespace, newlines and comments."
srecode-template-separator-block
srecode-template-wy--<keyword>-keyword-analyzer
srecode-template-property-analyzer
srecode-template-wy--<symbol>-regexp-analyzer
srecode-template-wy--<number>-regexp-analyzer
srecode-template-wy--<symbol>-regexp-analyzer
srecode-template-wy--<string>-sexp-analyzer
srecode-template-wy--<punctuation>-string-analyzer
semantic-lex-default-action

View file

@ -33,7 +33,7 @@ GNULIB_MODULES='
getloadavg getopt-gnu gettime gettimeofday
ignore-value intprops largefile lstat
manywarnings memrchr mktime
pselect pthread_sigmask putenv readlink readlinkat
pselect pthread_sigmask putenv qacl readlink readlinkat
sig2str socklen stat-time stdalign stdarg stdbool stdio
strftime strtoimax strtoumax symlink sys_stat
sys_time time timer-time timespec-add timespec-sub unsetenv utimens
@ -42,7 +42,7 @@ GNULIB_MODULES='
GNULIB_TOOL_FLAGS='
--avoid=dup
--avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat
--avoid=fchdir --avoid=fcntl --avoid=fstat
--avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow
--avoid=open --avoid=openat-die --avoid=opendir
--avoid=raise

View file

@ -8,7 +8,8 @@ This is 95% of all you will ever need to know.
** How do I report a bug?
Use M-x report-emacs-bug, or send mail to bug-gnu-emacs@gnu.org.
If you want to Cc someone, use an "X-Debbugs-CC" header instead.
If you want to Cc someone, use an "X-Debbugs-CC" header (or
pseudo-header, see below) instead.
** How do I comment on a bug?
Reply to a mail on the bug-gnu-emacs list in the normal way.
@ -52,8 +53,8 @@ i) Your report will be assigned a number and generate an automatic reply.
ii) Optionally, you can set some database parameters when you first
report a bug (see "Setting bug parameters" below).
iii) If you want to CC: someone, use X-Debbugs-CC: (this is important;
see below).
iii) If you want to CC: someone, use X-Debbugs-CC: (note this only
applies to _new_ reports, not followups).
Once your report is filed and assigned a number, it is sent out to the
bug mailing list. In some cases, it may be appropriate to just file a
@ -92,18 +93,21 @@ but create duplicates and errors. (It is possible, but unlikely, that
you might want to have a dialog with the owner address, outside of
normal bug reporting.)
** When reporting a bug, to send a Cc to another address
** When reporting a new bug, to send a Cc to another address
(e.g. bug-cc-mode@gnu.org), do NOT just use a Cc: header.
Instead, use "X-Debbugs-CC:". This ensures the Cc address will get a
mail with the bug report number in. If you do not do this, each reply
in the subsequent discussion will end up creating a new bug.
This is annoying.
in the subsequent discussion might end up creating a new bug.
This is annoying. (So annoying that a form of message-id tracking has
been implemented to hopefully stop this happening, but it is still
better to use X-Debbugs-CC.)
(So annoying that a form of message-id tracking has been implemented
to hopefully stop this happening, but it is still better to use X-Debbugs-CC.)
Like any X-Debbugs- header, this one can also be specified in the
pseudo-header (see below), if your mail client does not let you add
"X-" headers.
If a new report contains X-Debbugs-CC in the input, this is
converted to a real Cc header in the output. (See Bug#1720).
converted to a real Cc header in the output. (See Bug#1780,5384)
It is also merged into the Resent-CC header (see below).
** How does Debbugs send out mails?
@ -218,8 +222,8 @@ Package: emacs
Version: 23.0.60
Severity: minor
This can also include tags. Some things (e.g. submitter) don't seem to
work here.
This can also include tags, or any X-Debbugs- setting.
Some things (e.g. submitter) don't seem to work here.
Otherwise, send mail to the control server, control@debbugs.gnu.org.
At the start of the message body, supply the desired commands, one per
@ -627,7 +631,9 @@ following headers:
1) The leading envelope From line.
2) Message-ID (get it from /var/log/mailman/vette).
3) X-Debbugs-Envelope-To: submit
3) X-Debbugs-Envelope-To: xxx
For a new report, xxx = submit; for a control message, xxx = control;
for a reply to bug#123, xxx = 123
Then pipe it to receive as above.

View file

@ -170,11 +170,9 @@ nontrivial changes to the build process.
* japanese-iso-8bit
SKK-JISYO.L is a verbatim copy of a file taken from an external source.
ja-dic.el is generated automatically by skkdic-convert; this process
hasn't been converted to use UTF-8.
It hasn't been converted to UTF-8.
leim/SKK-DIC/SKK-JISYO.L
leim/ja-dic/ja-dic.el
* japanese-shift-jis
@ -192,11 +190,33 @@ nontrivial changes to the build process.
* iso-2022-7bit
This file contains significant charset information, which is not
encoded in UTF-8.
This file switches between CJK charsets, which is not encoded in UTF-8.
etc/HELLO
Each of these files contains just one CJK charset, but Emacs
currently has no easy way to specify set-charset-priority on a
per-file basis, so converting any of these files to UTF-8 might
change the file's appearance when viewed by an Emacs that is
operating in some other language environment.
etc/tutorials/TUTORIAL.ja
leim/quail/cyril-jis.el
leim/quail/hanja-jis.el
leim/quail/japanese.el
leim/quail/py-punct.el
leim/quail/pypunct-b5.el
lisp/international/ja-dic-cnv.el
lisp/international/ja-dic-utl.el
lisp/international/kinsoku.el
lisp/international/kkc.el
lisp/international/titdic-cnv.el
lisp/language/japan-util.el
lisp/language/japanese.el
lisp/term/x-win.el
* utf-8-emacs
These files contain characters that cannot be encoded in UTF-8.
leim/quail/tibetan.el

View file

@ -105,8 +105,8 @@ and build directories reside.
Optionally, $me can also remove old versions of
automatically generated files that are version-specific (such as the
versioned emacs executables in the \`src' directory, and the DOC-* files
in the \`etc' directory). The latter action is called \`pruning,' and
versioned emacs executables in the \`src' directory).
The latter action is called \`pruning,' and
can be enabled using the \`-p' or \`--prune' options.
EOF
exit 0
@ -209,10 +209,6 @@ maybe_mkdir "$DST_INFO"
PRUNED=""
if test x"$PRUNE" != xno; then
for D in `ls -1t $BUILD/etc/DOC-* | sed 1d`; do
echo $REMOVE_CMD $D
PRUNED="$PRUNED $D"
done
for D in `ls -1t $BUILD/src/emacs-$VERSION.* | sed 1d`; do
echo $REMOVE_CMD $D
PRUNED="$PRUNED $D"

File diff suppressed because it is too large Load diff

2
autogen/aclocal.m4 vendored
View file

@ -985,6 +985,7 @@ AC_SUBST([am__untar])
]) # _AM_PROG_TAR
m4_include([m4/00gnulib.m4])
m4_include([m4/acl.m4])
m4_include([m4/alloca.m4])
m4_include([m4/c-strtod.m4])
m4_include([m4/clock_time.m4])
@ -992,6 +993,7 @@ m4_include([m4/close-stream.m4])
m4_include([m4/dirent_h.m4])
m4_include([m4/dup2.m4])
m4_include([m4/environ.m4])
m4_include([m4/errno_h.m4])
m4_include([m4/euidaccess.m4])
m4_include([m4/execinfo.m4])
m4_include([m4/extensions.m4])

View file

@ -110,6 +110,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you are using the GNU C Library. */
#undef DOUG_LEA_MALLOC
/* Define to 1 to enable w32 debug facilities. */
#undef EMACSDEBUG
/* Define to the canonical Emacs configuration name. */
#undef EMACS_CONFIGURATION
@ -129,7 +132,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
# define _FORTIFY_SOURCE 2
#endif
/* Define to 1 if futimesat mishandles a NULL file name. */
#undef FUTIMESAT_NULL_BUG
@ -209,6 +212,75 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `access' function. */
#undef HAVE_ACCESS
/* Define to 1 if you have the `aclsort' function. */
#undef HAVE_ACLSORT
/* Define to 1 if you have the <aclv.h> header file. */
#undef HAVE_ACLV_H
/* Define to 1 if you have the `aclx_get' function. */
#undef HAVE_ACLX_GET
/* Define to 1 if you have the `acl_copy_ext_native' function. */
#undef HAVE_ACL_COPY_EXT_NATIVE
/* Define to 1 if you have the `acl_create_entry_np' function. */
#undef HAVE_ACL_CREATE_ENTRY_NP
/* Define to 1 if you have the `acl_delete_def_file' function. */
#undef HAVE_ACL_DELETE_DEF_FILE
/* Define to 1 if you have the `acl_delete_fd_np' function. */
#undef HAVE_ACL_DELETE_FD_NP
/* Define to 1 if you have the `acl_delete_file_np' function. */
#undef HAVE_ACL_DELETE_FILE_NP
/* Define to 1 if you have the `acl_entries' function. */
#undef HAVE_ACL_ENTRIES
/* Define to 1 if you have the `acl_extended_file' function. */
#undef HAVE_ACL_EXTENDED_FILE
/* Define to 1 if the constant ACL_FIRST_ENTRY exists. */
#undef HAVE_ACL_FIRST_ENTRY
/* Define to 1 if you have the `acl_free' function. */
#undef HAVE_ACL_FREE
/* Define to 1 if you have the `acl_free_text' function. */
#undef HAVE_ACL_FREE_TEXT
/* Define to 1 if you have the `acl_from_mode' function. */
#undef HAVE_ACL_FROM_MODE
/* Define to 1 if you have the `acl_from_text' function. */
#undef HAVE_ACL_FROM_TEXT
/* Define to 1 if you have the `acl_get_fd' function. */
#undef HAVE_ACL_GET_FD
/* Define to 1 if you have the `acl_get_file' function. */
#undef HAVE_ACL_GET_FILE
/* Define to 1 if you have the <acl/libacl.h> header file. */
#undef HAVE_ACL_LIBACL_H
/* Define to 1 if you have the `acl_set_fd' function. */
#undef HAVE_ACL_SET_FD
/* Define to 1 if you have the `acl_set_file' function. */
#undef HAVE_ACL_SET_FILE
/* Define to 1 if you have the `acl_to_short_text' function. */
#undef HAVE_ACL_TO_SHORT_TEXT
/* Define to 1 if you have the `acl_trivial' function. */
#undef HAVE_ACL_TRIVIAL
/* Define to 1 if the ACL type ACL_TYPE_EXTENDED exists. */
#undef HAVE_ACL_TYPE_EXTENDED
/* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */
#undef HAVE_AIX_SMT_EXP
@ -376,6 +448,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `faccessat' function. */
#undef HAVE_FACCESSAT
/* Define to 1 if you have the `facl' function. */
#undef HAVE_FACL
/* Define to 1 if you have the `fdatasync' function. */
#undef HAVE_FDATASYNC
@ -415,6 +490,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if using GConf. */
#undef HAVE_GCONF
/* Define to 1 if you have the `getacl' function. */
#undef HAVE_GETACL
/* Define to 1 if you have the `getaddrinfo' function. */
#undef HAVE_GETADDRINFO
@ -469,6 +547,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `get_current_dir_name' function. */
#undef HAVE_GET_CURRENT_DIR_NAME
/* Define to 1 to use glib's notify. */
#undef HAVE_GFILENOTIFY
/* Define to 1 if you have a gif (or ungif) library. */
#undef HAVE_GIF
@ -718,6 +799,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have a working `mmap' system call. */
#undef HAVE_MMAP
/* Define to 1 if you have the <mmsystem.h> header file. */
#undef HAVE_MMSYSTEM_H
/* Define to 1 if you have the `nanotime' function. */
#undef HAVE_NANOTIME
@ -749,9 +833,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <png.h> header file. */
#undef HAVE_PNG_H
/* Define to 1 if using POSIX ACL support. */
#undef HAVE_POSIX_ACL
/* Define to 1 if you have the `posix_memalign' function. */
#undef HAVE_POSIX_MEMALIGN
@ -858,6 +939,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if `speed_t' is declared by <termios.h>. */
#undef HAVE_SPEED_T
/* Define to 1 if you have the `statacl' function. */
#undef HAVE_STATACL
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
@ -946,6 +1030,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the `sync' function. */
#undef HAVE_SYNC
/* Define to 1 if you have the <sys/acl.h> header file. */
#undef HAVE_SYS_ACL_H
/* Define to 1 if you have the <sys/bitypes.h> header file. */
#undef HAVE_SYS_BITYPES_H
@ -1056,6 +1143,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if you have the <vfork.h> header file. */
#undef HAVE_VFORK_H
/* Define to 1 to use w32notify. */
#undef HAVE_W32NOTIFY
/* Define to 1 if you have the <wchar.h> header file. */
#undef HAVE_WCHAR_H
@ -1106,15 +1196,27 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Define to 1 if XIM is available */
#undef HAVE_XIM
/* Define to 1 if you have the XkbGetKeyboard function. */
#undef HAVE_XKBGETKEYBOARD
/* Define to 1 if you have the Xinerama extension. */
#undef HAVE_XINERAMA
/* Define to 1 if you have the Xkb extension. */
#undef HAVE_XKB
/* Define to 1 if you have the Xpm library (-lXpm). */
#undef HAVE_XPM
/* Define to 1 if you have the XRandr extension. */
#undef HAVE_XRANDR
/* Define to 1 if you have the `XrmSetDatabase' function. */
#undef HAVE_XRMSETDATABASE
/* Define to 1 if you have the `XRRGetOutputPrimary' function. */
#undef HAVE_XRRGETOUTPUTPRIMARY
/* Define to 1 if you have the `XRRGetScreenResourcesCurrent' function. */
#undef HAVE_XRRGETSCREENRESOURCESCURRENT
/* Define to 1 if you have the `XScreenNumberOfScreen' function. */
#undef HAVE_XSCREENNUMBEROFSCREEN
@ -1397,6 +1499,12 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* How to get a user's full name. */
#undef USER_FULL_NAME
/* Define to nonzero if you want access control list support. */
#undef USE_ACL
/* Define to 1 if if using file notifications. */
#undef USE_FILE_NOTIFY
/* Define to 1 if using GTK. */
#undef USE_GTK
@ -1476,6 +1584,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Use long long for EMACS_INT if available. */
#undef WIDE_EMACS_INT
/* Define if compiling for native MS Windows. */
#undef WINDOWSNT
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
'wint_t'. */
#undef WINT_T_SUFFIX
@ -1579,13 +1690,21 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
Suppress extern inline with HP-UX cc, as it appears to be broken; see
<http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
Suppress the use of extern inline on Apple's platforms,
as Libc-825.25 (2012-09-19) is incompatible with it; see
Suppress extern inline with Sun C in standards-conformance mode, as it
mishandles inline functions that call each other. E.g., for 'inline void f
(void) { } inline void g (void) { f (); }', c99 incorrectly complains
'reference to static identifier "f" in extern inline function'.
This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
Suppress the use of extern inline on Apple's platforms, as Libc at least
through Libc-825.26 (2013-04-09) is incompatible with it; see, e.g.,
<http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
Perhaps Apple will fix this some day. */
#if ((__GNUC__ \
? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
: 199901L <= __STDC_VERSION__ && !defined __HP_cc) \
: (199901L <= __STDC_VERSION__ \
&& !defined __HP_cc \
&& !(defined __SUNPRO_C && __STDC__))) \
&& !defined __APPLE__)
# define _GL_INLINE inline
# define _GL_EXTERN_INLINE extern inline
@ -1726,4 +1845,3 @@ Local Variables:
mode: c
End:
*/

2186
autogen/configure vendored

File diff suppressed because it is too large Load diff

View file

@ -49,8 +49,8 @@ else
;; no-byte-compile: t
;; End:" > subdirs.el~
if cmp "subdirs.el" "subdirs.el~" >/dev/null 2>&1; then
:; # echo "subdirs.el unchanged";
rm subdirs.el~
else
mv subdirs.el~ subdirs.el
mv subdirs.el~ subdirs.el
fi
fi

File diff suppressed because it is too large Load diff

View file

@ -1,11 +1,68 @@
2013-06-02 Michael Albinus <michael.albinus@gmx.de>
* cmdargs.texi (General Variables): Use "unix:path=/dev/null" as
dummy value for $DBUS_SESSION_BUS_ADDRESS. It also suppresses
autolaunching of the D-Bus session bus.
2013-06-03 Juri Linkov <juri@jurta.org>
* display.texi (Highlight Interactively): Add global keybindings
with the key prefix `M-s h'. Document old command `highlight-phrase'.
Document new command `highlight-symbol-at-point'.
2013-06-01 Glenn Morris <rgm@gnu.org>
* programs.texi (Semantic): Fix typo.
2013-05-30 Xue Fuqiao <xfq.free@gmail.com>
* maintaining.texi (Types of Log File): Supplement some
information of change log files.
2013-05-15 Juri Linkov <juri@jurta.org>
* search.texi (Repeat Isearch): Mention key `RET' to finish
editing the string. (Bug#13348)
2013-05-14 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el.
2013-05-09 Glenn Morris <rgm@gnu.org>
* sending.texi (Mail Sending): Fix typo.
* windows.texi (Change Window): Fix typo.
* custom.texi (Changing a Variable): Fix typo.
* trouble.texi (Contributing): Remove obsolete info re pretesters.
2013-05-05 Paul Eggert <eggert@cs.ucla.edu>
`write-region-inhibit-fsync' defaults to noninteractive (Bug#14273).
* cmdargs.texi (Initial Options):
* files.texi (Customize Save): Document this.
2013-05-04 Glenn Morris <rgm@gnu.org>
* calendar.texi (Importing Diary): Mention diary-from-outlook-function.
2013-03-17 Paul Eggert <eggert@cs.ucla.edu>
doc: convert some TeX accents to UTF-8
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments):
Convert some TeX accents (e.g., '@l{}') to UTF-8 (e.g., 'ł').
Apparently the TeX accents cause problems when generating gnu.org
web pages, e.g., @l{} is rendered as '/l' on
<http://www.gnu.org/software/emacs/manual/html_node/
emacs/Acknowledgments.html>.
2013-03-16 Glenn Morris <rgm@gnu.org>
* emacs.texi (Top): Add some stuff specific to www.gnu.org.
2013-03-16 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.
2013-03-04 Paul Eggert <eggert@cs.ucla.edu>
Prefer UTF-8 for documentation.

View file

@ -166,7 +166,7 @@ David M. Brown wrote @file{array.el}, for editing arrays and other
tabular data.
@item
W@l{}odek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
Włodek Bzyl and Ryszard Kubiak wrote @file{ogonek.el}, a package for
changing the encoding of Polish characters.
@item
@ -605,7 +605,7 @@ files and running a PostScript interpreter interactively from within
Emacs.
@item
Karel Klí@v{c} contributed SELinux support, for preserving the
Karel Klíč contributed SELinux support, for preserving the
Security-Enhanced Linux context of files on backup and copy.
@item
@ -635,7 +635,7 @@ R. Dodd. He also wrote @file{ls-lisp.el}, a Lisp emulation of the
program.
@item
David K@ringaccent{a}gedal wrote @file{tempo.el}, providing support for
David Kågedal wrote @file{tempo.el}, providing support for
easy insertion of boilerplate text and other common constructions.
@item
@ -694,7 +694,7 @@ directory-local variables; and the @code{info-finder} feature that
creates a virtual Info manual of package keywords.
@item
Károly L@H{o}rentey wrote the ``multi-terminal'' code, which allows
Károly Lőrentey wrote the ``multi-terminal'' code, which allows
Emacs to run on graphical and text terminals simultaneously.
@item
@ -1058,8 +1058,7 @@ contributed extensively to the MS-Windows port of Emacs.
@item
Wolfgang Rupprecht wrote Emacs 19's floating-point support (including
@file{float-sup.el} and @file{floatfns.c}), and @file{sup-mouse.el},
support for the Supdup mouse on lisp machines.
@file{float-sup.el} and @file{floatfns.c}).
@item
Kevin Ryde wrote @file{info-xref.el}, a library for checking
@ -1224,7 +1223,7 @@ Olaf Sylvester wrote @file{bs.el}, a package for manipulating Emacs
buffers.
@item
Tibor @v{S}imko and Milan Zamazal wrote @file{slovak.el}, support for
Tibor Šimko and Milan Zamazal wrote @file{slovak.el}, support for
editing text in Slovak language.
@item

View file

@ -1542,7 +1542,8 @@ variety of other formats.
messages. While viewing such a message in Rmail or Gnus, do @kbd{M-x
diary-from-outlook} to import the entry. You can make this command
recognize additional appointment message formats by customizing the
variable @code{diary-outlook-formats}.
variable @code{diary-outlook-formats}. Other mail clients can set
@code{diary-from-outlook-function} to an appropriate value.
@c FIXME the name of the RFC is hardly very relevant.
@cindex iCalendar support

View file

@ -251,7 +251,8 @@ terminal's standard input stream (@code{stdin}) instead.
but @file{site-start.el} is loaded nonetheless. It also causes Emacs
to exit after processing all the command options. In addition, it
disables auto-saving except in buffers for which auto-saving is
explicitly requested.
explicitly requested, and when saving files it omits the @code{fsync}
system call unless otherwise requested.
@item --script @var{file}
@opindex --script
@ -437,8 +438,8 @@ when you specify a relative directory name.
@item DBUS_SESSION_BUS_ADDRESS
Used by D-Bus when Emacs is compiled with it. Usually, there is no
need to change it. Setting it to a dummy address, like
@samp{unix:path=/tmp/foo}, suppresses connections to the D-Bus session
bus.
@samp{unix:path=/dev/null}, suppresses connections to the D-Bus session
bus as well as autolaunching the D-Bus session bus if not running yet.
@item EMACSDATA
Directory for the architecture-independent files that come with Emacs.
This is used to initialize the variable @code{data-directory}.

View file

@ -345,7 +345,7 @@ hidden, nor on subgroups that are hidden or not visible in the buffer.
@kindex C-x C-c @r{(customization buffer)}
@findex Custom-set
@findex Custom-save
The command @kbd{C-c C-c} (@code{Custom-set}) is equivalent using to
The command @kbd{C-c C-c} (@code{Custom-set}) is equivalent to using
the @samp{[Set for Current Session]} button. The command @kbd{C-x
C-s} (@code{Custom-save}) is like using the @samp{[Save for Future
Sessions]} button.

View file

@ -903,14 +903,16 @@ that you specify explicitly the regular expressions to highlight. You
control them with these commands:
@table @kbd
@item C-x w h @var{regexp} @key{RET} @var{face} @key{RET}
@item M-s h r @var{regexp} @key{RET} @var{face} @key{RET}
@itemx C-x w h @var{regexp} @key{RET} @var{face} @key{RET}
@kindex M-s h r
@kindex C-x w h
@findex highlight-regexp
Highlight text that matches @var{regexp} using face @var{face}
(@code{highlight-regexp}). The highlighting will remain as long as
the buffer is loaded. For example, to highlight all occurrences of
the word ``whim'' using the default face (a yellow background)
@kbd{C-x w h whim @key{RET} @key{RET}}. Any face can be used for
@kbd{M-s h r whim @key{RET} @key{RET}}. Any face can be used for
highlighting, Hi Lock provides several of its own and these are
pre-loaded into a list of default values. While being prompted
for a face use @kbd{M-n} and @kbd{M-p} to cycle through them.
@ -918,7 +920,9 @@ for a face use @kbd{M-n} and @kbd{M-p} to cycle through them.
You can use this command multiple times, specifying various regular
expressions to highlight in different ways.
@item C-x w r @var{regexp} @key{RET}
@item M-s h u @var{regexp} @key{RET}
@itemx C-x w r @var{regexp} @key{RET}
@kindex M-s h u
@kindex C-x w r
@findex unhighlight-regexp
Unhighlight @var{regexp} (@code{unhighlight-regexp}).
@ -926,13 +930,15 @@ Unhighlight @var{regexp} (@code{unhighlight-regexp}).
If you invoke this from the menu, you select the expression to
unhighlight from a list. If you invoke this from the keyboard, you
use the minibuffer. It will show the most recently added regular
expression; use @kbd{M-p} to show the next older expression and
@kbd{M-n} to select the next newer expression. (You can also type the
expression; use @kbd{M-n} to show the next older expression and
@kbd{M-p} to select the next newer expression. (You can also type the
expression by hand, with completion.) When the expression you want to
unhighlight appears in the minibuffer, press @kbd{@key{RET}} to exit
the minibuffer and unhighlight it.
@item C-x w l @var{regexp} @key{RET} @var{face} @key{RET}
@item M-s h l @var{regexp} @key{RET} @var{face} @key{RET}
@itemx C-x w l @var{regexp} @key{RET} @var{face} @key{RET}
@kindex M-s h l
@kindex C-x w l
@findex highlight-lines-matching-regexp
@cindex lines, highlighting
@ -940,7 +946,31 @@ the minibuffer and unhighlight it.
Highlight entire lines containing a match for @var{regexp}, using face
@var{face} (@code{highlight-lines-matching-regexp}).
@item C-x w b
@item M-s h p @var{phrase} @key{RET} @var{face} @key{RET}
@itemx C-x w p @var{phrase} @key{RET} @var{face} @key{RET}
@kindex M-s h p
@kindex C-x w p
@findex highlight-phrase
@cindex phrase, highlighting
@cindex highlighting phrase
Highlight matches of @var{phrase}, using face @var{face}
(@code{highlight-phrase}). @var{phrase} can be any regexp,
but spaces will be replaced by matches to whitespace and
initial lower-case letters will become case insensitive.
@item M-s h .
@itemx C-x w .
@kindex M-s h .
@kindex C-x w .
@findex highlight-symbol-at-point
@cindex symbol, highlighting
@cindex highlighting symbol at point
Highlight the symbol found near point without prompting, using the next
available face automatically (@code{highlight-symbol-at-point}).
@item M-s h w
@itemx C-x w b
@kindex M-s h w
@kindex C-x w b
@findex hi-lock-write-interactive-patterns
Insert all the current highlighting regexp/face pairs into the buffer
@ -952,7 +982,9 @@ These patterns are extracted from the comments, if appropriate, if you
invoke @kbd{M-x hi-lock-find-patterns}, or if you visit the file while
Hi Lock mode is enabled (since that runs @code{hi-lock-find-patterns}).
@item C-x w i
@item M-s h f
@itemx C-x w i
@kindex M-s h f
@kindex C-x w i
@findex hi-lock-find-patterns
Extract regexp/face pairs from comments in the current buffer

View file

@ -1370,11 +1370,11 @@ Berry, Anna M. Bigatti, Ray Blaak, Martin Blais, Jim Blandy, Johan
Bockgård, Jan Böcker, Joel Boehland, Lennart Borgman, Per Bothner,
Terrence Brannon, Frank Bresz, Peter Breton, Emmanuel Briot, Kevin
Broadey, Vincent Broman, Michael Brouwer, David M. Brown, Stefan Bruda,
Georges Brun-Cottan, Joe Buehler, Scott Byer, W@l{}odek Bzyl,
Georges Brun-Cottan, Joe Buehler, Scott Byer, Włodek Bzyl,
Bill Carpenter, Per Cederqvist, Hans Chalupsky, Chris Chase, Bob
Chassell, Andrew Choi, Chong Yidong, Sacha Chua, Stewart Clamen, James
Clark, Mike Clarkson, Glynn Clements, Andrew Cohen, Daniel Colascione,
Edward O'Connor, Christoph Conrad, Ludovic Courtès, Andrew Csillag,
Christoph Conrad, Ludovic Courtès, Andrew Csillag,
Toby Cubitt, Baoqiu Cui, Doug Cutting, Mathias Dahl, Julien Danjou, Satyaki
Das, Vivek Dasmohapatra, Dan Davison, Michael DeCorte, Gary Delp, Nachum
Dershowitz, Dave Detlefs, Matthieu Devin, Christophe de Dinechin, Eri
@ -1403,14 +1403,14 @@ Josefsson, Alexandre Julliard, Arne Jørgensen, Tomoji Kagatani,
Brewster Kahle, Tokuya Kameshima, Lute Kamstra, Ivan Kanis, David
Kastrup, David Kaufman, Henry Kautz, Taichi Kawabata, Taro Kawagishi,
Howard Kaye, Michael Kifer, Richard King, Peter Kleiweg, Karel
Klí@v{c}, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David
Klíč, Shuhei Kobayashi, Pavel Kobyakov, Larry K. Kolodney, David
M. Koppelman, Koseki Yoshinori, Robert Krawitz, Sebastian Kremer,
Ryszard Kubiak, Igor Kuzmin, David Kågedal, Daniel LaLiberte, Karl
Landstrom, Mario Lang, Aaron Larson, James R. Larus, Vinicius Jose
Latorre, Werner Lemberg, Frederic Lepied, Peter Liljenberg, Christian
Limpach, Lars Lindberg, Chris Lindblad, Anders Lindgren, Thomas Link,
Juri Linkov, Francis Litterio, Sergey Litvinov, Emilio C. Lopes,
Martin Lorentzon, Dave Love, Eric Ludlam, Károly L@H{o}rentey, Sascha
Martin Lorentzon, Dave Love, Eric Ludlam, Károly Lőrentey, Sascha
Lüdecke, Greg McGary, Roland McGrath, Michael McNamara, Alan Mackenzie,
Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann,
Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin,
@ -1421,7 +1421,7 @@ Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris,
Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum,
Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen,
Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff Norden,
Andrew Norman, Kentaro Ohkouchi, Christian Ohler,
Andrew Norman, Edward O'Connor, Kentaro Ohkouchi, Christian Ohler,
Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota,
Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar,
Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per
@ -1441,7 +1441,7 @@ Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stefan Schoef,
Rainer Schoepf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal
Schwartz, Oliver Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham,
Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor
@v{S}imko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
Šimko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith,
David Smith, Paul D. Smith, Wilson Snyder, William Sommerfeld, Simon
South, Andre Spiegel, Michael Staats, Thomas Steffen, Ulf Stegemann,
Reiner Steib, Sam Steingold, Ake Stenhoff, Peter Stephenson, Ken

View file

@ -705,13 +705,27 @@ setting the latter variable, you can control how these modes handle
final newlines.
@vindex write-region-inhibit-fsync
When Emacs saves a file, it invokes the @code{fsync} system call to
force the data immediately out to disk. This is important for safety
if the system crashes or in case of power outage. However, it can be
disruptive on laptops using power saving, as it may force a disk
spin-up each time you save a file. If you accept an increased risk of
data loss, you can set @code{write-region-inhibit-fsync} to a
non-@code{nil} value to disable the synchronization.
Normally, when a program writes a file, the operating system briefly
caches the file's data in main memory before committing the data to
disk. This can greatly improve performance; for example, when running
on laptops, it can avoid a disk spin-up each time a file is written.
However, it risks data loss if the operating system crashes before
committing the cache to disk.
To lessen this risk, Emacs can invoke the @code{fsync} system call
after saving a file. Using @code{fsync} does not eliminate the risk
of data loss, partly because many systems do not implement
@code{fsync} properly, and partly because Emacs's file-saving
procedure typically relies also on directory updates that might not
survive a crash even if @code{fsync} works properly.
The @code{write-region-inhibit-fsync} variable controls whether
Emacs invokes @code{fsync} after saving a file. The variable's
default value is @code{nil} when Emacs is interactive, and @code{t}
when Emacs runs in batch mode.
Emacs never uses @code{fsync} when writing auto-save files, as these
files might lose data anyway.
@node Interlocking
@subsection Protection against Simultaneous Editing

View file

@ -342,7 +342,9 @@ before version control systems.
modification log for the entire system, which makes change log files
somewhat redundant. One advantage that they retain is that it is
sometimes useful to be able to view the transaction history of a
single directory separately from those of other directories.
single directory separately from those of other directories. Another
advantage is that commit logs can't be fixed in many version control
systems.
A project maintained with version control can use just the version
control log, or it can use both kinds of logs. It can handle some

View file

@ -1356,7 +1356,7 @@ the menu item named @samp{Source Code Parsers (Semantic)} in the
@samp{Tools} menu. This enables Semantic mode, a global minor mode.
When Semantic mode is enabled, Emacs automatically attempts to
parses each file you visit. Currently, Semantic understands C, C++,
parse each file you visit. Currently, Semantic understands C, C++,
Scheme, Javascript, Java, HTML, and Make. Within each parsed buffer,
the following commands are available:

View file

@ -175,7 +175,7 @@ element in the minibuffer, where you can edit it.
@kindex M-e @r{(Incremental search)}
To edit the current search string in the minibuffer without
replacing it with items from the search ring, type @kbd{M-e}. Type
replacing it with items from the search ring, type @kbd{M-e}. Type @key{RET},
@kbd{C-s} or @kbd{C-r} to finish editing the string and search for it.
@node Error in Isearch

View file

@ -374,7 +374,7 @@ This is the default, unless you have already set the variables for
sending mail via @code{smtpmail-send-it} (see below).
@item smtpmail-send-it
Send mail using the through an external mail host, such as your
Send mail through an external mail host, such as your
Internet service provider's outgoing SMTP mail server. If you have
not told Emacs how to contact the SMTP server, it prompts for this
information, which is saved in the @code{smtpmail-smtp-server} variable

View file

@ -1138,12 +1138,9 @@ form that is clearly safe to install.
@section Contributing to Emacs Development
@cindex contributing to Emacs
If you would like to help pretest Emacs releases to assure they work
well, or if you would like to work on improving Emacs, please contact
the maintainers at @email{emacs-devel@@gnu.org}. A pretester
should be prepared to investigate bugs as well as report them. If you'd
like to work on improving Emacs, please ask for suggested projects or
suggest your own ideas.
If you would like to work on improving Emacs, please contact
the maintainers at @email{emacs-devel@@gnu.org}. You can ask for
suggested projects or suggest your own ideas.
If you have already written an improvement, please tell us about it. If
you have not yet started work, it is useful to contact

View file

@ -258,7 +258,7 @@ Make all windows the same height (@code{balance-windows}).
the space that it occupied is given to an adjacent window (but not the
minibuffer window, even if that is active at the time). Deleting the
window has no effect on the buffer it used to display; the buffer
continues to exist, and you can still switch to with @kbd{C-x b}.
continues to exist, and you can still switch to it with @kbd{C-x b}.
@findex kill-buffer-and-window
@kindex C-x 4 0

View file

@ -1,11 +1,39 @@
2013-04-24 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last
commit.
2013-04-24 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (emacsver.texi): Include it.
(copying): For non-printed versions, uses Emacs version rather
than that of the printed book.
(Complications, Lisp macro, defvar and asterisk, defcustom): Copyedits.
* Makefile.in (emacsdir): New variable..
(MAKEINFO_OPTS, ENVADD): Add $emacsdir.
(srcs): Add emacsver.texi.
(dist): Include emacsver.texi. Edit emacsdir.
* makefile.w32-in (emacsdir): New variable.
(INFO_SOURCES): Add emacsver.texi.
(ENVADD): Add $emacsdir (and $texinfodir).
2013-04-23 Xue Fuqiao <xfq.free@gmail.com>
* emacs-lisp-intro.texi (Complications, defvar, Writing Defuns)
(Prevent confusion, Determining the Element, lambda): Refine the
doc about Lisp macros, reported by Glenn Morris.
2013-04-21 Xue Fuqiao <xfq.free@gmail.com>
* emacs-lisp-intro.texi (defcustom, defun)
(simplified-beginning-of-buffer, defvar, Building Robots, Review)
(save-excursion): `defun' and `defcustom' are now macros rather
than special forms. (Bug#13853)
2013-03-16 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org.
2013-03-16 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.
2013-03-03 Glenn Morris <rgm@gnu.org>
* emacs-lisp-intro.texi (Digression into C): Update example.

View file

@ -25,6 +25,8 @@ version=@version@
buildinfodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
# Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs
MKDIR_P = @MKDIR_P@
@ -33,17 +35,18 @@ INFO_EXT=@INFO_EXT@
INFO_OPTS=@INFO_OPTS@
MAKEINFO = @MAKEINFO@
MAKEINFO_OPTS = --force -I $(srcdir)
MAKEINFO_OPTS = --force -I $(emacsdir) -I $(srcdir)
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
DVIPS = dvips
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \
ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \
MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)"
mkinfodir = @${MKDIR_P} ${buildinfodir}
srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi
srcs = ${srcdir}/emacs-lisp-intro.texi ${srcdir}/doclicense.texi \
${emacsdir}/emacsver.texi
.PHONY: info dvi html pdf ps
@ -97,9 +100,10 @@ dist:
rm -rf emacs-lispintro-${version}
mkdir emacs-lispintro-${version}
cp ${srcdir}/*.texi ${srcdir}/*.eps ${srcdir}/*.pdf \
${texinfodir}/texinfo.tex \
${texinfodir}/texinfo.tex ${emacsdir}/emacsver.texi \
${srcdir}/ChangeLog* ${srcdir}/README emacs-lispintro-${version}/
sed -e 's/@sr[c]dir@/./' -e 's/^\(texinfodir *=\).*/\1 ./' \
-e 's/^\(emacsdir *=\).*/\1 ./' \
-e 's/^\(buildinfodir *=\).*/\1 ./' \
-e 's/^\(clean:.*\)/\1 infoclean/' \
-e "s/@ver[s]ion@/${version}/" \

View file

@ -8,6 +8,8 @@
@syncodeindex fn cp
@finalout
@include emacsver.texi
@c ---------
@c <<<< For hard copy printing, this file is now
@c set for smallbook, which works for all sizes
@ -35,79 +37,10 @@
\global\hbadness=6666 % don't worry about not-too-underfull boxes
@end tex
@c These refer to the printed book sold by the FSF.
@set edition-number 3.10
@set update-date 28 October 2009
@ignore
## Summary of shell commands to create various output formats:
pushd /usr/local/src/emacs/lispintro/
## pushd /u/intro/
## Info output
makeinfo --paragraph-indent=0 --verbose emacs-lisp-intro.texi
## ;; (progn (when (bufferp (get-buffer "*info*")) (kill-buffer "*info*")) (info "/usr/local/src/emacs/info/eintr"))
## DVI output
texi2dvi emacs-lisp-intro.texi
## xdvi -margins 24pt -topmargin 4pt -offsets 24pt -geometry 760x1140 -s 5 -useTeXpages -mousemode 1 emacs-lisp-intro.dvi &
## HTML output
makeinfo --html --no-split --verbose emacs-lisp-intro.texi
## galeon emacs-lisp-intro.html
## Plain text output
makeinfo --fill-column=70 --no-split --paragraph-indent=0 \
--verbose --no-headers --output=emacs-lisp-intro.txt emacs-lisp-intro.texi
popd
# as user `root'
# insert thumbdrive
mtusb # mount -v -t ext3 /dev/sda /mnt
cp -v /u/intro/emacs-lisp-intro.texi /mnt/backup/intro/emacs-lisp-intro.texi
umtusb # umount -v /mnt
# remove thumbdrive
## Other shell commands
pushd /usr/local/src/emacs/lispintro/
## pushd /u/intro/
## PDF
texi2dvi --pdf emacs-lisp-intro.texi
# xpdf emacs-lisp-intro.pdf &
## DocBook -- note file extension
makeinfo --docbook --no-split --paragraph-indent=0 \
--verbose --output=emacs-lisp-intro.docbook emacs-lisp-intro.texi
## XML with a Texinfo DTD -- note file extension
makeinfo --xml --no-split --paragraph-indent=0 \
--verbose --output=emacs-lisp-intro.texinfoxml emacs-lisp-intro.texi
## PostScript (needs DVI)
# gv emacs-lisp-intro.ps &
# Create DVI if we lack it
# texi2dvi emacs-lisp-intro.texi
dvips emacs-lisp-intro.dvi -o emacs-lisp-intro.ps
## RTF (needs HTML)
# Use OpenOffice to view RTF
# Create HTML if we lack it
# makeinfo --no-split --html emacs-lisp-intro.texi
/usr/local/src/html2rtf.pl emacs-lisp-intro.html
## LaTeX (needs RTF)
/usr/bin/rtf2latex emacs-lisp-intro.rtf
popd
@end ignore
@c ================ Included Figures ================
@c Set print-postscript-figures if you print PostScript figures.
@ -116,25 +49,6 @@
@c Your site may require editing changes to print PostScript; in this
@c case, search for `print-postscript-figures' and make appropriate changes.
@c ================ How to Create an Info file ================
@c If you have `makeinfo' installed, run the following command
@c makeinfo emacs-lisp-intro.texi
@c or, if you want a single, large Info file, and no paragraph indents:
@c makeinfo --no-split --paragraph-indent=0 --verbose emacs-lisp-intro.texi
@c After creating the Info file, edit your Info `dir' file, if the
@c `dircategory' section below does not enable your system to
@c install the manual automatically.
@c (The `dir' file is often in the `/usr/local/share/info/' directory.)
@c ================ How to Create an HTML file ================
@c To convert to HTML format
@c makeinfo --html --no-split --verbose emacs-lisp-intro.texi
@c ================ How to Print a Book in Various Sizes ================
@c This book can be printed in any of three different sizes.
@ -153,34 +67,6 @@
@c @afourpaper
@c @set largebook
@c ================ How to Typeset and Print ================
@c If you do not include PostScript figures, run either of the
@c following command sequences, or similar commands suited to your
@c system:
@c texi2dvi emacs-lisp-intro.texi
@c lpr -d emacs-lisp-intro.dvi
@c or else:
@c tex emacs-lisp-intro.texi
@c texindex emacs-lisp-intro.??
@c tex emacs-lisp-intro.texi
@c lpr -d emacs-lisp-intro.dvi
@c If you include the PostScript figures, and you have old software,
@c you may need to convert the .dvi file to a .ps file before
@c printing. Run either of the following command sequences, or one
@c similar:
@c
@c dvips -f < emacs-lisp-intro.dvi > emacs-lisp-intro.ps
@c
@c or else:
@c
@c postscript -p < emacs-lisp-intro.dvi > emacs-lisp-intro.ps
@c
@c (Note: if you edit the book so as to change the length of the
@c table of contents, you may have to change the value of `pageno' below.)
@ -226,7 +112,12 @@
This is an @cite{Introduction to Programming in Emacs Lisp}, for
people who are not programmers.
@sp 1
@iftex
Edition @value{edition-number}, @value{update-date}
@end iftex
@ifnottex
Distributed with Emacs version @value{EMACSVER}.
@end ifnottex
@ifset WWW_GNU_ORG
@html
<p>The homepage for GNU Emacs is at
@ -243,7 +134,7 @@ Foundation, Inc.
@iftex
Published by the:@*
GNU Press, @hfill @uref{http://www.fsf.org/campaigns/gnu-press/}@*
GNU Press, @hfill @uref{http://www.fsf.org/licensing/gnu-press/}@*
a division of the @hfill email: @email{sales@@fsf.org}@*
Free Software Foundation, Inc. @hfill Tel: +1 (617) 542-5942@*
51 Franklin Street, Fifth Floor @hfill Fax: +1 (617) 542-2652@*
@ -251,10 +142,10 @@ Boston, MA 02110-1301 USA
@end iftex
@ifnottex
Published by the:
Printed copies available from @uref{http://shop.fsf.org/}. Published by:
@example
GNU Press, http://www.fsf.org/campaigns/gnu-press/
GNU Press, http://www.fsf.org/licensing/gnu-press/
a division of the email: sales@@fsf.org
Free Software Foundation, Inc. Tel: +1 (617) 542-5942
51 Franklin Street, Fifth Floor Fax: +1 (617) 542-2652
@ -263,7 +154,6 @@ Boston, MA 02110-1301 USA
@end ifnottex
@sp 1
@c Printed copies are available from @uref{http://shop.fsf.org/} for $35 each.@*
ISBN 1-882114-43-4
Permission is granted to copy, distribute and/or modify this document
@ -456,7 +346,7 @@ Practicing Evaluation
How To Write Function Definitions
* Primitive Functions::
* defun:: The @code{defun} special form.
* defun:: The @code{defun} macro.
* Install:: Install a function definition.
* Interactive:: Making a function interactive.
* Interactive Options:: Different options for @code{interactive}.
@ -1617,13 +1507,25 @@ the symbol's value as a @dfn{variable}. This situation is described
in the section on variables. (@xref{Variables}.)
@cindex Special form
The second complication occurs because some functions are unusual and do
not work in the usual manner. Those that don't are called @dfn{special
forms}. They are used for special jobs, like defining a function, and
there are not many of them. In the next few chapters, you will be
introduced to several of the more important special forms.
The second complication occurs because some functions are unusual and
do not work in the usual manner. Those that don't are called
@dfn{special forms}. They are used for special jobs, like defining a
function, and there are not many of them. In the next few chapters,
you will be introduced to several of the more important special forms.
The third and final complication is this: if the function that the
As well as special forms, there are also @dfn{macros}. A macro
is a construct defined in Lisp, which differs from a function in that it
translates a Lisp expression into another expression that is to be
evaluated in place of the original expression. (@xref{Lisp macro}.)
For the purposes of this introduction, you do not need to worry too much
about whether something is a special form, macro, or ordinary function.
For example, @code{if} is a special form (@pxref{if}), but @code{when}
is a macro (@pxref{Lisp macro}). In earlier versions of Emacs,
@code{defun} was a special form, but now it is a macro (@pxref{defun}).
It still behaves in the same way.
The final complication is this: if the function that the
Lisp interpreter is looking at is not a special form, and if it is part
of a list, the Lisp interpreter looks to see whether the list has a list
inside of it. If there is an inner list, the Lisp interpreter first
@ -3053,7 +2955,7 @@ symbol refers to it.)
@menu
* Primitive Functions::
* defun:: The @code{defun} special form.
* defun:: The @code{defun} macro.
* Install:: Install a function definition.
* Interactive:: Making a function interactive.
* Interactive Options:: Different options for @code{interactive}.
@ -3094,18 +2996,15 @@ unless you investigate, you won't know whether an already-written
function is written in Emacs Lisp or C.
@node defun
@section The @code{defun} Special Form
@section The @code{defun} Macro
@findex defun
@cindex Special form of @code{defun}
@cindex @samp{function definition} defined
In Lisp, a symbol such as @code{mark-whole-buffer} has code attached to
it that tells the computer what to do when the function is called.
This code is called the @dfn{function definition} and is created by
evaluating a Lisp expression that starts with the symbol @code{defun}
(which is an abbreviation for @emph{define function}). Because
@code{defun} does not evaluate its arguments in the usual way, it is
called a @dfn{special form}.
(which is an abbreviation for @emph{define function}).
In subsequent sections, we will look at function definitions from the
Emacs source code, such as @code{mark-whole-buffer}. In this section,
@ -3697,7 +3596,7 @@ name for a @dfn{local variable} that overshadows any use of the same
name outside the @code{let} expression. This is like understanding
that whenever your host refers to `the house', he means his house, not
yours. (Symbols used in argument lists work the same way.
@xref{defun, , The @code{defun} Special Form}.)
@xref{defun, , The @code{defun} Macro}.)
Local variables created by a @code{let} expression retain their value
@emph{only} within the @code{let} expression itself (and within
@ -4254,7 +4153,7 @@ On the other hand, this function returns @code{nil} if the test is false.
@findex point
@findex mark
The @code{save-excursion} function is the fourth and final special form
The @code{save-excursion} function is the third and final special form
that we will discuss in this chapter.
In Emacs Lisp programs used for editing, the @code{save-excursion}
@ -4381,9 +4280,9 @@ within the body of a @code{let} expression. It looks like this:
@node Review
@section Review
In the last few chapters we have introduced a fair number of functions
and special forms. Here they are described in brief, along with a few
similar functions that have not been mentioned yet.
In the last few chapters we have introduced a macro and a fair number
of functions and special forms. Here they are described in brief,
along with a few similar functions that have not been mentioned yet.
@table @code
@item eval-last-sexp
@ -4393,10 +4292,10 @@ invoked with an argument; in that case, the output is printed in the
current buffer. This command is normally bound to @kbd{C-x C-e}.
@item defun
Define function. This special form has up to five parts: the name,
a template for the arguments that will be passed to the function,
documentation, an optional interactive declaration, and the body of the
definition.
Define function. This macro has up to five parts: the name, a
template for the arguments that will be passed to the function,
documentation, an optional interactive declaration, and the body of
the definition.
@need 1250
For example, in an early version of Emacs, the function definition was
@ -4803,7 +4702,7 @@ leave mark at previous position."
@end smallexample
Like all function definitions, this definition has five parts following
the special form @code{defun}:
the macro @code{defun}:
@enumerate
@item
@ -8310,7 +8209,7 @@ an @code{if} without the possibility of an else clause. In your mind,
you can replace @code{when} with @code{if} and understand what goes
on. That is what the Lisp interpreter does.
Technically speaking, @code{when} is a Lisp macro. A Lisp @dfn{macro}
Technically speaking, @code{when} is a Lisp macro. A Lisp macro
enables you to define new control constructs and other language
features. It tells the interpreter how to compute another Lisp
expression which will in turn compute the value. In this case, the
@ -9293,7 +9192,7 @@ have a value. If the variable already has a value, @code{defvar} does
not override the existing value. Second, @code{defvar} has a
documentation string.
(Another special form, @code{defcustom}, is designed for variables
(There is a related macro, @code{defcustom}, designed for variables
that people customize. It has more features than @code{defvar}.
(@xref{defcustom, , Setting Variables with @code{defcustom}}.)
@ -9363,7 +9262,7 @@ In the past, Emacs used the @code{defvar} special form both for
internal variables that you would not expect a user to change and for
variables that you do expect a user to change. Although you can still
use @code{defvar} for user customizable variables, please use
@code{defcustom} instead, since that special form provides a path into
@code{defcustom} instead, since it provides a path into
the Customization commands. (@xref{defcustom, , Specifying Variables
using @code{defcustom}}.)
@ -11300,11 +11199,11 @@ Let's expand on the metaphor in which a computer program is a robot.
A function definition provides the blueprints for a robot. When you
install a function definition, that is, when you evaluate a
@code{defun} special form, you install the necessary equipment to
build robots. It is as if you were in a factory, setting up an
assembly line. Robots with the same name are built according to the
same blueprints. So they have, as it were, the same `model number',
but a different `serial number'.
@code{defun} macro, you install the necessary equipment to build
robots. It is as if you were in a factory, setting up an assembly
line. Robots with the same name are built according to the same
blueprints. So they have, as it were, the same `model number', but a
different `serial number'.
We often say that a recursive function `calls itself'. What we mean
is that the instructions in a recursive function cause the Lisp
@ -16971,10 +16870,9 @@ definitions; but you can write @code{defuns} in your @file{.emacs}
file. Indeed, you can write any Lisp expression in your @file{.emacs}
file.)
The @code{customize} feature depends on the @code{defcustom} special
form. Although you can use @code{defvar} or @code{setq} for variables
that users set, the @code{defcustom} special form is designed for the
job.
The @code{customize} feature depends on the @code{defcustom} macro.
Although you can use @code{defvar} or @code{setq} for variables that
users set, the @code{defcustom} macro is designed for the job.
You can use your knowledge of @code{defvar} for writing the
first three arguments for @code{defcustom}. The first argument to
@ -17023,7 +16921,7 @@ Finally, the @code{:group} keyword tells the Emacs Customization
command in which group the variable is located. This tells where to
find it.
The @code{defcustom} function recognizes more than a dozen keywords.
The @code{defcustom} macro recognizes more than a dozen keywords.
For more information, see @ref{Customization, , Writing Customization
Definitions, elisp, The GNU Emacs Lisp Reference Manual}.
@ -19454,7 +19352,7 @@ them in an argument list (and within expressions called by them).
@ignore
@c texi2dvi fails when the name of the section is within ifnottex ...
(@xref{Prevent confusion, , @code{let} Prevents Confusion}, and
@ref{defun, , The @code{defun} Special Form}.)
@ref{defun, , The @code{defun} Macro}.)
@end ignore
@node yank
@ -20974,7 +20872,7 @@ equivalent of @code{multiply-by-seven} is:
@end smallexample
@noindent
(@xref{defun, , The @code{defun} Special Form}.)
(@xref{defun, , The @code{defun} Macro}.)
@need 1250
@noindent

View file

@ -23,10 +23,13 @@ srcdir = .
infodir = $(srcdir)/../../info
# Directory with the (customized) texinfo.tex file.
texinfodir = $(srcdir)/../misc
# Directory with emacsver.texi.
emacsdir = $(srcdir)/../emacs
INFO_EXT=.info
INFO_OPTS=--no-split
INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(srcdir)/doclicense.texi
INFO_OPTS=--no-split -I$(emacsdir)
INFO_SOURCES = $(srcdir)/emacs-lisp-intro.texi $(emacsdir)/emacsver.texi \
$(srcdir)/doclicense.texi
# The file name eintr must fit within 5 characters, to allow for
# -NN extensions to fit into DOS 8+3 limits without clashing
INFO_TARGETS = $(infodir)/eintr$(INFO_EXT)
@ -37,8 +40,9 @@ INSTALL_INFO = install-info
TEXI2DVI = texi2dvi
TEXI2PDF = texi2pdf
DVIPS = dvips
ENVADD = $(srcdir)\..\..\nt\envadd.bat "TEXINPUTS=$(srcdir);$(TEXINPUTS)" \
"MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(texinfodir)" /C
ENVADD = $(srcdir)\..\..\nt\envadd.bat \
"TEXINPUTS=$(srcdir);$(texinfodir);$(emacsdir);$(TEXINPUTS)" \
"MAKEINFO=$(MAKEINFO) -I$(srcdir) -I$(emacsdir) -I$(texinfodir)" /C
.SUFFIXES: .dvi .ps .texi

View file

@ -1,10 +1,66 @@
2013-05-29 Stefan Monnier <monnier@iro.umontreal.ca>
* functions.texi (Lambda Expressions): Lambda expressions don't
evaluate to themselves in general (bug#11782).
2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
* loading.texi (Autoload):
* help.texi (Documentation Basics, Accessing Documentation)
(Accessing Documentation, Accessing Documentation): DOC-* is now DOC.
2013-04-23 Glenn Morris <rgm@gnu.org>
* internals.texi (Writing Emacs Primitives): Remove obvious example.
Tweak other to avoid overly long line.
2013-04-21 Xue Fuqiao <xfq.free@gmail.com>
* internals.texi (Writing Emacs Primitives): Remove unnecessary
references to the sources. (Bug#13800)
* searching.texi (Regexp Backslash): Doc fix for backslash
constructs in regular expressions.
2013-04-15 Christopher Schmidt <christopher@ch.ristopher.com>
* tips.texi (Coding Conventions): Mention separation of package
descriptor and name of internal symbols by two hyphens.
2013-04-13 Stephen Berman <stephen.berman@gmx.net>
* windows.texi (Splitting Windows): Change category of
split-window from a command to a function.
2013-04-06 Chong Yidong <cyd@gnu.org>
* display.texi (Faces): Minor clarifications.
(Defining Faces): Clarify default vs custom face specs.
Document face-spec-set.
* display.texi (Overlay Properties):
* text.texi (Special Properties): Use the "anonymous face"
terminology. Describe foreground-color and background-color forms
as compatibility-only.
2013-03-24 Eli Zaretskii <eliz@gnu.org>
* compile.texi (Byte-Code Objects): Add index entry.
(Disassembly): Add cross-references.
2013-03-23 Eli Zaretskii <eliz@gnu.org>
* frames.texi (Size Parameters): More accurate description of the
difference between 'fullboth' and 'maximized'. (Bug#13935)
2013-03-17 Christopher Schmidt <christopher@ch.ristopher.com>
* symbols.texi (Standard Properties): Document pure. (Bug#13823)
2013-03-16 Glenn Morris <rgm@gnu.org>
* elisp.texi: Add some stuff specific to www.gnu.org.
2013-03-16 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.
2013-03-11 Teodor Zlatanov <tzz@lifelogs.com>
* control.texi (Pattern matching case statement): Fix typo.
@ -2005,8 +2061,8 @@
2012-02-04 Chong Yidong <cyd@gnu.org>
* functions.texi (What Is a Function): Add closures. Mention
"return value" terminology. Add xref for command-execute.
* functions.texi (What Is a Function): Add closures.
Mention "return value" terminology. Add xref for command-execute.
Remove unused "keystroke command" terminology.
(Lambda Expressions): Give a different example than in the
following subsection. Add xref to Anonymous Functions.
@ -11553,7 +11609,7 @@
2002-05-13 Kim F. Storm <storm@cua.dk>
* variables.texi (Intro to Buffer-Local): Updated warning and
* variables.texi (Intro to Buffer-Local): Update warning and
example relating to changing buffer inside let.
2002-03-10 Jan Djärv <jan.h.d@swipnet.se>

View file

@ -514,6 +514,7 @@ one you intend to suppress.
@section Byte-Code Function Objects
@cindex compiled function
@cindex byte-code function
@cindex byte-code object
Byte-compiled functions have a special data type: they are
@dfn{byte-code function objects}. Whenever such an object appears as
@ -606,8 +607,9 @@ name of an existing buffer. Then the output goes there, at point, and
point is left before the output.
The argument @var{object} can be a function name, a lambda expression
or a byte-code object. If it is a lambda expression, @code{disassemble}
compiles it and disassembles the resulting compiled code.
(@pxref{Lambda Expressions}), or a byte-code object (@pxref{Byte-Code
Objects}). If it is a lambda expression, @code{disassemble} compiles
it and disassembles the resulting compiled code.
@end deffn
Here are two examples of using the @code{disassemble} function. We

View file

@ -1510,31 +1510,31 @@ of the symbol serve as defaults for the properties of the overlay.
@item face
@kindex face @r{(overlay property)}
This property controls the way text is displayed---for example, which
font and which colors. @xref{Faces}, for more information.
In the simplest case, the value is a face name. It can also be a list;
then each element can be any of these possibilities:
This property controls the appearance of the text (@pxref{Faces}).
The value of the property can be the following:
@itemize @bullet
@item
A face name (a symbol or string).
@item
A property list of face attributes. This has the form (@var{keyword}
@var{value} @dots{}), where each @var{keyword} is a face attribute
name and @var{value} is a meaningful value for that attribute. With
this feature, you do not need to create a face each time you want to
specify a particular attribute for certain text. @xref{Face
Attributes}.
An anonymous face: a property list of the form @code{(@var{keyword}
@var{value} @dots{})}, where each @var{keyword} is a face attribute
name and @var{value} is a value for that attribute.
@item
A cons cell, of the form @code{(foreground-color . @var{color-name})}
or @code{(background-color . @var{color-name})}. These elements
specify just the foreground color or just the background color.
A list of faces. Each list element should be either a face name or an
anonymous face. This specifies a face which is an aggregate of the
attributes of each of the listed faces. Faces occurring earlier in
the list have higher priority.
@code{(foreground-color . @var{color-name})} has the same effect as
@code{(:foreground @var{color-name})}; likewise for the background.
@item
A cons cell of the form @code{(foreground-color . @var{color-name})}
or @code{(background-color . @var{color-name})}. This specifies the
foreground or background color, similar to @code{(:foreground
@var{color-name})} or @code{(:background @var{color-name})}. This
form is supported for backward compatibility only, and should be
avoided.
@end itemize
@item mouse-face
@ -1901,44 +1901,39 @@ height.
@section Faces
@cindex faces
A @dfn{face} is a collection of graphical @dfn{attributes} for
displaying text: font, foreground color, background color, optional
underlining, etc. Faces control how Emacs displays text in buffers,
as well as other parts of the frame such as the mode line.
A @dfn{face} is a collection of graphical attributes for displaying
text: font, foreground color, background color, optional underlining,
etc. Faces control how Emacs displays text in buffers, as well as
other parts of the frame such as the mode line.
@cindex anonymous face
One way to represent a face is as a property list of attributes,
like @code{(:foreground "red" :weight bold)}. For example, you can
assign such an @dfn{anonymous face} as the value of the @code{face}
text property; this causes Emacs to display the underlying text with
the specified attributes. @xref{Special Properties}.
like @code{(:foreground "red" :weight bold)}. Such a list is called
an @dfn{anonymous face}. For example, you can assign an anonymous
face as the value of the @code{face} text property, and Emacs will
display the underlying text with the specified attributes.
@xref{Special Properties}.
@cindex face name
More commonly, a face is referred to via a @dfn{face name}: a Lisp
symbol which is associated with a set of face attributes. Named faces
are defined using the @code{defface} macro (@pxref{Defining Faces}).
Emacs defines several standard named faces; @xref{Standard Faces,,,
emacs, The GNU Emacs Manual}.
symbol associated with a set of face attributes@footnote{For backward
compatibility, you can also use a string to specify a face name; that
is equivalent to a Lisp symbol with the same name.}. Named faces are
defined using the @code{defface} macro (@pxref{Defining Faces}).
Emacs comes with several standard named faces (@pxref{Basic Faces}).
Many parts of Emacs require named faces, and do not accept anonymous
faces. These include the functions documented in @ref{Attribute
Functions}, and the variable @code{font-lock-keywords}
Many parts of Emacs required named faces, and do not accept
anonymous faces. These include the functions documented in
@ref{Attribute Functions}, and the variable @code{font-lock-keywords}
(@pxref{Search-based Fontification}). Unless otherwise stated, we
will use the term @dfn{face} to refer only to named faces.
For backward compatibility, you can also use a string to specify a
face name; that is equivalent to a Lisp symbol with the same name.
@defun facep object
This function returns a non-@code{nil} value if @var{object} is a
named face: a Lisp symbol or string which serves as a face name.
Otherwise, it returns @code{nil}.
@end defun
By default, each face name corresponds to the same set of attributes
in all frames. But you can also assign a face name a special set of
attributes in one frame (@pxref{Attribute Functions}).
@menu
* Face Attributes:: What is in a face?
* Defining Faces:: How to define a face.
@ -2178,32 +2173,47 @@ suitable for use with @code{:stipple} (see above). It returns
@node Defining Faces
@subsection Defining Faces
@cindex face spec
The usual way to define a face is through the @code{defface} macro.
This macro defines a face name, and associates that name with a set of
face attributes. It also sets up the face so that the user can
customize it via the Customize interface (@pxref{Customization}).
This macro associates a face name (a symbol) with a default @dfn{face
spec}. A face spec is a construct which specifies what attributes a
face should have on any given terminal; for example, a face spec might
specify one foreground color on high-color terminals, and a different
foreground color on low-color terminals.
People are sometimes tempted to create a variable whose value is a
face name. In the vast majority of cases, this is not necessary; the
usual procedure is to define a face with @code{defface}, and then use
its name directly.
@defmac defface face spec doc [keyword value]@dots{}
This macro declares @var{face} as a customizable face whose default
attributes are given by @var{spec}. You should not quote the symbol
@var{face}, and it should not end in @samp{-face} (that would be
redundant). The argument @var{doc} is a documentation string for the
face. The additional @var{keyword} arguments have the same meanings
as in @code{defgroup} and @code{defcustom} (@pxref{Common Keywords}).
This macro declares @var{face} as a named face whose default face spec
is given by @var{spec}. You should not quote the symbol @var{face},
and it should not end in @samp{-face} (that would be redundant). The
argument @var{doc} is a documentation string for the face. The
additional @var{keyword} arguments have the same meanings as in
@code{defgroup} and @code{defcustom} (@pxref{Common Keywords}).
When @code{defface} executes, it defines the face according to
@var{spec}, then uses any customizations that were read from the
init file (@pxref{Init File}) to override that specification.
If @var{face} already has a default face spec, this macro does
nothing.
When you evaluate a @code{defface} form with @kbd{C-M-x} in Emacs
Lisp mode (@code{eval-defun}), a special feature of @code{eval-defun}
overrides any customizations of the face. This way, the face reflects
exactly what the @code{defface} says.
The default face spec determines @var{face}'s appearance when no
customizations are in effect (@pxref{Customization}). If @var{face}
has already been customized (via Custom themes or via customizations
read from the init file), its appearance is determined by the custom
face spec(s), which override the default face spec @var{spec}.
However, if the customizations are subsequently removed, the
appearance of @var{face} will again be determined by its default face
spec.
@cindex face specification
The @var{spec} argument is a @dfn{face specification}, which states
how the face should appear on different kinds of terminals. It should
be an alist whose elements each have the form
As an exception, if you evaluate a @code{defface} form with
@kbd{C-M-x} in Emacs Lisp mode (@code{eval-defun}), a special feature
of @code{eval-defun} overrides any custom face specs on the face,
causing the face to reflect exactly what the @code{defface} says.
The @var{spec} argument is a @dfn{face spec}, which states how the
face should appear on different kinds of terminals. It should be an
alist whose elements each have the form
@example
(@var{display} . @var{plist})
@ -2275,7 +2285,8 @@ terminal must match one of the @var{value}s specified for it in
@end table
@end defmac
Here's how the standard face @code{highlight} is defined:
For example, here's the definition of the standard face
@code{highlight}:
@example
(defface highlight
@ -2294,65 +2305,56 @@ terminal must match one of the @var{value}s specified for it in
:group 'basic-faces)
@end example
Internally, Emacs stores the face's default specification in its
Internally, Emacs stores each face's default spec in its
@code{face-defface-spec} symbol property (@pxref{Symbol Properties}).
The @code{saved-face} property stores the face specification saved by
the user, using the customization buffer; the @code{customized-face}
property stores the face specification customized for the current
session, but not saved; and the @code{theme-face} property stores an
alist associating the active customization settings and Custom themes
with their specifications for that face. The face's documentation
string is stored in the @code{face-documentation} property. But
normally you should not try to set any of these properties directly.
@xref{Applying Customizations}, for the @code{custom-set-faces}
function, which is used to apply customized face settings.
The @code{saved-face} property stores any face spec saved by the user
using the customization buffer; the @code{customized-face} property
stores the face spec customized for the current session, but not
saved; and the @code{theme-face} property stores an alist associating
the active customization settings and Custom themes with the face
specs for that face. The face's documentation string is stored in the
@code{face-documentation} property.
People are sometimes tempted to create variables whose values
specify a face to use. In the vast majority of cases, this is not
necessary; it is preferable to simply use faces directly.
Normally, a face is declared just once, using @code{defface}, and
any further changes to its appearance are applied using the Customize
framework (e.g., via the Customize user interface or via the
@code{custom-set-faces} function; @pxref{Applying Customizations}), or
by face remapping (@pxref{Face Remapping}). In the rare event that
you need to change a face spec directly from Lisp, you can use the
@code{face-spec-set} function.
@defun face-spec-set face spec &optional spec-type
This function applies @var{spec} as a face spec for @code{face}.
@var{spec} should be a face spec, as described in the above
documentation for @code{defface}.
@cindex override spec @r{(for a face)}
The argument @var{spec-type} determines which spec to set. If it is
@code{nil} or @code{face-override-spec}, this function sets the
@dfn{override spec}, which overrides over all other face specs on
@var{face}. If it is @code{face-defface-spec}, this function sets the
default face spec (the same one set by @code{defface}). If it is
@code{reset}, this function clears out all customization specs and
override specs from @var{face} (in this case, the value of @var{spec}
is ignored). Any other value of @var{spec-type} is reserved for
internal use.
@end defun
@node Attribute Functions
@subsection Face Attribute Functions
This section describes the functions for accessing and modifying the
attributes of an existing named face.
@defun set-face-attribute face frame &rest arguments
This function sets one or more attributes of @var{face} for
@var{frame}. The attributes you specify this way override whatever
the @code{defface} says.
The extra arguments @var{arguments} specify the attributes to set, and
the values for them. They should consist of alternating attribute
names (such as @code{:family} or @code{:underline}) and values. Thus,
@example
(set-face-attribute 'foo nil
:width 'extended
:weight 'bold)
@end example
@noindent
sets the attribute @code{:width} to @code{extended} and the attribute
@code{:weight} to @code{bold}.
If @var{frame} is @code{t}, this function sets the default attributes
for new frames. Default attribute values specified this way override
the @code{defface} for newly created frames.
If @var{frame} is @code{nil}, this function sets the attributes for
all existing frames, and the default for new frames.
@end defun
This section describes functions for directly accessing and
modifying the attributes of a named face.
@defun face-attribute face attribute &optional frame inherit
This returns the value of the @var{attribute} attribute of @var{face}
on @var{frame}. If @var{frame} is @code{nil}, that means the selected
frame (@pxref{Input Focus}).
This function returns the value of the @var{attribute} attribute for
@var{face} on @var{frame}.
If @var{frame} is @code{t}, this returns whatever new-frames default
value you previously specified with @code{set-face-attribute} for the
@var{attribute} attribute of @var{face}. If you have not specified
one, it returns @code{nil}.
If @var{frame} is @code{nil}, that means the selected frame
(@pxref{Input Focus}). If @var{frame} is @code{t}, this function
returns the value of the specified attribute for newly-created frames
(this is normally @code{unspecified}, unless you have specified some
value using @code{set-face-attribute}; see below).
If @var{inherit} is @code{nil}, only attributes directly defined by
@var{face} are considered, so the return value may be
@ -2409,6 +2411,36 @@ If @var{value1} is a relative value for the face attribute
@var{attribute}, returns it merged with the underlying value
@var{value2}; otherwise, if @var{value1} is an absolute value for the
face attribute @var{attribute}, returns @var{value1} unchanged.
@end defun
Normally, Emacs uses the face specs of each face to automatically
calculate its attributes on each frame (@pxref{Defining Faces}). The
function @code{set-face-attribute} can override this calculation by
directly assigning attributes to a face, either on a specific frame or
for all frames. This function is mostly intended for internal usage.
@defun set-face-attribute face frame &rest arguments
This function sets one or more attributes of @var{face} for
@var{frame}. The attributes specifies in this way override the face
spec(s) belonging to @var{face}.
The extra arguments @var{arguments} specify the attributes to set, and
the values for them. They should consist of alternating attribute
names (such as @code{:family} or @code{:underline}) and values. Thus,
@example
(set-face-attribute 'foo nil :weight 'bold :slant 'italic)
@end example
@noindent
sets the attribute @code{:weight} to @code{bold} and the attribute
@code{:slant} to @code{italic}.
If @var{frame} is @code{t}, this function sets the default attributes
for newly created frames. If @var{frame} is @code{nil}, this function
sets the attributes for all existing frames, as well as for newly
created frames.
@end defun
The following commands and functions mostly provide compatibility
@ -2457,16 +2489,17 @@ This sets the @code{:inverse-video} attribute of @var{face} to
This swaps the foreground and background colors of face @var{face}.
@end deffn
The following functions examine the attributes of a face. If you
don't specify @var{frame}, they refer to the selected frame; @code{t}
refers to the default data for new frames. They return the symbol
@code{unspecified} if the face doesn't define any value for that
attribute. If @var{inherit} is @code{nil}, only an attribute directly
defined by the face is returned. If @var{inherit} is non-@code{nil},
any faces specified by its @code{:inherit} attribute are considered as
well, and if @var{inherit} is a face or a list of faces, then they are
also considered, until a specified attribute is found. To ensure that
the return value is always specified, use a value of @code{default} for
The following functions examine the attributes of a face. They
mostly provide compatibility with old versions of Emacs. If you don't
specify @var{frame}, they refer to the selected frame; @code{t} refers
to the default data for new frames. They return @code{unspecified} if
the face doesn't define any value for that attribute. If
@var{inherit} is @code{nil}, only an attribute directly defined by the
face is returned. If @var{inherit} is non-@code{nil}, any faces
specified by its @code{:inherit} attribute are considered as well, and
if @var{inherit} is a face or a list of faces, then they are also
considered, until a specified attribute is found. To ensure that the
return value is always specified, use a value of @code{default} for
@var{inherit}.
@defun face-font face &optional frame
@ -2576,13 +2609,13 @@ The value of this variable is an alist whose elements have the form
any text having the face @var{face} with @var{remapping}, rather than
the ordinary definition of @var{face}.
@var{remapping} may be any face specification suitable for a
@code{face} text property: either a face (i.e., a face name or a
property list of attribute/value pairs), or a list of faces. For
details, see the description of the @code{face} text property in
@ref{Special Properties}. @var{remapping} serves as the complete
specification for the remapped face---it replaces the normal
definition of @var{face}, instead of modifying it.
@var{remapping} may be any face spec suitable for a @code{face} text
property: either a face (i.e., a face name or a property list of
attribute/value pairs), or a list of faces. For details, see the
description of the @code{face} text property in @ref{Special
Properties}. @var{remapping} serves as the complete specification for
the remapped face---it replaces the normal definition of @var{face},
instead of modifying it.
If @code{face-remapping-alist} is buffer-local, its local value takes
effect only within that buffer.
@ -2629,7 +2662,7 @@ and @code{face-remap-reset-base} functions; it is intended for major
modes to remap faces in the buffers they control.
@defun face-remap-add-relative face &rest specs
This functions adds the face specifications in @var{specs} as relative
This functions adds the face spec in @var{specs} as relative
remappings for face @var{face} in the current buffer. The remaining
arguments, @var{specs}, should form either a list of face names, or a
property list of attribute/value pairs.

View file

@ -632,8 +632,9 @@ possible. The value @code{fullboth} specifies that both the width and
the height shall be set to the size of the screen. The value
@code{maximized} specifies that the frame shall be maximized. The
difference between @code{maximized} and @code{fullboth} is that the
former still has window manager decorations while the latter really
covers the whole screen.
former can still be resized by dragging window manager decorations
with the mouse, while the latter really covers the whole screen and
does not allow resizing by mouse dragging.
@end table
@node Layout Parameters

View file

@ -196,9 +196,8 @@ an example:
@end example
@noindent
In Emacs Lisp, such a list is valid as an expression---it evaluates to
itself. But its main use is not to be evaluated as an expression, but
to be called as a function.
In Emacs Lisp, such a list is a valid expression which evaluates to
a function object.
A lambda expression, by itself, has no name; it is an @dfn{anonymous
function}. Although lambda expressions can be used this way

View file

@ -93,13 +93,12 @@ When you define a variable with a @code{defvar} or related form
(@pxref{Defining Variables}), the documentation is stored in the
variable's @code{variable-documentation} property.
@cindex @file{DOC-@var{version}} (documentation) file
@cindex @file{DOC} (documentation) file
@item
To save memory, the documentation for preloaded functions and
variables (including primitive functions and autoloaded functions) is
not kept in memory, but in the file
@file{emacs/etc/DOC-@var{version}}, where @var{version} is the Emacs
version number (@pxref{Version Info}).
@file{emacs/etc/DOC}).
@item
When a function or variable is loaded from a byte-compiled file during
@ -126,7 +125,7 @@ customization groups (but for function documentation, use the
@code{documentation} command, below).
If the value recorded in the property list refers to a documentation
string stored in a @file{DOC-@var{version}} file or a byte-compiled
string stored in a @file{DOC} file or a byte-compiled
file, it looks up that string and returns it. If the property value
isn't @code{nil}, isn't a string, and doesn't refer to text in a file,
then it is evaluated as a Lisp expression to obtain a string.
@ -296,12 +295,12 @@ memory in the function definitions and variable property lists.
Emacs reads the file @var{filename} from the @file{emacs/etc} directory.
When the dumped Emacs is later executed, the same file will be looked
for in the directory @code{doc-directory}. Usually @var{filename} is
@code{"DOC-@var{version}"}.
@code{"DOC"}.
@end defun
@defvar doc-directory
This variable holds the name of the directory which should contain the
file @code{"DOC-@var{version}"} that contains documentation strings for
file @code{"DOC"} that contains documentation strings for
built-in and preloaded functions and variables.
In most cases, this is the same as @code{data-directory}. They may be

View file

@ -661,15 +661,25 @@ equivalent of @code{&rest}). Both @code{UNEVALLED} and @code{MANY} are
macros. If @var{max} is a number, it must be more than @var{min} but
less than 8.
@cindex interactive specification in primitives
@item interactive
This is an interactive specification, a string such as might be used as
the argument of @code{interactive} in a Lisp function. In the case of
@code{or}, it is 0 (a null pointer), indicating that @code{or} cannot be
called interactively. A value of @code{""} indicates a function that
should receive no arguments when called interactively. If the value
begins with a @samp{(}, the string is evaluated as a Lisp form.
For examples of the last two forms, see @code{widen} and
@code{narrow-to-region} in @file{editfns.c}.
This is an interactive specification, a string such as might be used
as the argument of @code{interactive} in a Lisp function. In the case
of @code{or}, it is 0 (a null pointer), indicating that @code{or}
cannot be called interactively. A value of @code{""} indicates a
function that should receive no arguments when called interactively.
If the value begins with a @samp{"(}, the string is evaluated as a
Lisp form. For example:
@example
@group
DEFUN ("foo", Ffoo, Sfoo, 0, UNEVALLED,
"(list (read-char-by-name \"Insert character: \")\
(prefix-numeric-value current-prefix-arg)\
t))",
doc: /* @dots{} /*)
@end group
@end example
@item doc
This is the documentation string. It uses C comment syntax rather

View file

@ -483,7 +483,7 @@ For example,
@noindent
In this case, @code{"prolog"} is the name of the file to load, 169681
refers to the documentation string in the
@file{emacs/etc/DOC-@var{version}} file (@pxref{Documentation Basics}),
@file{emacs/etc/DOC} file (@pxref{Documentation Basics}),
@code{t} means the function is interactive, and @code{nil} that it is
not a macro or a keymap.
@end defun

View file

@ -589,10 +589,8 @@ through @samp{f} and @samp{A} through @samp{F}.
For the most part, @samp{\} followed by any character matches only
that character. However, there are several exceptions: certain
two-character sequences starting with @samp{\} that have special
meanings. (The character after the @samp{\} in such a sequence is
always ordinary when used on its own.) Here is a table of the special
@samp{\} constructs.
sequences starting with @samp{\} that have special meanings. Here is
a table of the special @samp{\} constructs.
@table @samp
@item \|

View file

@ -539,8 +539,9 @@ deleted from the local value of a hook variable when changing major
modes. @xref{Setting Hooks}.
@item pure
This property is used internally to mark certain named functions for
byte compiler optimization. Do not set it.
If the value is non-@code{nil}, the named function is considered to be
side-effect free. Calls with constant arguments can be evaluated at
compile time. This may shift run time errors to compile time.
@item risky-local-variable
If the value is non-@code{nil}, the named variable is considered risky

View file

@ -3008,27 +3008,31 @@ character.
@item face
@cindex face codes of text
@kindex face @r{(text property)}
The @code{face} property controls the appearance of the character,
such as its font and color. @xref{Faces}. The value of the property
can be the following:
The @code{face} property controls the appearance of the character
(@pxref{Faces}). The value of the property can be the following:
@itemize @bullet
@item
A face name (a symbol or string).
@item
A property list of face attributes. This has the form (@var{keyword}
@var{value} @dots{}), where each @var{keyword} is a face attribute
name and @var{value} is a meaningful value for that attribute. With
this feature, you do not need to create a face each time you want to
specify a particular attribute for certain text.
An anonymous face: a property list of the form @code{(@var{keyword}
@var{value} @dots{})}, where each @var{keyword} is a face attribute
name and @var{value} is a value for that attribute.
@item
A list of faces. This specifies a face which is an aggregate of the
A list of faces. Each list element should be either a face name or an
anonymous face. This specifies a face which is an aggregate of the
attributes of each of the listed faces. Faces occurring earlier in
the list have higher priority. Each list element must have one of the
two above forms (i.e., either a face name or a property list of face
attributes).
the list have higher priority.
@item
A cons cell of the form @code{(foreground-color . @var{color-name})}
or @code{(background-color . @var{color-name})}. This specifies the
foreground or background color, similar to @code{(:foreground
@var{color-name})} or @code{(:background @var{color-name})}. This
form is supported for backward compatibility only, and should be
avoided.
@end itemize
Font Lock mode (@pxref{Font Lock Mode}) works in most buffers by

View file

@ -51,13 +51,15 @@ don't postpone it.
@item
You should choose a short word to distinguish your program from other
Lisp programs. The names of all global variables, constants, and
functions in your program should begin with that chosen prefix.
Separate the prefix from the rest of the name with a hyphen, @samp{-}.
This practice helps avoid name conflicts, since all global variables
in Emacs Lisp share the same name space, and all functions share
another name space@footnote{The benefits of a Common Lisp-style
package system are considered not to outweigh the costs.}.
Lisp programs. The names of all global symbols in your program, that
is the names of variables, constants, and functions, should begin with
that chosen prefix. Separate the prefix from the rest of the name
with a hyphen, @samp{-}. Use two hyphens if the symbol is not meant
to be used by other packages. This practice helps avoid name
conflicts, since all global variables in Emacs Lisp share the same
name space, and all functions share another name space@footnote{The
benefits of a Common Lisp-style package system are considered not to
outweigh the costs.}.
Occasionally, for a command name intended for users to use, it is more
convenient if some words come before the package's name prefix. And

View file

@ -717,7 +717,7 @@ window.
This section describes functions for creating a new window by
@dfn{splitting} an existing one.
@deffn Command split-window &optional window size side
@defun split-window &optional window size side
This function creates a new live window next to the window
@var{window}. If @var{window} is omitted or @code{nil}, it defaults
to the selected window. That window is ``split'', and reduced in
@ -767,7 +767,7 @@ called with the arguments @var{window}, @var{size}, and @var{side}, in
lieu of the usual action of @code{split-window}. Otherwise, this
function obeys the @code{window-atom} or @code{window-side} window
parameter, if any. @xref{Window Parameters}.
@end deffn
@end defun
As an example, here is a sequence of @code{split-window} calls that
yields the window configuration discussed in @ref{Windows and Frames}.

View file

@ -1,3 +1,7 @@
2013-04-20 Petr Hracek <phracek@redhat.com> (tiny change)
* emacs.1: Add some more command-line options. (Bug#14165)
2012-12-02 Kevin Ryde <user42@zip.com.au>
* etags.1: Mention effect of --declarations in Lisp.

View file

@ -79,12 +79,22 @@ Go to the specified
and
.IR column .
.TP
.BI \-\-chdir " directory"
Change to
.IR directory .
.TP
.BR \-q ", " \-\-no\-init\-file
Do not load an init file.
.TP
.BR \-nl ", " \-\-no\-shared\-memory
Do not use shared memory.
.TP
.B \-\-no\-site\-file
Do not load the site-wide startup file.
.TP
.BR \-nsl ", " \-\-no\-site\-lisp
Do not add site-lisp directories to load-path.
.TP
.B \-\-no\-desktop
Do not load a saved desktop.
.TP
@ -325,6 +335,9 @@ in iconified state.
.BR \-nbc ", " \-\-no\-blinking\-cursor
Disable blinking cursor.
.TP
.BI \-\-parent-id " xid"
Set parent window.
.TP
.BR \-nw ", " \-\-no\-window\-system
Tell
.I Emacs

View file

@ -1,3 +1,50 @@
2013-05-28 Xue Fuqiao <xfq.free@gmail.com>
* erc.texi (Special Features): ERC is being maintained within
Emacs now.
2013-05-25 Xue Fuqiao <xfq.free@gmail.com>
* flymake.texi: Changing from one space between sentences to two.
2013-05-04 Stefan Monnier <monnier@iro.umontreal.ca>
* cl.texi (Obsolete Macros): Describe replacements for `flet'
(bug#14293).
2013-04-16 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (Frequently Asked Questions): Precise, how to define
an own ControlPath.
2013-04-15 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (Frequently Asked Questions): New item for
ControlPath settings.
2013-03-31 Jay Belanger <jay.p.belanger@gmail.com>
* calc.texi: (Basic Operations on Units): Streamline some
descriptions.
2013-03-27 Aidan Gauland <aidalgol@no8wireless.co.nz>
* eshell.texi (Built-ins): Update manual to mention tramp module.
2013-03-18 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (Filename Syntax): Host names are not allowed to be
any method name, unless method name is specified explicitly.
Remove restriction on unibyte filenames.
* trampver.texi: Update release number.
2013-03-17 Paul Eggert <eggert@cs.ucla.edu>
doc: convert some TeX accents to UTF-8
* emacs-mime.texi (Interface Functions): Use 'ï' rather than
'@"{@dotless{i}}'.
2013-03-15 Michael Albinus <michael.albinus@gmx.de>
Sync with Tramp 2.2.7.
@ -2395,6 +2442,10 @@
dired-add-entry, dired-initial-position, dired-clean-up-after-deletion,
dired-read-shell-command, or dired-find-buffer-nocreate.
2013-02-18 Aidan Gauland <aidalgol@no8wireless.co.nz>
* eshell.texi (Input/Output): Document insert output redirection operator, >>>.
2011-02-18 Glenn Morris <rgm@gnu.org>
* dired-x.texi (Optional Installation File At Point): Simplify.

View file

@ -27911,11 +27911,10 @@ prompt first for the old units which this value should be considered
to have, then for the new units. (If the value on the stack can be
simplified so that it doesn't contain any units, like @samp{ft/in} can
be simplified to 12, then @kbd{u c} will still prompt for both old
units and new units. This can be disabled; @pxref{Customizing Calc}.)
Assuming the old and new units you give are consistent with each
other, the result also will not contain any units. For example,
@kbd{@w{u c} cm @key{RET} in @key{RET}} converts the number 2 on the
stack to 5.08.
units and new units. Assuming the old and new units you give are
consistent with each other, the result also will not contain any
units. For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts
the number 2 on the stack to 5.08.
@kindex u b
@pindex calc-base-units
@ -35694,17 +35693,6 @@ have different dimensions. The default value of @code{calc-ensure-consistent-uni
is @code{nil}.
@end defvar
@defvar calc-allow-units-as-numbers
When converting units, the variable @code{calc-allow-units-as-numbers}
determines whether or not values which can be simplified so that
they don't contain units (such as @samp{ft/in} can be simplified to 12)
can be regarded as not containing units. If
@code{calc-allow-units-as-numbers} is non-@code{nil}, then @kbd{u c}
will prompt for both old units and new units when converting an expression
like @samp{ft/in}, otherwise @kbd{u c} will only prompt for the new units.
The default value of @code{calc-allow-units-as-numbers} is @code{t}.
@end defvar
@defvar calc-undo-length
The variable @code{calc-undo-length} determines the number of undo
steps that Calc will keep track of when @code{calc-quit} is called.

View file

@ -4850,10 +4850,27 @@ generated directly inside Emacs will not be caught since they make
direct C-language calls to the message routines rather than going
through the Lisp @code{message} function.
For those cases where the dynamic scoping of @code{flet} is desired,
@code{cl-flet} is clearly not a substitute. The most direct replacement would
be instead to use @code{cl-letf} to temporarily rebind @code{(symbol-function
'@var{fun})}. But in most cases, a better substitute is to use an advice, such
as:
@example
(defvar my-fun-advice-enable nil)
(add-advice '@var{fun} :around
(lambda (orig &rest args)
(if my-fun-advice-enable (do-something)
(apply orig args))))
@end example
so that you can then replace the @code{flet} with a simple dynamically scoped
binding of @code{my-fun-advice-enable}.
@c Bug#411.
Note that many primitives (e.g., @code{+}) have special byte-compile
handling. Attempts to redefine such functions using @code{flet} will
fail if byte-compiled.
Note that many primitives (e.g., @code{+}) have special byte-compile handling.
Attempts to redefine such functions using @code{flet}, @code{cl-letf}, or an
advice will fail when byte-compiled.
@c Or cl-flet.
@c In such cases, use @code{labels} instead.
@end defmac

View file

@ -1221,7 +1221,7 @@ Return the value of the field under point.
@item mail-encode-encoded-word-region
@findex mail-encode-encoded-word-region
Encode the non-@acronym{ASCII} words in the region. For instance,
@samp{Na@"{@dotless{i}}ve} is encoded as @samp{=?iso-8859-1?q?Na=EFve?=}.
@samp{Naïve} is encoded as @samp{=?iso-8859-1?q?Na=EFve?=}.
@item mail-encode-encoded-word-buffer
@findex mail-encode-encoded-word-buffer
@ -1234,7 +1234,7 @@ Encode the words that need encoding in a string, and return the result.
@example
(mail-encode-encoded-word-string
"This is na@"{@dotless{i}}ve, baby")
"This is naïve, baby")
@result{} "This is =?iso-8859-1?q?na=EFve,?= baby"
@end example
@ -1249,7 +1249,7 @@ Decode the encoded words in the string and return the result.
@example
(mail-decode-encoded-word-string
"This is =?iso-8859-1?q?na=EFve,?= baby")
@result{} "This is na@"{@dotless{i}}ve, baby"
@result{} "This is naïve, baby"
@end example
@end table

View file

@ -234,9 +234,9 @@ forwards.
Different channels and servers may have different language encodings.
In addition, it is possible to translate the messages that ERC uses into
multiple languages. Please contact the developers of ERC at
@email{erc-discuss@@gnu.org} if you are interested in helping with the
In addition, it is possible to translate the messages that ERC uses
into multiple languages. Please contact the developers of Emacs at
@email{emacs-devel@@gnu.org} if you are interested in helping with the
translation effort.
@item user scripting

View file

@ -460,8 +460,9 @@ With @samp{cd -42}, you can access the directory stack by number.
@cmindex su
@itemx sudo
@cmindex sudo
Uses TRAMP's @command{su} or @command{sudo} method to run a command via
@command{su} or @command{sudo}.
Uses TRAMP's @command{su} or @command{sudo} method @pxref{Inline methods, , , tramp}
to run a command via @command{su} or @command{sudo}. These commands
are in the eshell-tramp module, which is disabled by default.
@end table

View file

@ -63,13 +63,13 @@ modify this GNU manual.''
@cindex Overview of Flymake
Flymake is a universal on-the-fly syntax checker implemented as an
Emacs minor mode. Flymake runs the pre-configured syntax check tool
Emacs minor mode. Flymake runs the pre-configured syntax check tool
(compiler for C++ files, @code{perl} for perl files, etc.)@: in the
background, passing it a temporary copy of the current buffer, and
parses the output for known error/warning message patterns. Flymake
parses the output for known error/warning message patterns. Flymake
then highlights erroneous lines (i.e., lines for which at least one
error or warning has been reported by the syntax check tool), and
displays an overall buffer status in the mode line. Status information
displays an overall buffer status in the mode line. Status information
displayed by Flymake contains total number of errors and warnings
reported for the buffer during the last syntax check.
@ -79,14 +79,14 @@ line, respectively.
Calling @code{flymake-display-err-menu-for-current-line} will popup a
menu containing error messages reported by the syntax check tool for
the current line. Errors/warnings belonging to another file, such as a
the current line. Errors/warnings belonging to another file, such as a
@code{.h} header file included by a @code{.c} file, are shown in the
current buffer as belonging to the first line. Menu items for such
messages also contain a filename and a line number. Selecting such a
current buffer as belonging to the first line. Menu items for such
messages also contain a filename and a line number. Selecting such a
menu item will automatically open the file and jump to the line with
error.
Syntax check is done 'on-the-fly'. It is started whenever
Syntax check is done 'on-the-fly'. It is started whenever
@itemize @bullet
@item buffer is loaded
@ -97,7 +97,7 @@ delay is configurable).
Flymake is a universal syntax checker in the sense that it's easily
extended to support new syntax check tools and error message
patterns. @xref{Configuring Flymake}.
patterns. @xref{Configuring Flymake}.
@node Installing Flymake
@chapter Installing
@ -107,7 +107,7 @@ patterns. @xref{Configuring Flymake}.
Flymake is packaged in a single file, @code{flymake.el}.
To install/update Flymake, place @code{flymake.el} to a directory
somewhere on Emacs load path. You might also want to byte-compile
somewhere on Emacs load path. You might also want to byte-compile
@code{flymake.el} to improve performance.
Also, place the following line in the @code{.emacs} file.
@ -141,13 +141,13 @@ You might also map the most frequently used Flymake functions, such as
@section Flymake mode
@cindex flymake-mode
Flymake is an Emacs minor mode. To use Flymake, you
Flymake is an Emacs minor mode. To use Flymake, you
must first activate @code{flymake-mode} by using the
@code{flymake-mode} function.
Instead of manually activating @code{flymake-mode}, you can configure
Flymake to automatically enable @code{flymake-mode} upon opening any
file for which syntax check is possible. To do so, place the following
file for which syntax check is possible. To do so, place the following
line in @code{.emacs}:
@lisp
@ -159,9 +159,9 @@ line in @code{.emacs}:
@cindex Manually starting the syntax check
When @code{flymake-mode} is active, syntax check is started
automatically on any of the three conditions mentioned above. Syntax
automatically on any of the three conditions mentioned above. Syntax
check can also be started manually by using the
@code{flymake-start-syntax-check-for-current-buffer} function. This
@code{flymake-start-syntax-check-for-current-buffer} function. This
can be used, for example, when changes were made to some other buffer
affecting the current buffer.
@ -171,7 +171,7 @@ affecting the current buffer.
After syntax check is completed, lines for which at least one error or
warning has been reported are highlighted, and total number of errors
and warning is shown in the mode line. Use the following functions to
and warning is shown in the mode line. Use the following functions to
navigate the highlighted lines.
@multitable @columnfractions 0.25 0.75
@ -184,7 +184,7 @@ navigate the highlighted lines.
@end multitable
These functions treat erroneous lines as a linked list. Therefore,
These functions treat erroneous lines as a linked list. Therefore,
@code{flymake-goto-next-error} will go to the first erroneous line
when invoked in the end of the buffer.
@ -193,7 +193,7 @@ when invoked in the end of the buffer.
@cindex Viewing error messages
To view error messages belonging to the current line, use the
@code{flymake-display-err-menu-for-current-line} function. If there's
@code{flymake-display-err-menu-for-current-line} function. If there's
at least one error or warning reported for the current line, this
function will display a popup menu with error/warning texts.
Selecting the menu item whose error belongs to another file brings
@ -209,12 +209,12 @@ The following statuses are defined.
@multitable @columnfractions 0.25 0.75
@item Flymake* or Flymake:E/W*
@tab Flymake is currently running. For the second case, E/W contains the
@tab Flymake is currently running. For the second case, E/W contains the
error and warning count for the previous run.
@item Flymake
@tab Syntax check is not running. Usually this means syntax check was
successfully passed (no errors, no warnings). Other possibilities are:
@tab Syntax check is not running. Usually this means syntax check was
successfully passed (no errors, no warnings). Other possibilities are:
syntax check was killed as a result of executing
@code{flymake-compile}, or syntax check cannot start as compilation
is currently in progress.
@ -232,7 +232,7 @@ OFF for the buffer.
@multitable @columnfractions 0.25 0.75
@item CFGERR
@tab Syntax check process returned nonzero exit code, but no
errors/warnings were reported. This indicates a possible configuration
errors/warnings were reported. This indicates a possible configuration
error (for example, no suitable error message patterns for the
syntax check tool).
@ -253,12 +253,12 @@ syntax check tool).
@cindex Troubleshooting
Flymake uses a simple logging facility for indicating important points
in the control flow. The logging facility sends logging messages to
the @code{*Messages*} buffer. The information logged can be used for
in the control flow. The logging facility sends logging messages to
the @code{*Messages*} buffer. The information logged can be used for
resolving various problems related to Flymake.
Logging output is controlled by the @code{flymake-log-level}
variable. @code{3} is the most verbose level, and @code{-1} switches
variable. @code{3} is the most verbose level, and @code{-1} switches
logging off.
@node Configuring Flymake
@ -286,30 +286,30 @@ Controls logging output, see @ref{Troubleshooting}.
@item flymake-allowed-file-name-masks
A list of @code{(filename-regexp, init-function, cleanup-function
getfname-function)} for configuring syntax check tools. @xref{Adding
getfname-function)} for configuring syntax check tools. @xref{Adding
support for a new syntax check tool}.
@ignore
@item flymake-buildfile-dirs
A list of directories (relative paths) for searching a
buildfile. @xref{Locating the buildfile}.
buildfile. @xref{Locating the buildfile}.
@end ignore
@item flymake-master-file-dirs
A list of directories for searching a master file. @xref{Locating a
A list of directories for searching a master file. @xref{Locating a
master file}.
@item flymake-get-project-include-dirs-function
A function used for obtaining a list of project include dirs (C/C++
specific). @xref{Getting the include directories}.
specific). @xref{Getting the include directories}.
@item flymake-master-file-count-limit
@itemx flymake-check-file-limit
Used when looking for a master file. @xref{Locating a master file}.
Used when looking for a master file. @xref{Locating a master file}.
@item flymake-err-line-patterns
Patterns for error/warning messages in the form @code{(regexp file-idx
line-idx col-idx err-text-idx)}. @xref{Parsing the output}.
line-idx col-idx err-text-idx)}. @xref{Parsing the output}.
@item flymake-compilation-prevents-syntax-check
A flag indicating whether compilation and syntax check of the same
@ -321,7 +321,7 @@ started after @code{flymake-no-changes-timeout} seconds.
@item flymake-gui-warnings-enabled
A boolean flag indicating whether Flymake will show message boxes for
non-recoverable errors. If @code{flymake-gui-warnings-enabled} is
non-recoverable errors. If @code{flymake-gui-warnings-enabled} is
@code{nil}, these errors will only be logged to the @code{*Messages*}
buffer.
@ -360,7 +360,7 @@ Which fringe (if any) should show the warning/error bitmaps.
@end menu
Syntax check tools are configured using the
@code{flymake-allowed-file-name-masks} list. Each item of this list
@code{flymake-allowed-file-name-masks} list. Each item of this list
has the following format:
@lisp
@ -371,14 +371,14 @@ has the following format:
@item filename-regexp
This field is used as a key for locating init/cleanup/getfname
functions for the buffer. Items in
@code{flymake-allowed-file-name-masks} are searched sequentially. The
@code{flymake-allowed-file-name-masks} are searched sequentially. The
first item with @code{filename-regexp} matching buffer filename is
selected. If no match is found, @code{flymake-mode} is switched off.
selected. If no match is found, @code{flymake-mode} is switched off.
@item init-function
@code{init-function} is required to initialize the syntax check,
usually by creating a temporary copy of the buffer contents. The
function must return @code{(list cmd-name arg-list)}. If
usually by creating a temporary copy of the buffer contents. The
function must return @code{(list cmd-name arg-list)}. If
@code{init-function} returns null, syntax check is aborted, by
@code{flymake-mode} is not switched off.
@ -389,7 +389,7 @@ usually deleting a temporary copy created by the @code{init-function}.
@item getfname-function
This function is used for translating filenames reported by the syntax
check tool into ``real'' filenames. Filenames reported by the tool
check tool into ``real'' filenames. Filenames reported by the tool
will be different from the real ones, as actually the tool works with
the temporary copy. In most cases, the default implementation
provided by Flymake, @code{flymake-get-real-file-name}, can be used as
@ -411,7 +411,7 @@ support for various syntax check tools.
@cindex Adding support for perl
In this example, we will add support for @code{perl} as a syntax check
tool. @code{perl} supports the @code{-c} option which does syntax
tool. @code{perl} supports the @code{-c} option which does syntax
checking.
First, we write the @code{init-function}:
@ -463,7 +463,7 @@ In this example we will add support for C files syntax checked by
@command{gcc} called via @command{make}.
We're not required to write any new functions, as Flymake already has
functions for @command{make}. We just add a new entry to the
functions for @command{make}. We just add a new entry to the
@code{flymake-allowed-file-name-masks}:
@lisp
@ -489,7 +489,7 @@ command line:
@code{base-dir} is a directory containing @code{Makefile}, see @ref{Locating the buildfile}.
Thus, @code{Makefile} must contain the @code{check-syntax} target. In
Thus, @code{Makefile} must contain the @code{check-syntax} target. In
our case this target might look like this:
@verbatim
@ -527,12 +527,12 @@ check-syntax:
Syntax check is started by calling @code{flymake-start-syntax-check-for-current-buffer}.
Flymake first determines whether it is able to do syntax
check. It then saves a copy of the buffer in a temporary file in the
check. It then saves a copy of the buffer in a temporary file in the
buffer's directory (or in the system temp directory, for java
files), creates a syntax check command and launches a process with
this command. The output is parsed using a list of error message patterns,
this command. The output is parsed using a list of error message patterns,
and error information (file name, line number, type and text) is
saved. After the process has finished, Flymake highlights erroneous
saved. After the process has finished, Flymake highlights erroneous
lines in the buffer using the accumulated error information.
@node Determining whether syntax check is possible
@ -551,14 +551,14 @@ Two syntax check modes are distinguished:
@item
Buffer can be syntax checked in a standalone fashion, that is, the
file (its temporary copy, in fact) can be passed over to the compiler to
do the syntax check. Examples are C/C++ (.c, .cpp) and Java (.java)
do the syntax check. Examples are C/C++ (.c, .cpp) and Java (.java)
sources.
@item
Buffer can be syntax checked, but additional file, called master file,
is required to perform this operation. A master file is a file that
is required to perform this operation. A master file is a file that
includes the current file, so that running a syntax check tool on it
will also check syntax in the current file. Examples are C/C++ (.h,
will also check syntax in the current file. Examples are C/C++ (.h,
.hpp) headers.
@end enumerate
@ -579,7 +579,7 @@ copies, finding master files, etc.), as well as some tool-specific
After the possibility of the syntax check has been determined, a
temporary copy of the current buffer is made so that the most recent
unsaved changes could be seen by the syntax check tool. Making a copy
unsaved changes could be seen by the syntax check tool. Making a copy
is quite straightforward in a standalone case (mode @code{1}), as it's
just saving buffer contents to a temporary file.
@ -595,11 +595,11 @@ name.
Locating a master file is discussed in the following section.
Patching just changes all appropriate lines of the master file so that they
use the new (temporary) name of the current file. For example, suppose current
use the new (temporary) name of the current file. For example, suppose current
file name is @code{file.h}, the master file is @code{file.cpp}, and
it includes current file via @code{#include "file.h"}. Current file's copy
it includes current file via @code{#include "file.h"}. Current file's copy
is saved to file @code{file_flymake.h}, so the include line must be
changed to @code{#include "file_flymake.h"}. Finally, patched master file
changed to @code{#include "file_flymake.h"}. Finally, patched master file
is saved to @code{file_flymake_master.cpp}, and the last one is passed to
the syntax check tool.
@ -609,27 +609,27 @@ the syntax check tool.
Master file is located in two steps.
First, a list of possible master files is built. A simple name
matching is used to find the files. For a C++ header @code{file.h},
First, a list of possible master files is built. A simple name
matching is used to find the files. For a C++ header @code{file.h},
Flymake searches for all @code{.cpp} files in the directories whose relative paths are
stored in a customizable variable @code{flymake-master-file-dirs}, which
usually contains something like @code{("." "./src")}. No more than
usually contains something like @code{("." "./src")}. No more than
@code{flymake-master-file-count-limit} entries is added to the master file
list. The list is then sorted to move files with names @code{file.cpp} to
list. The list is then sorted to move files with names @code{file.cpp} to
the top.
Next, each master file in a list is checked to contain the appropriate
include directives. No more than @code{flymake-check-file-limit} of each
include directives. No more than @code{flymake-check-file-limit} of each
file are parsed.
For @code{file.h}, the include directives to look for are
@code{#include "file.h"}, @code{#include "../file.h"}, etc. Each
@code{#include "file.h"}, @code{#include "../file.h"}, etc. Each
include is checked against a list of include directories
(see @ref{Getting the include directories}) to be sure it points to the
correct @code{file.h}.
First matching master file found stops the search. The master file is then
patched and saved to disk. In case no master file is found, syntax check is
First matching master file found stops the search. The master file is then
patched and saved to disk. In case no master file is found, syntax check is
aborted, and corresponding status (!) is reported in the mode line.
@node Getting the include directories
@ -637,19 +637,19 @@ aborted, and corresponding status (!) is reported in the mode line.
@cindex Include directories (C/C++ specific)
Two sets of include directories are distinguished: system include directories
and project include directories. The former is just the contents of the
@code{INCLUDE} environment variable. The latter is not so easy to obtain,
and project include directories. The former is just the contents of the
@code{INCLUDE} environment variable. The latter is not so easy to obtain,
and the way it can be obtained can vary greatly for different projects.
Therefore, a customizable variable
@code{flymake-get-project-include-dirs-function} is used to provide the
way to implement the desired behavior.
The default implementation, @code{flymake-get-project-include-dirs-imp},
uses a @command{make} call. This requires a correct base directory, that is, a
uses a @command{make} call. This requires a correct base directory, that is, a
directory containing a correct @file{Makefile}, to be determined.
As obtaining the project include directories might be a costly operation, its
return value is cached in the hash table. The cache is cleared in the beginning
return value is cached in the hash table. The cache is cleared in the beginning
of every syntax check attempt.
@node Locating the buildfile
@ -659,18 +659,18 @@ of every syntax check attempt.
@cindex Makefile, locating
Flymake can be configured to use different tools for performing syntax
checks. For example, it can use direct compiler call to syntax check a perl
checks. For example, it can use direct compiler call to syntax check a perl
script or a call to @command{make} for a more complicated case of a
@code{C/C++} source. The general idea is that simple files, like perl
@code{C/C++} source. The general idea is that simple files, like perl
scripts and html pages, can be checked by directly invoking a
corresponding tool. Files that are usually more complex and generally
corresponding tool. Files that are usually more complex and generally
used as part of larger projects, might require non-trivial options to
be passed to the syntax check tool, like include directories for
C++. The latter files are syntax checked using some build tool, like
C++. The latter files are syntax checked using some build tool, like
Make or Ant.
All Make configuration data is usually stored in a file called
@code{Makefile}. To allow for future extensions, flymake uses a notion of
@code{Makefile}. To allow for future extensions, flymake uses a notion of
buildfile to reference the 'project configuration' file.
Special function, @code{flymake-find-buildfile} is provided for locating buildfiles.
@ -679,7 +679,7 @@ for possible master files.
@ignore
A customizable variable
@code{flymake-buildfile-dirs} holds a list of relative paths to the
buildfile. They are checked sequentially until a buildfile is found.
buildfile. They are checked sequentially until a buildfile is found.
@end ignore
In case there's no build file, syntax check is aborted.
@ -690,7 +690,7 @@ Buildfile values are also cached.
@cindex Syntax check process
The command line (command name and the list of arguments) for launching a process is returned by the
initialization function. Flymake then just calls @code{start-process}
initialization function. Flymake then just calls @code{start-process}
to start an asynchronous process and configures process filter and
sentinel which is used for processing the output of the syntax check
tool.
@ -701,24 +701,24 @@ tool.
The output generated by the syntax check tool is parsed in the process
filter/sentinel using the error message patterns stored in the
@code{flymake-err-line-patterns} variable. This variable contains a
@code{flymake-err-line-patterns} variable. This variable contains a
list of items of the form @code{(regexp file-idx line-idx
err-text-idx)}, used to determine whether a particular line is an
error message and extract file name, line number and error text,
respectively. Error type (error/warning) is also guessed by matching
error text with the '@code{^[wW]arning}' pattern. Anything that was not
classified as a warning is considered an error. Type is then used to
respectively. Error type (error/warning) is also guessed by matching
error text with the '@code{^[wW]arning}' pattern. Anything that was not
classified as a warning is considered an error. Type is then used to
sort error menu items, which shows error messages first.
Flymake is also able to interpret error message patterns missing err-text-idx
information. This is done by merely taking the rest of the matched line
(@code{(substring line (match-end 0))}) as error text. This trick allows
information. This is done by merely taking the rest of the matched line
(@code{(substring line (match-end 0))}) as error text. This trick allows
to make use of a huge collection of error message line patterns from
@code{compile.el}. All these error patterns are appended to
@code{compile.el}. All these error patterns are appended to
the end of @code{flymake-err-line-patterns}.
The error information obtained is saved in a buffer local
variable. The buffer for which the process output belongs is
variable. The buffer for which the process output belongs is
determined from the process-id@w{}->@w{}buffer mapping updated
after every process launch/exit.
@ -727,7 +727,7 @@ after every process launch/exit.
@cindex Erroneous lines, faces
Highlighting is implemented with overlays and happens in the process
sentinel, after calling the cleanup function. Two customizable faces
sentinel, after calling the cleanup function. Two customizable faces
are used: @code{flymake-errline} and
@code{flymake-warnline}. Errors belonging outside the current
buffer are considered to belong to line 1 of the current buffer.
@ -749,12 +749,13 @@ and @code{flymake-warning-bitmap}.
The only mode flymake currently knows about is @code{compile}.
Flymake can be configured to not start syntax check if it thinks the
compilation is in progress. The check is made by the
compilation is in progress. The check is made by the
@code{flymake-compilation-is-running}, which tests the
@code{compilation-in-progress} variable. The reason why this might be
@code{compilation-in-progress} variable. The reason why this might be
useful is saving CPU time in case both syntax check and compilation
are very CPU intensive. The original reason for adding this feature,
though, was working around a locking problem with MS Visual C++ compiler.
are very CPU intensive. The original reason for adding this feature,
though, was working around a locking problem with MS Visual C++
compiler.
Flymake also provides an alternative command for starting compilation,
@code{flymake-compile}:

View file

@ -15400,7 +15400,7 @@ substitutions in the group names), you can say things like:
In this example, messages sent to @samp{debian-foo@@lists.debian.org}
will be filed in @samp{mail.debian.foo}.
If the string contains the element @samp{\&}, then the previously
If the string contains the element @samp{\\&}, then the previously
matched string will be substituted. Similarly, the elements @samp{\\1}
up to @samp{\\9} will be substituted with the text matched by the
groupings 1 through 9.

View file

@ -2406,13 +2406,18 @@ using the @option{ssh} method to transfer files, and edit
@file{.emacs} in my home directory I would specify the filename
@file{@trampfn{ssh, daniel, melancholia, .emacs}}.
@ifset emacs
A remote filename containing a host name only, which is equal to a
method name, is not allowed. If such a host name is used, it must
always be preceded by an explicit method name, like
@file{@value{prefix}ssh@value{postfixhop}ssh@value{postfix}}.
@end ifset
Finally, for some methods it is possible to specify a different port
number than the default one, given by the method. This is specified
by adding @file{#<port>} to the host name, like in @file{@trampfn{ssh,
daniel, melancholia#42, .emacs}}.
Note that @value{tramp} supports only filenames encoded in unibyte.
@node Alternative Syntax
@section URL-like filename syntax
@ -3118,6 +3123,45 @@ Host *
@end example
@item
@value{tramp} does not use my @command{ssh} @code{ControlPath}
Your @code{ControlPath} setting will be overwritten by @command{ssh}
sessions initiated by @value{tramp}. This is because a master
session, initiated outside @value{emacsname}, could be closed, which
would stall all other @command{ssh} sessions for that host inside
@value{emacsname}.
Consequently, if you connect to a remote host via @value{tramp}, you
might be prompted for a password again, even if you have established
already an @command{ssh} connection to that host. Further
@value{tramp} connections to that host, for example in order to run a
process on that host, will reuse that initial @command{ssh}
connection.
If your @command{ssh} version supports the @code{ControlPersist}
option, you could customize the variable
@code{tramp-ssh-controlmaster-options} to use your @code{ControlPath},
for example:
@lisp
(setq tramp-ssh-controlmaster-options
(concat
"-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
"-o ControlMaster=auto -o ControlPersist=yes"))
@end lisp
Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and
"%%p", respectively. The entries of @code{ControlPath},
@code{ControlMaster} and @code{ControlPersist} can be removed from
this setting, if they are configured properly in your
@file{~/.ssh/config}:
@lisp
(setq tramp-ssh-controlmaster-options "")
@end lisp
@item
File name completion does not work with @value{tramp}

View file

@ -8,7 +8,7 @@
@c In the Tramp CVS, the version number is auto-frobbed from
@c configure.ac, so you should edit that file and run
@c "autoconf && ./configure" to change the version number.
@set trampver 2.2.7
@set trampver 2.2.8-pre
@c Other flags from configuration
@set instprefix /usr/local

1
etc/.gitignore vendored
View file

@ -1,3 +1,2 @@
DOC
DOC-*
icons/

View file

@ -1,3 +1,122 @@
2013-06-03 Tassilo Horn <tsdh@gnu.org>
* NEWS: Document eshell visual subcommands and options.
2013-06-02 Eric Ludlam <zappo@gnu.org>
* srecode/c.srt (header_guard): Add :c parameter so it works
standalone
2013-06-01 Alex Ott <alexott@gmail.com>
* tutorials/TUTORIAL.ru: Fix incorrectly translated wording.
2013-05-31 Tassilo Horn <tsdh@gnu.org>
* themes/tsdh-dark-theme.el (tsdh-dark): Refine mode-line faces.
2013-05-25 Xue Fuqiao <xfq.free@gmail.com>
* refcards/refcard.tex: Refine some entries. (Bug#14087)
* refcards/dired-ref.tex: Refine some entries. (Bug#14072)
2013-05-24 Fabrice Niessen <fni@missioncriticalit.com>
* themes/leuven-theme.el: Update theme.
2013-05-16 Eli Zaretskii <eliz@gnu.org>
* NEWS: Advertise the MSYS build on MS-Windows.
2013-05-15 Stefan Monnier <monnier@iro.umontreal.ca>
* .gitignore: Don't ignore DOC-* any more.
2013-05-07 Paul Eggert <eggert@cs.ucla.edu>
Use Gnulib ACL implementation, for benefit of Solaris etc. (Bug#14295)
* NEWS: Emacs is no longer limited to POSIX ACLs. --disable-acl,
not --without-acl, since we're now using Gnulib's implementation.
2013-05-07 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* NEWS: Mention multi-monitor support.
2013-05-05 Paul Eggert <eggert@cs.ucla.edu>
`write-region-inhibit-fsync' defaults to noninteractive (Bug#14273).
* NEWS: Document this.
2013-04-24 Tassilo Horn <tsdh@gnu.org>
* themes/tsdh-dark-theme.el (tsdh-dark): Add ido faces and remove
:box from outline faces.
2013-04-18 Leo Liu <sdl.web@gmail.com>
* NEWS: Mention new key ? for describe-prefix-bindings.
2013-04-15 Christopher Schmidt <christopher@ch.ristopher.com>
* NEWS: Mention separation of package descriptor and name of
internal symbols by two hyphens.
2013-04-13 Stephen Berman <stephen.berman@gmx.net>
* NEWS: Mention fixing `split-window' to be non-interactive.
2013-04-09 Tassilo Horn <tsdh@gnu.org>
* themes/tsdh-dark-theme.el (tsdh-dark): Add some more faces.
2013-04-09 Masatake YAMATO <yamato@redhat.com>
* NEWS: Mention `sh-mode' own `add-log-current-defun-function'.
2013-04-07 Jan Djärv <jan.h.d@swipnet.se>
* PROBLEMS: Mention Ubuntu warnings about libdbusmenu.
2013-04-02 Fabrice Niessen <fni@missioncriticalit.com>
* themes/leuven-theme.el: Update theme.
2013-04-01 Paul Eggert <eggert@cs.ucla.edu>
Use UTF-8 for most files with non-ASCII characters (Bug#13936).
* tutorials/TUTORIAL.ko, tutorials/TUTORIAL.th:
Switch from iso-2022-7bit to utf-8.
2013-03-30 Leo Liu <sdl.web@gmail.com>
* NEWS: Mention `kmacro-to-register' and new eldoc feature.
2013-03-29 Aidan Gauland <aidalgol@no8wireless.co.nz>
* NEWS (Eshell): New entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz
2013-03-21 Eric Ludlam <zappo@gnu.org>
* srecode/ede-autoconf.srt: Change Copyright to FSF.
(ede-empty): Change AC_INIT to use PROJECT_NAME, and
PROJECT_VERSION.
* srecode/ede-make.srt (ede-empty): Add a dependency on :project.
Add header comment specifying the project's relative path.
* srecode/c.srt (header_guard): Upcase the filename symbol.
2013-03-21 Vladimir Kazanov <vkazanov@inbox.ru>
* srecode/java.srt (empty-main): New.
(class-tag): Decapitalize class.
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
Emacs crashes with ImageMagick 6.8.2-3 through 6.8.3-9 (Bug#13867).
* PROBLEMS: Mention problem with ImageMagick 6.8.2-3 through 6.8.3-9.
2013-03-12 Paul Eggert <eggert@cs.ucla.edu>
Add coding tags for iso-2022-7bit files that are not already tagged.

View file

@ -41,6 +41,9 @@ a web search is often the best way to find results.
The Emacs Wiki has an area for storing elisp files
<URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
* WikEmacs
<URL:http://wikemacs.org> is an alternative wiki for Emacs.
* Emacs slides and tutorials can be found here:
<URL:http://web.psung.name/emacs/>

181
etc/NEWS
View file

@ -23,13 +23,39 @@ so we will look at it and add it to the manual.
* Installation Changes in Emacs 24.4
** Emacs can be compiled with POSIX ACL support.
** Emacs can be compiled with ACL support.
This happens by default if a suitable support library is found at
build time, like libacl on GNU/Linux. To prevent this, use the
configure option `--without-acl'.
configure option `--disable-acl'.
** Emacs can be compiled with file notification support.
The configure option `--with-file-notification=LIB' enables file
notification support in Emacs. This option's value should be `yes',
`no', `gfile', `inotify' or `w32'. `yes' is a synonym for `w32' on
MS-Windows, and for `gfile' otherwise. The default value is `yes'.
** The configure option --with-crt-dir has been removed.
It is no longer needed, as the crt*.o files are no longer linked specially.
It is no longer needed, as the crt*.o files are no longer linked
specially.
** Emacs for MS-Windows can now be built by running the configure script
using the MSYS environment and MinGW development tools.
This is from now on the preferred method of building Emacs on
MS-Windows. The Windows-specific configure.bat and makefile.w32-in
files are deprecated. See the file nt/INSTALL.MSYS for detailed
instructions.
Using the Posix configure script and Makefile's also means a change in
the directory structure of the Emacs installation on Windows. It is
now the same as on GNU and Unix systems. In particular, the auxiliary
programs, such as cmdproxy.exe and hexl.exe, are in
libexec/emacs/VERSION/i686-pc-mingw32 (where VERSION is the Emacs
version), version-independent site-lisp is in share/emacs/site-lisp,
version-specific Lisp files are in share/emacs/VERSION/lisp and in
share/emacs/VERSION/site-lisp, Info docs are in share/info, and data
files are in share/emacs/VERSION/etc. (Emacs knows about all these
directories and will find the files in there automatically; there's no
need to set any variables due to this change.)
* Startup Changes in Emacs 24.4
@ -37,6 +63,8 @@ It is no longer needed, as the crt*.o files are no longer linked specially.
* Changes in Emacs 24.4
** Key ? also describes prefix bindings like C-h.
+++
** `apropos-variable' is now `apropos-user-option'
`apropos-user-option' shows all user options while `apropos-variable'
@ -59,6 +87,8 @@ simply disabling Transient Mark mode does the same thing.
** `initial-buffer-choice' can now specify a function to set up the
initial buffer.
** `write-region-inhibit-fsync' now defaults to t in batch mode.
** ACL support has been added.
+++
*** Emacs preserves the ACL entries of files when backing up.
@ -73,18 +103,58 @@ Available only on X, this option allows to control over-scrolling
using the scroll bar (i.e. dragging the thumb down even when the end
of the buffer is visible).
** In compiled Lisp files, the header no longer includes a timestamp.
** Multi-monitor support has been added.
*** New functions `display-monitor-attributes-list' and
`frame-monitor-attributes' can be used to obtain information about
each physical monitor on multi-monitor setups.
* Editing Changes in Emacs 24.4
** `split-window' is no longer a command, just a non-interactive function.
As a command it was a special case of `split-window-below', and as such
superfluous. After being reimplemented in Lisp, its interactive form
was mistakenly retained.
** New commands `toggle-frame-fullscreen' and `toggle-frame-maximized',
bound to <f11> and M-<f10>, respectively.
** In keymaps where SPC scrolls, S-SPC now scrolls in the reverse direction.
Eg View mode, etc.
** New command `kmacro-to-register' to store keyboard macros in registers.
** Shell Script mode
*** `sh-mode' now has the mode own `add-log-current-defun-function'.
You can pick the name of the function and the variables with `C-x 4 a'.
* Changes in Specialized Modes and Packages in Emacs 24.4
** `eshell' now supports visual subcommands and options
Eshell has been able to handle "visual" commands (interactive,
non-line oriented commands such as top that require display
capabilities not provided by eshell) by running them in an Emacs
terminal emulator. See `eshell-visual-commands'.
This feature has been extended to subcommands and options that make a
usually line-oriented command a visual command. Typical examples are
"git log" and "git <command> --help" which display their output in a
pager by default. See `eshell-visual-subcommands' and
`eshell-visual-options'.
** `remember' can now store notes in separates files
You can use the new function `remember-store-in-files' within the
`remember-handler-functions' option.
See `remember-data-directory' and `remember-directory-file-name-format'
for new options related to this function.
** `ido-decorations' has been slightly extended to give a bit more control.
** More packages look for ~/.emacs.d/<foo> additionally to ~/.<foo>.
Affected files:
~/.emacs.d/timelog replaces ~/.timelog
@ -111,6 +181,8 @@ Affected files:
use `electric-indent-mode' instead.
*** `delphi-tab' is gone, replaced by `indent-for-tab-command'.
** Eldoc Mode works properly in the minibuffer.
** jit-lock-debug-mode lets you use the debuggers on code run via jit-lock.
** completing-read-multiple's separator can now be a regexp.
@ -120,6 +192,12 @@ The default separator is changed to allow surrounding spaces around the comma.
*** Battery information via the BSD `apm' utility is now supported.
** Calendar and Diary
+++
*** New variable `diary-from-outlook-function', used by the command
`diary-from-outlook'.
** cl-lib
*** New macro cl-tagbody.
@ -143,6 +221,11 @@ on the given date.
*** Support for ISO 8601 dates.
** Desktop
*** `desktop-auto-save-timeout' defines the number of seconds between
auto-saves of the desktop.
** Dired
*** New minor mode `dired-hide-details-mode' hides details.
@ -153,6 +236,9 @@ on the given date.
If set to a number, this can be used to avoid accidentally paste large
amounts of data into the ERC input.
---
** New F90 mode option `f90-smart-end-names'.
** Icomplete is a bit more like IDO.
*** key bindings to navigate through and select the completions.
*** The icomplete-separator is customizable, and its default has changed.
@ -174,11 +260,38 @@ When toggling, it restores the frame's previous window configuration.
It also has an optional frame argument, which can be used by Lisp
callers to fit the image to a frame other than the selected frame.
** Isearch
** Info
*** New face `info-index-match' is used to highlight matches in index
entries displayed by `Info-index-next', `Info-virtual-index' and
`info-apropos'.
** Hi-Lock
*** New option `hi-lock-auto-select-face'. When non-nil, hi-lock commands
will cycle through faces in `hi-lock-face-defaults' without prompting.
+++
*** New global command `M-s h .' (`highlight-symbol-at-point')
highlights the symbol found near point without prompting,
using the next face automatically.
** Search and Replace
*** New global command `M-s .' (`isearch-forward-symbol-at-point')
starts a symbol (identifier) incremental search forward with the
symbol found near point added to the search string initially.
*** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
and adds it to the search string.
*** `M-s i' in Isearch mode toggles the variable `isearch-invisible'
between nil and the value of the option `search-invisible' (or `open'
when it's nil).
*** `query-replace' skips invisible text when `search-invisible' is nil,
and opens overlays with hidden text when `search-invisible' is `open'.
** MH-E has been updated to MH-E version 8.5.
See MH-E-NEWS for details.
@ -202,10 +315,12 @@ New features include:
name and arguments. Useful to trace the value of (current-buffer) or
(point) when the function is invoked.
** New command `delete-duplicate-lines' has two types of operation:
when its arg ADJACENT is non-nil (when called interactively with C-u C-u)
** New command `delete-duplicate-lines' has new types of operation:
When its arg ADJACENT is non-nil (when called interactively with C-u C-u)
it works like the utility `uniq'. Otherwise by default it deletes
duplicate lines everywhere in the region without regard to adjacency.
When it arg KEEP-BLANKS is non-nil (when called interactively with C-u C-u C-u),
duplicate blank lines are preserved.
** New `cycle-spacing' command allows cycling between having just one
space, no spaces, or reverting to the original spacing. Like
@ -228,17 +343,35 @@ when possible.
*** Handlers for `file-acl' and `set-file-acl' for remote machines
which support POSIX ACLs.
** VHDL mode
*** New options: `vhdl-actual-generic-name', `vhdl-beautify-options'.
*** New commands: `vhdl-fix-statement-region', `vhdl-fix-statement-buffer'.
** Woman
*** The commands `woman-default-faces' and `woman-monochrome-faces'
are obsolete. Customize the `woman-* faces instead.
** Eshell
*** Added Eshell-TRAMP module
External su and sudo commands are now the default; the internal,
TRAMP-using variants can still be used by enabling the eshell-tramp
module.
** Obsolete packages:
*** longlines.el is obsolete; use visual-line-mode instead.
+++
*** sup-mouse.el.
*** terminal.el is obsolete; use term.el instead.
*** xesam.el.
+++
*** yow.el is obsolete; use fortune.el or cookie1.el instead.
@ -248,6 +381,11 @@ has not been relevant for some time.
* New Modes and Packages in Emacs 24.4
** New `superword-mode' in subword.el
`superword-mode' overrides the default word motion commands to treat
symbol_words as a single word, similar to what `subword-mode' does and
using the same internal functions.
** New nadvice.el package offering lighter-weight advice facilities.
It is layered as:
- add-function/remove-function which can be used to add/remove code on any
@ -258,6 +396,9 @@ It is layered as:
* Incompatible Lisp Changes in Emacs 24.4
** Default process filers and sentinels are not nil any more.
Instead they default to a function which does what the nil value used to do.
** `read-event' does not return decoded chars in ttys any more.
Just as was the case in Emacs-22 and before, decoding of tty input according to
keyboard-coding-system is not performed in read-event any more. But contrary
@ -289,13 +430,29 @@ file using `set-file-extended-attributes'.
* Lisp Changes in Emacs 24.4
** `dont-compile' is declared obsolete.
** Obsoleted functions:
*** `dont-compile'
*** `lisp-complete-symbol'
*** `field-complete'
*** `minibuffer-completion-contents'
*** `isearch-nonincremental-exit-minibuffer'
*** `isearch-filter-visible'
** `with-wrapper-hook' is obsoleted by `add-function'.
The few hooks that used with-wrapper-hook are replaced as follows:
*** `abbrev-expand-function' obsoletes `abbrev-expand-functions'.
*** `completion-in-region-function' obsoletes `completion-in-region-functions'.
*** `filter-buffer-substring-function' obsoletes `filter-buffer-substring-functions'.
** `get-upcase-table' is obsoleted by the new `case-table-get-table'.
** Support for filesystem notifications.
Emacs now supports notifications of filesystem changes, such as
creation, modification, and deletion of files. This requires the
'inotify' API on GNU/Linux systems. On MS-Windows systems, this is
supported for Windows XP and newer versions.
`glib' API, or the 'inotify' API (on GNU/Linux systems only). On
MS-Windows systems, this is supported for Windows XP and newer
versions.
** Changes in autorevert.el
@ -373,6 +530,12 @@ used in place of the 9th element of `file-attributes'.
`preserve-extended-attributes' as it now handles both SELinux context
and ACL entries.
** Changes to the Emacs Lisp Coding Conventions in Emacs 24.4
*** The package descriptor and name of global variables, constants,
and functions should be separated by two hyphens if the symbol is not
meant to be used by other packages.
* Changes in Emacs 24.4 on Non-Free Operating Systems

View file

@ -206,6 +206,10 @@ added a line like this at the beginning of files of Lisp code:
If your tar has this problem, install GNU tar--if you can manage to
untar it :-).
** Emacs can crash when displaying PNG images with transparency.
This is due to a bug introduced in ImageMagick 6.8.2-3. The bug
should be fixed in ImageMagick 6.8.3-10. Please see Bug#13867.
** Crashes when displaying GIF images in Emacs built with version
libungif-4.1.0 are resolved by using version libungif-4.1.0b1.
Configure checks for the correct version, but this problem could occur
@ -547,7 +551,7 @@ with CEDET 1.0pre4) or later.
*** Self-documentation messages are garbled.
This means that the file `etc/DOC-...' doesn't properly correspond
This means that the file `etc/DOC' doesn't properly correspond
with the Emacs executable. Redumping Emacs and then installing the
corresponding pair of files should fix the problem.
@ -1401,6 +1405,23 @@ For example, in the Xfce 4.8 desktop environment, the clipboard
manager in versions of xfce4-settings-helper before 4.8.2 is buggy;
https://bugzilla.xfce.org/show_bug.cgi?id=7588 .
*** Warning messages when running in Ubuntu
When you start Emacs you may see something like this:
(emacs:2286): LIBDBUSMENU-GTK-CRITICAL **: watch_submenu: assertion
`GTK_IS_MENU_SHELL(menu)' failed
This happens if the Emacs binary has been renamed. The cause is the Ubuntu
appmenu concept. It tries to track Emacs menus and show them in the top
panel, instead of in each Emacs window. This is not properly implemented,
so it fails for Emacs. The order of menus is wrong, and things like copy/paste
that depend on what state Emacs is in are usually wrong (i.e. paste disabled
even if you should be able to paste, and similar).
You can get back menus on each frame by starting emacs like this:
% env UBUNTU_MENUPROXY= emacs
* Runtime problems on character terminals
** The meta key does not work on xterm.

View file

@ -72,6 +72,14 @@ Grep finished (matches found) at Thu Jul 21 15:02:15
agrep -n "INFO tree" ../info/*
../info/dir: 6: File: dir Node: Top This is the top of the INFO tree
* git-grep
with `[diff "el"] xfuncname = "^(\\(.*)$"' in .gitconfig
and `*.el diff=el' in .gitattributes
git grep -inH -p -e "org-element-map"
lisp/org/org.el=20969=(defun org-fill-paragraph (&optional justify)
lisp/org/org.el:21047: (org-element-map
* unknown greps
grep -nH -e "xyzxyz" ../info/*

View file

@ -302,8 +302,7 @@ \section{Motion Commands}
\key{move to first child subdirectory}{M-C-d}
\section{Mouse Commands}
\metax{visit file}{Mouse_Button_2}
\metax{popup menu}{Control-Mouse_Button_3}
\metax{visit file or directory}{Mouse_Button_2}
\section{Immediate Actions on Files}
@ -326,7 +325,7 @@ \section{Marking and Unmarking Files}
\key{mark all directories}{* /}
\key{mark all symlinks}{* @}
\key{mark all executables}{* *}
\key{invert marking}{* t}
\key{invert marking}{t}
\key{mark all files in the current subdir}{* s}
\key{mark file names matching a regular expression}{* \%}
\key{change the marks to a different character}{* c}
@ -340,7 +339,7 @@ \section{Modifying the Dired Buffer}
\key{re-read all directories (retains all marks)}{g}
\key{toggle sorting of current subdir by name/date}{s}
\key{edit ls switches}{C-u s}
\key{recover marks, hidden lines, and such}{C-_}
\key{recover marks, hidden lines, and such (undo)}{C-_}
\key{hide all subdirectories}{M-\$}
\key{hide or unhide subdirectory}{\$}
@ -354,7 +353,7 @@ \section{Commands on Files Marked or Specified by the Prefix}
\key{print file(s)}{P}
\key{convert filename(s) to lower case}{\% l}
\key{convert filename(s) to upper case}{\% u}
\key{delete marked (as opposed to flagged) files}{D}
\key{delete marked (as opposed to flagged) file(s)}{D}
%% Huh?
%%\key{uuencode or uudecode file(s)}{U}
\key{compress or uncompress file(s)}{Z}
@ -364,9 +363,9 @@ \section{Commands on Files Marked or Specified by the Prefix}
\key{make relative symbolic link(s)}{Y}
\key{make hard link(s)}{H}
\key{search files for a regular expression}{A}
\key{query replace regular expression}{Q}
\key{byte-compile files}{B}
\key{load files}{L}
\key{regexp query replace on marked files}{Q}
\key{byte-compile file(s)}{B}
\key{load file(s)}{L}
\key{shell command on file(s)}{!}
\key{asynchronous shell command on file(s)}{\&}

View file

@ -355,6 +355,7 @@ \section{Motion}
\key{scroll current line to center, top, bottom}{C-l}
\key{goto line}{M-g g}
\key{goto char}{M-g c}
\key{back to indentation}{M-m}
\section{Killing and Deleting}
@ -504,6 +505,7 @@ \section{Spelling Check}
\key{check spelling of current word}{M-\$}
\metax{check spelling of all words in region}{M-x ispell-region}
\metax{check spelling of entire buffer}{M-x ispell-buffer}
\metax{toggle on-the-fly spell checking}{M-x flyspell-mode}
\section{Tags}
@ -518,6 +520,7 @@ \section{Tags}
\section{Shells}
\key{execute a shell command}{M-!}
\key{execute a shell command asynchronously}{M-\&}
\key{run a shell command on the region}{M-|}
\key{filter region through a shell command}{C-u M-|}
\key{start a shell in window \kbd{*shell*}}{M-x shell}
@ -554,9 +557,12 @@ \section{Regular Expressions}
\key{zero or more repeats}{*}
\key{one or more repeats}{+}
\key{zero or one repeat}{?}
\key{quote special characters}{\\}
\key{quote regular expression special character {\it c\/}}{\\{\it c}}
\key{alternative (``or'')}{\\|}
\key{grouping}{\\( {\rm$\ldots$} \\)}
\key{shy grouping}{\\(:? {\rm$\ldots$} \\)}
\key{explicit numbered grouping}{\\(:NUM {\rm$\ldots$} \\)}
\key{same text as {\it n\/}th group}{\\{\it n}}
\key{at word break}{\\b}
\key{not at word break}{\\B}
@ -565,12 +571,15 @@ \section{Regular Expressions}
\threecol{{\bf entity}}{{\bf match start}}{{\bf match end}}
\threecol{line}{^}{\$}
\threecol{word}{\\<}{\\>}
\threecol{symbol}{\\_<}{\\_>}
\threecol{buffer}{\\`}{\\'}
%% FIXME: "`" and "'" isn't displayed correctly in the output PDF file
\threecol{{\bf class of characters}}{{\bf match these}}{{\bf match others}}
\threecol{explicit set}{[ {\rm$\ldots$} ]}{[^ {\rm$\ldots$} ]}
\threecol{word-syntax character}{\\w}{\\W}
\threecol{character with syntax {\it c}}{\\s{\it c}}{\\S{\it c}}
\threecol{character with category {\it c}}{\\c{\it c}}{\\C{\it c}}
}
\section{International Character Sets}
@ -592,7 +601,7 @@ \section{Info}
\key{scroll forward}{SPC}
\key{scroll reverse}{DEL}
\key{beginning of node}{. {\rm (dot)}}
\key{beginning of node}{b}
Moving between nodes:
@ -640,7 +649,7 @@ \section{Commands Dealing with Emacs Lisp}
\key{eval current {\bf defun}}{C-M-x}
\metax{eval {\bf region}}{M-x eval-region}
\key{read and eval minibuffer}{M-:}
\metax{load from standard system directory}{M-x load-library}
\metax{load a Lisp library from {\bf load-path}}{M-x load-library}
\section{Simple Customization}
@ -669,7 +678,7 @@ \section{Writing Commands}
\beginexample%
(defun this-line-to-top-of-window (line)
"Reposition current line to top of window.
With ARG, put point on line ARG."
With prefix argument LINE, put point on LINE."
(interactive "P")
(recenter (if (null line)
0
@ -677,7 +686,7 @@ \section{Writing Commands}
\endexample
The \kbd{interactive} spec says how to read arguments interactively.
Type \kbd{C-h f interactive} for more details.
Type \kbd{C-h f interactive RET} for more details.
\copyrightnotice

View file

@ -44,14 +44,14 @@ template empty :time :user :file :c
{{/HEADER}}
----
template header_guard :file :blank
template header_guard :file :blank :c
----
#ifndef {{FILENAME_SYMBOL}}
#define {{FILENAME_SYMBOL}} 1
#ifndef {{FILENAME_SYMBOL:upcase}}
#define {{FILENAME_SYMBOL:upcase}} 1
{{^}}
#endif // {{FILENAME_SYMBOL}}
#endif // {{FILENAME_SYMBOL:upcase}}
----
context misc

View file

@ -1,21 +1,23 @@
;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE.
;;
;; Copyright (C) 2010 Eric M. Ludlam
;;
;; Author: Eric M. Ludlam <eric@siege-engine.com>
;;
;; 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) any later version.
;;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE
;; This program 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.
;; Copyright (C) 2010, 2012-2013 Free Software Foundation, Inc.
;; Author: Eric M. Ludlam <eric@siege-engine.com>
;; This file is part of GNU Emacs.
;; 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 of the License, 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 this program. If not, see <http://www.gnu.org/licenses/>.
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
set mode "autoconf-mode"
set escape_start "{{"
@ -26,7 +28,7 @@ set application "ede"
context file
template ede-empty
template ede-empty :project
"Start a new EDE generated configure.in/ac file."
----
{{comment_prefix}} Automatically Generated/Maintained {{FILE}} by EDE.
@ -40,7 +42,7 @@ template ede-empty
{{comment_prefix}}
{{comment_prefix}} Process this file with autoconf to produce a configure script
AC_INIT({{TEST_FILE}})
AC_INIT({{PROJECT_NAME}}, {{PROJECT_VERSION}})
AM_INIT_AUTOMAKE([{{PROGRAM}}], 0)
AM_CONFIG_HEADER(config.h)

View file

@ -26,10 +26,11 @@ set application "ede"
context file
template ede-empty :file
template ede-empty :file :project
----
# Automatically Generated {{FILE}} by EDE.
# For use with: {{MAKETYPE}}
# Relative File Name: {{PROJECT_FILENAME}}
#
# DO NOT MODIFY THIS FILE OR YOUR CHANGES MAY BE LOST.
# EDE is the Emacs Development Environment.

View file

@ -43,6 +43,23 @@ package {{FILENAME_AS_PACKAGE}};
----
bind "e"
template empty-main :file :user :time :java :indent
"Fill out an empty file with a class having a static main method"
sectiondictionary "CLASSSECTION"
set NAME macro "FILENAME_AS_CLASS"
----
{{>:filecomment}}
package {{FILENAME_AS_PACKAGE}};
{{<CLASSSECTION:declaration:class}}
public static void main(String args[]) {
{{^}}
}
{{/CLASSSECTION}}
----
bind "l"
context declaration
template import :blank :indent
@ -74,8 +91,8 @@ Override this to affect applications, or the outer class structure for
the user-facing template."
----
{{>:declaration:javadoc-class}}
public Class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}implements {{/NOTFIRST}}{{NAME}}{{/PARENTS}}
{
public class {{?NAME}} {{#PARENTS}}{{#FIRST}}extends {{/FIRST}}{{#NOTFIRST}}implements {{/NOTFIRST}}{{NAME}}{{/PARENTS}}
{
{{^}}
};
----

View file

@ -1,7 +1,7 @@
;;; leuven-theme.el --- Emacs custom theme
;; Copyright (C) 2003-2013 Free Software Foundation, Inc.
;; Time-stamp: <2012-12-05 Wed 10:47>
;; Time-stamp: <2013-05-24 Fri 10:33>
;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")>
@ -39,11 +39,11 @@ Semantic, and Ansi-Color faces are included -- and much more...")
(diff-none '(:foreground "gray33"))
(diff-removed '(:foreground "#A60000" :background "#FFDDDD"))
(directory '(:weight bold :foreground "blue" :background "#FFFFD2"))
(highlight-line '(:inverse-video t))
(highlight-line '(:background "#CCDEED"))
(link '(:underline t :foreground "#006DAF"))
(mail-header-name '(:weight bold :foreground "black"))
(marked-line '(:weight bold :foreground "white" :background "red"))
(match '(:background "#FFFF99"))
(match '(:background "#FBE448"))
(ol1 '(:height 1.3 :weight bold :overline "#A7A7A7" :foreground "#3C3C3C" :background "#F0F0F0"))
(ol2 '(:height 1.0 :weight bold :overline "#123555" :foreground "#123555" :background "#E5F4FB"))
(ol3 '(:height 1.0 :weight bold :overline "#005522" :foreground "#005522" :background "#EFFFEF"))
@ -52,35 +52,36 @@ Semantic, and Ansi-Color faces are included -- and much more...")
(ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC"))
(ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C"))
(ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008"))
(region '(:background "#D2D9E0"))
(region '(:background "#CCDEED"))
(shadow '(:foreground "#7F7F7F"))
(string '(:foreground "#008000"))
(string '(:foreground "#FF5500")) ;; D0372D
(subject '(:weight bold :foreground "#CF5D60"))
(symlink '(:foreground "deep sky blue"))
(volatile-highlight '(:background "#FBE448"))
(vc-branch '(:box (:line-width 1 :color "#00CC33") :foreground "black" :background "#AAFFAA")))
(custom-theme-set-faces
'leuven
`(default ((,class (:background "#ffffff" :foreground "#333333"))))
`(default ((,class (:background "#FFFFFF" :foreground "#333333"))))
`(bold ((,class (:weight bold :foreground "black"))))
`(bold-italic ((,class (:weight bold :slant italic :foreground "black"))))
`(italic ((,class (:slant italic :foreground "#1A1A1A"))))
`(underline ((,class (:underline t))))
`(cursor ((,class (:background "#15ff00"))))
`(cursor ((,class (:background "#15FF00"))))
;; Highlighting faces
`(fringe ((,class (:foreground "#808080" :background "#DDEEFF"))))
`(highlight ((,class (:background "#FFFF00"))))
`(region ((t ,region)))
`(secondary-selection ((t ,match))) ;; used by Org-mode for highlighting matched entries and keywords
`(fringe ((,class (:foreground "#56B556" :background "#E2F9E2"))))
`(highlight ((,class ,volatile-highlight)))
`(region ((,class ,region)))
`(secondary-selection ((,class ,match))) ;; used by Org-mode for highlighting matched entries and keywords
`(isearch ((,class (:weight bold :foreground "#00AA00" :background "#99FF99"))))
`(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999"))))
`(lazy-highlight ((,class (:weight bold :foreground "#990099" :background "#FF66FF"))))
`(trailing-whitespace ((t (:background "#F6EBFE"))))
`(whitespace-line ((t (:foreground "#CC0000" :background "#FFFF88"))))
`(whitespace-tab ((t (:foreground "lightgray" :background "beige"))))
`(whitespace-indentation ((t (:foreground "firebrick" :background "yellow"))))
`(whitespace-trailing ((t (:weight bold :foreground "yellow" :background "red1"))))
`(whitespace-hspace ((t (:background "#CCE8F6"))))
`(trailing-whitespace ((,class (:background "#F6EBFE"))))
`(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
`(whitespace-tab ((,class (:foreground "lightgray" :background "beige"))))
`(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow"))))
`(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1"))))
`(whitespace-hspace ((,class (:background "#CCE8F6"))))
;; Mode line faces
`(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8"))))
`(mode-line-inactive ((,class (:box (:line-width 1 :color "#4E4E4C") :foreground "#F0F0EF" :background "#9B9C97"))))
@ -95,21 +96,18 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(warning ((,class (:foreground "orange"))))
`(success ((,class (:foreground "green"))))
;; Font lock faces
`(font-lock-builtin-face ((,class (:foreground "#FF5803"))))
`(font-lock-comment-delimiter-face ((,class (:foreground "#EE0000"))))
`(font-lock-comment-face ((,class (:slant italic :foreground "#EE0000"))))
`(font-lock-constant-face ((,class (:foreground "#009944"))))
`(font-lock-doc-face ((,class (:foreground "#BA2121"))))
`(font-lock-doc-string-face ((,class (:foreground "#63639C"))))
`(font-lock-function-name-face ((,class (:foreground "#1A50B8"))))
`(font-lock-keyword-face ((,class (:bold t :foreground "#A535AE"))))
`(font-lock-preprocessor-face ((,class (:bold t :foreground "#A3A3A3"))))
`(font-lock-reference-face ((,class (:foreground "dark cyan"))))
`(font-lock-regexp-grouping-backslash ((,class (:bold t :weight bold))))
`(font-lock-regexp-grouping-construct ((,class (:bold t :weight bold))))
`(font-lock-string-face ((t ,string)))
`(font-lock-type-face ((,class (:foreground "#1B781F"))))
`(font-lock-variable-name-face ((,class (:foreground "#2E91AF"))))
`(font-lock-builtin-face ((,class (:foreground "#006FE0"))))
`(font-lock-comment-delimiter-face ((,class (:foreground "#008200"))))
`(font-lock-comment-face ((,class (:slant italic :foreground "#008200"))))
`(font-lock-constant-face ((,class (:foreground "#6434A3"))))
`(font-lock-doc-face ((,class (:foreground "#008000"))))
`(font-lock-doc-string-face ((,class (:foreground "#008000"))))
`(font-lock-function-name-face ((,class (:foreground "#006699"))))
`(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ;; #3654DC
`(font-lock-preprocessor-face ((,class (:foreground "#808080"))))
`(font-lock-string-face ((,class ,string)))
`(font-lock-type-face ((,class (:foreground "#6D6D6D"))))
`(font-lock-variable-name-face ((,class (:foreground "#BA36A5")))) ;; 800080
`(font-lock-warning-face ((,class (:weight bold :foreground "red"))))
;; Button and link faces
`(link ((,class (:foreground "#8ac6f2" :underline t))))
@ -135,39 +133,39 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-group-mail-2 ((,class (:weight bold :foreground "#FF0066"))))
`(gnus-group-mail-3-empty ((,class (:foreground "#808080"))))
`(gnus-group-mail-3 ((,class (:weight bold :foreground "black"))))
`(gnus-group-mail-low-empty ((t ,cancel)))
`(gnus-group-mail-low ((t ,cancel)))
`(gnus-header-content ((,class (:family "Sans Serif" :foreground "#786FB4"))))
`(gnus-group-mail-low-empty ((,class ,cancel)))
`(gnus-group-mail-low ((,class ,cancel)))
`(gnus-header-content ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(gnus-header-from ((,class (:family "Sans Serif" :foreground "blue"))))
`(gnus-header-subject ((t ,subject)))
`(gnus-header-name ((t ,mail-header-name)))
`(gnus-header-subject ((,class ,subject)))
`(gnus-header-name ((,class ,mail-header-name)))
`(gnus-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
;; Message faces
`(message-header-name ((t ,mail-header-name)))
`(message-header-name ((,class ,mail-header-name)))
`(message-header-cc ((,class (:family "Sans Serif" :foreground "blue"))))
`(message-header-other ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-header-subject ((t ,subject)))
`(message-header-subject ((,class ,subject)))
`(message-header-to ((,class (:family "Sans Serif" :foreground "blue"))))
`(message-cited-text ((,class (:foreground "#5050B0"))))
`(message-separator ((,class (:family "Sans Serif" :weight bold :foreground "red"))))
`(message-header-newsgroups ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-header-xheader ((,class (:foreground "red"))))
`(message-header-xheader ((,class (:family "Sans Serif" :foreground "#3399CC"))))
`(message-mml ((,class (:foreground "forest green"))))
;; Diff
`(diff-added ((t ,diff-added)))
`(diff-added ((,class ,diff-added)))
`(diff-changed ((,class (:foreground "blue" :background "#DDDDFF"))))
`(diff-context ((t ,diff-none)))
`(diff-context ((,class ,diff-none)))
`(diff-file-header ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
`(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
`(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
`(diff-file1-hunk-header ((,class (:foreground "dark magenta" :background "#EAF2F5"))))
`(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5"))))
`(diff-header ((,class (:foreground "#999999" :background "#EAF2F5"))))
`(diff-hunk-header ((t ,diff-hunk-header)))
`(diff-index ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4" :background "#EAF2F5"))))
`(diff-indicator-added ((,class (:background "#AAFFAA"))))
`(diff-indicator-changed ((,class (:background "#AAAAFF"))))
`(diff-indicator-removed ((,class (:background "#FFAAAA"))))
`(diff-hunk-header ((,class ,diff-hunk-header)))
`(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ;; my foreground is NOT applied!?
`(diff-indicator-added ((,class (:foreground "#008000" :background "#AAFFAA"))))
`(diff-indicator-changed ((,class (:foreground "black" :background "#AAAAFF"))))
`(diff-indicator-removed ((,class (:foreground "#A60000" :background "#FFAAAA"))))
`(diff-refine-change ((,class (:background "#DDDDFF"))))
`(diff-removed ((t ,diff-removed)))
`(diff-removed ((,class ,diff-removed)))
;; SMerge
`(smerge-refined-change ((,class (:background "#AAAAFF"))))
;; Ediff
@ -181,45 +179,44 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(ediff-odd-diff-A ((,class (:foreground "black" :background "light grey"))))
`(ediff-odd-diff-B ((,class (:foreground "black" :background "light grey"))))
;; Flyspell
`(flyspell-duplicate ((,class (:underline "#008000"))))
`(flyspell-incorrect ((,class (:underline "red"))))
`(flyspell-duplicate ((,class (:underline "#008000" :inherit nil))))
`(flyspell-incorrect ((,class (:underline "red" :inherit nil))))
;; ;; Semantic faces
;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
;; `(semantic-decoration-on-includes ((,class (:underline ,cham-4))))
;; `(semantic-decoration-on-private-members-face ((,class (:background ,alum-2))))
;; `(semantic-decoration-on-protected-members-face ((,class (:background ,alum-2))))
;; `(semantic-decoration-on-unknown-includes ((,class (:background ,choc-3))))
;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
`(Info-title-1-face ((t ,ol1)))
`(Info-title-2-face ((t ,ol2)))
`(Info-title-3-face ((t ,ol3)))
`(Info-title-4-face ((t ,ol4)))
;; `(semantic-decoration-on-unparsed-includes ((,class (:underline ,orange-3))))
;; `(semantic-tag-boundary-face ((,class (:overline ,blue-1))))
;; `(semantic-unmatched-syntax-face ((,class (:underline ,red-1))))
`(Info-title-1-face ((,class ,ol1)))
`(Info-title-2-face ((,class ,ol2)))
`(Info-title-3-face ((,class ,ol3)))
`(Info-title-4-face ((,class ,ol4)))
`(bbdb-company ((,class (:slant italic :foreground "steel blue"))))
`(bbdb-field-name ((,class (:weight bold :foreground "steel blue"))))
`(bbdb-field-value ((,class (:foreground "steel blue"))))
`(bbdb-name ((,class (:underline t :foreground "#FF6633"))))
`(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray"))))
`(calendar-today ((,class (:weight bold :background "#CCCCFF"))))
`(cfw:face-annotation ((,class (:foreground "RosyBrown" :inherit cfw:face-day-title))))
`(cfw:face-day-title ((,class (:background "#F8F9FF"))))
`(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
`(cfw:face-annotation ((,class (:foreground "green" :background "red"))))
`(cfw:face-day-title ((,class (:foreground "#C9C9C9"))))
`(cfw:face-default-content ((,class (:foreground "#2952A3"))))
`(cfw:face-default-day ((,class (:weight bold :inherit cfw:face-day-title))))
`(cfw:face-disable ((,class (:foreground "DarkGray" :inherit cfw:face-day-title))))
`(cfw:face-grid ((,class (:foreground "SlateBlue"))))
`(cfw:face-header ((,class (:foreground "blue" :background "#D4E5FF" :weight bold))))
`(cfw:face-holiday ((,class (:background "#FFD5E5"))))
`(cfw:face-default-day ((,class (:weight bold))))
`(cfw:face-disable ((,class (:foreground "DarkGray"))))
`(cfw:face-grid ((,class (:foreground "#DDDDDD"))))
`(cfw:face-header ((,class (:foreground "#1662AF" :background "white" :weight bold))))
`(cfw:face-holiday ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(cfw:face-periods ((,class (:background "#668CD9" :foreground "white" :slant italic))))
`(cfw:face-saturday ((,class (:foreground "SlateGray4" :background "gray90" :weight bold))))
`(cfw:face-select ((,class (:background "#C3C9F8"))))
`(cfw:face-sunday ((,class (:foreground "red2" :background "#FFD5E5" :weight bold))))
`(cfw:face-title ((,class (:foreground "DarkGrey" :weight bold :height 2.0 :inherit variable-pitch))))
`(cfw:face-today ((,class (:background "#FFF7D7"))))
`(cfw:face-today-title ((,class (:background "#FAD163"))))
`(cfw:face-toolbar ((,class (:foreground "gray90" :background "gray90"))))
`(cfw:face-toolbar-button-off ((,class (:foreground "LightSkyBlue4" :background "white"))))
`(cfw:face-toolbar-button-on ((,class (:foreground "LightPink3" :background "gray94"))))
`(cfw:face-saturday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
`(cfw:face-select ((,class (:foreground "#4A95EB" :background "#EDF1FA"))))
`(cfw:face-sunday ((,class (:foreground "#4E4E4E" :background "white" :weight bold))))
`(cfw:face-title ((,class (:foreground "#676767" :weight bold :height 2.0 :inherit variable-pitch))))
`(cfw:face-today ((,class (:foreground "#4F4A3D" :background "#FFFABE"))))
`(cfw:face-today-title ((,class (:foreground "#4A95EB" :background "#FFFABE"))))
`(cfw:face-toolbar ((,class (:background "white"))))
`(cfw:face-toolbar-button-off ((,class (:foreground "#CFCFCF" :background "white"))))
`(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6"))))
`(change-log-date-face ((,class (:foreground "purple"))))
`(change-log-file ((,class (:weight bold :foreground "#4183C4"))))
`(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ;; other nick names
@ -228,7 +225,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(circe-originator-face ((,class (:foreground "blue"))))
`(circe-prompt-face ((,class (:foreground "red"))))
`(circe-server-face ((,class (:foreground "#99CAE5"))))
`(comint-highlight-input ((t ,code-block)))
`(comint-highlight-input ((,class ,code-block)))
`(comint-highlight-prompt ((,class (:foreground "#008ED1" :background "#EAEAFF"))))
`(compare-windows ((,class (:background "#FFFF00"))))
`(compilation-error ((,class (:weight bold :foreground "red"))))
@ -259,11 +256,12 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(custom-themed ((,class (:background "blue1" :foreground "white"))))
`(custom-variable-button ((,class (:weight bold :underline t))))
`(custom-variable-tag ((,class (:bold t :family "Sans Serif" :foreground "blue1" :weight bold :height 1.2))))
`(custom-visibility ((,class ,link)))
`(diary-face ((,class (:foreground "#87C9FC"))))
`(dircolors-face-asm ((,class (:foreground "black"))))
`(dircolors-face-backup ((,class (:foreground "black"))))
`(dircolors-face-compress ((,class (:foreground "red"))))
`(dircolors-face-dir ((t ,directory)))
`(dircolors-face-dir ((,class ,directory)))
`(dircolors-face-doc ((,class (:foreground "black"))))
`(dircolors-face-dos ((,class (:foreground "green3"))))
`(dircolors-face-emacs ((,class (:foreground "black"))))
@ -281,35 +279,36 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(dircolors-face-tar ((,class (:foreground "red"))))
`(dircolors-face-text ((,class (:foreground "black"))))
`(dircolors-face-yacc ((,class (:foreground "black"))))
`(dired-directory ((t ,directory)))
`(dired-header ((t ,directory)))
`(dired-directory ((,class ,directory)))
`(dired-header ((,class ,directory)))
`(dired-ignored ((,class (:strike-through t :foreground "red"))))
`(dired-mark ((t ,marked-line)))
`(dired-marked ((t ,marked-line)))
`(dired-symlink ((t ,symlink)))
`(dired-mark ((,class ,marked-line)))
`(dired-marked ((,class ,marked-line)))
`(dired-symlink ((,class ,symlink)))
`(diredp-compressed-file-suffix ((,class (:foreground "red"))))
`(diredp-date-time ((,class (:foreground "purple"))))
`(diredp-dir-heading ((t ,directory)))
`(diredp-dir-priv ((t ,directory)))
`(diredp-dir-heading ((,class ,directory)))
`(diredp-dir-priv ((,class ,directory)))
`(diredp-exec-priv ((,class (:background "#03C03C"))))
`(diredp-executable-tag ((,class (:foreground "green3" :background "white"))))
`(diredp-file-name ((,class (:foreground "black"))))
`(diredp-file-suffix ((,class (:foreground "#008000"))))
`(diredp-flag-mark-line ((t ,marked-line)))
`(diredp-flag-mark-line ((,class ,marked-line)))
`(diredp-ignored-file-name ((,class (:strike-through t :foreground "red"))))
`(diredp-read-priv ((,class (:background "#0A99FF"))))
`(diredp-write-priv ((,class (:foreground "white" :background "#FF4040"))))
`(file-name-shadow ((t ,shadow)))
`(font-latex-bold-face ((,class (:weight bold :foreground "medium sea green"))))
`(file-name-shadow ((,class ,shadow)))
`(font-latex-bold-face ((,class (:weight bold :foreground "black"))))
`(font-latex-italic-face ((,class (:slant italic :foreground "#1A1A1A"))))
`(font-latex-math-face ((,class (:foreground "blue"))))
`(font-latex-sectioning-1-face ((,class (:family "Sans Serif" :height 2.7 :weight bold :foreground "cornflower blue"))))
`(font-latex-sectioning-2-face ((t ,ol1)))
`(font-latex-sectioning-3-face ((t ,ol2)))
`(font-latex-sectioning-4-face ((t ,ol3)))
`(font-latex-sectioning-5-face ((t ,ol4)))
`(font-latex-sedate-face ((,class (:foreground "#FF5803"))))
`(font-latex-sectioning-2-face ((,class ,ol1)))
`(font-latex-sectioning-3-face ((,class ,ol2)))
`(font-latex-sectioning-4-face ((,class ,ol3)))
`(font-latex-sectioning-5-face ((,class ,ol4)))
`(font-latex-sedate-face ((,class (:foreground "#FF5500"))))
`(font-latex-string-face ((,class (:bold t :foreground "#0066FF"))))
`(font-latex-verbatim-face ((,class (:foreground "tan1"))))
`(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil))))
`(gnus-cite-attribution-face ((,class (:foreground "#5050B0"))))
`(gnus-cite-face-1 ((,class (:foreground "#5050B0"))))
`(gnus-cite-face-10 ((,class (:foreground "#990000"))))
@ -327,7 +326,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(gnus-picon-xbm ((,class (:foreground "yellow" :background "white"))))
`(gnus-signature ((,class (:foreground "#7F7F7F"))))
`(gnus-splash ((,class (:foreground "#FF8C00"))))
`(gnus-summary-cancelled ((t ,cancel)))
`(gnus-summary-cancelled ((,class ,cancel)))
`(gnus-summary-high-ancient ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
`(gnus-summary-high-read ((,class (:weight normal :foreground "#808080" :background "#FFFFE6"))))
`(gnus-summary-high-ticked ((,class (:weight normal :foreground "black" :background "#E7AEB0"))))
@ -347,24 +346,24 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66"))))
`(helm-dir-heading ((,class (:foreground "blue" :background "pink"))))
`(helm-dir-priv ((,class (:foreground "dark red" :background "light grey"))))
`(helm-ff-directory ((t ,directory)))
`(helm-ff-directory ((,class ,directory)))
`(helm-ff-executable ((,class (:foreground "green3" :background "white"))))
`(helm-ff-file ((,class (:foreground "black"))))
`(helm-ff-invalid-symlink ((,class (:foreground "yellow" :background "red"))))
`(helm-ff-symlink ((t ,symlink)))
`(helm-ff-symlink ((,class ,symlink)))
`(helm-file-name ((,class (:foreground "blue"))))
`(helm-gentoo-match-face ((,class (:foreground "red"))))
`(helm-grep-running ((,class (:weight bold :foreground "white"))))
`(helm-isearch-match ((,class (:background "#CCFFCC"))))
`(helm-match ((t ,match)))
`(helm-overlay-line-face ((,class (:underline t :foreground "white" :background "IndianRed4"))))
`(helm-selection ((t ,highlight-line)))
`(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#666699"))))
`(helm-visible-mark ((t ,marked-line)))
`(helm-match ((,class ,match)))
`(helm-selection ((,class ,highlight-line)))
`(helm-selection-line ((,class ,volatile-highlight)))
`(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF"))))
`(helm-visible-mark ((,class ,marked-line)))
`(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1"))))
`(highlight-symbol-face ((,class (:background "#FFFFA0"))))
`(hl-line ((t ,highlight-line)))
`(holiday-face ((,class (:background "#B6B2AE"))))
`(hl-line ((,class ,highlight-line)))
`(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(html-helper-bold-face ((,class (:weight bold :foreground "black"))))
`(html-helper-italic-face ((,class (:slant italic :foreground "black"))))
`(html-helper-underline-face ((,class (:underline t :foreground "black"))))
@ -375,54 +374,54 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(info-menu-header ((,class (:family "Sans Serif" :height 1.6 :weight bold :underline t :foreground "#00CC00")))) ;; menu titles (headers) -- major topics
`(info-menu-star ((,class (:foreground "black")))) ;; every 3rd menu item
`(info-node ((,class (:underline t :foreground "blue")))) ;; node names
`(info-quoted-name ((t ,code-inline)))
`(info-string ((t ,string)))
`(info-title-1 ((t ,ol1)))
`(info-quoted-name ((,class ,code-inline)))
`(info-string ((,class ,string)))
`(info-title-1 ((,class ,ol1)))
`(info-xref ((,class (:weight bold :underline t :foreground "blue")))) ;; unvisited cross-references
`(info-xref-visited ((,class (:weight bold :foreground "magenta4")))) ;; previously visited cross-references
`(light-symbol-face ((,class (:background "#FFFFA0"))))
`(linum ((,class (:foreground "#AFB7BA" :background "#DDEEFF"))))
`(linum ((,class (:foreground "#AFAFAF" :background "white"))))
`(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5"))))
`(lui-button-face ((t ,link)))
`(lui-button-face ((,class ,link)))
`(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ;; my nickname
`(lui-time-stamp-face ((,class (:foreground "purple"))))
`(magit-branch ((t ,vc-branch)))
`(magit-diff-add ((t ,diff-added)))
`(magit-diff-del ((t ,diff-removed)))
`(magit-branch ((,class ,vc-branch)))
`(magit-diff-add ((,class ,diff-added)))
`(magit-diff-del ((,class ,diff-removed)))
`(magit-diff-file-header ((,class (:family "Sans Serif" :height 1.1 :weight bold :foreground "#4183C4"))))
`(magit-diff-hunk-header ((t ,diff-hunk-header)))
`(magit-diff-none ((t ,diff-none)))
`(magit-diff-hunk-header ((,class ,diff-hunk-header)))
`(magit-diff-none ((,class ,diff-none)))
`(magit-header ((,class (:foreground "white" :background "#FF4040"))))
`(magit-item-highlight ((,class (:background "#EAF2F5"))))
`(magit-item-mark ((t ,marked-line)))
`(magit-item-mark ((,class ,marked-line)))
`(magit-log-head-label ((,class (:box (:line-width 1 :color "blue" :style nil)))))
`(magit-log-tag-label ((,class (:box (:line-width 1 :color "#00CC00" :style nil)))))
`(magit-section-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "cornflower blue"))))
`(makefile-space-face ((,class (:background "hot pink"))))
`(makefile-targets ((,class (:weight bold :foreground "blue"))))
`(match ((t ,match)))
`(mm-uu-extract ((t ,code-block)))
`(match ((,class ,match)))
`(mm-uu-extract ((,class ,code-block)))
`(moccur-current-line-face ((,class (:background "#FFFFCC" :foreground "black"))))
`(moccur-face ((,class (:background "#FFFF99" :foreground "black"))))
`(nobreak-space ((,class (:background "#CCE8F6"))))
`(nxml-attribute-local-name-face ((,class (:foreground "magenta"))))
`(nxml-attribute-value-delimiter-face ((,class (:foreground "green4"))))
`(nxml-attribute-value-face ((,class (:foreground "green4"))))
`(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
`(nxml-comment-content-face ((,class (:slant italic :foreground "red"))))
`(nxml-comment-delimiter-face ((,class (:foreground "red"))))
`(nxml-element-local-name ((,class (:box (:line-width 1 :color "#999999") :background "#DEDEDE" :foreground "#000088"))))
`(nxml-element-local-name-face ((,class (:foreground "blue"))))
`(nxml-processing-instruction-target-face ((,class (:foreground "purple1"))))
`(nxml-tag-delimiter-face ((,class (:foreground "blue"))))
`(nxml-tag-slash-face ((,class (:foreground "blue"))))
`(org-agenda-calendar-event ((,class (:weight bold :foreground "white" :background "#1662AF"))))
`(org-agenda-calendar-sexp ((,class (:foreground "black" :background "#80CBFF"))))
`(org-agenda-clocking ((t ,clock-line)))
`(org-agenda-column-dateline ((t ,column)))
`(org-agenda-calendar-event ((,class (:weight bold :foreground "#3774CC" :background "#A8C5EF"))))
`(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE"))))
`(org-agenda-clocking ((,class ,clock-line)))
`(org-agenda-column-dateline ((,class ,column)))
`(org-agenda-current-time ((,class (:underline t :foreground "#1662AF"))))
`(org-agenda-date ((,class (:height 1.6 :weight normal :foreground "#0063F5"))))
`(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
`(org-agenda-date-weekend ((,class (:height 1.6 :weight normal :foreground "dim gray"))))
`(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF"))))
`(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
`(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E"))))
`(org-agenda-diary ((,class (:weight bold :foreground "green4" :background "light blue"))))
`(org-agenda-dimmed-todo-face ((,class (:foreground "gold2"))))
`(org-agenda-done ((,class (:foreground "#555555" :background "#EEEEEE"))))
@ -432,15 +431,15 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-agenda-structure ((,class (:height 1.6 :weight bold :box (:line-width 1 :color "#999999") :foreground "#666666" :background "#CCCCCC"))))
`(org-archived ((,class (:foreground "gray70"))))
`(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0"))))
`(org-block ((t ,code-block)))
`(org-block ((,class ,code-block)))
`(org-block-background ((,class (:background "#FFFFE0"))))
`(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
`(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5"))))
`(org-checkbox ((,class (:weight bold :foreground "white" :background "#777777" :box (:line-width 1 :style pressed-button)))))
`(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4"))))
`(org-code ((t ,code-inline)))
`(org-column ((t ,column)))
`(org-column-title ((t ,column)))
`(org-code ((,class (:foreground "#007300" :background "#EBF5EB"))))
`(org-column ((,class ,column)))
`(org-column-title ((,class ,column)))
`(org-date ((,class (:underline t :foreground "#00459E"))))
`(org-default ((,class (:foreground "#333333"))))
`(org-dim ((,class (:foreground "#AAAAAA"))))
@ -457,74 +456,75 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(org-hide ((,class (:foreground "#E2E2E2"))))
`(org-inlinetask ((,class (:box (:line-width 1 :color "#EBEBEB") :foreground "#777777" :background "#FFFFD6"))))
`(org-latex-and-export-specials ((,class (:foreground "blue"))))
`(org-level-1 ((t ,ol1)))
`(org-level-2 ((t ,ol2)))
`(org-level-3 ((t ,ol3)))
`(org-level-4 ((t ,ol4)))
`(org-level-5 ((t ,ol5)))
`(org-level-6 ((t ,ol6)))
`(org-level-7 ((t ,ol7)))
`(org-level-8 ((t ,ol8)))
`(org-link ((t ,link)))
`(org-level-1 ((,class ,ol1)))
`(org-level-2 ((,class ,ol2)))
`(org-level-3 ((,class ,ol3)))
`(org-level-4 ((,class ,ol4)))
`(org-level-5 ((,class ,ol5)))
`(org-level-6 ((,class ,ol6)))
`(org-level-7 ((,class ,ol7)))
`(org-level-8 ((,class ,ol8)))
`(org-link ((,class ,link)))
`(org-list-dt ((,class (:weight bold :foreground "#335EA8"))))
`(org-meta-line ((,class (:slant normal :foreground "#008ED1" :background "#EAEAFF"))))
`(org-mode-line-clock ((t ,clock-line)))
`(org-mode-line-clock ((,class ,clock-line)))
`(org-mode-line-clock-overrun ((,class (:weight bold :box (:line-width 1 :color "#335EA8") :foreground "white" :background "#FF4040"))))
`(org-number-of-items ((,class (:weight bold :foreground "white" :background "#79BA79"))))
`(org-property-value ((,class (:foreground "#00A000"))))
`(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0"))))
`(org-scheduled ((,class (:slant italic :foreground "#0063DC"))))
`(org-scheduled ((,class (:foreground "#333333"))))
`(org-scheduled-previously ((,class (:weight bold :foreground "#373737"))))
`(org-scheduled-today ((,class (:foreground "black" :background "#FFFFCB"))))
`(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE"))))
`(org-sexp-date ((,class (:foreground "purple"))))
`(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA"))))
`(org-table ((,class (:foreground "dark green" :background "#EAFFEA"))))
`(org-tag ((,class (:height 1.0 :weight normal :slant italic :foreground "#3C424F" :background "#E5ECFA"))))
`(org-target ((,class (:underline t))))
`(org-time-grid ((,class (:foreground "#6D6D6D"))))
`(org-tag ((,class (:weight normal :slant italic :foreground "#3E6D8E" :background "#E0EAF1"))))
`(org-target ((,class ,link)))
`(org-time-grid ((,class (:foreground "#CFCFCF"))))
`(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4"))))
`(org-upcoming-deadline ((,class (:foreground "#FF5555"))))
`(org-verbatim ((,class (:box (:line-width 1 :color "#DDDDDD") :foreground "#000088" :background "#E0FFE0"))))
`(org-verbatim ((,class (:foreground "#0066CC"))))
`(org-verse ((,class (:slant italic :foreground "dim gray" :background "#EEEEEE"))))
`(org-warning ((,class (:weight bold :foreground "black" :background "#CCE7FF"))))
`(outline-1 ((t ,ol1)))
`(outline-2 ((t ,ol2)))
`(outline-3 ((t ,ol3)))
`(outline-4 ((t ,ol4)))
`(outline-5 ((t ,ol5)))
`(outline-6 ((t ,ol6)))
`(outline-7 ((t ,ol7)))
`(outline-8 ((t ,ol8)))
`(outline-1 ((,class ,ol1)))
`(outline-2 ((,class ,ol2)))
`(outline-3 ((,class ,ol3)))
`(outline-4 ((,class ,ol4)))
`(outline-5 ((,class ,ol5)))
`(outline-6 ((,class ,ol6)))
`(outline-7 ((,class ,ol7)))
`(outline-8 ((,class ,ol8)))
`(pabbrev-debug-display-label-face ((,class (:background "chartreuse"))))
`(pabbrev-suggestions-face ((,class (:weight bold :foreground "white" :background "red"))))
`(pabbrev-suggestions-label-face ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-match ((,class (:foreground "white" :background "#FF3F3F"))))
`(paren-face-mismatch ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-no-match ((,class (:weight bold :foreground "white" :background "purple"))))
`(paren-face-match ((,class (:foreground "#E2464C" :background "#FFE182"))))
`(paren-face-mismatch ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
`(paren-face-no-match ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
`(pp^L-highlight ((,class (:strike-through t))))
`(recover-this-file ((,class (:background "white" :background "#FF3F3F"))))
`(sh-heredoc ((,class (:foreground "blue" :background "#FBF9EA"))))
`(shadow ((t ,shadow)))
`(sh-heredoc ((,class (:foreground "blue" :background "#EEF5FE"))))
`(sh-quoted-exec ((,class (:foreground "#FF1493"))))
`(shadow ((,class ,shadow)))
`(shell-option-face ((,class (:foreground "forest green"))))
`(shell-output-2-face ((,class (:foreground "blue"))))
`(shell-output-3-face ((,class (:foreground "purple"))))
`(shell-output-face ((,class (:foreground "black"))))
`(shell-prompt-face ((,class (:weight bold :foreground "yellow"))))
`(show-paren-match ((,class (:foreground "white" :background "#FF3F3F"))))
`(show-paren-mismatch ((,class (:weight bold :foreground "white" :background "purple"))))
`(show-paren-match ((,class (:foreground "#E2464C" :background "#FFE182"))))
`(show-paren-mismatch ((,class (:weight bold :foreground "white" :background "#FF3F3F"))))
`(speedbar-button-face ((,class (:foreground "green4"))))
`(speedbar-directory-face ((,class (:foreground "blue4"))))
`(speedbar-file-face ((,class (:foreground "cyan4"))))
`(speedbar-highlight-face ((,class (:background "green"))))
`(speedbar-highlight-face ((,class ,volatile-highlight)))
`(speedbar-selected-face ((,class (:underline t :foreground "red"))))
`(speedbar-tag-face ((,class (:foreground "brown"))))
`(svn-status-directory-face ((t ,directory)))
`(svn-status-directory-face ((,class ,directory)))
`(svn-status-filename-face ((,class (:weight bold :foreground "#4183C4"))))
`(svn-status-locked-face ((,class (:weight bold :foreground "red"))))
`(svn-status-marked-face ((t ,marked-line)))
`(svn-status-marked-face ((,class ,marked-line)))
`(svn-status-marked-popup-face ((,class (:weight bold :foreground "green3"))))
`(svn-status-switched-face ((,class (:slant italic :foreground "gray55"))))
`(svn-status-symlink-face ((t ,symlink)))
`(svn-status-symlink-face ((,class ,symlink)))
`(svn-status-update-available-face ((,class (:foreground "orange"))))
`(tex-verbatim ((,class (:foreground "blue"))))
`(tool-bar ((,class (:box (:line-width 1 :style released-button) :foreground "black" :background "gray75"))))
@ -549,7 +549,7 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(vc-annotate-face-FF993F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFC63F ((,class (:foreground "#FF993F" :background "black"))))
`(vc-annotate-face-FFF33F ((,class (:foreground "#FFF33F" :background "black"))))
`(w3m-anchor ((t ,link)))
`(w3m-anchor ((,class ,link)))
`(w3m-arrived-anchor ((,class (:foreground "purple1"))))
`(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green"))))
`(w3m-bold ((,class (:weight bold :foreground "medium sea green"))))
@ -569,9 +569,9 @@ Semantic, and Ansi-Color faces are included -- and much more...")
`(whitespace-hspace ((,class (:background "#CCE8F6"))))
`(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow"))))
`(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88"))))
`(whitespace-tab ((,class (:foreground "lightgray" :background "beige"))))
`(whitespace-tab ((,class (:foreground "lightgray" :background "beige"))))
`(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1"))))
`(widget-button-face ((t ,link)))
`(widget-button-face ((,class ,link)))
`(widget-button-pressed-face ((,class (:foreground "red"))))
`(widget-documentation-face ((,class (:foreground "green4"))))
`(widget-field-face ((,class (:background "gray85"))))
@ -583,8 +583,8 @@ Semantic, and Ansi-Color faces are included -- and much more...")
(custom-theme-set-variables
'leuven
'(ansi-color-names-vector ["#242424" "#e5786d" "#95e454" "#cae682"
"#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"]))
'(ansi-color-names-vector ["#242424" "#E5786D" "#95E454" "#CAE682"
"#8AC6F2" "#333366" "#CCAA8F" "#F6F3E8"]))
(provide-theme 'leuven)

View file

@ -64,11 +64,17 @@ Used and created by Tassilo Horn.")
'(highlight ((t (:background "sea green"))))
'(hl-line ((t (:background "grey25"))))
'(hl-paren-face ((t (:weight bold))) t)
'(icomplete-first-match ((t (:foreground "deep sky blue" :weight bold))))
'(ido-first-match ((t (:foreground "turquoise" :weight bold))))
'(ido-only-match ((t (:foreground "medium spring green" :weight bold))))
'(ido-subdir ((t (:inherit dired-directory :weight normal))))
'(lusty-file-face ((t (:foreground "SpringGreen1"))) t)
'(magit-header ((t (:box 1 :weight bold))))
'(magit-section-title ((t (:inherit magit-header :background "dark slate blue"))))
'(menu ((t (:background "gray30" :foreground "gray70"))))
'(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
'(mode-line ((t (:box (:line-width 1 :color "red") :family "DejaVu Sans"))))
'(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray"))))
'(mode-line ((t (:background "gray30" :box (:line-width 1 :color "red") :family "DejaVu Sans"))))
'(mode-line-inactive ((t (:inherit mode-line :foreground "dark gray"))))
'(org-agenda-date ((t (:inherit org-agenda-structure))) t)
'(org-agenda-date-today ((t (:inherit org-agenda-date :underline t))) t)
'(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "green"))) t)
@ -92,14 +98,14 @@ Used and created by Tassilo Horn.")
'(org-scheduled-previously ((t (:foreground "#FF7400"))))
'(org-tag ((t (:weight bold))))
'(org-todo ((t (:foreground "#FF6961" :weight bold))))
'(outline-1 ((t (:foreground "cyan1" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-2 ((t (:foreground "SeaGreen1" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-3 ((t (:foreground "cyan3" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-4 ((t (:foreground "SeaGreen3" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-5 ((t (:foreground "LightGoldenrod1" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-6 ((t (:foreground "light salmon" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-7 ((t (:foreground "pale goldenrod" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-8 ((t (:foreground "OliveDrab1" :box (:line-width 1 :color "gainsboro") :weight bold))))
'(outline-1 ((t (:foreground "cyan1" :weight bold))))
'(outline-2 ((t (:foreground "SeaGreen1" :weight bold))))
'(outline-3 ((t (:foreground "cyan3" :weight bold))))
'(outline-4 ((t (:foreground "SeaGreen3" :weight bold))))
'(outline-5 ((t (:foreground "LightGoldenrod1" :weight bold))))
'(outline-6 ((t (:foreground "light salmon" :weight bold))))
'(outline-7 ((t (:foreground "pale goldenrod" :weight bold))))
'(outline-8 ((t (:foreground "OliveDrab1" :weight bold))))
'(rcirc-my-nick ((t (:foreground "SpringGreen1" :weight bold))) t)
'(rcirc-other-nick ((t (:foreground "dodger blue"))) t)
'(rcirc-track-keyword ((t (:foreground "DodgerBlue" :weight bold))) t)

File diff suppressed because it is too large Load diff

View file

@ -259,9 +259,9 @@ META. Мы рекомендуем привыкнуть к использован
говорящее о том, какая команда вызывается, и запросит у вас, хотите ли вы
продолжать работу и выполнить данную команду.
Если вы действительно попробовать выполнить эту команду, то нажмите клавишу
<SPC> (пробел) в ответ на заданный вопрос. Обычно, если вы не хотите
выполнять запрещенную команду, то ответьте на вопрос нажатием клавиши "n".
Если вы действительно хотите выполнить эту команду, то нажмите клавишу
<SPC> (пробел) в ответ на заданный вопрос. А если вы не хотите выполнить
запрещенную команду, то ответьте на вопрос нажатием клавиши "n".
>> Нажмите `C-x C-l' ("запрещенная" команда), а потом ответьте "n" на
заданный вопрос.
@ -284,7 +284,7 @@ Emacs может отображать информацию в нескольки
>> Переместите курсор на эту строку и нажмите C-u 0 C-l.
>> Наберите C-h k C-f.
Посмотрите, как текущее окно сожмется, когда появится новое окно и
Заметьте как текущее окно уменьшится, когда появится новое окно и
отобразит документацию для сочетания клавиш C-f.
>> Наберите C-x 1 и посмотрите, как окно с документацией исчезнет.

File diff suppressed because it is too large Load diff

View file

@ -1,3 +1,45 @@
2013-05-25 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (leim-list.el, check-declare): Replace
reveal-filename with unmsys--file-name.
2013-05-16 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (leim-list.el, check-declare): Use reveal-filename.
2013-04-01 Paul Eggert <eggert@cs.ucla.edu>
Use UTF-8 for most files with non-ASCII characters (Bug#13936).
* quail/cyrillic.el, quail/czech.el, quail/ethiopic.el:
* quail/greek.el, quail/hanja.el, quail/hanja3.el, quail/hebrew.el:
* quail/lao.el, quail/lrt.el, quail/slovak.el, quail/symbol-ksc.el:
* quail/thai.el, quail/tibetan.el, quail/viqr.el, quail/vntelex.el:
* quail/vnvni.el, quail/welsh.el:
Switch from iso-2022-7bit to utf-8 or (if needed) utf-8-emacs.
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
* Makefile.in ($(srcdir)/ja-dic/ja-dic.el): Use batch-skkdic-convert.
2013-03-18 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(srcdir)/ja-dic/ja-dic.el): New target.
2013-03-18 Paul Eggert <eggert@cs.ucla.edu>
Automate the build of ja-dic.el (Bug#13984).
ja-dic.el no longer needs to be in the repository: it's now
generated as part of the build from bzr. Also, update SKK-JISYO.L to
match the upstream source exactly.
* ja-dic/ja-dic.el: Remove from repository. It is still distributed
as part of the Emacs tarball.
* Makefile.in ($(srcdir)/ja-dic/ja-dic.el): New rule.
(compile-main): Depend on it.
* SKK-DIC/README: Update to reflect new build procedure.
* SKK-DIC/SKK-JISYO.L: Update to match source exactly.
This is now the annotated version, to match the upstream file name;
the unannotated one is built from it automatically.
2013-03-16 Stefan Monnier <monnier@iro.umontreal.ca>
* quail/latin-ltx.el: Resolve conflicts (bug#13950).
@ -6,10 +48,6 @@
(rules): Use tighter regexps to avoid conflicts.
Consolidate the various rules for combining marks.
2013-03-16 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.
2013-02-08 Stefan Monnier <monnier@iro.umontreal.ca>
* quail/latin-ltx.el: Add greek superscripts.

View file

@ -140,10 +140,16 @@ leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
--eval "(update-leim-list-file \".\")" ; \
else \
${RUN_EMACS} -l ${buildlisppath}/international/quail \
--eval "(update-leim-list-file \".\" \"${srcdir}\")" ; \
--eval "(update-leim-list-file \".\" (unmsys--file-name \"${srcdir}\"))" ; \
fi
sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
@$(MKDIR_P) $(srcdir)/ja-dic
$(RUN_EMACS) -batch -l $(buildlisppath)/international/ja-dic-cnv \
-f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \
"$(srcdir)/SKK-DIC/SKK-JISYO.L"
## Following adapted from lisp/Makefile.in.
setwins=wins="${srcdir}/ja-dic quail"; \
[ `cd ${srcdir} && /bin/pwd` != `/bin/pwd` ] && \
@ -156,7 +162,7 @@ compile-targets: $(TARGETS)
# Compile all the Elisp files that need it. Beware: it approximates
# `no-byte-compile', so watch out for false-positives!
.PHONY: compile-main
compile-main: ${TIT_MISC}
compile-main: ${TIT_MISC} $(srcdir)/ja-dic/ja-dic.el
@($(setwins); \
els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
for el in $$els; do \
@ -193,4 +199,4 @@ extraclean: maintainer-clean
check-declare:
$(RUN_EMACS) -l $(buildlisppath)/emacs-lisp/check-declare \
--eval '(check-declare-directory "$(srcdir)")'
--eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))'

View file

@ -1,4 +1,6 @@
The file SKK-JISYO.L is renamed from SKK-JISYO.L.unannotated which is
distributed at http://openlab.ring.gr.jp/skk/skk/dic/.
SKK-JISYO.L.unannotated is free software distributed under the terms
This directory contains a copy of the following file:
http://openlab.ring.gr.jp/skk/skk/dic/SKK-JISYO.L
This file is free software distributed under the terms
of the GNU General Public License.

Binary file not shown.

File diff suppressed because it is too large Load diff

View file

@ -189,6 +189,13 @@ $(MISC_DIC):
$(ARGQUOTE)$(buildlisppath)/international/quail$(ARGQUOTE) \
-f batch-byte-compile $(MISC_DIC:.elc=.el)
# Rule to generate ja-dic/ja-dic.el from SKK-DIC/SKK-JISYO.L.
$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
- mkdir ja-dic
$(RUN_EMACS) -l \
$(ARGQUOTE)$(buildlisppath)/international/ja-dic-cnv$(ARGQUOTE) \
-f batch-skkdic-convert -dir ja-dic $(srcdir)/SKK-DIC/SKK-JISYO.L
#
# WARNING: Do NOT split the parts inside $(ARGQUOTE)s into multiple lines as
# this can break with GNU Make 3.81 and later if sh.exe is used.

File diff suppressed because it is too large Load diff

View file

@ -1,9 +1,9 @@
;;; czech.el --- Quail package for inputting Czech -*-coding: iso-2022-7bit;-*-
;;; czech.el --- Quail package for inputting Czech -*-coding: utf-8;-*-
;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc.
;; Author: Milan Zamazal <pdm@zamazal.org>
;; Maintainer: Pavel Jan,Bm(Bk <Pavel@Janik.cz>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
;; Keywords: i18n, multilingual, input method, Czech
;; This file is part of GNU Emacs.
@ -40,15 +40,15 @@
(quail-define-rules
("1" ?+)
("2" ?,Bl(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,Bx(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("2" ?ě)
("3" ?š)
("4" ?č)
("5" ?ř)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("!" ?1)
("@" ?2)
("#" ?3)
@ -61,14 +61,14 @@
(")" ?0)
("-" ?=)
("_" ?%)
("[" ?,Bz(B)
("[" ?ú)
("{" ?/)
("]" ?\))
("}" ?\()
("|" ?`)
(";" ?,By(B)
(";" ?ů)
(":" ?\")
("'" ?,B'(B)
("'" ?§)
("\"" ?!)
("<" ??)
(">" ?:)
@ -79,44 +79,44 @@
("z" ?y)
("Y" ?Z)
("Z" ?Y)
("\\a" ?,Bd(B)
("\\o" ?,Bv(B)
("\\s" ?,B_(B)
("\\u" ?,B|(B)
("\\A" ?,BD(B)
("\\O" ?,BV(B)
("\\S" ?,B_(B)
("\\U" ?,B\(B)
("~u" ?,By(B)
("~U" ?,BY(B)
("=a" ?,Ba(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("=e" ?,Bi(B)
("+e" ?,Bl(B)
("=i" ?,Bm(B)
("+n" ?,Br(B)
("=o" ?,Bs(B)
("+r" ?,Bx(B)
("+s" ?,B9(B)
("+t" ?,B;(B)
("=u" ?,Bz(B)
("=z" ?,B}(B)
("+y" ?,B>(B)
("=A" ?,BA(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("=E" ?,BI(B)
("+E" ?,BL(B)
("=I" ?,BM(B)
("+N" ?,BR(B)
("=O" ?,BS(B)
("+R" ?,BX(B)
("+S" ?,B)(B)
("+T" ?,B+(B)
("=U" ?,BZ(B)
("=Z" ?,B](B)
("+Y" ?,B.(B)
("\\a" ?ä)
("\\o" ?ö)
("\\s" ?ß)
("\\u" ?ü)
("\\A" ?Ä)
("\\O" ?Ö)
("\\S" ?ß)
("\\U" ?Ü)
("~u" ?ů)
("~U" ?Ů)
("=a" ?á)
("+c" ?č)
("+d" ?ď)
("=e" ?é)
("+e" ?ě)
("=i" ?í)
("+n" ?ň)
("=o" ?ó)
("+r" ?ř)
("+s" ?š)
("+t" ?ť)
("=u" ?ú)
("=z" ?ý)
("+y" ?ž)
("=A" ?Á)
("+C" ?Č)
("+D" ?Ď)
("=E" ?É)
("+E" ?Ě)
("=I" ?Í)
("+N" ?Ň)
("=O" ?Ó)
("+R" ?Ř)
("+S" ?Š)
("+T" ?Ť)
("=U" ?Ú)
("=Z" ?Ý)
("+Y" ?Ž)
("=1" ?!)
("=2" ?@)
("=3" ?#)
@ -162,15 +162,15 @@
(quail-define-rules
("1" ?+)
("2" ?,Bl(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,Bx(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("2" ?ě)
("3" ?š)
("4" ?č)
("5" ?ř)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("!" ?1)
("@" ?2)
("#" ?3)
@ -183,58 +183,58 @@
(")" ?0)
("-" ?=)
("_" ?%)
("[" ?,Bz(B)
("[" ?ú)
("{" ?/)
("]" ?\))
("}" ?\()
("|" ?`)
(";" ?,By(B)
(";" ?ů)
(":" ?\")
("'" ?,B'(B)
("'" ?§)
("\"" ?!)
("<" ??)
(">" ?:)
("/" ?-)
("?" ?_)
("`" ?\;)
("\\a" ?,Bd(B)
("\\o" ?,Bv(B)
("\\s" ?,B_(B)
("\\u" ?,B|(B)
("\\A" ?,BD(B)
("\\O" ?,BV(B)
("\\S" ?,B_(B)
("\\U" ?,B\(B)
("~u" ?,By(B)
("~U" ?,BY(B)
("=a" ?,Ba(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("=e" ?,Bi(B)
("+e" ?,Bl(B)
("=i" ?,Bm(B)
("+n" ?,Br(B)
("=o" ?,Bs(B)
("+r" ?,Bx(B)
("+s" ?,B9(B)
("+t" ?,B;(B)
("=u" ?,Bz(B)
("=y" ?,B}(B)
("+z" ?,B>(B)
("=A" ?,BA(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("=E" ?,BI(B)
("+E" ?,BL(B)
("=I" ?,BM(B)
("+N" ?,BR(B)
("=O" ?,BS(B)
("+R" ?,BX(B)
("+S" ?,B)(B)
("+T" ?,B+(B)
("=Y" ?,B](B)
("+Z" ?,B.(B)
("=U" ?,BZ(B)
("\\a" ?ä)
("\\o" ?ö)
("\\s" ?ß)
("\\u" ?ü)
("\\A" ?Ä)
("\\O" ?Ö)
("\\S" ?ß)
("\\U" ?Ü)
("~u" ?ů)
("~U" ?Ů)
("=a" ?á)
("+c" ?č)
("+d" ?ď)
("=e" ?é)
("+e" ?ě)
("=i" ?í)
("+n" ?ň)
("=o" ?ó)
("+r" ?ř)
("+s" ?š)
("+t" ?ť)
("=u" ?ú)
("=y" ?ý)
("+z" ?ž)
("=A" ?Á)
("+C" ?Č)
("+D" ?Ď)
("=E" ?É)
("+E" ?Ě)
("=I" ?Í)
("+N" ?Ň)
("=O" ?Ó)
("+R" ?Ř)
("+S" ?Š)
("+T" ?Ť)
("=Y" ?Ý)
("+Z" ?Ž)
("=U" ?Ú)
("=1" ?!)
("=2" ?@)
("=3" ?#)
@ -286,15 +286,15 @@ All other keys are the same as on standard US keyboard."
(quail-define-rules
("1" ?+)
("2" ?,Bl(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,Bx(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("2" ?ě)
("3" ?š)
("4" ?č)
("5" ?ř)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("+1" ?1)
("+2" ?2)
("+3" ?3)
@ -305,52 +305,52 @@ All other keys are the same as on standard US keyboard."
("+8" ?8)
("+9" ?9)
("+0" ?0)
("+a" ?,Ba(B)
("++a" ?,Bd(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("+e" ?,Bi(B)
("++e" ?,Bl(B)
("+i" ?,Bm(B)
("+l" ?,Be(B)
("++l" ?,B5(B)
("+n" ?,Br(B)
("+o" ?,Bs(B)
("++o" ?,Bv(B)
("+++o" ?,Bt(B)
("+r" ?,Bx(B)
("++r" ?,B`(B)
("+s" ?,B9(B)
("++s" ?,B_(B)
("+t" ?,B;(B)
("+u" ?,Bz(B)
("++u" ?,By(B)
("+++u" ?,B|(B)
("+y" ?,B}(B)
("+z" ?,B>(B)
("+A" ?,BA(B)
("++A" ?,BD(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("+E" ?,BI(B)
("++E" ?,BL(B)
("+I" ?,BM(B)
("+L" ?,BE(B)
("++L" ?,B%(B)
("+N" ?,BR(B)
("+O" ?,BS(B)
("++O" ?,BV(B)
("+++O" ?,BT(B)
("+R" ?,BX(B)
("++R" ?,B@(B)
("+S" ?,B)(B)
("++S" ?,B_(B)
("+T" ?,B+(B)
("+U" ?,BZ(B)
("++U" ?,BY(B)
("+++U" ?,B\(B)
("+Y" ?,B](B)
("+Z" ?,B.(B)
("+a" ?á)
("++a" ?ä)
("+c" ?č)
("+d" ?ď)
("+e" ?é)
("++e" ?ě)
("+i" ?í)
("+l" ?ĺ)
("++l" ?ľ)
("+n" ?ň)
("+o" ?ó)
("++o" ?ö)
("+++o" ?ô)
("+r" ?ř)
("++r" ?ŕ)
("+s" ?š)
("++s" ?ß)
("+t" ?ť)
("+u" ?ú)
("++u" ?ů)
("+++u" ?ü)
("+y" ?ý)
("+z" ?ž)
("+A" ?Á)
("++A" ?Ä)
("+C" ?Č)
("+D" ?Ď)
("+E" ?É)
("++E" ?Ě)
("+I" ?Í)
("+L" ?Ĺ)
("++L" ?Ľ)
("+N" ?Ň)
("+O" ?Ó)
("++O" ?Ö)
("+++O" ?Ô)
("+R" ?Ř)
("++R" ?Ŕ)
("+S" ?Š)
("++S" ?ß)
("+T" ?Ť)
("+U" ?Ú)
("++U" ?Ů)
("+++U" ?Ü)
("+Y" ?Ý)
("+Z" ?Ž)
([kp-1] ?1)
([kp-2] ?2)
([kp-3] ?3)
@ -369,22 +369,22 @@ All other keys are the same as on standard US keyboard."
All digits except of `1' are replaced by Czech characters as on the standard
Czech keyboard.
`1' is replaced by `,By(B'.
`1' is replaced by `ů'.
`+' is a dead key. Multiple presses of the dead key generate various accents.
All other keys are the same as on standard US keyboard."
nil t nil nil t nil nil nil nil nil t)
(quail-define-rules
("1" ?,By(B)
("2" ?,Bl(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,Bx(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("1" ?ů)
("2" ?ě)
("3" ?š)
("4" ?č)
("5" ?ř)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("+1" ?1)
("+2" ?2)
("+3" ?3)
@ -395,52 +395,52 @@ All other keys are the same as on standard US keyboard."
("+8" ?8)
("+9" ?9)
("+0" ?0)
("+a" ?,Ba(B)
("++a" ?,Bd(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("+e" ?,Bi(B)
("++e" ?,Bl(B)
("+i" ?,Bm(B)
("+l" ?,Be(B)
("++l" ?,B5(B)
("+n" ?,Br(B)
("+o" ?,Bs(B)
("++o" ?,Bv(B)
("+++o" ?,Bt(B)
("+r" ?,Bx(B)
("++r" ?,B`(B)
("+s" ?,B9(B)
("++s" ?,B_(B)
("+t" ?,B;(B)
("+u" ?,Bz(B)
("++u" ?,By(B)
("+++u" ?,B|(B)
("+y" ?,B}(B)
("+z" ?,B>(B)
("+A" ?,BA(B)
("++A" ?,BD(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("+E" ?,BI(B)
("++E" ?,BL(B)
("+I" ?,BM(B)
("+L" ?,BE(B)
("++L" ?,B%(B)
("+N" ?,BR(B)
("+O" ?,BS(B)
("++O" ?,BV(B)
("+++O" ?,BT(B)
("+R" ?,BX(B)
("++R" ?,B@(B)
("+S" ?,B)(B)
("++S" ?,B_(B)
("+T" ?,B+(B)
("+U" ?,BZ(B)
("++U" ?,BY(B)
("+++U" ?,B\(B)
("+Y" ?,B](B)
("+Z" ?,B.(B)
("+a" ?á)
("++a" ?ä)
("+c" ?č)
("+d" ?ď)
("+e" ?é)
("++e" ?ě)
("+i" ?í)
("+l" ?ĺ)
("++l" ?ľ)
("+n" ?ň)
("+o" ?ó)
("++o" ?ö)
("+++o" ?ô)
("+r" ?ř)
("++r" ?ŕ)
("+s" ?š)
("++s" ?ß)
("+t" ?ť)
("+u" ?ú)
("++u" ?ů)
("+++u" ?ü)
("+y" ?ý)
("+z" ?ž)
("+A" ?Á)
("++A" ?Ä)
("+C" ?Č)
("+D" ?Ď)
("+E" ?É)
("++E" ?Ě)
("+I" ?Í)
("+L" ?Ĺ)
("++L" ?Ľ)
("+N" ?Ň)
("+O" ?Ó)
("++O" ?Ö)
("+++O" ?Ô)
("+R" ?Ř)
("++R" ?Ŕ)
("+S" ?Š)
("++S" ?ß)
("+T" ?Ť)
("+U" ?Ú)
("++U" ?Ů)
("+++U" ?Ü)
("+Y" ?Ý)
("+Z" ?Ž)
([kp-1] ?1)
([kp-2] ?2)
([kp-3] ?3)
@ -460,24 +460,24 @@ keyboard from the obsolete `emacs-czech' package.
All digits except of `1' are replaced by Czech characters as on the standard
Czech keyboard.
`[' and `]' are replaced with `,Bz(B' and `,By(B', respectively.
`[' and `]' are replaced with `ú' and `ů', respectively.
There are two dead keys on `=' and `+'. Characters with diaereses are
accessible through `+='.
All other keys are the same as on standard US keyboard."
nil t nil nil t nil nil nil nil nil t)
(quail-define-rules
("2" ?,Bl(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,Bx(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("[" ?,Bz(B)
("]" ?,By(B)
("2" ?ě)
("3" ?š)
("4" ?č)
("5" ?ř)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("[" ?ú)
("]" ?ů)
("==" ?=)
("++" ?+)
("=+" ?+)
@ -505,54 +505,54 @@ All other keys are the same as on standard US keyboard."
("+8" ?8)
("+9" ?9)
("+0" ?0)
("=A" ?,BA(B)
("+A" ?,BD(B)
("+=A" ?,BD(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("=E" ?,BI(B)
("+E" ?,BL(B)
("=I" ?,BM(B)
("=L" ?,B%(B)
("+L" ?,BE(B)
("+N" ?,BR(B)
("=O" ?,BS(B)
("+O" ?,BT(B)
("+=O" ?,BV(B)
("=R" ?,B@(B)
("+R" ?,BX(B)
("+S" ?,B)(B)
("=S" ?,B_(B)
("+T" ?,B+(B)
("=U" ?,BZ(B)
("+U" ?,BY(B)
("+=U" ?,B\(B)
("=Y" ?,B](B)
("+Z" ?,B.(B)
("=a" ?,Ba(B)
("+a" ?,Bd(B)
("+=a" ?,Bd(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("=e" ?,Bi(B)
("+e" ?,Bl(B)
("=i" ?,Bm(B)
("=l" ?,B5(B)
("+l" ?,Be(B)
("+n" ?,Br(B)
("=o" ?,Bs(B)
("+o" ?,Bt(B)
("+=o" ?,Bv(B)
("=r" ?,B`(B)
("+r" ?,Bx(B)
("+s" ?,B9(B)
("=s" ?,B_(B)
("+t" ?,B;(B)
("=u" ?,Bz(B)
("+u" ?,By(B)
("+=u" ?,B|(B)
("=y" ?,B}(B)
("+z" ?,B>(B)
("=A" ?Á)
("+A" ?Ä)
("+=A" ?Ä)
("+C" ?Č)
("+D" ?Ď)
("=E" ?É)
("+E" ?Ě)
("=I" ?Í)
("=L" ?Ľ)
("+L" ?Ĺ)
("+N" ?Ň)
("=O" ?Ó)
("+O" ?Ô)
("+=O" ?Ö)
("=R" ?Ŕ)
("+R" ?Ř)
("+S" ?Š)
("=S" ?ß)
("+T" ?Ť)
("=U" ?Ú)
("+U" ?Ů)
("+=U" ?Ü)
("=Y" ?Ý)
("+Z" ?Ž)
("=a" ?á)
("+a" ?ä)
("+=a" ?ä)
("+c" ?č)
("+d" ?ď)
("=e" ?é)
("+e" ?ě)
("=i" ?í)
("=l" ?ľ)
("+l" ?ĺ)
("+n" ?ň)
("=o" ?ó)
("+o" ?ô)
("+=o" ?ö)
("=r" ?ŕ)
("+r" ?ř)
("+s" ?š)
("=s" ?ß)
("+t" ?ť)
("=u" ?ú)
("+u" ?ů)
("+=u" ?ü)
("=y" ?ý)
("+z" ?ž)
([kp-1] ?1)
([kp-2] ?2)
([kp-3] ?3)

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
;;; hanja.el --- Quail-package for Korean Hanja (KSC5601) -*-coding: iso-2022-7bit;-*-
;;; hanja.el --- Quail-package for Korean Hanja (KSC5601) -*-coding: utf-8;-*-
;; Copyright (C) 1997, 2001-2013 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@ -34,483 +34,483 @@
(require 'korea-util)
(quail-define-package
"korean-hanja" "Korean" "$(CyS(B2" t
"2$(C9z=D(BKSC$(CySm.(B: $(Cz1SWGO4B(B $(CySm.@G(B $(Cj$@;(B $(CGQ1[(B2$(C9zcR@87N(B $(C{<usGO?)(B $(C`TwI(B"
"korean-hanja" "Korean" "2" t
"2벌식KSC漢字: 該當하는 漢字의 韻을 한글2벌式으로 呼出하여 選擇"
nil nil nil nil nil nil t)
(quail-define-rules
("rk" "$(CJ!J"J#J$J%J&J'J(J)J*J+J,J-J.J/J0J1J2J3J4J5J6J7J8J9J:J;J<J=(B")
("rkr" "$(CJ>J?J@JAJBJCJDJEJFJGJH(B")
("rks" "$(CJIJJJKJLJMJNJOJPJQJRJSJTJUJVJWJXJYJZJ[J\J]J^J_J`(B")
("rkf" "$(CJaJbJcJdJeJfJgJhJiJj(B")
("rka" "$(CJkJlJmJnJoJpJqJrJsJtJuJvJwJxJyJzJ{J|J}J~(B")
("rkq" "$(CK!K"K#K$K%K&(B")
("rkd" "$(CK'K(K)K*K+K,K-K.K/K0K1K2K3K4K5K6K7K8K9K:K;K<K=K>(B")
("ro" "$(CK?K@KAKBKCKDKEKFKGKHKIKJKKKLKMKNKOKPKQKR(B")
("ror" "$(CKSKT(B")
("rod" "$(CKUKVKWKX(B")
("rir" "$(CKY(B")
("rj" "$(CKZK[K\K]K^K_K`KaKbKcKdKeKfKgKhKiKj(B")
("rjs" "$(CKkKlKmKnKoKpKqKrKsKtKuKv(B")
("rjf" "$(CKwKxKyKz(B")
("rja" "$(CK{K|K}K~L!L"L#(B")
("rjq" "$(CL$L%L&(B")
("rp" "$(CL'L(L)(B")
("rur" "$(CL*L+L,L-L.L/L0(B")
("rus" "$(CL1L2L3L4L5L6L7L8L9L:L;(B")
("ruf" "$(CL<L=L>L?L@LA(B")
("rua" "$(CLBLCLDLELFLG(B")
("rud" "$(CLHLILJLKLLLMLNLOLPLQLRLSLTLULVLWLXLYLZL[L\L]L^L_L`LaLbLcLdLeLfLgLhLiLjLkLlLmLnLoLpLqLrLsLt(B")
("rP" "$(CLuLvLwLxLyLzL{L|L}L~M!M"M#M$M%M&M'M(M)M*M+M,M-M.(B")
("rh" "$(CM/M0M1M2M3M4M5M6M7M8M9M:M;M<M=M>M?M@MAMBMCMDMEMFMGMHMIMJMKMLMMMNMOMPMQMRMSMTMU(B")
("rhr" "$(CMVMWMXMYMZM[M\(B")
("rhs" "$(CM]M^M_M`MaMbMcMdMeMf(B")
("rhf" "$(CMgMhMi(B")
("rhd" "$(CMjMkMlMmMnMoMpMqMrMsMtMuMvMwMxMy(B")
("rhw" "$(CMz(B")
("rhk" "$(CM{M|M}M~N!N"N#N$N%N&N'N((B")
("rhkr" "$(CN)N*N+N,(B")
("rhks" "$(CN-N.N/N0N1N2N3N4N5N6N7N8N9N:N;N<N=(B")
("rhkf" "$(CN>N?N@NA(B")
("rhkd" "$(CNBNCNDNENFNGNHNINJNKNLNMNN(B")
("rho" "$(CNONPNQ(B")
("rhl" "$(CNRNSNTNUNVNWNXNYNZ(B")
("rhld" "$(CN[N\N]N^(B")
("ry" "$(CN_N`NaNbNcNdNeNfNgNhNiNjNkNlNmNnNoNpNqNrNsNtNuNvNw(B")
("rn" "$(CNxNyNzN{N|N}N~O!O"O#O$O%O&O'O(O)O*O+O,O-O.O/O0O1O2O3O4O5O6O7O8O9O:O;O<O=O>O?O@OAOBOCODOEOFOGOHOIOJOKOLOMONOO(B")
("rnr" "$(COPOQOROSOTOU(B")
("rns" "$(COVOWOXOYOZO[(B")
("rnf" "$(CO\O]O^O_(B")
("rnd" "$(CO`OaObOcOdOe(B")
("rnjs" "$(COfOgOhOiOjOkOlOmOnOo(B")
("rnjf" "$(COpOqOrOsOt(B")
("rnp" "$(COuOvOwOxOyOz(B")
("rnl" "$(CO{O|O}O~P!P"(B")
("rb" "$(CP#P$P%P&P'P(P)P*P+P,P-P.P/P0P1(B")
("rbs" "$(CP2P3P4P5P6P7P8(B")
("rbf" "$(CP9(B")
("rmr" "$(CP:P;P<P=P>P?P@(B")
("rms" "$(CPAPBPCPDPEPFPGPHPIPJPKPLPMPNPO(B")
("rmf" "$(CPP(B")
("rma" "$(CPQPRPSPTPUPVPWPXPYPZP[P\P]P^(B")
("rmq" "$(CP_P`PaPbPcPdPe(B")
("rmd" "$(CPfPgPhPi(B")
("rl" "$(CPjPkPlPmPnPoPpPqPrPsPtPuPvPwPxPyPzP{P|P}P~Q!Q"Q#Q$Q%Q&Q'Q(Q)Q*Q+Q,Q-Q.Q/Q0Q1Q2Q3Q4Q5Q6Q7Q8Q9Q:Q;Q<Q=Q>Q?Q@QAQBQCQDQEQFQGQHQIQJQK(B")
("rls" "$(CQL(B")
("rlf" "$(CQMQNQOQP(B")
("rla" "$(CQQ(B")
("Rlr" "$(CQR(B")
("sk" "$(CQSQTQUQVQWQXQYQZQ[Q\Q]Q^Q_Q`Qa(B")
("skr" "$(CQbQcQdQeQfQgQhQi(B")
("sks" "$(CQjQkQlQmQnQoQpQqQr(B")
("skf" "$(CQsQt(B")
("ska" "$(CQuQvQwQxQyQzQ{Q|Q}(B")
("skq" "$(CQ~R!R"R#R$(B")
("skd" "$(CR%R&R'R(R)R*R+(B")
("so" "$(CR,R-R.R/R0R1(B")
("sod" "$(CR2(B")
("su" "$(CR3(B")
("sus" "$(CR4R5R6(B")
("sua" "$(CR7R8R9R:(B")
("sud" "$(CR;R<(B")
("sh" "$(CR=R>R?R@RARBRCRDRERFRGRHRIRJRKRLRMRN(B")
("shr" "$(CRORPRQRRRSRT(B")
("shs" "$(CRU(B")
("shd" "$(CRVRWRXRYRZR[R\(B")
("shl" "$(CR]R^R_R`RaRb(B")
("sy" "$(CRc(B")
("sn" "$(CRdReRfRgRhRiRjRk(B")
("sns" "$(CRl(B")
("snf" "$(CRm(B")
("sb" "$(CRnRo(B")
("smr" "$(CRpRq(B")
("sma" "$(CRr(B")
("smd" "$(CRsRtRuRvRwRx(B")
("sl" "$(CRyRz(B")
("slr" "$(CR{R|(B")
("ek" "$(CR}R~(B")
("eks" "$(CS!S"S#S$S%S&S'S(S)S*S+S,S-S.S/S0S1S2S3S4(B")
("ekf" "$(CS5S6S7S8S9(B")
("eka" "$(CS:S;S<S=S>S?S@SASBSCSDSESFSGSHSISJ(B")
("ekq" "$(CSKSLSMSNSO(B")
("ekd" "$(CSPSQSRSSSTSUSVSWSXSYSZ(B")
("eo" "$(CS[S\S]S^S_S`SaSbScSdSeSfSgShSiSj(B")
("eor" "$(CSk(B")
("ejr" "$(CSlSm(B")
("eh" "$(CSnSoSpSqSrSsStSuSvSwSxSySzS{S|S}S~T!T"T#T$T%T&T'T(T)T*T+T,T-T.T/T0T1T2T3T4T5T6T7(B")
("ehr" "$(CT8T9T:T;T<T=T>T?T@TA(B")
("ehs" "$(CTBTCTDTETFTGTHTITJTK(B")
("ehf" "$(CTLTM(B")
("ehd" "$(CTNTOTPTQTRTSTTTUTVTWTXTYTZT[T\T]T^(B")
("en" "$(CT_T`TaTbTcTdTeTfTgThTi(B")
("ens" "$(CTjTkTlTmTnTo(B")
("emr" "$(CTp(B")
("emd" "$(CTqTrTsTtTuTvTwTxTy(B")
("fk" "$(CTzT{T|T}T~U!U"U#U$(B")
("fkr" "$(CU%U&U'U(U)U*U+U,U-(B")
("fks" "$(CU.U/U0U1U2U3U4U5U6(B")
("fkf" "$(CU7U8(B")
("fka" "$(CU9U:U;U<U=U>U?U@UAUB(B")
("fkq" "$(CUCUDUE(B")
("fkd" "$(CUFUGUHUIUJUKULUM(B")
("fo" "$(CUNUOUPUQ(B")
("fod" "$(CUR(B")
("fir" "$(CUSUT(B")
("fid" "$(CUUUVUWUXUYUZU[U\U]U^U_U`Ua(B")
("fu" "$(CUbUcUdUeUfUgUhUiUjUkUlUmUnUoUpUqUrUs(B")
("fur" "$(CUtUuUvUwUxUyUz(B")
("fus" "$(CU{U|U}U~V!V"V#V$V%V&V'V((B")
("fuf" "$(CV)V*V+V,V-V.(B")
("fua" "$(CV/V0V1V2V3(B")
("fuq" "$(CV4(B")
("fud" "$(CV5V6V7V8V9V:V;V<V=V>V?V@VAVBVCVDVEVF(B")
("fP" "$(CVGVHVIVJVK(B")
("fh" "$(CVLVMVNVOVPVQVRVSVTVUVVVWVXVYVZV[V\V](B")
("fhr" "$(CV^V_V`VaVbVcVd(B")
("fhs" "$(CVe(B")
("fhd" "$(CVfVgVhViVjVkVl(B")
("fhl" "$(CVmVnVoVpVqVrVsVt(B")
("fy" "$(CVuVvVwVxVyVzV{V|V}V~W!W"(B")
("fyd" "$(CW#(B")
("fn" "$(CW$W%W&W'W(W)W*W+W,W-W.W/W0(B")
("fb" "$(CW1W2W3W4W5W6W7W8W9W:W;W<W=W>(B")
("fbr" "$(CW?W@WA(B")
("fbs" "$(CWBWCWDWEWFWG(B")
("fbf" "$(CWHWIWJWK(B")
("fbd" "$(CWL(B")
("fmr" "$(CWMWN(B")
("fma" "$(CWO(B")
("fmd" "$(CWPWQWRWSWTWU(B")
("fl" "$(CWVWWWXWYWZW[W\W]W^W_W`WaWbWcWdWeWfWgWhWiWjWkWlWmWnWo(B")
("fls" "$(CWpWqWrWsWtWuWvWwWx(B")
("fla" "$(CWyWzW{W|W}(B")
("flq" "$(CW~X!X"X#(B")
("ak" "$(CX$X%X&X'X(X)X*X+(B")
("akr" "$(CX,X-X.X/X0X1(B")
("aks" "$(CX2X3X4X5X6X7X8X9X:X;X<X=X>X?X@XAXBXCXD(B")
("akf" "$(CXEXFXGXHXIXJXK(B")
("akd" "$(CXLXMXNXOXPXQXRXSXTXUXVXW(B")
("ao" "$(CXXXYXZX[X\X]X^X_X`XaXbXcXdXe(B")
("aor" "$(CXfXgXhXiXj(B")
("aod" "$(CXkXlXmXnXoXp(B")
("aur" "$(CXqXr(B")
("aus" "$(CXsXtXuXvXwXxXyXzX{X|X}(B")
("auf" "$(CX~Y!(B")
("aud" "$(CY"Y#Y$Y%Y&Y'Y(Y)Y*Y+Y,Y-Y.Y/Y0(B")
("aP" "$(CY1(B")
("ah" "$(CY2Y3Y4Y5Y6Y7Y8Y9Y:Y;Y<Y=Y>Y?Y@YAYBYCYDYEYFYGYHYI(B")
("ahr" "$(CYJYKYLYMYNYOYP(B")
("ahf" "$(CYQYR(B")
("ahd" "$(CYSYTYU(B")
("ay" "$(CYVYWYXYYYZY[Y\Y]Y^Y_Y`Ya(B")
("an" "$(CYbYcYdYeYfYgYhYiYjYkYlYmYnYoYpYqYrYsYtYuYvYw(B")
("anr" "$(CYxYy(B")
("ans" "$(CYzY{Y|Y}Y~Z!Z"Z#Z$Z%Z&Z'(B")
("anf" "$(CZ(Z)Z*(B")
("al" "$(CZ+Z,Z-Z.Z/Z0Z1Z2Z3Z4Z5Z6Z7Z8Z9Z:Z;Z<Z=(B")
("als" "$(CZ>Z?Z@ZAZBZCZDZEZFZGZHZIZJ(B")
("alf" "$(CZKZLZM(B")
("qkr" "$(CZNZOZPZQZRZSZTZUZVZWZXZYZZZ[Z\Z]Z^Z_Z`(B")
("qks" "$(CZaZbZcZdZeZfZgZhZiZjZkZlZmZnZoZpZqZrZsZtZuZvZwZxZy(B")
("qkf" "$(CZzZ{Z|Z}Z~[!["[#[$[%[&(B")
("qkd" "$(C['[([)[*[+[,[-[.[/[0[1[2[3[4[5[6[7[8[9[:[;[<[=[>[?[@[A[B(B")
("qo" "$(C[C[D[E[F[G[H[I[J[K[L[M[N[O[P[Q[R[S[T[U[V(B")
("qor" "$(C[W[X[Y[Z[[[\[][^(B")
("qjs" "$(C[_[`[a[b[c[d[e[f[g[h(B")
("qjf" "$(C[i[j[k[l(B")
("qja" "$(C[m[n[o[p[q[r[s[t[u(B")
("qjq" "$(C[v[w(B")
("qur" "$(C[x[y[z[{[|[}[~\!\"\#\$(B")
("qus" "$(C\%\&\'\(\)\*\+(B")
("quf" "$(C\,\-\.\/(B")
("qud" "$(C\0\1\2\3\4\5\6\7\8\9\:\;\<\=\>\?\@(B")
("qh" "$(C\A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P(B")
("qhr" "$(C\Q\R\S\T\U\V\W\X\Y\Z\[\\\]\^\_\`\a(B")
("qhs" "$(C\b(B")
("qhf" "$(C\c(B")
("qhd" "$(C\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s(B")
("qn" "$(C\t\u\v\w\x\y\z\{\|\}\~]!]"]#]$]%]&]'](])]*]+],]-].]/]0]1]2]3]4]5]6]7]8]9]:];]<]=]>]?]@(B")
("qnr" "$(C]A(B")
("qns" "$(C]B]C]D]E]F]G]H]I]J]K]L]M]N]O]P]Q]R]S]T(B")
("qnf" "$(C]U]V]W]X]Y(B")
("qnd" "$(C]Z][]\]]]^]_(B")
("ql" "$(C]`]a]b]c]d]e]f]g]h]i]j]k]l]m]n]o]p]q]r]s]t]u]v]w]x]y]z]{]|]}]~^!^"^#^$^%^&^'^(^)^*^+^,(B")
("qls" "$(C^-^.^/^0^1^2^3^4^5^6^7^8^9^:(B")
("qld" "$(C^;^<^=^>(B")
("tk" "$(C^?^@^A^B^C^D^E^F^G^H^I^J^K^L^M^N^O^P^Q^R^S^T^U^V^W^X^Y^Z^[^\^]^^^_^`^a^b^c^d^e^f^g^h^i^j^k^l^m^n^o^p^q^r^s^t^u^v^w^x^y^z(B")
("tkr" "$(C^{^|^}^~(B")
("tks" "$(C_!_"_#_$_%_&_'_(_)_*_+_,(B")
("tkf" "$(C_-_._/_0_1(B")
("tka" "$(C_2_3_4_5_6_7_8_9(B")
("tkq" "$(C_:_;_<_=(B")
("tkd" "$(C_>_?_@_A_B_C_D_E_F_G_H_I_J_K_L_M_N_O_P_Q_R_S_T_U_V_W_X_Y_Z_[_\(B")
("to" "$(C_]_^__(B")
("tor" "$(C_`_a_b_c_d(B")
("tod" "$(C_e_f_g_h_i(B")
("tj" "$(C_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z_{_|_}_~`!`"`#`$`%`&`'`(`)(B")
("tjr" "$(C`*`+`,`-`.`/`0`1`2`3`4`5`6`7`8(B")
("tjs" "$(C`9`:`;`<`=`>`?`@`A`B`C`D`E`F`G`H`I`J`K`L`M`N`O`P`Q`R`S`T`U`V`W`X(B")
("tjf" "$(C`Y`Z`[`\`]`^`_```a`b`c`d`e(B")
("tja" "$(C`f`g`h`i`j`k`l`m(B")
("tjq" "$(C`n`o`p`q(B")
("tjd" "$(C`r`s`t`u`v`w`x`y`z`{`|`}`~a!a"a#a$a%(B")
("tp" "$(Ca&a'a(a)a*a+a,a-a.(B")
("th" "$(Ca/a0a1a2a3a4a5a6a7a8a9a:a;a<a=a>a?a@aAaBaCaDaEaFaGaHaIaJaKaLaMaNaOaPaQaRaS(B")
("thr" "$(CaTaUaVaWaXaYaZa[a\(B")
("ths" "$(Ca]a^a_a`aaab(B")
("thf" "$(Cac(B")
("thd" "$(Cadaeafagahaiajak(B")
("tho" "$(Calamanaoap(B")
("thl" "$(Caqar(B")
("tn" "$(Casatauavawaxayaza{a|a}a~b!b"b#b$b%b&b'b(b)b*b+b,b-b.b/b0b1b2b3b4b5b6b7b8b9b:b;b<b=b>b?b@bAbBbCbDbEbFbGbHbIbJbKbLbMbNbObPbQ(B")
("tnr" "$(CbRbSbTbUbVbWbXbYbZb[b\b](B")
("tns" "$(Cb^b_b`babbbcbdbebfbgbhbibjbkblbmbnbobpbqbrbsbtbubvbwbx(B")
("tnf" "$(Cbybzb{b|(B")
("tnd" "$(Cb}b~c!(B")
("tmf" "$(Cc"c#c$(B")
("tmq" "$(Cc%c&c'c(c)(B")
("tmd" "$(Cc*c+c,c-c.c/c0c1c2c3(B")
("tl" "$(Cc4c5c6c7c8c9c:c;c<c=c>c?c@cAcBcCcDcEcFcGcHcIcJcKcLcMcNcO(B")
("tlr" "$(CcPcQcRcScTcUcVcWcXcYcZc[c\c]c^(B")
("tls" "$(Cc_c`cacbcccdcecfcgchcicjckclcmcncocpcqcrcsctcucv(B")
("tlf" "$(Ccwcxcycz(B")
("tla" "$(Cc{c|c}c~d!d"d#d$d%d&(B")
("tlq" "$(Cd'd(d)(B")
("Tkd" "$(Cd*(B")
("Tl" "$(Cd+(B")
("dk" "$(Cd,d-d.d/d0d1d2d3d4d5d6d7d8d9d:d;d<d=(B")
("dkr" "$(Cd>d?d@dAdBdCdDdEdFdGdHdIdJdK(B")
("dks" "$(CdLdMdNdOdPdQdRdSdTdU(B")
("dkf" "$(CdVdWdXdY(B")
("dka" "$(CdZd[d\d]d^d_d`da(B")
("dkq" "$(Cdbdcddde(B")
("dkd" "$(Cdfdgdhdidjdkdl(B")
("do" "$(Cdmdndodpdqdrdsdtdudvdw(B")
("dor" "$(Cdxdydzd{d|d}d~(B")
("dod" "$(Ce!e"e#e$(B")
("di" "$(Ce%e&e'e(e)e*e+e,e-e.e/(B")
("dir" "$(Ce0e1e2e3e4e5e6e7e8(B")
("did" "$(Ce9e:e;e<e=e>e?e@eAeBeCeDeEeFeGeHeIeJeKeLeMeNeOePeQeReSeTeUeVeW(B")
("dj" "$(CeXeYeZe[e\e]e^e_e`ea(B")
("djr" "$(Cebecedeeef(B")
("djs" "$(Cegeheiejekel(B")
("djf" "$(Cemen(B")
("dja" "$(Ceoepeqereset(B")
("djq" "$(Ceuev(B")
("dps" "$(Cew(B")
("du" "$(Cexeyeze{e|e}e~f!f"f#f$f%f&f'f(f)f*f+f,f-f.f/f0f1(B")
("dur" "$(Cf2f3f4f5f6f7f8f9f:f;f<f=f>(B")
("dus" "$(Cf?f@fAfBfCfDfEfFfGfHfIfJfKfLfMfNfOfPfQfRfSfTfUfVfWfXfYfZf[f\f]f^f_f`fafbfcfdfefffgfhfi(B")
("duf" "$(Cfjfkflfmfnfofpfqfrfs(B")
("dua" "$(Cftfufvfwfxfyfzf{f|f}f~g!g"g#g$(B")
("duq" "$(Cg%g&g'g((B")
("dud" "$(Cg)g*g+g,g-g.g/g0g1g2g3g4g5g6g7g8g9g:g;g<g=g>g?g@gAgBgCgDgEgFgGgHgIgJgKgLgMgNgOgP(B")
("dP" "$(CgQgRgSgTgUgVgWgXgYgZg[g\g]g^g_g`gagbgcgdgegfgggh(B")
("dh" "$(Cgigjgkglgmgngogpgqgrgsgtgugvgwgxgygzg{g|g}g~h!h"h#h$h%h&h'h((B")
("dhr" "$(Ch)h*h+h,h-(B")
("dhs" "$(Ch.h/h0h1h2h3(B")
("dhf" "$(Ch4(B")
("dhd" "$(Ch5h6h7h8h9h:h;h<h=(B")
("dhk" "$(Ch>h?h@hAhBhChDhE(B")
("dhks" "$(ChFhGhHhIhJhKhLhMhNhOhPhQhRhShThUhVhW(B")
("dhkf" "$(ChX(B")
("dhkd" "$(ChYhZh[h\h](B")
("dho" "$(Ch^h_h`ha(B")
("dhl" "$(Chbhchdhehf(B")
("dy" "$(Chghhhihjhkhlhmhnhohphqhrhshthuhvhwhxhyhzh{h|h}h~i!i"i#i$i%i&i'i(i)i*i+i,i-i.(B")
("dyr" "$(Ci/i0i1i2i3i4(B")
("dyd" "$(Ci5i6i7i8i9i:i;i<i=i>i?i@iAiBiCiDiEiFiGiHiIiJiKiL(B")
("dn" "$(CiMiNiOiPiQiRiSiTiUiViWiXiYiZi[i\i]i^i_i`iaibicidieifigihiiijikil(B")
("dnr" "$(Ciminioipiqirisitiu(B")
("dns" "$(Civiwixiyizi{i|i}i~j!j"j#j$(B")
("dnf" "$(Cj%j&j'(B")
("dnd" "$(Cj(j)(B")
("dnjs" "$(Cj*j+j,j-j.j/j0j1j2j3j4j5j6j7j8j9j:j;j<j=j>j?j@jAjBjCjD(B")
("dnjf" "$(CjEjFjG(B")
("dnl" "$(CjHjIjJjKjLjMjNjOjPjQjRjSjTjUjVjWjXjYjZj[j\j]j^j_j`(B")
("db" "$(Cjajbjcjdjejfjgjhjijjjkjljmjnjojpjqjrjsjtjujvjwjxjyjzj{j|j}j~k!k"k#k$k%k&k'k(k)k*k+k,k-k.k/k0k1k2k3k4k5k6k7k8k9k:(B")
("dbr" "$(Ck;k<k=k>k?k@kA(B")
("dbs" "$(CkBkCkDkEkFkGkHkIkJkKkLkMkN(B")
("dbf" "$(CkOkPkQkRkS(B")
("dbd" "$(CkTkUkVkWkX(B")
("dms" "$(CkYkZk[k\k]k^k_(B")
("dmf" "$(Ck`(B")
("dma" "$(Ckakbkckdkekf(B")
("dmq" "$(Ckgkhki(B")
("dmd" "$(Ckjkkklkm(B")
("dml" "$(Cknkokpkqkrksktkukvkwkxkykzk{k|k}k~l!l"(B")
("dl" "$(Cl#l$l%l&l'l(l)l*l+l,l-l.l/l0l1l2l3l4l5l6l7l8l9l:l;l<l=l>l?l@lAlBlClDlElFlGlH(B")
("dlr" "$(ClIlJlKlLlMlNlOlP(B")
("dls" "$(ClQlRlSlTlUlVlWlXlYlZl[l\l]l^l_l`lalblcldlelflglh(B")
("dlf" "$(Cliljlklllmlnlolplq(B")
("dla" "$(Clrlsltlulvlwlxlylzl{l|(B")
("dlq" "$(Cl}l~m!m"m#(B")
("dld" "$(Cm$m%m&m'(B")
("wk" "$(Cm(m)m*m+m,m-m.m/m0m1m2m3m4m5m6m7m8m9m:m;m<m=m>m?m@mA(B")
("wkr" "$(CmBmCmDmEmFmGmHmImJmKmLmMmN(B")
("wks" "$(CmOmPmQmRmS(B")
("wka" "$(CmTmUmVmWmXmY(B")
("wkq" "$(CmZ(B")
("wkd" "$(Cm[m\m]m^m_m`mambmcmdmemfmgmhmimjmkmlmmmnmompmqmrmsmtmumvmwmxmymzm{m|m}m~n!(B")
("wo" "$(Cn"n#n$n%n&n'n(n)n*n+n,n-n.n/n0n1n2(B")
("wod" "$(Cn3n4n5n6(B")
("wj" "$(Cn7n8n9n:n;n<n=n>n?n@nAnBnCnDnEnFnGnHnInJnKnLnMnNnOnPnQnR(B")
("wjr" "$(CnSnTnUnVnWnXnYnZn[n\n]n^n_n`nanbncndnenfngnhninjnk(B")
("wjs" "$(Cnlnmnnnonpnqnrnsntnunvnwnxnynzn{n|n}n~o!o"o#o$o%o&o'o(o)o*o+o,o-o.o/o0o1o2o3o4o5o6(B")
("wjf" "$(Co7o8o9o:o;o<o=o>(B")
("wja" "$(Co?o@oAoBoCoDoEoFoG(B")
("wjq" "$(CoHoIoJ(B")
("wjd" "$(CoKoLoMoNoOoPoQoRoSoToUoVoWoXoYoZo[o\o]o^o_o`oaobocodoeofogohoiojokolomonooopoqorosotouovowoxoyozo{o|o}o~p!p"p#(B")
("wp" "$(Cp$p%p&p'p(p)p*p+p,p-p.p/p0p1p2p3p4p5p6p7p8p9p:(B")
("wh" "$(Cp;p<p=p>p?p@pApBpCpDpEpFpGpHpIpJpKpLpMpNpOpPpQpRpSpTpUpVpWpXpYpZp[p\p]p^p_p`papbpcpdpepfpgph(B")
("whr" "$(Cpipjpkpl(B")
("whs" "$(Cpmpn(B")
("whf" "$(Cpopppq(B")
("whd" "$(Cprpsptpupvpwpxpypzp{p|p}p~q!q"q#q$(B")
("whk" "$(Cq%q&q'q(q)(B")
("whl" "$(Cq*(B")
("wn" "$(Cq+q,q-q.q/q0q1q2q3q4q5q6q7q8q9q:q;q<q=q>q?q@qAqBqCqDqEqFqGqHqIqJqKqLqMqNqOqPqQqR(B")
("wnr" "$(CqSqT(B")
("wns" "$(CqUqVqWqXqYqZq[q\q]q^q_q`qaqbqcqdqeqfqg(B")
("wnf" "$(Cqh(B")
("wnd" "$(Cqiqjqkql(B")
("wmr" "$(Cqm(B")
("wmf" "$(Cqn(B")
("wmq" "$(Cqoqpqq(B")
("wmd" "$(Cqrqsqtquqvqwqxqyqzq{q|(B")
("wl" "$(Cq}q~r!r"r#r$r%r&r'r(r)r*r+r,r-r.r/r0r1r2r3r4r5r6r7r8r9r:r;r<r=r>r?r@(B")
("wlr" "$(CrArBrCrDrE(B")
("wls" "$(CrFrGrHrIrJrKrLrMrNrOrPrQrRrSrTrUrVrWrXrYrZr[r\r]r^r_r`rarbrcrdrerfrgrh(B")
("wlf" "$(Crirjrkrlrmrnrorprqrrrsrtrurvrw(B")
("wla" "$(Crxry(B")
("wlq" "$(Crzr{r|r}r~s!s"(B")
("wld" "$(Cs#s$s%(B")
("ck" "$(Cs&s's(s)s*s+s,s-s.s/s0s1s2s3s4(B")
("ckr" "$(Cs5s6s7s8s9s:s;(B")
("cks" "$(Cs<s=s>s?s@sAsBsCsDsEsFsGsHsIsJ(B")
("ckf" "$(CsKsLsMsNsO(B")
("cka" "$(CsPsQsRsSsTsUsVsWsXsY(B")
("ckd" "$(CsZs[s\s]s^s_s`sasbscsdsesfsgshsisjskslsmsnso(B")
("co" "$(Cspsqsrssstsusvswsxsyszs{(B")
("cor" "$(Cs|s}s~t!(B")
("cj" "$(Ct"t#t$t%(B")
("cjr" "$(Ct&t't(t)t*t+t,t-t.t/t0t1t2t3t4(B")
("cjs" "$(Ct5t6t7t8t9t:t;t<t=t>t?t@tAtBtCtDtEtFtG(B")
("cjf" "$(CtHtItJtKtLtMtNtOtPtQ(B")
("cja" "$(CtRtStTtUtVtWtXtYtZt[(B")
("cjq" "$(Ct\t]t^t_t`tatbtctdte(B")
("cjd" "$(Ctftgthtitjtktltm(B")
("cp" "$(Ctntotptqtrtstttutvtw(B")
("ch" "$(Ctxtytzt{t|t}t~u!u"u#u$u%u&u'u(u)u*u+u,u-u.u/u0u1u2u3u4(B")
("chr" "$(Cu5u6u7u8u9u:(B")
("chs" "$(Cu;u<u=u>(B")
("chd" "$(Cu?u@uAuBuCuDuEuFuGuH(B")
("chkf" "$(CuI(B")
("chl" "$(CuJuKuL(B")
("cn" "$(CuMuNuOuPuQuRuSuTuUuVuWuXuYuZu[u\u]u^u_u`uaubuc(B")
("cnr" "$(Cudueufuguhuiujukulumunuo(B")
("cns" "$(Cupuqur(B")
("cnf" "$(Cusutuu(B")
("cnd" "$(Cuvuwuxuyuzu{(B")
("cnp" "$(Cu|u}u~v!(B")
("cnl" "$(Cv"v#v$v%v&v'v(v)v*v+v,v-v.v/(B")
("cmr" "$(Cv0v1v2v3v4(B")
("cmd" "$(Cv5(B")
("cl" "$(Cv6v7v8v9v:v;v<v=v>v?v@vAvBvCvDvEvFvGvHvIvJvKvLvM(B")
("clr" "$(CvNvOvP(B")
("cls" "$(CvQ(B")
("clf" "$(CvRvSvT(B")
("cla" "$(CvUvVvWvXvYvZv[v\v](B")
("clq" "$(Cv^(B")
("cld" "$(Cv_v`(B")
("zho" "$(Cva(B")
("xk" "$(Cvbvcvdvevfvgvhvivjvkvlvmvnvo(B")
("xkr" "$(Cvpvqvrvsvtvuvvvwvxvyvzv{v|v}v~w!(B")
("xks" "$(Cw"w#w$w%w&w'w(w)w*w+(B")
("xkf" "$(Cw,w-(B")
("xka" "$(Cw.w/w0w1(B")
("xkq" "$(Cw2w3w4(B")
("xkd" "$(Cw5w6w7w8w9(B")
("xo" "$(Cw:w;w<w=w>w?w@wAwBwCwDwEwFwG(B")
("xor" "$(CwHwIwJ(B")
("xod" "$(CwK(B")
("xj" "$(CwL(B")
("xh" "$(CwMwNwOwP(B")
("xhd" "$(CwQwRwSwTwUwVwW(B")
("xhl" "$(CwXwYwZw[w\w](B")
("xn" "$(Cw^w_w`wawbwc(B")
("xmr" "$(Cwdwe(B")
("xma" "$(Cwf(B")
("vk" "$(Cwgwhwiwjwkwlwmwnwowpwqwrwswtwuwv(B")
("vks" "$(Cwwwxwywzw{w|w}w~x!(B")
("vkf" "$(Cx"x#x$(B")
("vo" "$(Cx%x&x'x(x)x*x+x,x-x.x/(B")
("vod" "$(Cx0x1x2x3(B")
("vir" "$(Cx4(B")
("vus" "$(Cx5x6x7x8x9x:x;x<x=x>(B")
("vua" "$(Cx?(B")
("vud" "$(Cx@xAxBxCxD(B")
("vP" "$(CxExFxGxHxIxJxKxLxMxN(B")
("vh" "$(CxOxPxQxRxSxTxUxVxWxXxYxZx[x\x]x^x_x`xaxbxcxdxexfxgxhxixj(B")
("vhr" "$(Cxkxlxmxnxoxp(B")
("vy" "$(Cxqxrxsxtxuxvxwxxxyxzx{x|x}x~(B")
("vna" "$(Cy!y"(B")
("vnd" "$(Cy#y$y%y&y'(B")
("vl" "$(Cy(y)y*y+y,y-y.(B")
("vlf" "$(Cy/y0y1y2y3y4y5y6y7y8(B")
("vlq" "$(Cy9y:(B")
("gk" "$(Cy;y<y=y>y?y@yAyByCyDyEyFyGyH(B")
("gkr" "$(CyIyJyKyLyM(B")
("gks" "$(CyNyOyPyQyRySyTyUyVyWyXyYyZy[(B")
("gkf" "$(Cy\y](B")
("gka" "$(Cy^y_y`yaybycydyeyfygyhyi(B")
("gkq" "$(Cyjykylymynyoyp(B")
("gkd" "$(Cyqyrysytyuyvywyxyyyzy{y|y}y~z!z"z#(B")
("go" "$(Cz$z%z&z'z(z)z*z+z,z-z.z/z0z1z2z3z4z5(B")
("gor" "$(Cz6z7(B")
("god" "$(Cz8z9z:z;z<(B")
("gid" "$(Cz=z>z?z@zAzBzCzDzE(B")
("gj" "$(CzFzGzHzI(B")
("gjs" "$(CzJzKzLzM(B")
("gjf" "$(CzN(B")
("gja" "$(CzOzP(B")
("gur" "$(CzQzRzSzT(B")
("gus" "$(CzUzVzWzXzYzZz[z\z]z^z_z`zazbzczdzezfzgzhzi(B")
("guf" "$(Czjzkzlzm(B")
("gua" "$(Czn(B")
("guq" "$(Czozpzqzrzsztzuzvzwzxzyzz(B")
("gud" "$(Cz{z|z}z~{!{"{#{${%{&{'{({){*{+{,{-{.{/{0(B")
("gP" "$(C{1{2{3{4{5{6{7{8{9(B")
("gh" "$(C{:{;{<{={>{?{@{A{B{C{D{E{F{G{H{I{J{K{L{M{N{O{P{Q{R{S{T{U{V{W{X{Y{Z{[{\{]{^{_{`{a{b(B")
("ghr" "$(C{c{d{e(B")
("ghs" "$(C{f{g{h{i{j{k(B")
("ghf" "$(C{l{m{n(B")
("ghd" "$(C{o{p{q{r{s{t{u{v{w{x(B")
("ghk" "$(C{y{z{{{|{}{~|!|"|#|$|%|&|'|((B")
("ghkr" "$(C|)|*|+|,|-|.(B")
("ghks" "$(C|/|0|1|2|3|4|5|6|7|8|9|:|;|<|=|>|?(B")
("ghkf" "$(C|@|A|B|C|D(B")
("ghkd" "$(C|E|F|G|H|I|J|K|L|M|N|O|P|Q|R|S|T|U|V|W|X|Y|Z|[|\(B")
("ghl" "$(C|]|^|_|`|a|b|c|d|e|f|g|h|i|j|k|l|m|n|o|p(B")
("ghlr" "$(C|q|r(B")
("ghld" "$(C|s|t|u(B")
("gy" "$(C|v|w|x|y|z|{|||}|~}!}"}#}$(B")
("gn" "$(C}%}&}'}(})}*}+},}-}.}/}0}1(B")
("gns" "$(C}2}3}4}5}6}7}8}9}:};(B")
("gnd" "$(C}<(B")
("gnjs" "$(C}=}>}?}@(B")
("gnp" "$(C}A}B}C(B")
("gnl" "$(C}D}E}F}G}H}I}J}K(B")
("gb" "$(C}L}M}N}O}P(B")
("gbf" "$(C}Q}R}S(B")
("gbd" "$(C}T}U}V}W}X(B")
("gmr" "$(C}Y(B")
("gms" "$(C}Z}[}\}](B")
("gmf" "$(C}^}_}`}a(B")
("gma" "$(C}b}c}d(B")
("gmq" "$(C}e}f}g}h(B")
("gmd" "$(C}i(B")
("gml" "$(C}j}k}l}m}n}o}p}q}r}s}t}u}v}w}x}y}z}{}|}}(B")
("glf" "$(C}~(B"))
("rk" "伽佳假價加可呵哥嘉嫁家暇架枷柯歌珂痂稼苛茄街袈訶賈跏軻迦駕")
("rkr" "刻却各恪慤殼珏脚覺角閣")
("rks" "侃刊墾奸姦干幹懇揀杆柬桿澗癎看磵稈竿簡肝艮艱諫間")
("rkf" "乫喝曷渴碣竭葛褐蝎鞨")
("rka" "勘坎堪嵌感憾戡敢柑橄減甘疳監瞰紺邯鑑鑒龕")
("rkq" "匣岬甲胛鉀閘")
("rkd" "剛堈姜岡崗康强彊慷江畺疆糠絳綱羌腔舡薑襁講鋼降鱇")
("ro" "介价個凱塏愷愾慨改槪漑疥皆盖箇芥蓋豈鎧開")
("ror" "喀客")
("rod" "坑更粳羹")
("rir" "")
("rj" "倨去居巨拒据據擧渠炬祛距踞車遽鉅鋸")
("rjs" "乾件健巾建愆楗腱虔蹇鍵騫")
("rjf" "乞傑杰桀")
("rja" "儉劍劒檢瞼鈐黔")
("rjq" "劫怯迲")
("rp" "偈憩揭")
("rur" "擊格檄激膈覡隔")
("rus" "堅牽犬甄絹繭肩見譴遣鵑")
("ruf" "抉決潔結缺訣")
("rua" "兼慊箝謙鉗鎌")
("rud" "京俓倞傾儆勁勍卿坰境庚徑慶憬擎敬景暻更梗涇炅烱璟璥瓊痙硬磬竟競絅經耕耿脛莖警輕逕鏡頃頸驚鯨")
("rP" "係啓堺契季屆悸戒桂械棨溪界癸磎稽系繫繼計誡谿階鷄")
("rh" "古叩告呱固姑孤尻庫拷攷故敲暠枯槁沽痼皐睾稿羔考股膏苦苽菰藁蠱袴誥賈辜錮雇顧高鼓")
("rhr" "哭斛曲梏穀谷鵠")
("rhs" "困坤崑昆梱棍滾琨袞鯤")
("rhf" "汨滑骨")
("rhd" "供公共功孔工恐恭拱控攻珙空蚣貢鞏")
("rhw" "")
("rhk" "寡戈果瓜科菓誇課跨過鍋顆")
("rhkr" "廓槨藿郭")
("rhks" "串冠官寬慣棺款灌琯瓘管罐菅觀貫關館")
("rhkf" "刮恝括适")
("rhkd" "侊光匡壙廣曠洸炚狂珖筐胱鑛")
("rho" "卦掛罫")
("rhl" "乖傀塊壞怪愧拐槐魁")
("rhld" "宏紘肱轟")
("ry" "交僑咬喬嬌嶠巧攪敎校橋狡皎矯絞翹膠蕎蛟較轎郊餃驕鮫")
("rn" "丘久九仇俱具勾區口句咎嘔坵垢寇嶇廐懼拘救枸柩構歐毆毬求溝灸狗玖球瞿矩究絿耉臼舅舊苟衢謳購軀逑邱鉤銶駒驅鳩鷗龜")
("rnr" "國局菊鞠鞫麴")
("rns" "君窘群裙軍郡")
("rnf" "堀屈掘窟")
("rnd" "宮弓穹窮芎躬")
("rnjs" "倦券勸卷圈拳捲權淃眷")
("rnjf" "厥獗蕨蹶闕")
("rnp" "机櫃潰詭軌饋")
("rnl" "句晷歸貴鬼龜")
("rb" "叫圭奎揆槻珪硅窺竅糾葵規赳逵閨")
("rbs" "勻均畇筠菌鈞龜")
("rbf" "")
("rmr" "克剋劇戟棘極隙")
("rms" "僅劤勤懃斤根槿瑾筋芹菫覲謹近饉")
("rmf" "")
("rma" "今妗擒昑檎琴禁禽芩衾衿襟金錦")
("rmq" "伋及急扱汲級給")
("rmd" "亘兢矜肯")
("rl" "企伎其冀嗜器圻基埼夔奇妓寄岐崎己幾忌技旗旣朞期杞棋棄機欺氣汽沂淇玘琦琪璂璣畸畿碁磯祁祇祈祺箕紀綺羈耆耭肌記譏豈起錡錤飢饑騎騏驥麒")
("rls" "")
("rlf" "佶吉拮桔")
("rla" "")
("Rlr" "")
("sk" "儺喇奈娜懦懶拏拿癩羅蘿螺裸邏那")
("skr" "樂洛烙珞落諾酪駱")
("sks" "亂卵暖欄煖爛蘭難鸞")
("skf" "捏捺")
("ska" "南嵐枏楠湳濫男藍襤")
("skq" "拉納臘蠟衲")
("skd" "囊娘廊朗浪狼郎")
("so" "乃來內奈柰耐")
("sod" "")
("su" "")
("sus" "年撚秊")
("sua" "念恬拈捻")
("sud" "寧寗")
("sh" "努勞奴弩怒擄櫓爐瑙盧老蘆虜路露駑魯鷺")
("shr" "碌祿綠菉錄鹿")
("shs" "")
("shd" "壟弄濃籠聾膿農")
("shl" "惱牢磊腦賂雷")
("sy" "尿")
("sn" "壘屢樓淚漏累縷陋")
("sns" "")
("snf" "")
("sb" "杻紐")
("smr" "勒肋")
("sma" "")
("smd" "凌稜綾能菱陵")
("sl" "尼泥")
("slr" "匿溺")
("ek" "多茶")
("eks" "丹亶但單團壇彖斷旦檀段湍短端簞緞蛋袒鄲鍛")
("ekf" "撻澾獺疸達")
("eka" "啖坍憺擔曇淡湛潭澹痰聃膽蕁覃談譚錟")
("ekq" "沓畓答踏遝")
("ekd" "唐堂塘幢戇撞棠當糖螳黨")
("eo" "代垈坮大對岱帶待戴擡玳臺袋貸隊黛")
("eor" "")
("ejr" "德悳")
("eh" "倒刀到圖堵塗導屠島嶋度徒悼挑掉搗桃棹櫂淘渡滔濤燾盜睹禱稻萄覩賭跳蹈逃途道都鍍陶韜")
("ehr" "毒瀆牘犢獨督禿篤纛讀")
("ehs" "墩惇敦旽暾沌焞燉豚頓")
("ehf" "乭突")
("ehd" "仝冬凍動同憧東桐棟洞潼疼瞳童胴董銅")
("en" "兜斗杜枓痘竇荳讀豆逗頭")
("ens" "屯臀芚遁遯鈍")
("emr" "")
("emd" "嶝橙燈登等藤謄鄧騰")
("fk" "喇懶拏癩羅蘿螺裸邏")
("fkr" "樂洛烙珞絡落諾酪駱")
("fks" "丹亂卵欄欒瀾爛蘭鸞")
("fkf" "剌辣")
("fka" "嵐擥攬欖濫籃纜藍襤覽")
("fkq" "拉臘蠟")
("fkd" "廊朗浪狼琅瑯螂郞")
("fo" "來崍徠萊")
("fod" "")
("fir" "掠略")
("fid" "亮倆兩凉梁樑粮粱糧良諒輛量")
("fu" "侶儷勵呂廬慮戾旅櫚濾礪藜蠣閭驢驪麗黎")
("fur" "力曆歷瀝礫轢靂")
("fus" "憐戀攣漣煉璉練聯蓮輦連鍊")
("fuf" "冽列劣洌烈裂")
("fua" "廉斂殮濂簾")
("fuq" "")
("fud" "令伶囹寧岺嶺怜玲笭羚翎聆逞鈴零靈領齡")
("fP" "例澧禮醴隷")
("fh" "勞怒撈擄櫓潞瀘爐盧老蘆虜路輅露魯鷺鹵")
("fhr" "碌祿綠菉錄鹿麓")
("fhs" "")
("fhd" "壟弄朧瀧瓏籠聾")
("fhl" "儡瀨牢磊賂賚賴雷")
("fy" "了僚寮廖料燎療瞭聊蓼遼鬧")
("fyd" "")
("fn" "壘婁屢樓淚漏瘻累縷蔞褸鏤陋")
("fb" "劉旒柳榴流溜瀏琉瑠留瘤硫謬類")
("fbr" "六戮陸")
("fbs" "侖倫崙淪綸輪")
("fbf" "律慄栗率")
("fbd" "")
("fmr" "勒肋")
("fma" "")
("fmd" "凌楞稜綾菱陵")
("fl" "俚利厘吏唎履悧李梨浬犁狸理璃異痢籬罹羸莉裏裡里釐離鯉")
("fls" "吝潾燐璘藺躪隣鱗麟")
("fla" "林淋琳臨霖")
("flq" "砬立笠粒")
("ak" "摩瑪痲碼磨馬魔麻")
("akr" "寞幕漠膜莫邈")
("aks" "万卍娩巒彎慢挽晩曼滿漫灣瞞萬蔓蠻輓饅鰻")
("akf" "唜抹末沫茉襪靺")
("akd" "亡妄忘忙望網罔芒茫莽輞邙")
("ao" "埋妹媒寐昧枚梅每煤罵買賣邁魅")
("aor" "脈貊陌驀麥")
("aod" "孟氓猛盲盟萌")
("aur" "冪覓")
("aus" "免冕勉棉沔眄眠綿緬面麵")
("auf" "滅蔑")
("aud" "冥名命明暝椧溟皿瞑茗蓂螟酩銘鳴")
("aP" "")
("ah" "侮冒募姆帽慕摸摹暮某模母毛牟牡瑁眸矛耗芼茅謀謨貌")
("ahr" "木沐牧目睦穆鶩")
("ahf" "歿沒")
("ahd" "夢朦蒙")
("ay" "卯墓妙廟描昴杳渺猫竗苗錨")
("an" "務巫憮懋戊拇撫无楙武毋無珷畝繆舞茂蕪誣貿霧鵡")
("anr" "墨默")
("ans" "們刎吻問文汶紊紋聞蚊門雯")
("anf" "勿沕物")
("al" "味媚尾嵋彌微未梶楣渼湄眉米美薇謎迷靡黴")
("als" "岷悶愍憫敏旻旼民泯玟珉緡閔")
("alf" "密蜜謐")
("qkr" "剝博拍搏撲朴樸泊珀璞箔粕縛膊舶薄迫雹駁")
("qks" "伴半反叛拌搬攀斑槃泮潘班畔瘢盤盼磐磻礬絆般蟠返頒飯")
("qkf" "勃拔撥渤潑發跋醱鉢髮魃")
("qkd" "倣傍坊妨尨幇彷房放方旁昉枋榜滂磅紡肪膀舫芳蒡蚌訪謗邦防龐")
("qo" "倍俳北培徘拜排杯湃焙盃背胚裴裵褙賠輩配陪")
("qor" "伯佰帛柏栢白百魄")
("qjs" "幡樊煩燔番磻繁蕃藩飜")
("qjf" "伐筏罰閥")
("qja" "凡帆梵氾汎泛犯範范")
("qjq" "法琺")
("qur" "僻劈壁擘檗璧癖碧蘗闢霹")
("qus" "便卞弁變辨辯邊")
("quf" "別瞥鱉鼈")
("qud" "丙倂兵屛幷昞昺柄棅炳甁病秉竝輧餠騈")
("qh" "保堡報寶普步洑湺潽珤甫菩補褓譜輔")
("qhr" "伏僕匐卜宓復服福腹茯蔔複覆輹輻馥鰒")
("qhs" "")
("qhf" "")
("qhd" "俸奉封峯峰捧棒烽熢琫縫蓬蜂逢鋒鳳")
("qn" "不付俯傅剖副否咐埠夫婦孚孵富府復扶敷斧浮溥父符簿缶腐腑膚艀芙莩訃負賦賻赴趺部釜阜附駙鳧")
("qnr" "")
("qns" "分吩噴墳奔奮忿憤扮昐汾焚盆粉糞紛芬賁雰")
("qnf" "不佛弗彿拂")
("qnd" "崩朋棚硼繃鵬")
("ql" "丕備匕匪卑妃婢庇悲憊扉批斐枇榧比毖毗毘沸泌琵痺砒碑秕秘粃緋翡肥脾臂菲蜚裨誹譬費鄙非飛鼻")
("qls" "嚬嬪彬斌檳殯浜濱瀕牝玭貧賓頻")
("qld" "憑氷聘騁")
("tk" "乍事些仕伺似使俟僿史司唆嗣四士奢娑寫寺射巳師徙思捨斜斯柶査梭死沙泗渣瀉獅砂社祀祠私篩紗絲肆舍莎蓑蛇裟詐詞謝賜赦辭邪飼駟麝")
("tkr" "削數朔索")
("tks" "傘刪山散汕珊産疝算蒜酸霰")
("tkf" "乷撒殺煞薩")
("tka" "三參杉森渗芟蔘衫")
("tkq" "揷澁鈒颯")
("tkd" "上傷像償商喪嘗孀尙峠常床庠廂想桑橡湘爽牀狀相祥箱翔裳觴詳象賞霜")
("to" "塞璽賽")
("tor" "嗇塞穡索色")
("tod" "牲生甥省笙")
("tj" "墅壻嶼序庶徐恕抒捿敍暑曙書栖棲犀瑞筮絮緖署胥舒薯西誓逝鋤黍鼠")
("tjr" "夕奭席惜昔晳析汐淅潟石碩蓆釋錫")
("tjs" "仙僊先善嬋宣扇敾旋渲煽琁瑄璇璿癬禪線繕羨腺膳船蘚蟬詵跣選銑鐥饍鮮")
("tjf" "卨屑楔泄洩渫舌薛褻設說雪齧")
("tja" "剡暹殲纖蟾贍閃陝")
("tjq" "攝涉燮葉")
("tjd" "城姓宬性惺成星晟猩珹盛省筬聖聲腥誠醒")
("tp" "世勢歲洗稅笹細說貰")
("th" "召嘯塑宵小少巢所掃搔昭梳沼消溯瀟炤燒甦疏疎瘙笑篠簫素紹蔬蕭蘇訴逍遡邵銷韶騷")
("thr" "俗屬束涑粟續謖贖速")
("ths" "孫巽損蓀遜飡")
("thf" "")
("thd" "宋悚松淞訟誦送頌")
("tho" "刷殺灑碎鎖")
("thl" "衰釗")
("tn" "修受嗽囚垂壽嫂守岫峀帥愁戍手授搜收數樹殊水洙漱燧狩獸琇璲瘦睡秀穗竪粹綏綬繡羞脩茱蒐蓚藪袖誰讐輸遂邃酬銖銹隋隧隨雖需須首髓鬚")
("tnr" "叔塾夙孰宿淑潚熟琡璹肅菽")
("tns" "巡徇循恂旬栒楯橓殉洵淳珣盾瞬筍純脣舜荀蓴蕣詢諄醇錞順馴")
("tnf" "戌術述鉥")
("tnd" "崇崧嵩")
("tmf" "瑟膝蝨")
("tmq" "濕拾習褶襲")
("tmd" "丞乘僧勝升承昇繩蠅陞")
("tl" "侍匙嘶始媤尸屎屍市弑恃施是時枾柴猜矢示翅蒔蓍視試詩諡豕豺")
("tlr" "埴寔式息拭植殖湜熄篒蝕識軾食飾")
("tls" "伸侁信呻娠宸愼新晨燼申神紳腎臣莘薪藎蜃訊身辛辰迅")
("tlf" "失室實悉")
("tla" "審尋心沁沈深瀋甚芯諶")
("tlq" "什十拾")
("Tkd" "")
("Tl" "")
("dk" "亞俄兒啞娥峨我牙芽莪蛾衙訝阿雅餓鴉鵝")
("dkr" "堊岳嶽幄惡愕握樂渥鄂鍔顎鰐齷")
("dks" "安岸按晏案眼雁鞍顔鮟")
("dkf" "斡謁軋閼")
("dka" "唵岩巖庵暗癌菴闇")
("dkq" "壓押狎鴨")
("dkd" "仰央怏昻殃秧鴦")
("do" "厓哀埃崖愛曖涯碍艾隘靄")
("dor" "厄扼掖液縊腋額")
("dod" "櫻罌鶯鸚")
("di" "也倻冶夜惹揶椰爺耶若野")
("dir" "弱掠略約若葯蒻藥躍")
("did" "亮佯兩凉壤孃恙揚攘敭暘梁楊樣洋瀁煬痒瘍禳穰糧羊良襄諒讓釀陽量養")
("dj" "圄御於漁瘀禦語馭魚齬")
("djr" "億憶抑檍臆")
("djs" "偃堰彦焉言諺")
("djf" "孼蘖")
("dja" "俺儼嚴奄掩淹")
("djq" "嶪業")
("dps" "")
("du" "予余勵呂女如廬旅歟汝濾璵礖礪與艅茹輿轝閭餘驪麗黎")
("dur" "亦力域役易曆歷疫繹譯轢逆驛")
("dus" "嚥堧姸娟宴年延憐戀捐挻撚椽沇沿涎涓淵演漣烟然煙煉燃燕璉硏硯秊筵緣練縯聯衍軟輦蓮連鉛鍊鳶")
("duf" "列劣咽悅涅烈熱裂說閱")
("dua" "厭廉念捻染殮炎焰琰艶苒簾閻髥鹽")
("duq" "曄獵燁葉")
("dud" "令囹塋寧嶺嶸影怜映暎楹榮永泳渶潁濚瀛瀯煐營獰玲瑛瑩瓔盈穎纓羚聆英詠迎鈴鍈零霙靈領")
("dP" "乂倪例刈叡曳汭濊猊睿穢芮藝蘂禮裔詣譽豫醴銳隸霓預")
("dh" "五伍俉傲午吾吳嗚塢墺奧娛寤悟惡懊敖旿晤梧汚澳烏熬獒筽蜈誤鰲鼇")
("dhr" "屋沃獄玉鈺")
("dhs" "溫瑥瘟穩縕蘊")
("dhf" "")
("dhd" "壅擁瓮甕癰翁邕雍饔")
("dhk" "渦瓦窩窪臥蛙蝸訛")
("dhks" "婉完宛梡椀浣玩琓琬碗緩翫脘腕莞豌阮頑")
("dhkf" "")
("dhkd" "往旺枉汪王")
("dho" "倭娃歪矮")
("dhl" "外嵬巍猥畏")
("dy" "了僚僥凹堯夭妖姚寥寮尿嶢拗搖撓擾料曜樂橈燎燿瑤療窈窯繇繞耀腰蓼蟯要謠遙遼邀饒")
("dyr" "慾欲浴縟褥辱")
("dyd" "俑傭冗勇埇墉容庸慂榕涌湧溶熔瑢用甬聳茸蓉踊鎔鏞龍")
("dn" "于佑偶優又友右宇寓尤愚憂旴牛玗瑀盂祐禑禹紆羽芋藕虞迂遇郵釪隅雨雩")
("dnr" "勖彧旭昱栯煜稶郁頊")
("dns" "云暈橒殞澐熉耘芸蕓運隕雲韻")
("dnf" "蔚鬱亐")
("dnd" "熊雄")
("dnjs" "元原員圓園垣媛嫄寃怨愿援沅洹湲源爰猿瑗苑袁轅遠阮院願鴛")
("dnjf" "月越鉞")
("dnl" "位偉僞危圍委威尉慰暐渭爲瑋緯胃萎葦蔿蝟衛褘謂違韋魏")
("db" "乳侑儒兪劉唯喩孺宥幼幽庾悠惟愈愉揄攸有杻柔柚柳楡楢油洧流游溜濡猶猷琉瑜由留癒硫紐維臾萸裕誘諛諭踰蹂遊逾遺酉釉鍮類")
("dbr" "六堉戮毓肉育陸")
("dbs" "倫允奫尹崙淪潤玧胤贇輪鈗閏")
("dbf" "律慄栗率聿")
("dbd" "戎瀜絨融隆")
("dms" "垠恩慇殷誾銀隱")
("dmf" "")
("dma" "吟淫蔭陰音飮")
("dmq" "揖泣邑")
("dmd" "凝應膺鷹")
("dml" "依倚儀宜意懿擬椅毅疑矣義艤薏蟻衣誼議醫")
("dl" "二以伊利吏夷姨履已弛彛怡易李梨泥爾珥理異痍痢移罹而耳肄苡荑裏裡貽貳邇里離飴餌")
("dlr" "匿溺瀷益翊翌翼謚")
("dls" "人仁刃印吝咽因姻寅引忍湮燐璘絪茵藺蚓認隣靭靷鱗麟")
("dlf" "一佚佾壹日溢逸鎰馹")
("dla" "任壬妊姙恁林淋稔臨荏賃")
("dlq" "入卄立笠粒")
("dld" "仍剩孕芿")
("wk" "仔刺咨姉姿子字孜恣慈滋炙煮玆瓷疵磁紫者自茨蔗藉諮資雌")
("wkr" "作勺嚼斫昨灼炸爵綽芍酌雀鵲")
("wks" "孱棧殘潺盞")
("wka" "岑暫潛箴簪蠶")
("wkq" "")
("wkd" "丈仗匠場墻壯奬將帳庄張掌暲杖樟檣欌漿牆狀獐璋章粧腸臟臧莊葬蔣薔藏裝贓醬長障")
("wo" "再哉在宰才材栽梓渽滓災縡裁財載齋齎")
("wod" "爭箏諍錚")
("wj" "佇低儲咀姐底抵杵楮樗沮渚狙猪疽箸紵苧菹著藷詛貯躇這邸雎齟")
("wjr" "勣吊嫡寂摘敵滴狄炙的積笛籍績翟荻謫賊赤跡蹟迪迹適鏑")
("wjs" "佃佺傳全典前剪塡塼奠專展廛悛戰栓殿氈澱煎琠田甸畑癲筌箋箭篆纏詮輾轉鈿銓錢鐫電顚顫餞")
("wjf" "切截折浙癤竊節絶")
("wja" "占岾店漸点粘霑鮎點")
("wjq" "接摺蝶")
("wjd" "丁井亭停偵呈姃定幀庭廷征情挺政整旌晶晸柾楨檉正汀淀淨渟湞瀞炡玎珽町睛碇禎程穽精綎艇訂諪貞鄭酊釘鉦鋌錠霆靖靜頂鼎")
("wp" "制劑啼堤帝弟悌提梯濟祭第臍薺製諸蹄醍除際霽題齊")
("wh" "俎兆凋助嘲弔彫措操早晁曺曹朝條棗槽漕潮照燥爪璪眺祖祚租稠窕粗糟組繰肇藻蚤詔調趙躁造遭釣阻雕鳥")
("whr" "族簇足鏃")
("whs" "存尊")
("whf" "卒拙猝")
("whd" "倧宗從悰慫棕淙琮種終綜縱腫踪踵鍾鐘")
("whk" "佐坐左座挫")
("whl" "")
("wn" "主住侏做姝胄呪周嗾奏宙州廚晝朱柱株注洲湊澍炷珠疇籌紂紬綢舟蛛註誅走躊輳週酎酒鑄駐")
("wnr" "竹粥")
("wns" "俊儁准埈寯峻晙樽浚準濬焌畯竣蠢逡遵雋駿")
("wnf" "")
("wnd" "中仲衆重")
("wmr" "")
("wmf" "")
("wmq" "楫汁葺")
("wmd" "增憎曾拯烝甑症繒蒸證贈")
("wl" "之只咫地址志持指摯支旨智枝枳止池沚漬知砥祉祗紙肢脂至芝芷蜘誌識贄趾遲")
("wlr" "直稙稷織職")
("wls" "唇嗔塵振搢晉晋桭榛殄津溱珍瑨璡畛疹盡眞瞋秦縉縝臻蔯袗診賑軫辰進鎭陣陳震")
("wlf" "侄叱姪嫉帙桎瓆疾秩窒膣蛭質跌迭")
("wla" "斟朕")
("wlq" "什執潗緝輯鏶集")
("wld" "徵懲澄")
("ck" "且侘借叉嗟嵯差次此磋箚茶蹉車遮")
("ckr" "捉搾着窄錯鑿齪")
("cks" "撰澯燦璨瓚竄簒纂粲纘讚贊鑽餐饌")
("ckf" "刹察擦札紮")
("cka" "僭參塹慘慙懺斬站讒讖")
("ckd" "倉倡創唱娼廠彰愴敞昌昶暢槍滄漲猖瘡窓脹艙菖蒼")
("co" "債埰寀寨彩採砦綵菜蔡采釵")
("cor" "冊柵策責")
("cj" "凄妻悽處")
("cjr" "倜刺剔尺慽戚拓擲斥滌瘠脊蹠陟隻")
("cjs" "仟千喘天川擅泉淺玔穿舛薦賤踐遷釧闡阡韆")
("cjf" "凸哲喆徹撤澈綴輟轍鐵")
("cja" "僉尖沾添甛瞻簽籤詹諂")
("cjq" "堞妾帖捷牒疊睫諜貼輒")
("cjd" "廳晴淸聽菁請靑鯖")
("cp" "切剃替涕滯締諦逮遞體")
("ch" "初剿哨憔抄招梢椒楚樵炒焦硝礁礎秒稍肖艸苕草蕉貂超酢醋醮")
("chr" "促囑燭矗蜀觸")
("chs" "寸忖村邨")
("chd" "叢塚寵悤憁摠總聰蔥銃")
("chkf" "")
("chl" "催崔最")
("cn" "墜抽推椎楸樞湫皺秋芻萩諏趨追鄒酋醜錐錘鎚雛騶鰍")
("cnr" "丑畜祝竺筑築縮蓄蹙蹴軸逐")
("cns" "春椿瑃")
("cnf" "出朮黜")
("cnd" "充忠沖蟲衝衷")
("cnp" "悴膵萃贅")
("cnl" "取吹嘴娶就炊翠聚脆臭趣醉驟鷲")
("cmr" "側仄厠惻測")
("cmd" "")
("cl" "侈値嗤峙幟恥梔治淄熾痔痴癡稚穉緇緻置致蚩輜雉馳齒")
("clr" "則勅飭")
("cls" "")
("clf" "七柒漆")
("cla" "侵寢枕沈浸琛砧針鍼")
("clq" "")
("cld" "秤稱")
("zho" "")
("xk" "他咤唾墮妥惰打拖朶楕舵陀馱駝")
("xkr" "倬卓啄坼度托拓擢晫柝濁濯琢琸託鐸")
("xks" "呑嘆坦彈憚歎灘炭綻誕")
("xkf" "奪脫")
("xka" "探眈耽貪")
("xkq" "塔搭榻")
("xkd" "宕帑湯糖蕩")
("xo" "兌台太怠態殆汰泰笞胎苔跆邰颱")
("xor" "宅擇澤")
("xod" "")
("xj" "")
("xh" "兎吐土討")
("xhd" "慟桶洞痛筒統通")
("xhl" "堆槌腿褪退頹")
("xn" "偸套妬投透鬪")
("xmr" "慝特")
("xma" "")
("vk" "坡婆巴把播擺杷波派爬琶破罷芭跛頗")
("vks" "判坂板版瓣販辦鈑阪")
("vkf" "八叭捌")
("vo" "佩唄悖敗沛浿牌狽稗覇貝")
("vod" "彭澎烹膨")
("vir" "")
("vus" "便偏扁片篇編翩遍鞭騙")
("vua" "")
("vud" "坪平枰萍評")
("vP" "吠嬖幣廢弊斃肺蔽閉陛")
("vh" "佈包匍匏咆哺圃布怖抛抱捕暴泡浦疱砲胞脯苞葡蒲袍褒逋鋪飽鮑")
("vhr" "幅暴曝瀑爆輻")
("vy" "俵剽彪慓杓標漂瓢票表豹飇飄驃")
("vna" "品稟")
("vnd" "楓諷豊風馮")
("vl" "彼披疲皮被避陂")
("vlf" "匹弼必泌珌畢疋筆苾馝")
("vlq" "乏逼")
("gk" "下何厦夏廈昰河瑕荷蝦賀遐霞鰕")
("gkr" "壑學虐謔鶴")
("gks" "寒恨悍旱汗漢澣瀚罕翰閑閒限韓")
("gkf" "割轄")
("gka" "函含咸啣喊檻涵緘艦銜陷鹹")
("gkq" "合哈盒蛤閤闔陜")
("gkd" "亢伉姮嫦巷恒抗杭桁沆港缸肛航行降項")
("go" "亥偕咳垓奚孩害懈楷海瀣蟹解該諧邂駭骸")
("gor" "劾核")
("god" "倖幸杏荇行")
("gid" "享向嚮珦鄕響餉饗香")
("gj" "噓墟虛許")
("gjs" "憲櫶獻軒")
("gjf" "")
("gja" "險驗")
("gur" "奕爀赫革")
("gus" "俔峴弦懸晛泫炫玄玹現眩睍絃絢縣舷衒見賢鉉顯")
("guf" "孑穴血頁")
("gua" "")
("guq" "俠協夾峽挾浹狹脅脇莢鋏頰")
("gud" "亨兄刑型形泂滎瀅灐炯熒珩瑩荊螢衡逈邢鎣馨")
("gP" "兮彗惠慧暳蕙蹊醯鞋")
("gh" "乎互呼壕壺好岵弧戶扈昊晧毫浩淏湖滸澔濠濩灝狐琥瑚瓠皓祜糊縞胡芦葫蒿虎號蝴護豪鎬頀顥")
("ghr" "惑或酷")
("ghs" "婚昏混渾琿魂")
("ghf" "忽惚笏")
("ghd" "哄弘汞泓洪烘紅虹訌鴻")
("ghk" "化和嬅樺火畵禍禾花華話譁貨靴")
("ghkr" "廓擴攫確碻穫")
("ghks" "丸喚奐宦幻患換歡晥桓渙煥環紈還驩鰥")
("ghkf" "活滑猾豁闊")
("ghkd" "凰幌徨恍惶愰慌晃晄榥況湟滉潢煌璜皇篁簧荒蝗遑隍黃")
("ghl" "匯回廻徊恢悔懷晦會檜淮澮灰獪繪膾茴蛔誨賄")
("ghlr" "劃獲")
("ghld" "宖橫鐄")
("gy" "哮嚆孝效斅曉梟涍淆爻肴酵驍")
("gn" "侯候厚后吼喉嗅帿後朽煦珝逅")
("gns" "勛勳塤壎焄熏燻薰訓暈")
("gnd" "")
("gnjs" "喧暄煊萱")
("gnp" "卉喙毁")
("gnl" "彙徽揮暉煇諱輝麾")
("gb" "休携烋畦虧")
("gbf" "恤譎鷸")
("gbd" "兇凶匈洶胸")
("gmr" "")
("gms" "昕欣炘痕")
("gmf" "吃屹紇訖")
("gma" "欠欽歆")
("gmq" "吸恰洽翕")
("gmd" "")
("gml" "僖凞喜噫囍姬嬉希憙憘戱晞曦熙熹熺犧禧稀羲")
("glf" ""))
;;; hanja.el ends here

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

View file

@ -1,4 +1,4 @@
;;; lao.el --- Quail package for inputting Lao characters -*-coding: iso-2022-7bit;-*-
;;; lao.el --- Quail package for inputting Lao characters -*-coding: utf-8;-*-
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009, 2010, 2011
@ -48,104 +48,104 @@
("#" . "3")
("$" . "4")
("&" . "5")
("%" . "(1l(B")
("'" . "(1'(B")
("%" . "")
("'" . "")
("(" . "7")
(")" . "8")
("*" . "6")
("+" . ["(1mh(B"])
("," . "(1A(B")
("-" . "(1*(B")
("." . "(1c(B")
("/" . "(1=(B")
("0" . "(1"(B")
("1" . "(1B(B")
("2" . "(1?(B")
("3" . "(1b(B")
("4" . "(16(B")
("5" . "(1X(B")
("6" . "(1Y(B")
("7" . "(1$(B")
("8" . "(15(B")
("9" . "(1((B")
("+" . ["ໍ່"])
("," . "")
("-" . "")
("." . "")
("/" . "")
("0" . "")
("1" . "")
("2" . "")
("3" . "")
("4" . "")
("5" . "")
("6" . "")
("7" . "")
("8" . "")
("9" . "")
(":" . "%")
(";" . "(1G(B")
("<" . "(1}(B")
("=" . "(1m(B")
(";" . "")
("<" . "")
("=" . "")
(">" . "$")
("?" . ")")
("@" . "2")
("A" . ["(1Qi(B"])
("B" . ["(1Vi(B"])
("C" . "(1O(B")
("A" . ["ັ້"])
("B" . ["ຶ້"])
("C" . "")
("D" . ".")
("E" . ["(1Si(B"])
("E" . ["ຳ້"])
("F" . ",")
("G" . ":")
("H" . "(1j(B")
("I" . "(1N(B")
("J" . "(1k(B")
("H" . "")
("I" . "")
("J" . "")
("K" . "!")
("L" . "?")
("M" . "(1f(B")
("N" . ["(1Wi(B"])
("O" . "(1|(B")
("P" . "(1](B")
("Q" . ["(1[i(B"])
("M" . "")
("N" . ["ື້"])
("O" . "")
("P" . "")
("Q" . ["ົ້"])
("R" . "_")
("S" . ";")
("T" . "+")
("U" . ["(1Ui(B"])
("U" . ["ີ້"])
("V" . "x")
("W" . "0")
("X" . "(")
("Y" . ["(1Ti(B"])
("Y" . ["ິ້"])
("Z" . "\"")
("[" . "(1:(B")
("]" . "(1E(B")
("^" . "(1\(B")
("[" . "")
("]" . "")
("^" . "")
("_" . "9")
("`" . "(1'(B")
("a" . "(1Q(B")
("b" . "(1V(B")
("c" . "(1a(B")
("d" . "(1!(B")
("e" . "(1S(B")
("f" . "(14(B")
("g" . "(1`(B")
("h" . "(1i(B")
("i" . "(1C(B")
("j" . "(1h(B")
("k" . "(1R(B")
("l" . "(1J(B")
("m" . "(17(B")
("n" . "(1W(B")
("o" . "(19(B")
("p" . "(1-(B")
("q" . "(1[(B")
("r" . "(1>(B")
("s" . "(1K(B")
("t" . "(1P(B")
("u" . "(1U(B")
("v" . "(1M(B")
("w" . "(1d(B")
("x" . "(1;(B")
("y" . "(1T(B")
("z" . "(1<(B")
("`" . "")
("a" . "")
("b" . "")
("c" . "")
("d" . "")
("e" . "")
("f" . "")
("g" . "")
("h" . "")
("i" . "")
("j" . "")
("k" . "")
("l" . "")
("m" . "")
("n" . "")
("o" . "")
("p" . "")
("q" . "")
("r" . "")
("s" . "")
("t" . "")
("u" . "")
("v" . "")
("w" . "")
("x" . "")
("y" . "")
("z" . "")
("{" . "-")
("|" . ["(1K\(B"])
("|" . ["ຫຼ"])
("}" . "/")
("~" . "(1l(B")
("\\0" . "(1p(B")
("\\1" . "(1q(B")
("\\2" . "(1r(B")
("\\3" . "(1s(B")
("\\4" . "(1t(B")
("\\5" . "(1u(B")
("\\6" . "(1v(B")
("\\7" . "(1w(B")
("\\8" . "(1x(B")
("\\9" . "(1y(B")
("~" . "")
("\\0" . "")
("\\1" . "")
("\\2" . "")
("\\3" . "")
("\\4" . "")
("\\5" . "")
("\\6" . "")
("\\7" . "")
("\\8" . "")
("\\9" . "")
)
"Alist of key sequences vs the corresponding Lao string to input.
This variable is for the input method \"lao\".
@ -155,7 +155,7 @@ you need to re-load it to properly re-initialize related alists.")
;; Temporary variable to initialize lao-consonant-key-alist, etc.
(defconst lao-key-alist-vector
(let ((tail lao-key-alist)
consonant-key-alist semivowel-key-alist vowel-key-alist
consonant-key-alist semivowel-key-alist vowel-key-alist
voweltone-key-alist tone-key-alist other-key-alist
elt phonetic-type)
(while tail
@ -178,7 +178,7 @@ you need to re-load it to properly re-initialize related alists.")
(setq semivowel-key-alist (cons elt semivowel-key-alist)))
(t
(setq other-key-alist (cons elt other-key-alist)))))
(vector consonant-key-alist semivowel-key-alist vowel-key-alist
(vector consonant-key-alist semivowel-key-alist vowel-key-alist
voweltone-key-alist tone-key-alist other-key-alist)))
(defconst lao-consonant-key-alist (aref lao-key-alist-vector 0))
@ -192,7 +192,7 @@ you need to re-load it to properly re-initialize related alists.")
(makunbound 'lao-key-alist-vector)
(quail-define-package
"lao" "Lao" "(1E(B" t
"lao" "Lao" "" t
"Lao input method simulating Lao keyboard layout based on Thai TIS620"
nil t t t t nil nil nil 'quail-lao-update-translation nil t)

View file

@ -1,4 +1,4 @@
;;; lrt.el --- Quail package for inputting Lao characters by LRT method -*-coding: iso-2022-7bit;-*-
;;; lrt.el --- Quail package for inputting Lao characters by LRT method -*-coding: utf-8;-*-
;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@ -52,11 +52,11 @@
(quail-define-package
"lao-lrt" "Lao" "(1E(BR" t
"lao-lrt" "Lao" "R" t
"Lao input method using LRT (Lao Roman Transcription).
`\\' (backslash) + number-key => (1p(B,(1q(B,(1r(B,... LAO DIGIT ZERO, ONE, TWO, ...
`\\' (backslash) + `\\' => (1f(B LAO KO LA (REPETITION)
`\\' (backslash) + `$' => (1O(B LAO ELLIPSIS
`\\' (backslash) + number-key => ,,,... LAO DIGIT ZERO, ONE, TWO, ...
`\\' (backslash) + `\\' => LAO KO LA (REPETITION)
`\\' (backslash) + `$' => LAO ELLIPSIS
"
nil 'forget-last-selection 'deterministic 'kbd-translate 'show-layout
nil nil nil 'quail-lao-update-translation nil t)

View file

@ -1,10 +1,10 @@
;;; slovak.el --- Quail package for inputting Slovak -*-coding: iso-2022-7bit;-*-
;;; slovak.el --- Quail package for inputting Slovak -*-coding: utf-8;-*-
;; Copyright (C) 1998, 2001-2013 Free Software Foundation, Inc.
;; Authors: Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>
;; Authors: Tibor Šimko <tibor.simko@fmph.uniba.sk>
;; Milan Zamazal <pdm@zamazal.org>
;; Maintainer: Pavel Jan,Bm(Bk <Pavel@Janik.cz>
;; Maintainer: Pavel Janík <Pavel@Janik.cz>
;; Keywords: i18n, multilingual, input method, Slovak
;; This file is part of GNU Emacs.
@ -40,15 +40,15 @@
(quail-define-rules
("1" ?+)
("2" ?,B5(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,B;(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("2" ?ľ)
("3" ?š)
("4" ?č)
("5" ?ť)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("!" ?1)
("@" ?2)
("#" ?3)
@ -62,15 +62,15 @@
("-" ?=)
("_" ?%)
("=" ?')
("[" ?,Bz(B)
("[" ?ú)
("{" ?/)
("]" ?,Bd(B)
("]" ?ä)
("}" ?\()
("\\" ?,Br(B)
("\\" ?ň)
("|" ?\))
(";" ?,Bt(B)
(";" ?ô)
(":" ?\")
("'" ?,B'(B)
("'" ?§)
("\"" ?!)
("<" ??)
(">" ?:)
@ -82,56 +82,56 @@
("z" ?y)
("Y" ?Z)
("Z" ?Y)
("=a" ?,Ba(B)
("+a" ?,Bd(B)
("+=a" ?,Bd(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("=e" ?,Bi(B)
("+e" ?,Bl(B)
("=i" ?,Bm(B)
("=l" ?,Be(B)
("+l" ?,B5(B)
("+n" ?,Br(B)
("=o" ?,Bs(B)
("+o" ?,Bt(B)
("~o" ?,Bt(B)
("+=o" ?,Bv(B)
("=r" ?,B`(B)
("+r" ?,Bx(B)
("=s" ?,B_(B)
("+s" ?,B9(B)
("+t" ?,B;(B)
("=u" ?,Bz(B)
("+u" ?,By(B)
("+=u" ?,B|(B)
("=z" ?,B}(B)
("+y" ?,B>(B)
("=A" ?,BA(B)
("+A" ?,BD(B)
("+=A" ?,BD(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("=E" ?,BI(B)
("+E" ?,BL(B)
("=I" ?,BM(B)
("=L" ?,BE(B)
("+L" ?,B%(B)
("+N" ?,BR(B)
("=O" ?,BS(B)
("+O" ?,BT(B)
("~O" ?,BT(B)
("+=O" ?,BV(B)
("=R" ?,B@(B)
("+R" ?,BX(B)
("=S" ?,B_(B)
("+S" ?,B)(B)
("+T" ?,B+(B)
("=U" ?,BZ(B)
("+U" ?,BY(B)
("+=U" ?,B\(B)
("=Z" ?,B](B)
("+Y" ?,B.(B)
("=a" ?á)
("+a" ?ä)
("+=a" ?ä)
("+c" ?č)
("+d" ?ď)
("=e" ?é)
("+e" ?ě)
("=i" ?í)
("=l" ?ĺ)
("+l" ?ľ)
("+n" ?ň)
("=o" ?ó)
("+o" ?ô)
("~o" ?ô)
("+=o" ?ö)
("=r" ?ŕ)
("+r" ?ř)
("=s" ?ß)
("+s" ?š)
("+t" ?ť)
("=u" ?ú)
("+u" ?ů)
("+=u" ?ü)
("=z" ?ý)
("+y" ?ž)
("=A" ?Á)
("+A" ?Ä)
("+=A" ?Ä)
("+C" ?Č)
("+D" ?Ď)
("=E" ?É)
("+E" ?Ě)
("=I" ?Í)
("=L" ?Ĺ)
("+L" ?Ľ)
("+N" ?Ň)
("=O" ?Ó)
("+O" ?Ô)
("~O" ?Ô)
("+=O" ?Ö)
("=R" ?Ŕ)
("+R" ?Ř)
("=S" ?ß)
("+S" ?Š)
("+T" ?Ť)
("=U" ?Ú)
("+U" ?Ů)
("+=U" ?Ü)
("=Z" ?Ý)
("+Y" ?Ž)
("=q" ?`)
("=2" ?@)
("=3" ?#)
@ -177,75 +177,75 @@ All other keys are the same as on standard US keyboard."
(quail-define-rules
("[[[[" ?\[)
("2" ?,B5(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,B;(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("[a" ?,Ba(B)
("[[a" ?,Bd(B)
("[[[a" ?,Bd(B)
("[c" ?,Bh(B)
("[[c" ?,Bh(B)
("[d" ?,Bo(B)
("[[d" ?,Bo(B)
("[e" ?,Bi(B)
("[[e" ?,Bl(B)
("[i" ?,Bm(B)
("[l" ?,Be(B)
("[[l" ?,B5(B)
("[n" ?,Br(B)
("[[n" ?,Br(B)
("[o" ?,Bs(B)
("[[o" ?,Bt(B)
("[[[o" ?,Bv(B)
("[r" ?,B`(B)
("[[r" ?,Bx(B)
("[s" ?,B9(B)
("[[s" ?,B9(B)
("[[[s" ?,B_(B)
("[t" ?,B;(B)
("[[t" ?,B;(B)
("[u" ?,Bz(B)
("[[u" ?,By(B)
("[[[u" ?,B|(B)
("[y" ?,B}(B)
("[z" ?,B>(B)
("[[z" ?,B>(B)
("[A" ?,BA(B)
("[[A" ?,BD(B)
("[[[A" ?,BD(B)
("[C" ?,BH(B)
("[[C" ?,BH(B)
("[D" ?,BO(B)
("[[D" ?,BO(B)
("[E" ?,BI(B)
("[[E" ?,BL(B)
("[I" ?,BM(B)
("[L" ?,BE(B)
("[[L" ?,B%(B)
("[N" ?,BR(B)
("[[N" ?,BR(B)
("[O" ?,BS(B)
("[[O" ?,BT(B)
("[[[O" ?,BV(B)
("[R" ?,B@(B)
("[[R" ?,BX(B)
("[S" ?,B)(B)
("[[S" ?,B)(B)
("[[[S" ?,B_(B)
("[T" ?,B+(B)
("[[T" ?,B+(B)
("[U" ?,BZ(B)
("[[U" ?,BY(B)
("[[[U" ?,B\(B)
("[Y" ?,B](B)
("[Z" ?,B.(B)
("[[Z" ?,B.(B)
("2" ?ľ)
("3" ?š)
("4" ?č)
("5" ?ť)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("[a" ?á)
("[[a" ?ä)
("[[[a" ?ä)
("[c" ?č)
("[[c" ?č)
("[d" ?ď)
("[[d" ?ď)
("[e" ?é)
("[[e" ?ě)
("[i" ?í)
("[l" ?ĺ)
("[[l" ?ľ)
("[n" ?ň)
("[[n" ?ň)
("[o" ?ó)
("[[o" ?ô)
("[[[o" ?ö)
("[r" ?ŕ)
("[[r" ?ř)
("[s" ?š)
("[[s" ?š)
("[[[s" ?ß)
("[t" ?ť)
("[[t" ?ť)
("[u" ?ú)
("[[u" ?ů)
("[[[u" ?ü)
("[y" ?ý)
("[z" ?ž)
("[[z" ?ž)
("[A" ?Á)
("[[A" ?Ä)
("[[[A" ?Ä)
("[C" ?Č)
("[[C" ?Č)
("[D" ?Ď)
("[[D" ?Ď)
("[E" ?É)
("[[E" ?Ě)
("[I" ?Í)
("[L" ?Ĺ)
("[[L" ?Ľ)
("[N" ?Ň)
("[[N" ?Ň)
("[O" ?Ó)
("[[O" ?Ô)
("[[[O" ?Ö)
("[R" ?Ŕ)
("[[R" ?Ř)
("[S" ?Š)
("[[S" ?Š)
("[[[S" ?ß)
("[T" ?Ť)
("[[T" ?Ť)
("[U" ?Ú)
("[[U" ?Ů)
("[[[U" ?Ü)
("[Y" ?Ý)
("[Z" ?Ž)
("[[Z" ?Ž)
([kp-1] ?1)
([kp-2] ?2)
([kp-3] ?3)
@ -270,15 +270,15 @@ All other keys are the same as on standard US keyboard."
nil t nil nil t nil nil nil nil nil t)
(quail-define-rules
("2" ?,B5(B)
("3" ?,B9(B)
("4" ?,Bh(B)
("5" ?,B;(B)
("6" ?,B>(B)
("7" ?,B}(B)
("8" ?,Ba(B)
("9" ?,Bm(B)
("0" ?,Bi(B)
("2" ?ľ)
("3" ?š)
("4" ?č)
("5" ?ť)
("6" ?ž)
("7" ?ý)
("8" ?á)
("9" ?í)
("0" ?é)
("==" ?=)
("++" ?+)
("=+" ?+)
@ -300,54 +300,54 @@ All other keys are the same as on standard US keyboard."
("+8" ?8)
("+9" ?9)
("+0" ?0)
("=a" ?,Ba(B)
("+a" ?,Bd(B)
("+=a" ?,Bd(B)
("+c" ?,Bh(B)
("+d" ?,Bo(B)
("=e" ?,Bi(B)
("+e" ?,Bl(B)
("=i" ?,Bm(B)
("=l" ?,Be(B)
("+l" ?,B5(B)
("+n" ?,Br(B)
("=o" ?,Bs(B)
("+o" ?,Bt(B)
("+=o" ?,Bv(B)
("=r" ?,B`(B)
("+r" ?,Bx(B)
("=s" ?,B_(B)
("+s" ?,B9(B)
("+t" ?,B;(B)
("=u" ?,Bz(B)
("+u" ?,By(B)
("+=u" ?,B|(B)
("=y" ?,B}(B)
("+z" ?,B>(B)
("=A" ?,BA(B)
("+A" ?,BD(B)
("+=A" ?,BD(B)
("+C" ?,BH(B)
("+D" ?,BO(B)
("=E" ?,BI(B)
("+E" ?,BL(B)
("=I" ?,BM(B)
("=L" ?,BE(B)
("+L" ?,B%(B)
("+N" ?,BR(B)
("=O" ?,BS(B)
("+O" ?,BT(B)
("+=O" ?,BV(B)
("=R" ?,B@(B)
("+R" ?,BX(B)
("=S" ?,B_(B)
("+S" ?,B)(B)
("+T" ?,B+(B)
("=U" ?,BZ(B)
("+U" ?,BY(B)
("+=U" ?,B\(B)
("=Y" ?,B](B)
("+Z" ?,B.(B)
("=a" ?á)
("+a" ?ä)
("+=a" ?ä)
("+c" ?č)
("+d" ?ď)
("=e" ?é)
("+e" ?ě)
("=i" ?í)
("=l" ?ĺ)
("+l" ?ľ)
("+n" ?ň)
("=o" ?ó)
("+o" ?ô)
("+=o" ?ö)
("=r" ?ŕ)
("+r" ?ř)
("=s" ?ß)
("+s" ?š)
("+t" ?ť)
("=u" ?ú)
("+u" ?ů)
("+=u" ?ü)
("=y" ?ý)
("+z" ?ž)
("=A" ?Á)
("+A" ?Ä)
("+=A" ?Ä)
("+C" ?Č)
("+D" ?Ď)
("=E" ?É)
("+E" ?Ě)
("=I" ?Í)
("=L" ?Ĺ)
("+L" ?Ľ)
("+N" ?Ň)
("=O" ?Ó)
("+O" ?Ô)
("+=O" ?Ö)
("=R" ?Ŕ)
("+R" ?Ř)
("=S" ?ß)
("+S" ?Š)
("+T" ?Ť)
("=U" ?Ú)
("+U" ?Ů)
("+=U" ?Ü)
("=Y" ?Ý)
("+Z" ?Ž)
([kp-1] ?1)
([kp-2] ?2)
([kp-3] ?3)
@ -374,96 +374,96 @@ All other keys are the same as on standard US keyboard."
("[]" ?\])
("][" ?\[)
("]]" ?\])
("[a" ?,Ba(B)
("[[a" ?,Bd(B)
("[[[a" ?,Bd(B)
("]a" ?,Bd(B)
("][a" ?,Bd(B)
("[c" ?,Bh(B)
("[[c" ?,Bh(B)
("]c" ?,Bh(B)
("[d" ?,Bo(B)
("[[d" ?,Bo(B)
("]d" ?,Bo(B)
("[e" ?,Bi(B)
("[[e" ?,Bl(B)
("]e" ?,Bl(B)
("[i" ?,Bm(B)
("[l" ?,Be(B)
("[[l" ?,B5(B)
("]l" ?,B5(B)
("[n" ?,Br(B)
("[[n" ?,Br(B)
("]n" ?,Br(B)
("[[o" ?,Bt(B)
("[[[o" ?,Bv(B)
("[o" ?,Bs(B)
("]o" ?,Bt(B)
("][o" ?,Bv(B)
("[r" ?,B`(B)
("[[r" ?,Bx(B)
("]r" ?,Bx(B)
("[s" ?,B9(B)
("[[s" ?,B9(B)
("[[[s" ?,B_(B)
("]s" ?,B9(B)
("[t" ?,B;(B)
("[[t" ?,B;(B)
("]t" ?,B;(B)
("[u" ?,Bz(B)
("[[u" ?,By(B)
("[[[u" ?,B|(B)
("]u" ?,By(B)
("][u" ?,B|(B)
("[y" ?,B}(B)
("[z" ?,B>(B)
("[[z" ?,B>(B)
("]z" ?,B>(B)
("[A" ?,BA(B)
("[[A" ?,BD(B)
("[[[A" ?,BD(B)
("]A" ?,BD(B)
("][A" ?,BD(B)
("[C" ?,BH(B)
("[[C" ?,BH(B)
("]C" ?,BH(B)
("[D" ?,BO(B)
("[[D" ?,BO(B)
("]D" ?,BO(B)
("[E" ?,BI(B)
("[[E" ?,BL(B)
("]E" ?,BL(B)
("[I" ?,BM(B)
("[L" ?,BE(B)
("[[L" ?,B%(B)
("]L" ?,B%(B)
("[N" ?,BR(B)
("[[N" ?,BR(B)
("]N" ?,BR(B)
("[O" ?,BS(B)
("[[O" ?,BT(B)
("[[[O" ?,BV(B)
("]O" ?,BT(B)
("][O" ?,BV(B)
("[R" ?,B@(B)
("[[R" ?,BX(B)
("]R" ?,BX(B)
("[S" ?,B)(B)
("[[S" ?,B)(B)
("[[[S" ?,B_(B)
("]S" ?,B)(B)
("[T" ?,B+(B)
("[[T" ?,B+(B)
("]T" ?,B+(B)
("[U" ?,BZ(B)
("[[U" ?,BY(B)
("[[[U" ?,B\(B)
("]U" ?,BY(B)
("][U" ?,B\(B)
("[Y" ?,B](B)
("[Z" ?,B.(B)
("[[Z" ?,B.(B)
("]Z" ?,B.(B)
("[a" ?á)
("[[a" ?ä)
("[[[a" ?ä)
("]a" ?ä)
("][a" ?ä)
("[c" ?č)
("[[c" ?č)
("]c" ?č)
("[d" ?ď)
("[[d" ?ď)
("]d" ?ď)
("[e" ?é)
("[[e" ?ě)
("]e" ?ě)
("[i" ?í)
("[l" ?ĺ)
("[[l" ?ľ)
("]l" ?ľ)
("[n" ?ň)
("[[n" ?ň)
("]n" ?ň)
("[[o" ?ô)
("[[[o" ?ö)
("[o" ?ó)
("]o" ?ô)
("][o" ?ö)
("[r" ?ŕ)
("[[r" ?ř)
("]r" ?ř)
("[s" ?š)
("[[s" ?š)
("[[[s" ?ß)
("]s" ?š)
("[t" ?ť)
("[[t" ?ť)
("]t" ?ť)
("[u" ?ú)
("[[u" ?ů)
("[[[u" ?ü)
("]u" ?ů)
("][u" ?ü)
("[y" ?ý)
("[z" ?ž)
("[[z" ?ž)
("]z" ?ž)
("[A" ?Á)
("[[A" ?Ä)
("[[[A" ?Ä)
("]A" ?Ä)
("][A" ?Ä)
("[C" ?Č)
("[[C" ?Č)
("]C" ?Č)
("[D" ?Ď)
("[[D" ?Ď)
("]D" ?Ď)
("[E" ?É)
("[[E" ?Ě)
("]E" ?Ě)
("[I" ?Í)
("[L" ?Ĺ)
("[[L" ?Ľ)
("]L" ?Ľ)
("[N" ?Ň)
("[[N" ?Ň)
("]N" ?Ň)
("[O" ?Ó)
("[[O" ?Ô)
("[[[O" ?Ö)
("]O" ?Ô)
("][O" ?Ö)
("[R" ?Ŕ)
("[[R" ?Ř)
("]R" ?Ř)
("[S" ?Š)
("[[S" ?Š)
("[[[S" ?ß)
("]S" ?Š)
("[T" ?Ť)
("[[T" ?Ť)
("]T" ?Ť)
("[U" ?Ú)
("[[U" ?Ů)
("[[[U" ?Ü)
("]U" ?Ů)
("][U" ?Ü)
("[Y" ?Ý)
("[Z" ?Ž)
("[[Z" ?Ž)
("]Z" ?Ž)
([kp-1] ?1)
([kp-2] ?2)
([kp-3] ?3)

View file

@ -1,4 +1,4 @@
;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: iso-2022-7bit;-*-
;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601) -*-coding: utf-8;-*-
;; Copyright (C) 1997, 2001-2013 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@ -35,168 +35,168 @@
(require 'korea-util)
(quail-define-package
"korean-symbol" "Korean" "$(C=I9z(B" t
"$(CGQ1[=I9z@T7BG%(B:
$(C!<(B($(C!=0}H#?-1b!<(Barrow$(C!=H-;l!<(Bsex$(C!=!N!O!<(Bindex$(C!=C7@Z(B $(C!<(Baccent$(C!=>G<>F.(B
$(C!<(B)$(C!=0}H#4]1b!<(Bmusic$(C!=@=>G!<(Bdot$(C!=A!(B $(C!<(Bquote$(C!=5{?HG%!<(Bxtext$(C!=!W!X"R"."/(B
$(C!<(BUnit$(C!=!I!J!K"5!<(Bmath$(C!=<vGP1bH#!<(Bpic$(C!=;sG|9.@Z!<(Bline$(C!=<19.@Z(B
$(C!<(Bunit$(C!=4\@'(B $(C!<(Bfrac$(C!=:P<v(B $(C!<(Btextline$(C!=!)!*!+!,!-(B
$(C!<(Bwn$(C!="_!<(Bks$(C!="^!<(BNo$(C!="`!<"a!="a(B $(C!<(Bdag$(C!="S(B $(C!<(Bddag$(C!="T!<(Bpercent$(C!="6(B
$(C!<(Bam$(C!="c!<(Bpm$(C!="d!<"b!="b!<(BTel$(C!="e!<(Bwon$(C!=#\(B $(C!<(Byen$(C!=!M(B $(C!<(Bpound$(C!=!L(B
$(C!<(BEng$(C!=#A#B#C!&(B $(C!<(Benum$(C!=#0#1#2!&(B $(C!<(BRuss$(C!=,!,",#!&!<(BGreek$(C!=%A%B%C!&(B
$(C!<(Beng$(C!=#a#b#c!&(B $(C!<(Beasc$(C!=?5>n(BASCII$(C!<(Bruss$(C!=,Q,R,S!&!<(Bgreek$(C!=%a%b%c!&(B
$(C!<(BRom$(C!=%0%1%2!&(B $(C!<(BScan$(C!=(!("(#!&(B $(C!<(Bhira$(C!=*!*"*#(B
$(C!<(Brom$(C!=%!%"%#!&(B $(C!<(Bscan$(C!=)!)")#!&(B $(C!<(Bkata$(C!=+!+"+#(B
$(C!<(Bojaso$(C!=(1!-(>!<(Bpjaso$(C!=)1!-)>!<(Boeng$(C!=(M!-(f!<(Bpeng$(C!=)M!-)f(B
$(C!<(Bogana$(C!=(?!-(L!<(Bpgana$(C!=)?!-)L!<(Bonum$(C!=(g!-(u!<(Bpnum$(C!=)g!-)u(B
$(C!<@Z<R!=(B2$(C9z=D(B + $(C$U(B(S) $(C$o(B(t_) $(C$q(B(D) $(C$p(B(DD) $(C$a(B(aD) $(C$v(B(_d) $(C$u(B(G) $(C$}(B(uk)")
"korean-symbol" "Korean" "심벌" t
"한글심벌입력표:
(괄호열기arrow화살sexindex첨자 accent악센트
)괄호닫기music음악dot quote따옴표xtext§¡¿
Unitmath수학기호pic상형문자line선문자
unit단위 frac분수 textline­
wnksNo dag ddagpercent
ampmTelwon yen pound
Eng enum RussАБВGreekΑΒΓ
eng easc영어ASCIIrussабвgreekαβγ
Rom ScanÆÐª hiraぁあぃ
rom scanæđð kataァアィ
ojasopjasooengpeng
oganapganaonumpnum
자소2벌식 + (S) (t_) (D) (DD) (aD) (_d) (G) (uk)")
(quail-define-rules
("(" "$(C!2!4!6!8!:!<(B")
(")" "$(C!3!5!7!9!;!=(B")
("math" "$(C!>!?!@!A!B!C!D!E!P!Q!R!S!T!U!V!k!l!m!n!o!p!q!r!s!t!u!v!w!x!y!z!{!|!}!~"!"""#"$"1"2"3(B")
("pic" "$(C!Y!Z![!\!]!^!_!`!a!b!c!d!e"7"8"9":";"<"=">"?"@"A"B"C"D"E"F"G"H"I"J"K"L"M"N"O"P"Q"4(B")
("arrow" "$(C!f!g!h!i!j"U"V"W"X"Y(B")
("music" "$(C"Z"["\"](B")
("won" "$(C#\(B")
("yen" "$(C!M(B")
("pound" "$(C!L(B")
("xtext" "$(C!W!X"R"."/(B")
("dot" "$(C!$!%!&!'"0(B")
("quote" "$(C!"!#!(!.!/!0!1!F!G!H"%")(B")
("textline" "$(C!)!*!+!,!-(B")
("Unit" "$(C!I!J!K"5(B")
("sex" "$(C!N!O(B")
("accent" "$(C"&"'"("*"+","-(B")
("percent" "$(C"6(B")
("dag" "$(C"S(B")
("ddag" "$(C"T(B")
("wn" "$(C"_(B")
("ks" "$(C"^(B")
("No" "$(C"`(B")
("Co" "$(C"a(B")
("TM" "$(C"b(B")
("am" "$(C"c(B")
("pm" "$(C"d(B")
("Tel" "$(C"e(B")
("easc" "$(C#!#"###$#%#&#'#(#)#*#+#,#-#.#/#:#;#<#=#>#?#@#[#]#^#_#`#{#|#}#~(B")
("enum" "$(C#0#1#2#3#4#5#6#7#8#9(B")
("Eng" "$(C#A#B#C#D#E#F#G#H#I#J#K#L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z(B")
("eng" "$(C#a#b#c#d#e#f#g#h#i#j#k#l#m#n#o#p#q#r#s#t#u#v#w#x#y#z(B")
("r" "$(C$!(B")
("R" "$(C$"(B")
("rt" "$(C$#(B")
("s" "$(C$$(B")
("sw" "$(C$%(B")
("sg" "$(C$&(B")
("e" "$(C$'(B")
("E" "$(C$((B")
("f" "$(C$)(B")
("fr" "$(C$*(B")
("fa" "$(C$+(B")
("fq" "$(C$,(B")
("ft" "$(C$-(B")
("fx" "$(C$.(B")
("fv" "$(C$/(B")
("fg" "$(C$0(B")
("a" "$(C$1(B")
("q" "$(C$2(B")
("Q" "$(C$3(B")
("qt" "$(C$4(B")
("t" "$(C$5(B")
("T" "$(C$6(B")
("d" "$(C$7(B")
("w" "$(C$8(B")
("W" "$(C$9(B")
("c" "$(C$:(B")
("z" "$(C$;(B")
("x" "$(C$<(B")
("v" "$(C$=(B")
("g" "$(C$>(B")
("k" "$(C$?(B")
("o" "$(C$@(B")
("i" "$(C$A(B")
("O" "$(C$B(B")
("j" "$(C$C(B")
("p" "$(C$D(B")
("u" "$(C$E(B")
("P" "$(C$F(B")
("h" "$(C$G(B")
("hk" "$(C$H(B")
("ho" "$(C$I(B")
("hl" "$(C$J(B")
("y" "$(C$K(B")
("n" "$(C$L(B")
("nj" "$(C$M(B")
("np" "$(C$N(B")
("nl" "$(C$O(B")
("b" "$(C$P(B")
("m" "$(C$Q(B")
("ml" "$(C$R(B")
("l" "$(C$S(B")
("S" "$(C$U(B")
("se" "$(C$V(B")
("st" "$(C$W(B")
("st_" "$(C$X(B")
("frt" "$(C$Y(B")
("fqt" "$(C$[(B")
("fe" "$(C$Z(B")
("ft_" "$(C$\(B")
("f_d" "$(C$](B")
("aq" "$(C$^(B")
("at" "$(C$_(B")
("at_" "$(C$`(B")
("aD" "$(C$a(B")
("qr" "$(C$b(B")
("qe" "$(C$c(B")
("qtr" "$(C$d(B")
("qte" "$(C$e(B")
("qw" "$(C$f(B")
("qx" "$(C$g(B")
("qD" "$(C$h(B")
("QD" "$(C$i(B")
("tr" "$(C$j(B")
("ts" "$(C$k(B")
("te" "$(C$l(B")
("tq" "$(C$m(B")
("tw" "$(C$n(B")
("t_" "$(C$o(B")
("DD" "$(C$p(B")
("D" "$(C$q(B")
("Dt" "$(C$r(B")
("Dt_" "$(C$s(B")
("vD" "$(C$t(B")
("G" "$(C$u(B")
("_d" "$(C$v(B")
("yi" "$(C$w(B")
("yO" "$(C$x(B")
("yl" "$(C$y(B")
("bu" "$(C$z(B")
("bP" "$(C${(B")
("bl" "$(C$|(B")
("uk" "$(C$}(B")
("ukl" "$(C$~(B")
("Rom" "$(C%0%1%2%3%4%5%6%7%8%9(B")
("rom" "$(C%!%"%#%$%%%&%'%(%)%*(B")
("Greek" "$(C%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W%X(B")
("greek" "$(C%a%b%c%d%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u%v%w%x(B")
("line" "$(C&!&"&#&$&%&&&'&(&)&*&+&,&-&.&/&0&1&2&3&4&5&6&7&8&9&:&;&<&=&>&?&@&A&B&C&D&E&F&G&H&I&J&K&L&M&N&O&P&Q&R&S&T&U&V&W&X&Y&Z&[&\&]&^&_&`&a&b&c&d(B")
("unit" "$(C'!'"'#'$'%'&'''(')'*'+','-'.'/'0'1'2'3'4'5'6'7'8'9':';'<'='>'?'@'A'B'C'D'E'F'G'H'I'J'K'L'M'N'O'P'Q'R'S'T'U'V'W'X'Y'Z'['\']'^'_'`'a'b'c'd'e'f'g'h'i'j'k'l'm'n'o(B")
("Scan" "$(C(!("(#($(&((()(*(+(,(-(.(/(B")
("ojaso" "$(C(1(2(3(4(5(6(7(8(9(:(;(<(=(>(B")
("ogana" "$(C(?(@(A(B(C(D(E(F(G(H(I(J(K(L(B")
("oeng" "$(C(M(N(O(P(Q(R(S(T(U(V(W(X(Y(Z([(\(](^(_(`(a(b(c(d(e(f(B")
("onum" "$(C(g(h(i(j(k(l(m(n(o(p(q(r(s(t(u(B")
("frac" "$(C(v(w(x(y(z({(|(}(~(B")
("scan" "$(C)!)")#)$)%)&)')()))*)+),)-).)/)0(B")
("pjaso" "$(C)1)2)3)4)5)6)7)8)9):);)<)=)>(B>")
("pgana" "$(C)?)@)A)B)C)D)E)F)G)H)I)J)K)L(B")
("peng" "$(C)M)N)O)P)Q)R)S)T)U)V)W)X)Y)Z)[)\)])^)_)`)a)b)c)d)e)f(B")
("pnum" "$(C)g)h)i)j)k)l)m)n)o)p)q)r)s)t)u(B")
("index" "$(C)v)w)x)y)z){)|)})~(B")
("hira" "$(C*!*"*#*$*%*&*'*(*)***+*,*-*.*/*0*1*2*3*4*5*6*7*8*9*:*;*<*=*>*?*@*A*B*C*D*E*F*G*H*I*J*K*L*M*N*O*P*Q*R*S*T*U*V*W*X*Y*Z*[*\*]*^*_*`*a*b*c*d*e*f*g*h*i*j*k*l*m*n*o*p*q*r*s(B")
("kata" "$(C+!+"+#+$+%+&+'+(+)+*+++,+-+.+/+0+1+2+3+4+5+6+7+8+9+:+;+<+=+>+?+@+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+[+\+]+^+_+`+a+b+c+d+e+f+g+h+i+j+k+l+m+n+o+p+q+r+s+t+u+v(B")
("Russ" "$(C,!,",#,$,%,&,',(,),*,+,,,-,.,/,0,1,2,3,4,5,6,7,8,9,:,;,<,=,>,?,@,A(B")
("russ" "$(C,Q,R,S,T,U,V,W,X,Y,Z,[,\,],^,_,`,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q(B"))
("(" "〔〈《「『【")
(")" "〕〉》」』】")
("math" "±×÷≠≤≥∞∴∠⊥⌒∂∇≡≒〓≪≫√∽∝∵∫∬∈∋⊆⊇⊂⊃∪∩∧∨¬⇒⇔∀∃∮∑∏")
("pic" "☆★○●◎◇◆□■△▲▽▼◁◀▷▶♤♠♡♥♧♣⊙◈▣◐◑▒▤▥▨▧▦▩♨☏☎☜☞¤")
("arrow" "→←↑↓↔↕↗↙↖↘")
("music" "♭♩♪♬")
("won" "")
("yen" "")
("pound" "")
("xtext" "§※¶¡¿")
("dot" "·‥…¨ː")
("quote" "、。〃‘’“”°′″´˝")
("textline" "­―∥\∼")
("Unit" "℃Å¢℉")
("sex" "♂♀")
("accent" "~ˇ˘˚˙¸˛")
("percent" "")
("dag" "")
("ddag" "")
("wn" "")
("ks" "")
("No" "")
("Co" "")
("TM" "")
("am" "")
("pm" "")
("Tel" "")
("easc" "!"#$%&'()*+,-./:;<=>?@[]^_`{|} ̄")
("enum" "")
("Eng" "")
("eng" "")
("r" "")
("R" "")
("rt" "")
("s" "")
("sw" "")
("sg" "")
("e" "")
("E" "")
("f" "")
("fr" "")
("fa" "")
("fq" "")
("ft" "")
("fx" "")
("fv" "")
("fg" "")
("a" "")
("q" "")
("Q" "")
("qt" "")
("t" "")
("T" "")
("d" "")
("w" "")
("W" "")
("c" "")
("z" "")
("x" "")
("v" "")
("g" "")
("k" "")
("o" "")
("i" "")
("O" "")
("j" "")
("p" "")
("u" "")
("P" "")
("h" "")
("hk" "")
("ho" "")
("hl" "")
("y" "")
("n" "")
("nj" "")
("np" "")
("nl" "")
("b" "")
("m" "")
("ml" "")
("l" "")
("S" "")
("se" "")
("st" "")
("st_" "")
("frt" "")
("fqt" "")
("fe" "")
("ft_" "")
("f_d" "")
("aq" "")
("at" "")
("at_" "")
("aD" "")
("qr" "")
("qe" "")
("qtr" "")
("qte" "")
("qw" "")
("qx" "")
("qD" "")
("QD" "")
("tr" "")
("ts" "")
("te" "")
("tq" "")
("tw" "")
("t_" "")
("DD" "")
("D" "")
("Dt" "")
("Dt_" "")
("vD" "")
("G" "")
("_d" "")
("yi" "")
("yO" "")
("yl" "")
("bu" "")
("bP" "")
("bl" "")
("uk" "")
("ukl" "")
("Rom" "ⅠⅡⅢⅣⅤⅥⅦⅧⅨⅩ")
("rom" "ⅰⅱⅲⅳⅴⅵⅶⅷⅸⅹ")
("Greek" "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩ")
("greek" "αβγδεζηθικλμνξοπρστυφχψω")
("line" "─│┌┐┘└├┬┤┴┼━┃┏┓┛┗┣┳┫┻╋┠┯┨┷┿┝┰┥┸╂┒┑┚┙┖┕┎┍┞┟┡┢┦┧┩┪┭┮┱┲┵┶┹┺┽┾╀╁╃╄╅╆╇╈╉╊")
("unit" "㎕㎖㎗ℓ㎘㏄㎣㎤㎥㎦㎙㎚㎛㎜㎝㎞㎟㎠㎡㎢㏊㎍㎎㎏㏏㎈㎉㏈㎧㎨㎰㎱㎲㎳㎴㎵㎶㎷㎸㎹㎀㎁㎂㎃㎄㎺㎻㎼㎽㎾㎿㎐㎑㎒㎓㎔Ω㏀㏁㎊㎋㎌㏖㏅㎭㎮㎯㏛㎩㎪㎫㎬㏝㏐㏓㏃㏉㏜㏆")
("Scan" "ÆÐªĦIJĿŁØŒºÞŦŊ")
("ojaso" "㉠㉡㉢㉣㉤㉥㉦㉧㉨㉩㉪㉫㉬㉭")
("ogana" "㉮㉯㉰㉱㉲㉳㉴㉵㉶㉷㉸㉹㉺㉻")
("oeng" "ⓐⓑⓒⓓⓔⓕⓖⓗⓘⓙⓚⓛⓜⓝⓞⓟⓠⓡⓢⓣⓤⓥⓦⓧⓨⓩ")
("onum" "①②③④⑤⑥⑦⑧⑨⑩⑪⑫⑬⑭⑮")
("frac" "½⅓⅔¼¾⅛⅜⅝⅞")
("scan" "æđðħıijĸŀłøœßþŧŋʼn")
("pjaso" "㈀㈁㈂㈃㈄㈅㈆㈇㈈㈉㈊㈋㈌㈍>")
("pgana" "㈎㈏㈐㈑㈒㈓㈔㈕㈖㈗㈘㈙㈚㈛")
("peng" "⒜⒝⒞⒟⒠⒡⒢⒣⒤⒥⒦⒧⒨⒩⒪⒫⒬⒭⒮⒯⒰⒱⒲⒳⒴⒵")
("pnum" "⑴⑵⑶⑷⑸⑹⑺⑻⑼⑽⑾⑿⒀⒁⒂")
("index" "¹²³⁴ⁿ₁₂₃₄")
("hira" "ぁあぃいぅうぇえぉおかがきぎくぐけげこごさざしじすずせぜそぞただちぢっつづてでとどなにぬねのはばぱひびぴふぶぷへべぺほぼぽまみむめもゃやゅゆょよらりるれろゎわゐゑをん")
("kata" "ァアィイゥウェエォオカガキギクグケゲコゴサザシジスズセゼソゾタダチヂッツヅテデトドナニヌネノハバパヒビピフブプヘベペホボポマミムメモャヤュユョヨラリルレロヮワヰヱヲンヴヵヶ")
("Russ" "АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ")
("russ" "абвгдеёжзийклмнопрстуфхцчшщъыьэюя"))
;;; symbol-ksc.el ends here

View file

@ -1,4 +1,4 @@
;;; thai.el --- Quail package for inputting Thai characters -*-coding: iso-2022-7bit;-*-
;;; thai.el --- Quail package for inputting Thai characters -*-coding: utf-8;-*-
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
@ -42,13 +42,13 @@
;; Thai Kesmanee keyboard support.
(quail-define-package
"thai-kesmanee" "Thai" ",T!!(B>" t
"thai-kesmanee" "Thai" "กก>" t
"Thai Kesmanee input method with TIS620 keyboard layout
The difference from the ordinal Thai keyboard:
',T_(B' and ',To(B' are assigned to '\\' and '|' respectively,
',T#(B' and ',T%(B' are assigned to '`' and '~' respectively,
Don't know where to assign characters ',Tz(B' and ',T{(B'."
'฿' and '' are assigned to '\\' and '|' respectively,
'ฃ' and 'ฅ' are assigned to '`' and '~' respectively,
Don't know where to assign characters '' and ''."
nil t t t t nil nil nil nil nil t)
(thai-generate-quail-map
@ -56,38 +56,38 @@ The difference from the ordinal Thai keyboard:
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ; control codes
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ; control codes
;; This data is quite old.
;; 0 "#" "." ",Tr(B" ",Ts(B" ",Tt(B" ",TQi(B" ",T'(B" ; SPC .. '
;; ",Tv(B" ",Tw(B" ",Tu(B" ",Ty(B" ",TA(B" ",T"(B" ",Tc(B" ",T=(B" ; ( .. /
;; ",T((B" ",TE(B" "/" "_" ",T@(B" ",T6(B" ",TX(B" ",TV(B" ; 0 .. 7
;; ",T$(B" ",T5(B" ",T+(B" ",TG(B" ",T2(B" ",T*(B" ",TL(B" ",TF(B" ; 8 .. ?
;; ",Tq(B" ",TD(B" ",TZ(B" ",T)(B" ",T/(B" ",T.(B" ",Tb(B" ",T,(B" ; @ .. G
;; ",Tg(B" ",T3(B" ",Tk(B" ",TI(B" ",TH(B" ",Tn(B" ",Tl(B" ",TO(B" ; H .. O
;; ",T-(B" ",Tp(B" ",T1(B" ",T&(B" ",T8(B" ",Tj(B" ",TN(B" "\"" ; P .. W
;; ")" ",Tm(B" "(" ",T:(B" ",T_(B" ",TE(B" ",TY(B" ",Tx(B" ; X .. _
;; ",T#(B" ",T?(B" ",TT(B" ",Ta(B" ",T!(B" ",TS(B" ",T4(B" ",T`(B" ; ` .. g
;; ",Ti(B" ",TC(B" ",Th(B" ",TR(B" ",TJ(B" ",T7(B" ",TW(B" ",T9(B" ; h .. o
;; ",TB(B" ",Tf(B" ",T>(B" ",TK(B" ",TP(B" ",TU(B" ",TM(B" ",Td(B" ; p .. w
;; ",T;(B" ",TQ(B" ",T<(B" ",T0(B" ",To(B" "," ",T%(B" 0 ; x .. DEL
;; 0 "#" "." "๒" "๓" "๔" "ั้" "ง" ; SPC .. '
;; "๖" "๗" "๕" "๙" "ม" "ข" "ใ" "ฝ" ; ( .. /
;; "จ" "ล" "/" "_" "ภ" "ถ" "ุ" "ึ" ; 0 .. 7
;; "ค" "ต" "ซ" "ว" "ฒ" "ช" "ฬ" "ฦ" ; 8 .. ?
;; "๑" "ฤ" "ฺ" "ฉ" "ฏ" "ฎ" "โ" "ฌ" ; @ .. G
;; "็" "ณ" "๋" "ษ" "ศ" "๎" "์" "ฯ" ; H .. O
;; "ญ" "" "ฑ" "ฆ" "ธ" "๊" "ฮ" "\"" ; P .. W
;; ")" "ํ" "(" "บ" "฿" "ล" "ู" "๘" ; X .. _
;; "ฃ" "ฟ" "ิ" "แ" "ก" "ำ" "ด" "เ" ; ` .. g
;; "้" "ร" "่" "า" "ส" "ท" "ื" "น" ; h .. o
;; "ย" "ๆ" "พ" "ห" "ะ" "ี" "อ" "ไ" ; p .. w
;; "ป" "ั" "ผ" "ฐ" "๏" "," "ฅ" 0 ; x .. DEL
;; This is the correct data nowadays.
0 "+" "." ",Tr(B" ",Ts(B" ",Tt(B" ",T_(B" ",T'(B" ; SPC .. '
",Tv(B" ",Tw(B" ",Tu(B" ",Ty(B" ",TA(B" ",T"(B" ",Tc(B" ",T=(B" ; ( .. /
",T((B" ",Te(B" "/" "-" ",T@(B" ",T6(B" ",TX(B" ",TV(B" ; 0 .. 7
",T$(B" ",T5(B" ",T+(B" ",TG(B" ",T2(B" ",T*(B" ",TL(B" ",TF(B" ; 8 .. ?
",Tq(B" ",TD(B" ",TZ(B" ",T)(B" ",T/(B" ",T.(B" ",Tb(B" ",T,(B" ; @ .. G
",Tg(B" ",T3(B" ",Tk(B" ",TI(B" ",TH(B" "?" ",Tl(B" ",TO(B" ; H .. O
",T-(B" ",Tp(B" ",T1(B" ",T&(B" ",T8(B" ",Tj(B" ",TN(B" "\"" ; P .. W
"\)" ",Tm(B" "\(" ",T:(B" ",T#(B" ",TE(B" ",TY(B" ",Tx(B" ; X .. _
"_" ",T?(B" ",TT(B" ",Ta(B" ",T!(B" ",TS(B" ",T4(B" ",T`(B" ; ` .. g
",Ti(B" ",TC(B" ",Th(B" ",TR(B" ",TJ(B" ",T7(B" ",TW(B" ",T9(B" ; h .. o
",TB(B" ",Tf(B" ",T>(B" ",TK(B" ",TP(B" ",TU(B" ",TM(B" ",Td(B" ; p .. w
",T;(B" ",TQ(B" ",T<(B" ",T0(B" ",T%(B" "," "%" 0 ; x .. DEL
0 "+" "." "" "" "" "฿" "" ; SPC .. '
"" "" "" "" "" "" "" "" ; ( .. /
"" "" "/" "-" "" "" "" "" ; 0 .. 7
"" "" "" "" "" "" "" "" ; 8 .. ?
"" "" "" "" "" "" "" "" ; @ .. G
"" "" "" "" "" "?" "" "" ; H .. O
"" "" "" "" "" "" "" "\"" ; P .. W
"\)" "" "\(" "" "" "" "" "" ; X .. _
"_" "" "" "" "" "" "" "" ; ` .. g
"" "" "" "" "" "" "" "" ; h .. o
"" "" "" "" "" "" "" "" ; p .. w
"" "" "" "" "" "," "%" 0 ; x .. DEL
])
;; Thai Pattachote keyboard support.
(quail-define-package
"thai-pattachote" "Thai" ",T!;(B>" t
"thai-pattachote" "Thai" "กป>" t
"Thai Pattachote input method with TIS620 keyboard layout"
nil t t t t nil nil nil nil nil t)
@ -95,18 +95,18 @@ The difference from the ordinal Thai keyboard:
[
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ; control codes
0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 ; control codes
0 "+" ",T1(B" "/" "," "?" "_" ",T"(B" ; SPC .. '
"(" ")" "." "%" ",TP(B" ",Tq(B" ",T((B" ",T>(B" ; ( .. /
",Tp(B" "=" ",Tr(B" ",Ts(B" ",Tt(B" ",Tu(B" ",TY(B" ",Tw(B" ; 0 .. 7
",Tx(B" ",Ty(B" ",T&(B" ",Td(B" ",T?(B" ",Tv(B" ",T2(B" ",TL(B" ; 8 .. ?
"\"" ",Tk(B" ",TQ(B" ",T0(B" ",TS(B" ",Tf(B" ",T3(B" ",Tl(B" ; @ .. G
",TW(B" ",T+(B" ",T<(B" ",T*(B" ",Tb(B" ",TN(B" ",TH(B" ",T6(B" ; H .. O
",T2(B" ",Tj(B" ",T-(B" ",T8(B" ",TI(B" ",T=(B" ",T@(B" ",TD(B" ; P .. W
",T.(B" ",TV(B" ",T.(B" ",Tc(B" ",TZ(B" ",T2(B" ",TX(B" "-" ; X .. _
",T#(B" ",Ti(B" ",TT(B" ",TE(B" ",T'(B" ",TB(B" ",T!(B" ",TQ(B" ; ` .. g
",TU(B" ",TA(B" ",TR(B" ",T9(B" ",T`(B" ",TJ(B" ",T$(B" ",TG(B" ; h .. o
",Ta(B" ",Tg(B" ",TM(B" ",T7(B" ",TC(B" ",T4(B" ",TK(B" ",T5(B" ; p .. w
",T;(B" ",Th(B" ",T:(B" ",TO(B" ",Tm(B" ",TF(B" ",T%(B" 0 ; x .. DEL
0 "+" "" "/" "," "?" "_" "" ; SPC .. '
"(" ")" "." "%" "" "" "" "" ; ( .. /
"" "=" "" "" "" "" "" "" ; 0 .. 7
"" "" "" "" "" "" "" "" ; 8 .. ?
"\"" "" "" "" "" "" "" "" ; @ .. G
"" "" "" "" "" "" "" "" ; H .. O
"" "" "" "" "" "" "" "" ; P .. W
"" "" "" "" "" "" "" "-" ; X .. _
"" "" "" "" "" "" "" "" ; ` .. g
"" "" "" "" "" "" "" "" ; h .. o
"" "" "" "" "" "" "" "" ; p .. w
"" "" "" "" "" "" "" 0 ; x .. DEL
])
;;; thai.el ends here

View file

@ -1,4 +1,4 @@
;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: iso-2022-7bit;-*-
;;; tibetan.el --- Quail package for inputting Tibetan characters -*-coding: utf-8-emacs;-*-
;; Copyright (C) 1997, 2001-2013 Free Software Foundation, Inc.
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
@ -68,82 +68,82 @@
;;; Wylie transcription based input methods.
;; Special alist for `$(7"A(B'. It must be treated as a subjoined
;; Special alist for `'. It must be treated as a subjoined
;; consonant if it follows a consonant.
;; * Removed by Tomabechi 2000/06/10 *
;; 'a chung must be explicitly typed as a vowel ("fa")
;; $(7"A(B is now treated as normal base consonants
;; (defconst tibetan-wylie-quote-alist '(("'" . ?$(7"A(B)))
;; is now treated as normal base consonants
;; (defconst tibetan-wylie-quote-alist '(("'" . ?)))
;; Special alist to avoid default stacking.
(defconst tibetan-wylie-non-stacking-alist
'(("-d" . "$(7"2(B")
("-y" . "$(7"B(B")))
'(("-d" . "")
("-y" . "")))
;; Punctuation characters are not transcribed.
(defconst tibetan-wylie-punctuation-alist
'(("." . " ")
(":" . "$(7"`(B")
(" " . "$(7!;(B")
("/" . "$(7!=(B")
("//" . "$(7!>(B")
("////" . ["$(7!>(B $(7!>(B"])
("$" . "$(7!?(B")
("/\"" . "$(7!@(B") ; Not defined in Ext. Wylie.
("&" . "$(7!@(B")
(";" . "$(7!A(B")
("%" . "$(7!D(B")
("!" . "$(7!8(B")
("<" . "$(7!l(B")
(">" . "$(7!m(B")
("@" . "$(7"f(B")
("*" . ["$(7!4!5(B"])
("#" . ["$(7!4!5!5(B"])
("^" . "$(7!6(B")
("0" . "$(7!P(B")
("1" . "$(7!Q(B")
("2" . "$(7!R(B")
("3" . "$(7!S(B")
("4" . "$(7!T(B")
("5" . "$(7!U(B")
("6" . "$(7!V(B")
("7" . "$(7!W(B")
("8" . "$(7!X(B")
("9" . "$(7!Y(B")
("-0" . "$(7!c(B")
("-1" . "$(7!Z(B")
("-2" . "$(7![(B")
("-3" . "$(7!\(B")
("-4" . "$(7!](B")
("-5" . "$(7!^(B")
("-6" . "$(7!_(B")
("-7" . "$(7!`(B")
("-8" . "$(7!a(B")
("-9" . "$(7!b(B")
("|" . "$(7!0!1!2!3!7!9!:!B!C!E!F!G!H!I!J!K!L!M!N!O!d!f!h!j!k!n!o#O#P#Q#R#S#T#U#V#W#X#Y#Z#[#\#]#`(B")))
(":" . "ཿ")
(" " . "")
("/" . "")
("//" . "")
("////" . ["༎ ༎"])
("$" . "")
("/\"" . "") ; Not defined in Ext. Wylie.
("&" . "")
(";" . "")
("%" . "")
("!" . "")
("<" . "")
(">" . "")
("@" . "")
("*" . ["༄༅"])
("#" . ["༄༅༅"])
("^" . "")
("0" . "")
("1" . "")
("2" . "")
("3" . "")
("4" . "")
("5" . "")
("6" . "")
("7" . "")
("8" . "")
("9" . "")
("-0" . "")
("-1" . "")
("-2" . "")
("-3" . "")
("-4" . "")
("-5" . "")
("-6" . "")
("-7" . "")
("-8" . "")
("-9" . "")
("|" . "ༀ༁༂༃༇༉༊༒༓༕༖༗༘༙༚༛༜༝༞༟༴༶༸༺༻༾༿྾྿࿀࿁࿂࿃࿄࿅࿆࿇࿈࿉࿊࿋࿌࿏")))
(quail-define-package "tibetan-wylie" "Tibetan" "TIBw" t
"Tibetan character input by Extended Wylie key assignment.
+-------------------------------------+
|$(7"!!;(B k |$(7""!;(B kh |$(7"#!;(B g |$(7"$!;(B gh |$(7"%!;(B ng| $(7"S(B i $(7!=(B /
|$(7"&!;(B c |$(7"'!;(B ch |$(7"(!;(B j | |$(7"*!;(B ny| $(7"U(B u $(7!>(B //
|$(7"+!;(B T |$(7",!;(B TH |$(7"-!;(B D |$(7".!;(B DH |$(7"/!;(B N | $(7"[(B e $(7!>(B $(7!>(B ////
|$(7"0!;(B t |$(7"1!;(B th |$(7"2!;(B d |$(7"3!;(B dh |$(7"4!;(B n | $(7"](B o $(7!A(B ;
|$(7"5!;(B p |$(7"6!;(B ph |$(7"7!;(B b |$(7"8!;(B bh |$(7"9!;(B m | $(7"\(B ai (ee, E) $(7!?(B $
|$(7":!;(B ts|$(7";!;(B tsh|$(7"<!;(B dz |$(7"=!;(B dzh|$(7">!;(B w | $(7"^(B au (oo, O) $(7!@(B &
|$(7"?!;(B zh|$(7"@!;(B z |$(7"A!;(B ' | |$(7"B!;(B y | $(7"a(B I $(7!4!5(B *
|$(7"C!;(B r |$(7"D!;(B l |$(7"E!;(B sh |$(7"F!;(B SH |$(7"G!;(B s | $(7"`(B : $(7!4!5!5(B #
|$(7"H!;(B h |$(7"I!;(B A |$(7"J!;(B kSH| | | $(7"_(B M $(7!l(B $(7!m(B < >
+-------------------------------------+ $(7!D(B %
(The consonant $(7"I!;(B must be typed explicitly.)
| k |ཁ kh |ག g |གྷ gh |ང ng| i /
| c |ཆ ch |ཇ j | |ཉ ny| u //
| T |ཋ TH |ཌ D |ཌྷ DH |ཎ N | e ////
| t |ཐ th |ད d |དྷ dh |ན n | o ;
| p |ཕ ph |བ b |བྷ bh |མ m | ai (ee, E) $
| ts|ཚ tsh|ཛ dz |ཛྷ dzh|ཝ w | au (oo, O) &
| zh|ཟ z |འ ' | |ཡ y | I *
| r |ལ l |ཤ sh |ཥ SH |ས s | ཿ : #
| h |ཨ A |ཀྵ kSH| | | M < >
+-------------------------------------+ %
(The consonant must be typed explicitly.)
NOT SPECIFIED IN EXT. WYLIE:
+--------------------------------------------------------+
|$(7"c(B = ~ |$(7"d(B = ` |$(7"e(B = , |$(7"f(B = @ |$(7!g(B = _o|$(7!e(B = _O|$(7!6(B = ^|
|= ~ |ྃ = ` |྄ = , | = @ |༷ = _o|༵ = _O| = ^|
+--------------------------------------------------------+
|$(7"i(B = x |$(7"j(B = X |$(7"g(B = v |$(7"h(B = V |$(7"k(B = q |$(7"l(B = Q |
|= x |ྉ = X |྆ = v |྇ = V |ྊ = q |ྋ = Q |
+-----------------------------------------------+
SPECIAL KEYS
@ -284,7 +284,7 @@
("h," . "+s") ; sa
("h." . "+h") ; ha
("h/" . "+A") ; Aa
;; Special rule for `$(7"B(B' to avoid stacking.
;; Special rule for `' to avoid stacking.
("E" . "-y")
))
@ -318,39 +318,39 @@
(error "No Tibetan transcription for %s" (cdr elt))))))
(defconst tibetan-punctuation-tibkey-alist
'(("1" . "$(7!Q(B")
("!" . "$(7!4(B") ; nyi zla long
("2" . "$(7!R(B")
("@" . "$(7!5(B") ; nyi zla simple
("3" . "$(7!S(B")
'(("1" . "")
("!" . "") ; nyi zla long
("2" . "")
("@" . "") ; nyi zla simple
("3" . "")
;;; ("#" )
("4" . "$(7!T(B")
("4" . "")
;;; ("$" )
("5" . "$(7!U(B")
("%" . "$(7!D(B")
("6" . "$(7!V(B")
("^" . "$(7!1(B")
("7" . "$(7!W(B")
("8" . "$(7!X(B")
("5" . "")
("%" . "")
("6" . "")
("^" . "")
("7" . "")
("8" . "")
;;; ("*" ) ; avagraha, not supported yet
("9" . "$(7!Y(B")
("(" . "$(7!l(B")
("0" . "$(7!P(B")
(")" . "$(7!m(B")
("9" . "")
("(" . "")
("0" . "")
(")" . "")
;;; ("-" ) ; emphatic, not yet supported
;;; ("_" ) ; id.
;;; ("=" ) ; special sign, not yet supported
("+" . "$(7!A(B")
("\\" . "$(7!?(B")
("|" . "$(7!8(B")
("I" . "$(7"f(B") ; avagraha
(":" . "$(7"`(B")
;;; (">" ?$(7!;(B) ; to be assigned to SPC
("+" . "")
("\\" . "")
("|" . "")
("I" . "") ; avagraha
(":" . "ཿ")
;;; (">" ?) ; to be assigned to SPC
(">" . " ")
("?" . "$(7!=(B")
("??" . "$(7!>(B")
("????" . ["$(7!>(B $(7!>(B"])
(" " . "$(7!;(B")
("?" . "")
("??" . "")
("????" . ["༎ ༎"])
(" " . "")
))
;; Convert TibKey string to Tibetan-Roman transcription string.
@ -401,26 +401,26 @@
[NOT SHIFTED]
+-------------------------------------------------------+
|`$(7"d(B|1$(7!Q(B|2$(7!R(B|3$(7!S(B|4$(7!T(B|5$(7!U(B|6$(7!V(B|7$(7!W(B|8$(7!X(B|9$(7!Y(B|0$(7!P(B|- |= |\\$(7!8(B|
|`ྃ|1༡|2༢|3༣|4༤|5༥|6༦|7༧|8༨|9༩|0༠|- |= |\\|
+-------------------------------------------------------+
|q$(7"!(B|w$(7""(B|e$(7"#(B|r$(7"%(B|t$(7"&(B|y$(7"'(B|u$(7"((B|i$(7"*(B|o$(7"0(B|p$(7"1(B|[$(7"2(B|]$(7"4(B|
|qཀ|wཁ|eག|rང|tཅ|yཆ|uཇ|iཉ|oཏ|pཐ|[ད|]|
+-----------------------------------------------+
|a$(7"5(B| s$(7"6(B| d$(7"7(B|f$(7"9(B|g$(7"U(B|h |j$(7"](B|k$(7":(B|l$(7";(B|;$(7"<(B|'$(7">(B|
|aཔ| sཕ| dབ|fམ|gུ|h |jོ|kཙ|lཚ|;ཛ|'ཝ|
+---------------------------------------------+
|z$(7"?(B|x$(7"@(B|c$(7"A(B|v$(7"B(B|b$(7"C(B|n$(7"D(B|m$(7"E(B|,$(7"G(B|.$(7"H(B|/$(7"I(B|
|zཞ|xཟ|cའ|vཡ|bར|nལ|mཤ|,ས|.ཧ|/ཨ|
+---------------------------------------+
The key 'h' is used for consonant stacking.
[SHIFTED]
+----------------------------------------------------------+
|~$(7"c(B|!$(7!4(B|@$(7!5(B|# |$ |%$(7!D(B |^$(7!1(B|& |* |($(7!l(B|)$(7!m(B|_ |+$(7!A(B| |$(7!8(B|
|~ྂ|!|@|# |$ |% |^|& |* |(|)|_ |+| ||
+----------------------------------------------------------+
|Q$(7"J(B|W |E |R |T$(7"a(B|Y |U |I$(7"f(B|O$(7"+(B|P$(7",(B|{$(7"-(B|}$(7"/(B|
|Qཀྵ|W |E |R |Tྀ|Y |U |I|Oཊ|Pཋ|{ཌ|}ཎ|
+-----------------------------------------------+
|A |S |D |F$(7"_(B|G$(7"S(B|H$(7"e(B|J$(7"[(B|K |L |:$(7"`(B|\"$(7#>(B|
|A |S |D |Fཾ|Gི|H྄|Jེ|K |L |:ཿ|\"ྭ|
+-------------------------------------------+
|Z |X |C$(7"R(B|V$(7#B(B|B$(7#C(B|N$(7#D(B|M$(7"F(B|< |> |?$(7!=(B |
|Z |X |Cཱ|Vྱ|Bྲ|Nླ|Mཥ|< |> |? |
+---------------------------------------+
DIFFERENCE FROM THE ORIGINAL TIBKEY:
@ -431,8 +431,8 @@
vowel sign for 'a'.
2. Tsheg is assigned to SPC key. You can input a space
by typing '>'.
4. To avoid the default stacking $(7$B(B and to obtain $(7"#"B(B,
type 'E' instead of 'v' (=$(7"B(B).
4. To avoid the default stacking <EFBFBD><EFBFBD><EFBFBD><EFBFBD> and to obtain གཡ,
type 'E' instead of 'v' (=ཡ).
3. There are many characters that are not supported in the
current implementation (especially special signs). I hope
I'll complete in a future revision.

View file

@ -1,4 +1,4 @@
;;; viqr.el --- Quail packages for inputting Vietnamese with VIQR system -*-coding: iso-2022-7bit;-*-
;;; viqr.el --- Quail packages for inputting Vietnamese with VIQR system -*-coding: utf-8;-*-
;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007, 2008, 2009, 2010, 2011
@ -48,21 +48,21 @@
effect | postfix | examples
------------+---------+----------
breve | ( | a( -> ,1e(B
circumflex | ^ | a^ -> ,1b(B
horn | + | o+ -> ,1=(B
breve | ( | a( -> ă
circumflex | ^ | a^ -> â
horn | + | o+ -> ơ
------------+---------+----------
acute | ' | a' -> ,1a(B
grave | ` | a` -> ,1`(B
hook above | ? | a? -> ,1d(B
tilde | ~ | a~ -> ,1c(B
dot below | . | a. -> ,1U(B
acute | ' | a' -> á
grave | ` | a` -> à
hook above | ? | a? ->
tilde | ~ | a~ -> ã
dot below | . | a. ->
------------+---------+----------
d bar | dd | dd -> ,1p(B
d bar | dd | dd -> đ
------------+---------+----------
no compose | \\ | a\\. -> a.
------------+---------+----------
combination| (~ | a(~ -> ,1G(B
combination| (~ | a(~ ->
" nil t t nil nil t nil nil nil nil t)

View file

@ -40,30 +40,30 @@
Vowels with circumflex:
aa -> ,1b(B, EE -> ,2j(B, etc.
aa -> â, EE -> Ê, etc.
Other diacritics:
effect postfix examples
------------------------------
breve w aw -> ,1e(B
horn w ow -> ,1=(B
breve w aw -> ă
horn w ow -> ơ
acute s as -> ,1a(B
grave f af -> ,1`(B
hook above r ar -> ,1d(B
tilde x ax -> ,1c(B
dot below j aj -> ,1U(B
acute s as -> á
grave f af -> à
hook above r ar ->
tilde x ax -> ã
dot below j aj ->
d bar dd -> ,1p(B
d bar dd -> đ
Combinations:
AWF -> ,2"(B, owx -> ,1^(B, etc.
AWF -> Ằ, owx -> ỡ, etc.
Alternatives:
EE = Ee -> ,2j(B, AWF = Awf -> ,2"(B, etc.
EE = Ee -> Ê, AWF = Awf -> Ằ, etc.
Doubling the postfix (but not in combinations) separates the letter
and postfix: Eee -> Ee, ajj -> aj, etc.
@ -81,208 +81,208 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
t) ; SIMPLE
(quail-define-rules
("af" ?,1`(B) ; LATIN SMALL LETTER A WITH GRAVE
("AF" ?,2`(B) ; LATIN CAPITAL LETTER A WITH GRAVE
("Af" ?,2`(B)
("as" ?,1a(B) ; LATIN SMALL LETTER A WITH ACUTE
("AS" ?,2a(B) ; LATIN CAPITAL LETTER A WITH ACUTE
("As" ?,2a(B)
("aa" ?,1b(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX
("AA" ?,2b(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX
("Aa" ?,2b(B)
("ax" ?,1c(B) ; LATIN SMALL LETTER A WITH TILDE
("AX" ?,2c(B) ; LATIN CAPITAL LETTER A WITH TILDE
("Ax" ?,2c(B)
("ef" ?,1h(B) ; LATIN SMALL LETTER E WITH GRAVE
("EF" ?,2h(B) ; LATIN CAPITAL LETTER E WITH GRAVE
("Ef" ?,2h(B)
("es" ?,1i(B) ; LATIN SMALL LETTER E WITH ACUTE
("ES" ?,2i(B) ; LATIN CAPITAL LETTER E WITH ACUTE
("Es" ?,2i(B)
("ee" ?,1j(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX
("EE" ?,2j(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX
("Ee" ?,2j(B)
("if" ?,1l(B) ; LATIN SMALL LETTER I WITH GRAVE
("IF" ?,2l(B) ; LATIN CAPITAL LETTER I WITH GRAVE
("If" ?,2l(B)
("is" ?,1m(B) ; LATIN SMALL LETTER I WITH ACUTE
("IS" ?,2m(B) ; LATIN CAPITAL LETTER I WITH ACUTE
("Is" ?,2m(B)
("of" ?,1r(B) ; LATIN SMALL LETTER O WITH GRAVE
("OF" ?,2r(B) ; LATIN CAPITAL LETTER O WITH GRAVE
("Of" ?,2r(B)
("os" ?,1s(B) ; LATIN SMALL LETTER O WITH ACUTE
("OS" ?,2s(B) ; LATIN CAPITAL LETTER O WITH ACUTE
("Os" ?,2s(B)
("oo" ?,1t(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX
("OO" ?,2t(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX
("Oo" ?,2t(B)
("ox" ?,1u(B) ; LATIN SMALL LETTER O WITH TILDE
("OX" ?,2u(B) ; LATIN CAPITAL LETTER O WITH TILDE
("Ox" ?,2u(B)
("uf" ?,1y(B) ; LATIN SMALL LETTER U WITH GRAVE
("UF" ?,2y(B) ; LATIN CAPITAL LETTER U WITH GRAVE
("Uf" ?,2y(B)
("us" ?,1z(B) ; LATIN SMALL LETTER U WITH ACUTE
("US" ?,2z(B) ; LATIN CAPITAL LETTER U WITH ACUTE
("Us" ?,2z(B)
("ys" ?,1}(B) ; LATIN SMALL LETTER Y WITH ACUTE
("YS" ?,2}(B) ; LATIN CAPITAL LETTER Y WITH ACUTE
("Ys" ?,2}(B)
("aw" ?,1e(B) ; LATIN SMALL LETTER A WITH BREVE
("AW" ?,2e(B) ; LATIN CAPITAL LETTER A WITH BREVE
("Aw" ?,2e(B)
("ix" ?,1n(B) ; LATIN SMALL LETTER I WITH TILDE
("IX" ?,2n(B) ; LATIN CAPITAL LETTER I WITH TILDE
("Ix" ?,2n(B)
("ux" ?,1{(B) ; LATIN SMALL LETTER U WITH TILDE
("UX" ?,2{(B) ; LATIN CAPITAL LETTER U WITH TILDE
("Ux" ?,2{(B)
("ow" ?,1=(B) ; LATIN SMALL LETTER O WITH HORN
("OW" ?,2=(B) ; LATIN CAPITAL LETTER O WITH HORN
("Ow" ?,2=(B)
("uw" ?,1_(B) ; LATIN SMALL LETTER U WITH HORN
("UW" ?,2_(B) ; LATIN CAPITAL LETTER U WITH HORN
("Uw" ?,2_(B)
("aj" ?,1U(B) ; LATIN SMALL LETTER A WITH DOT BELOW
("AJ" ?,2U(B) ; LATIN CAPITAL LETTER A WITH DOT BELOW
("Aj" ?,2U(B)
("ar" ?,1d(B) ; LATIN SMALL LETTER A WITH HOOK ABOVE
("AR" ?,2d(B) ; LATIN CAPITAL LETTER A WITH HOOK ABOVE
("Ar" ?,2d(B)
("aas" ?,1$(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
("AAS" ?,2$(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
("Aas" ?,2$(B)
("aaf" ?,1%(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
("AAF" ?,2%(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
("Aaf" ?,2%(B)
("aar" ?,1&(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
("AAR" ?,2&(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
("Aar" ?,2&(B)
("aax" ?,1g(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
("AAX" ?,2g(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
("Aax" ?,2g(B)
("aaj" ?,1'(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("AAJ" ?,2'(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("Aaj" ?,2'(B)
("aws" ?,1!(B) ; LATIN SMALL LETTER A WITH BREVE AND ACUTE
("AWS" ?,2!(B) ; LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
("Aws" ?,2!(B)
("awf" ?,1"(B) ; LATIN SMALL LETTER A WITH BREVE AND GRAVE
("AWF" ?,2"(B) ; LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
("Awf" ?,2"(B)
("awr" ?,1F(B) ; LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
("AWR" ?,2F(B) ; LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
("Awr" ?,2F(B)
("awx" ?,1G(B) ; LATIN SMALL LETTER A WITH BREVE AND TILDE
("AWX" ?,2G(B) ; LATIN CAPITAL LETTER A WITH BREVE AND TILDE
("Awx" ?,2G(B)
("awj" ?,1#(B) ; LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
("AWJ" ?,2#(B) ; LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
("Awj" ?,2#(B)
("ej" ?,1)(B) ; LATIN SMALL LETTER E WITH DOT BELOW
("EJ" ?,2)(B) ; LATIN CAPITAL LETTER E WITH DOT BELOW
("Ej" ?,2)(B)
("er" ?,1k(B) ; LATIN SMALL LETTER E WITH HOOK ABOVE
("ER" ?,2k(B) ; LATIN CAPITAL LETTER E WITH HOOK ABOVE
("Er" ?,2k(B)
("ex" ?,1((B) ; LATIN SMALL LETTER E WITH TILDE
("EX" ?,2((B) ; LATIN CAPITAL LETTER E WITH TILDE
("Ex" ?,2((B)
("ees" ?,1*(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
("EES" ?,2*(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
("Ees" ?,2*(B)
("eef" ?,1+(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
("EEF" ?,2+(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
("Eef" ?,2+(B)
("eer" ?,1,(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
("EER" ?,2,(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
("Eer" ?,2,(B)
("eex" ?,1-(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
("EEX" ?,2-(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
("Eex" ?,2-(B)
("eej" ?,1.(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("EEJ" ?,2.(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("Eej" ?,2.(B)
("ir" ?,1o(B) ; LATIN SMALL LETTER I WITH HOOK ABOVE
("IR" ?,2o(B) ; LATIN CAPITAL LETTER I WITH HOOK ABOVE
("Ir" ?,2o(B)
("ij" ?,18(B) ; LATIN SMALL LETTER I WITH DOT BELOW
("IJ" ?,28(B) ; LATIN CAPITAL LETTER I WITH DOT BELOW
("Ij" ?,28(B)
("oj" ?,1w(B) ; LATIN SMALL LETTER O WITH DOT BELOW
("OJ" ?,2w(B) ; LATIN CAPITAL LETTER O WITH DOT BELOW
("Oj" ?,2w(B)
("or" ?,1v(B) ; LATIN SMALL LETTER O WITH HOOK ABOVE
("OR" ?,2v(B) ; LATIN CAPITAL LETTER O WITH HOOK ABOVE
("Or" ?,2v(B)
("oos" ?,1/(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
("OOS" ?,2/(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
("Oos" ?,2/(B)
("oof" ?,10(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
("OOF" ?,20(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
("Oof" ?,20(B)
("oor" ?,11(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
("OOR" ?,21(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
("Oor" ?,21(B)
("oox" ?,12(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
("OOX" ?,22(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
("Oox" ?,22(B)
("ooj" ?,15(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
("OOJ" ?,25(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
("Ooj" ?,25(B)
("ows" ?,1>(B) ; LATIN SMALL LETTER O WITH HORN AND ACUTE
("OWS" ?,2>(B) ; LATIN CAPITAL LETTER O WITH HORN AND ACUTE
("Ows" ?,2>(B)
("owf" ?,16(B) ; LATIN SMALL LETTER O WITH HORN AND GRAVE
("OWF" ?,26(B) ; LATIN CAPITAL LETTER O WITH HORN AND GRAVE
("Owf" ?,26(B)
("owr" ?,17(B) ; LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
("OWR" ?,27(B) ; LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
("Owr" ?,27(B)
("owx" ?,1^(B) ; LATIN SMALL LETTER O WITH HORN AND TILDE
("OWX" ?,2^(B) ; LATIN CAPITAL LETTER O WITH HORN AND TILDE
("Owx" ?,2^(B)
("owj" ?,1~(B) ; LATIN SMALL LETTER O WITH HORN AND DOT BELOW
("OWJ" ?,2~(B) ; LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
("Owj" ?,2~(B)
("uj" ?,1x(B) ; LATIN SMALL LETTER U WITH DOT BELOW
("UJ" ?,2x(B) ; LATIN CAPITAL LETTER U WITH DOT BELOW
("Uj" ?,2x(B)
("ur" ?,1|(B) ; LATIN SMALL LETTER U WITH HOOK ABOVE
("UR" ?,2|(B) ; LATIN CAPITAL LETTER U WITH HOOK ABOVE
("Ur" ?,2|(B)
("uws" ?,1Q(B) ; LATIN SMALL LETTER U WITH HORN AND ACUTE
("UWS" ?,2Q(B) ; LATIN CAPITAL LETTER U WITH HORN AND ACUTE
("Uws" ?,2Q(B)
("uwf" ?,1W(B) ; LATIN SMALL LETTER U WITH HORN AND GRAVE
("UWF" ?,2W(B) ; LATIN CAPITAL LETTER U WITH HORN AND GRAVE
("Uwf" ?,2W(B)
("uwr" ?,1X(B) ; LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
("UWR" ?,2X(B) ; LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
("Uwr" ?,2X(B)
("uwx" ?,1f(B) ; LATIN SMALL LETTER U WITH HORN AND TILDE
("UWX" ?,2f(B) ; LATIN CAPITAL LETTER U WITH HORN AND TILDE
("Uwx" ?,2f(B)
("uwj" ?,1q(B) ; LATIN SMALL LETTER U WITH HORN AND DOT BELOW
("UWJ" ?,2q(B) ; LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
("Uwj" ?,2q(B)
("yf" ?,1O(B) ; LATIN SMALL LETTER Y WITH GRAVE
("YF" ?,2O(B) ; LATIN CAPITAL LETTER Y WITH GRAVE
("Yf" ?,2O(B)
("yj" ?,1\(B) ; LATIN SMALL LETTER Y WITH DOT BELOW
("YJ" ?,2\(B) ; LATIN CAPITAL LETTER Y WITH DOT BELOW
("Yj" ?,2\(B)
("yr" ?,1V(B) ; LATIN SMALL LETTER Y WITH HOOK ABOVE
("YR" ?,2V(B) ; LATIN CAPITAL LETTER Y WITH HOOK ABOVE
("Yr" ?,2V(B)
("yx" ?,1[(B) ; LATIN SMALL LETTER Y WITH TILDE
("YX" ?,2[(B) ; LATIN CAPITAL LETTER Y WITH TILDE
("Yx" ?,2[(B)
("dd" ?,1p(B) ; LATIN SMALL LETTER D WITH STROKE
("DD" ?,2p(B) ; LATIN CAPITAL LETTER D WITH STROKE
("Dd" ?,2p(B)
;("$$" ?$,1tK(B) ; U+20AB DONG SIGN (#### check)
("af" ?à) ; LATIN SMALL LETTER A WITH GRAVE
("AF" ?À) ; LATIN CAPITAL LETTER A WITH GRAVE
("Af" ?À)
("as" ?á) ; LATIN SMALL LETTER A WITH ACUTE
("AS" ?Á) ; LATIN CAPITAL LETTER A WITH ACUTE
("As" ?Á)
("aa" ?â) ; LATIN SMALL LETTER A WITH CIRCUMFLEX
("AA" ?Â) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX
("Aa" ?Â)
("ax" ?ã) ; LATIN SMALL LETTER A WITH TILDE
("AX" ?Ã) ; LATIN CAPITAL LETTER A WITH TILDE
("Ax" ?Ã)
("ef" ?è) ; LATIN SMALL LETTER E WITH GRAVE
("EF" ?È) ; LATIN CAPITAL LETTER E WITH GRAVE
("Ef" ?È)
("es" ?é) ; LATIN SMALL LETTER E WITH ACUTE
("ES" ?É) ; LATIN CAPITAL LETTER E WITH ACUTE
("Es" ?É)
("ee" ?ê) ; LATIN SMALL LETTER E WITH CIRCUMFLEX
("EE" ?Ê) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX
("Ee" ?Ê)
("if" ?ì) ; LATIN SMALL LETTER I WITH GRAVE
("IF" ?Ì) ; LATIN CAPITAL LETTER I WITH GRAVE
("If" ?Ì)
("is" ?í) ; LATIN SMALL LETTER I WITH ACUTE
("IS" ?Í) ; LATIN CAPITAL LETTER I WITH ACUTE
("Is" ?Í)
("of" ?ò) ; LATIN SMALL LETTER O WITH GRAVE
("OF" ?Ò) ; LATIN CAPITAL LETTER O WITH GRAVE
("Of" ?Ò)
("os" ?ó) ; LATIN SMALL LETTER O WITH ACUTE
("OS" ?Ó) ; LATIN CAPITAL LETTER O WITH ACUTE
("Os" ?Ó)
("oo" ?ô) ; LATIN SMALL LETTER O WITH CIRCUMFLEX
("OO" ?Ô) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX
("Oo" ?Ô)
("ox" ?õ) ; LATIN SMALL LETTER O WITH TILDE
("OX" ?Õ) ; LATIN CAPITAL LETTER O WITH TILDE
("Ox" ?Õ)
("uf" ?ù) ; LATIN SMALL LETTER U WITH GRAVE
("UF" ?Ù) ; LATIN CAPITAL LETTER U WITH GRAVE
("Uf" ?Ù)
("us" ?ú) ; LATIN SMALL LETTER U WITH ACUTE
("US" ?Ú) ; LATIN CAPITAL LETTER U WITH ACUTE
("Us" ?Ú)
("ys" ?ý) ; LATIN SMALL LETTER Y WITH ACUTE
("YS" ?Ý) ; LATIN CAPITAL LETTER Y WITH ACUTE
("Ys" ?Ý)
("aw" ?ă) ; LATIN SMALL LETTER A WITH BREVE
("AW" ?Ă) ; LATIN CAPITAL LETTER A WITH BREVE
("Aw" ?Ă)
("ix" ?ĩ) ; LATIN SMALL LETTER I WITH TILDE
("IX" ?Ĩ) ; LATIN CAPITAL LETTER I WITH TILDE
("Ix" ?Ĩ)
("ux" ?ũ) ; LATIN SMALL LETTER U WITH TILDE
("UX" ?Ũ) ; LATIN CAPITAL LETTER U WITH TILDE
("Ux" ?Ũ)
("ow" ?ơ) ; LATIN SMALL LETTER O WITH HORN
("OW" ?Ơ) ; LATIN CAPITAL LETTER O WITH HORN
("Ow" ?Ơ)
("uw" ?ư) ; LATIN SMALL LETTER U WITH HORN
("UW" ?Ư) ; LATIN CAPITAL LETTER U WITH HORN
("Uw" ?Ư)
("aj" ?) ; LATIN SMALL LETTER A WITH DOT BELOW
("AJ" ?) ; LATIN CAPITAL LETTER A WITH DOT BELOW
("Aj" ?)
("ar" ?) ; LATIN SMALL LETTER A WITH HOOK ABOVE
("AR" ?) ; LATIN CAPITAL LETTER A WITH HOOK ABOVE
("Ar" ?)
("aas" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
("AAS" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
("Aas" ?)
("aaf" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
("AAF" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
("Aaf" ?)
("aar" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
("AAR" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
("Aar" ?)
("aax" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
("AAX" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
("Aax" ?)
("aaj" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("AAJ" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("Aaj" ?)
("aws" ?) ; LATIN SMALL LETTER A WITH BREVE AND ACUTE
("AWS" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
("Aws" ?)
("awf" ?) ; LATIN SMALL LETTER A WITH BREVE AND GRAVE
("AWF" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
("Awf" ?)
("awr" ?) ; LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
("AWR" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
("Awr" ?)
("awx" ?) ; LATIN SMALL LETTER A WITH BREVE AND TILDE
("AWX" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND TILDE
("Awx" ?)
("awj" ?) ; LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
("AWJ" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
("Awj" ?)
("ej" ?) ; LATIN SMALL LETTER E WITH DOT BELOW
("EJ" ?) ; LATIN CAPITAL LETTER E WITH DOT BELOW
("Ej" ?)
("er" ?) ; LATIN SMALL LETTER E WITH HOOK ABOVE
("ER" ?) ; LATIN CAPITAL LETTER E WITH HOOK ABOVE
("Er" ?)
("ex" ?) ; LATIN SMALL LETTER E WITH TILDE
("EX" ?) ; LATIN CAPITAL LETTER E WITH TILDE
("Ex" ?)
("ees" ?ế) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
("EES" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
("Ees" ?)
("eef" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
("EEF" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
("Eef" ?)
("eer" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
("EER" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HOOK ABOVE
("Eer" ?)
("eex" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
("EEX" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
("Eex" ?)
("eej" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("EEJ" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("Eej" ?)
("ir" ?) ; LATIN SMALL LETTER I WITH HOOK ABOVE
("IR" ?) ; LATIN CAPITAL LETTER I WITH HOOK ABOVE
("Ir" ?)
("ij" ?) ; LATIN SMALL LETTER I WITH DOT BELOW
("IJ" ?) ; LATIN CAPITAL LETTER I WITH DOT BELOW
("Ij" ?)
("oj" ?) ; LATIN SMALL LETTER O WITH DOT BELOW
("OJ" ?) ; LATIN CAPITAL LETTER O WITH DOT BELOW
("Oj" ?)
("or" ?) ; LATIN SMALL LETTER O WITH HOOK ABOVE
("OR" ?) ; LATIN CAPITAL LETTER O WITH HOOK ABOVE
("Or" ?)
("oos" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
("OOS" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
("Oos" ?)
("oof" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
("OOF" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
("Oof" ?)
("oor" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
("OOR" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HOOK ABOVE
("Oor" ?)
("oox" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
("OOX" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
("Oox" ?)
("ooj" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELOW
("OOJ" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELOW
("Ooj" ?)
("ows" ?) ; LATIN SMALL LETTER O WITH HORN AND ACUTE
("OWS" ?) ; LATIN CAPITAL LETTER O WITH HORN AND ACUTE
("Ows" ?)
("owf" ?) ; LATIN SMALL LETTER O WITH HORN AND GRAVE
("OWF" ?) ; LATIN CAPITAL LETTER O WITH HORN AND GRAVE
("Owf" ?)
("owr" ?) ; LATIN SMALL LETTER O WITH HORN AND HOOK ABOVE
("OWR" ?) ; LATIN CAPITAL LETTER O WITH HORN AND HOOK ABOVE
("Owr" ?)
("owx" ?) ; LATIN SMALL LETTER O WITH HORN AND TILDE
("OWX" ?) ; LATIN CAPITAL LETTER O WITH HORN AND TILDE
("Owx" ?)
("owj" ?) ; LATIN SMALL LETTER O WITH HORN AND DOT BELOW
("OWJ" ?) ; LATIN CAPITAL LETTER O WITH HORN AND DOT BELOW
("Owj" ?)
("uj" ?) ; LATIN SMALL LETTER U WITH DOT BELOW
("UJ" ?) ; LATIN CAPITAL LETTER U WITH DOT BELOW
("Uj" ?)
("ur" ?) ; LATIN SMALL LETTER U WITH HOOK ABOVE
("UR" ?) ; LATIN CAPITAL LETTER U WITH HOOK ABOVE
("Ur" ?)
("uws" ?) ; LATIN SMALL LETTER U WITH HORN AND ACUTE
("UWS" ?) ; LATIN CAPITAL LETTER U WITH HORN AND ACUTE
("Uws" ?)
("uwf" ?) ; LATIN SMALL LETTER U WITH HORN AND GRAVE
("UWF" ?) ; LATIN CAPITAL LETTER U WITH HORN AND GRAVE
("Uwf" ?)
("uwr" ?) ; LATIN SMALL LETTER U WITH HORN AND HOOK ABOVE
("UWR" ?) ; LATIN CAPITAL LETTER U WITH HORN AND HOOK ABOVE
("Uwr" ?)
("uwx" ?) ; LATIN SMALL LETTER U WITH HORN AND TILDE
("UWX" ?) ; LATIN CAPITAL LETTER U WITH HORN AND TILDE
("Uwx" ?)
("uwj" ?) ; LATIN SMALL LETTER U WITH HORN AND DOT BELOW
("UWJ" ?) ; LATIN CAPITAL LETTER U WITH HORN AND DOT BELOW
("Uwj" ?)
("yf" ?) ; LATIN SMALL LETTER Y WITH GRAVE
("YF" ?) ; LATIN CAPITAL LETTER Y WITH GRAVE
("Yf" ?)
("yj" ?) ; LATIN SMALL LETTER Y WITH DOT BELOW
("YJ" ?) ; LATIN CAPITAL LETTER Y WITH DOT BELOW
("Yj" ?)
("yr" ?) ; LATIN SMALL LETTER Y WITH HOOK ABOVE
("YR" ?) ; LATIN CAPITAL LETTER Y WITH HOOK ABOVE
("Yr" ?)
("yx" ?) ; LATIN SMALL LETTER Y WITH TILDE
("YX" ?) ; LATIN CAPITAL LETTER Y WITH TILDE
("Yx" ?)
("dd" ?đ) ; LATIN SMALL LETTER D WITH STROKE
("DD" ?Đ) ; LATIN CAPITAL LETTER D WITH STROKE
("Dd" ?Đ)
;("$$" ?) ; U+20AB DONG SIGN (#### check)
("aff" ["af"])
("AFF" ["AF"])
@ -422,7 +422,7 @@ and postfix: Eee -> Ee, ajj -> aj, etc.
)
;; Local Variables:
;; coding: iso-2022-7bit
;; coding: utf-8
;; End:
;;; vntelex.el ends here

View file

@ -43,21 +43,21 @@ Diacritics:
effect postfix examples
------------------------------
circumflex 6 a6 -> ,Ab(B
breve 8 a8 -> ,1e(B
horn 7 o7 -> ,1=(B
circumflex 6 a6 -> â
breve 8 a8 -> ă
horn 7 o7 -> ơ
acute 1 a1 -> ,1a(B
grave 2 a2 -> ,1`(B
hook above 3 a3 -> ,1d(B
tilde 4 a4 -> ,1c(B
dot below 5 a5 -> ,1U(B
acute 1 a1 -> á
grave 2 a2 -> à
hook above 3 a3 ->
tilde 4 a4 -> ã
dot below 5 a5 ->
d bar 9 d9 -> ,1p(B
d bar 9 d9 -> đ
Combinations:
A82 -> ,2"(B, o74 -> ,1^(B, etc.
A82 -> Ằ, o74 -> ỡ, etc.
Doubling the postfix (but not in combinations) separates the letter
and postfix: E66 -> E6, a55 -> a5, etc.
@ -75,141 +75,141 @@ and postfix: E66 -> E6, a55 -> a5, etc.
t) ; SIMPLE
(quail-define-rules
("a2" ?,1`(B) ; LATIN SMALL LETTER A WITH GRAVE
("A2" ?,2`(B) ; LATIN CAPITAL LETTER A WITH GRAVE
("a1" ?,1a(B) ; LATIN SMALL LETTER A WITH ACUTE
("A1" ?,2a(B) ; LATIN CAPITAL LETTER A WITH ACUTE
("a6" ?,1b(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX
("A6" ?,2b(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX
("a4" ?,1c(B) ; LATIN SMALL LETTER A WITH TILDE
("A4" ?,2c(B) ; LATIN CAPITAL LETTER A WITH TILDE
("e2" ?,1h(B) ; LATIN SMALL LETTER E WITH GRAVE
("E2" ?,2h(B) ; LATIN CAPITAL LETTER E WITH GRAVE
("e1" ?,1i(B) ; LATIN SMALL LETTER E WITH ACUTE
("E1" ?,2i(B) ; LATIN CAPITAL LETTER E WITH ACUTE
("e6" ?,1j(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX
("E6" ?,2j(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX
("i2" ?,1l(B) ; LATIN SMALL LETTER I WITH GRAVE
("I2" ?,2l(B) ; LATIN CAPITAL LETTER I WITH GRAVE
("i1" ?,1m(B) ; LATIN SMALL LETTER I WITH ACUTE
("I1" ?,2m(B) ; LATIN CAPITAL LETTER I WITH ACUTE
("o2" ?,1r(B) ; LATIN SMALL LETTER O WITH GRAVE
("O2" ?,2r(B) ; LATIN CAPITAL LETTER O WITH GRAVE
("o1" ?,1s(B) ; LATIN SMALL LETTER O WITH ACUTE
("O1" ?,2s(B) ; LATIN CAPITAL LETTER O WITH ACUTE
("o6" ?,1t(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX
("O6" ?,2t(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX
("o4" ?,1u(B) ; LATIN SMALL LETTER O WITH TILDE
("O4" ?,2u(B) ; LATIN CAPITAL LETTER O WITH TILDE
("u2" ?,1y(B) ; LATIN SMALL LETTER U WITH GRAVE
("U2" ?,2y(B) ; LATIN CAPITAL LETTER U WITH GRAVE
("u1" ?,1z(B) ; LATIN SMALL LETTER U WITH ACUTE
("U1" ?,2z(B) ; LATIN CAPITAL LETTER U WITH ACUTE
("y1" ?,1}(B) ; LATIN SMALL LETTER Y WITH ACUTE
("Y1" ?,2}(B) ; LATIN CAPITAL LETTER Y WITH ACUTE
("a8" ?,1e(B) ; LATIN SMALL LETTER A WITH BREVE
("A8" ?,2e(B) ; LATIN CAPITAL LETTER A WITH BREVE
("i4" ?,1n(B) ; LATIN SMALL LETTER I WITH TILDE
("I4" ?,2n(B) ; LATIN CAPITAL LETTER I WITH TILDE
("u4" ?,1{(B) ; LATIN SMALL LETTER U WITH TILDE
("U4" ?,2{(B) ; LATIN CAPITAL LETTER U WITH TILDE
("o7" ?,1=(B) ; LATIN SMALL LETTER O WITH HORN
("O7" ?,2=(B) ; LATIN CAPITAL LETTER O WITH HORN
("u7" ?,1_(B) ; LATIN SMALL LETTER U WITH HORN
("U7" ?,2_(B) ; LATIN CAPITAL LETTER U WITH HORN
("a5" ?,1U(B) ; LATIN SMALL LETTER A WITH DOT BELOW
("A5" ?,2U(B) ; LATIN CAPITAL LETTER A WITH DOT BELOW
("a3" ?,1d(B) ; LATIN SMALL LETTER A WITH HOOK ABOVE
("A3" ?,2d(B) ; LATIN CAPITAL LETTER A WITH HOOK ABOVE
("a61" ?,1$(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
("A61" ?,2$(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
("a62" ?,1%(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
("A62" ?,2%(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
("a63" ?,1&(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND HO6K ABOVE
("A63" ?,2&(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HO6K ABOVE
("a64" ?,1g(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
("A64" ?,2g(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
("a65" ?,1'(B) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("A65" ?,2'(B) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("a81" ?,1!(B) ; LATIN SMALL LETTER A WITH BREVE AND ACUTE
("A81" ?,2!(B) ; LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
("a82" ?,1"(B) ; LATIN SMALL LETTER A WITH BREVE AND GRAVE
("A82" ?,2"(B) ; LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
("a83" ?,1F(B) ; LATIN SMALL LETTER A WITH BREVE AND HO6K ABOVE
("A83" ?,2F(B) ; LATIN CAPITAL LETTER A WITH BREVE AND HO6K ABOVE
("a84" ?,1G(B) ; LATIN SMALL LETTER A WITH BREVE AND TILDE
("A84" ?,2G(B) ; LATIN CAPITAL LETTER A WITH BREVE AND TILDE
("a85" ?,1#(B) ; LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
("A85" ?,2#(B) ; LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
("e5" ?,1)(B) ; LATIN SMALL LETTER E WITH DOT BELOW
("E5" ?,2)(B) ; LATIN CAPITAL LETTER E WITH DOT BELOW
("e3" ?,1k(B) ; LATIN SMALL LETTER E WITH HO6K ABOVE
("E3" ?,2k(B) ; LATIN CAPITAL LETTER E WITH HO6K ABOVE
("e4" ?,1((B) ; LATIN SMALL LETTER E WITH TILDE
("E4" ?,2((B) ; LATIN CAPITAL LETTER E WITH TILDE
("e61" ?,1*(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
("E61" ?,2*(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
("e62" ?,1+(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
("E62" ?,2+(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
("e63" ?,1,(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND HO6K ABOVE
("E63" ?,2,(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HO6K ABOVE
("e64" ?,1-(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
("E64" ?,2-(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
("e65" ?,1.(B) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("E65" ?,2.(B) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("i3" ?,1o(B) ; LATIN SMALL LETTER I WITH HO6K ABOVE
("I3" ?,2o(B) ; LATIN CAPITAL LETTER I WITH HO6K ABOVE
("i5" ?,18(B) ; LATIN SMALL LETTER I WITH DOT BELOW
("I5" ?,28(B) ; LATIN CAPITAL LETTER I WITH DOT BELOW
("o5" ?,1w(B) ; LATIN SMALL LETTER O WITH DOT BELOW
("O5" ?,2w(B) ; LATIN CAPITAL LETTER O WITH DOT BELOW
("o3" ?,1v(B) ; LATIN SMALL LETTER O WITH HO6K ABOVE
("O3" ?,2v(B) ; LATIN CAPITAL LETTER O WITH HO6K ABOVE
("o61" ?,1/(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
("O61" ?,2/(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
("o62" ?,10(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
("O62" ?,20(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
("o63" ?,11(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND HO6K ABOVE
("O63" ?,21(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HO6K ABOVE
("o64" ?,12(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
("O64" ?,22(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
("o65" ?,15(B) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELO7
("O65" ?,25(B) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELO7
("o71" ?,1>(B) ; LATIN SMALL LETTER O WITH HORN AND ACUTE
("O71" ?,2>(B) ; LATIN CAPITAL LETTER O WITH HORN AND ACUTE
("o72" ?,16(B) ; LATIN SMALL LETTER O WITH HORN AND GRAVE
("O72" ?,26(B) ; LATIN CAPITAL LETTER O WITH HORN AND GRAVE
("o73" ?,17(B) ; LATIN SMALL LETTER O WITH HORN AND HO6K ABOVE
("O73" ?,27(B) ; LATIN CAPITAL LETTER O WITH HORN AND HO6K ABOVE
("o74" ?,1^(B) ; LATIN SMALL LETTER O WITH HORN AND TILDE
("O74" ?,2^(B) ; LATIN CAPITAL LETTER O WITH HORN AND TILDE
("o75" ?,1~(B) ; LATIN SMALL LETTER O WITH HORN AND DOT BELO7
("O75" ?,2~(B) ; LATIN CAPITAL LETTER O WITH HORN AND DOT BELO7
("u5" ?,1x(B) ; LATIN SMALL LETTER U WITH DOT BELO7
("U5" ?,2x(B) ; LATIN CAPITAL LETTER U WITH DOT BELO7
("u3" ?,1|(B) ; LATIN SMALL LETTER U WITH HO6K ABOVE
("U3" ?,2|(B) ; LATIN CAPITAL LETTER U WITH HO6K ABOVE
("u71" ?,1Q(B) ; LATIN SMALL LETTER U WITH HORN AND ACUTE
("U71" ?,2Q(B) ; LATIN CAPITAL LETTER U WITH HORN AND ACUTE
("u72" ?,1W(B) ; LATIN SMALL LETTER U WITH HORN AND GRAVE
("U72" ?,2W(B) ; LATIN CAPITAL LETTER U WITH HORN AND GRAVE
("u73" ?,1X(B) ; LATIN SMALL LETTER U WITH HORN AND HO6K ABOVE
("U73" ?,2X(B) ; LATIN CAPITAL LETTER U WITH HORN AND HO6K ABOVE
("u74" ?,1f(B) ; LATIN SMALL LETTER U WITH HORN AND TILDE
("U74" ?,2f(B) ; LATIN CAPITAL LETTER U WITH HORN AND TILDE
("u75" ?,1q(B) ; LATIN SMALL LETTER U WITH HORN AND DOT BELO7
("U75" ?,2q(B) ; LATIN CAPITAL LETTER U WITH HORN AND DOT BELO7
("y2" ?,1O(B) ; LATIN SMALL LETTER Y WITH GRAVE
("Y2" ?,2O(B) ; LATIN CAPITAL LETTER Y WITH GRAVE
("y5" ?,1\(B) ; LATIN SMALL LETTER Y WITH DOT BELO7
("Y5" ?,2\(B) ; LATIN CAPITAL LETTER Y WITH DOT BELO7
("y3" ?,1V(B) ; LATIN SMALL LETTER Y WITH HO6K ABOVE
("Y3" ?,2V(B) ; LATIN CAPITAL LETTER Y WITH HO6K ABOVE
("y4" ?,1[(B) ; LATIN SMALL LETTER Y WITH TILDE
("Y4" ?,2[(B) ; LATIN CAPITAL LETTER Y WITH TILDE
("d9" ?,1p(B) ; LATIN SMALL LETTER D WITH STROKE
("D9" ?,2p(B) ; LATIN CAPITAL LETTER D WITH STROKE
;("$$" ?$,1tK(B) ; U+20AB DONG SIGN (#### check)
("a2" ?à) ; LATIN SMALL LETTER A WITH GRAVE
("A2" ?À) ; LATIN CAPITAL LETTER A WITH GRAVE
("a1" ?á) ; LATIN SMALL LETTER A WITH ACUTE
("A1" ?Á) ; LATIN CAPITAL LETTER A WITH ACUTE
("a6" ?â) ; LATIN SMALL LETTER A WITH CIRCUMFLEX
("A6" ?Â) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX
("a4" ?ã) ; LATIN SMALL LETTER A WITH TILDE
("A4" ?Ã) ; LATIN CAPITAL LETTER A WITH TILDE
("e2" ?è) ; LATIN SMALL LETTER E WITH GRAVE
("E2" ?È) ; LATIN CAPITAL LETTER E WITH GRAVE
("e1" ?é) ; LATIN SMALL LETTER E WITH ACUTE
("E1" ?É) ; LATIN CAPITAL LETTER E WITH ACUTE
("e6" ?ê) ; LATIN SMALL LETTER E WITH CIRCUMFLEX
("E6" ?Ê) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX
("i2" ?ì) ; LATIN SMALL LETTER I WITH GRAVE
("I2" ?Ì) ; LATIN CAPITAL LETTER I WITH GRAVE
("i1" ?í) ; LATIN SMALL LETTER I WITH ACUTE
("I1" ?Í) ; LATIN CAPITAL LETTER I WITH ACUTE
("o2" ?ò) ; LATIN SMALL LETTER O WITH GRAVE
("O2" ?Ò) ; LATIN CAPITAL LETTER O WITH GRAVE
("o1" ?ó) ; LATIN SMALL LETTER O WITH ACUTE
("O1" ?Ó) ; LATIN CAPITAL LETTER O WITH ACUTE
("o6" ?ô) ; LATIN SMALL LETTER O WITH CIRCUMFLEX
("O6" ?Ô) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX
("o4" ?õ) ; LATIN SMALL LETTER O WITH TILDE
("O4" ?Õ) ; LATIN CAPITAL LETTER O WITH TILDE
("u2" ?ù) ; LATIN SMALL LETTER U WITH GRAVE
("U2" ?Ù) ; LATIN CAPITAL LETTER U WITH GRAVE
("u1" ?ú) ; LATIN SMALL LETTER U WITH ACUTE
("U1" ?Ú) ; LATIN CAPITAL LETTER U WITH ACUTE
("y1" ?ý) ; LATIN SMALL LETTER Y WITH ACUTE
("Y1" ?Ý) ; LATIN CAPITAL LETTER Y WITH ACUTE
("a8" ?ă) ; LATIN SMALL LETTER A WITH BREVE
("A8" ?Ă) ; LATIN CAPITAL LETTER A WITH BREVE
("i4" ?ĩ) ; LATIN SMALL LETTER I WITH TILDE
("I4" ?Ĩ) ; LATIN CAPITAL LETTER I WITH TILDE
("u4" ?ũ) ; LATIN SMALL LETTER U WITH TILDE
("U4" ?Ũ) ; LATIN CAPITAL LETTER U WITH TILDE
("o7" ?ơ) ; LATIN SMALL LETTER O WITH HORN
("O7" ?Ơ) ; LATIN CAPITAL LETTER O WITH HORN
("u7" ?ư) ; LATIN SMALL LETTER U WITH HORN
("U7" ?Ư) ; LATIN CAPITAL LETTER U WITH HORN
("a5" ?) ; LATIN SMALL LETTER A WITH DOT BELOW
("A5" ?) ; LATIN CAPITAL LETTER A WITH DOT BELOW
("a3" ?) ; LATIN SMALL LETTER A WITH HOOK ABOVE
("A3" ?) ; LATIN CAPITAL LETTER A WITH HOOK ABOVE
("a61" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND ACUTE
("A61" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
("a62" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND GRAVE
("A62" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
("a63" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND HO6K ABOVE
("A63" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HO6K ABOVE
("a64" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND TILDE
("A64" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND TILDE
("a65" ?) ; LATIN SMALL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("A65" ?) ; LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND DOT BELOW
("a81" ?) ; LATIN SMALL LETTER A WITH BREVE AND ACUTE
("A81" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
("a82" ?) ; LATIN SMALL LETTER A WITH BREVE AND GRAVE
("A82" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
("a83" ?) ; LATIN SMALL LETTER A WITH BREVE AND HO6K ABOVE
("A83" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND HO6K ABOVE
("a84" ?) ; LATIN SMALL LETTER A WITH BREVE AND TILDE
("A84" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND TILDE
("a85" ?) ; LATIN SMALL LETTER A WITH BREVE AND DOT BELOW
("A85" ?) ; LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
("e5" ?) ; LATIN SMALL LETTER E WITH DOT BELOW
("E5" ?) ; LATIN CAPITAL LETTER E WITH DOT BELOW
("e3" ?) ; LATIN SMALL LETTER E WITH HO6K ABOVE
("E3" ?) ; LATIN CAPITAL LETTER E WITH HO6K ABOVE
("e4" ?) ; LATIN SMALL LETTER E WITH TILDE
("E4" ?) ; LATIN CAPITAL LETTER E WITH TILDE
("e61" ?ế) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND ACUTE
("E61" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND ACUTE
("e62" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND GRAVE
("E62" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND GRAVE
("e63" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND HO6K ABOVE
("E63" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND HO6K ABOVE
("e64" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND TILDE
("E64" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND TILDE
("e65" ?) ; LATIN SMALL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("E65" ?) ; LATIN CAPITAL LETTER E WITH CIRCUMFLEX AND DOT BELOW
("i3" ?) ; LATIN SMALL LETTER I WITH HO6K ABOVE
("I3" ?) ; LATIN CAPITAL LETTER I WITH HO6K ABOVE
("i5" ?) ; LATIN SMALL LETTER I WITH DOT BELOW
("I5" ?) ; LATIN CAPITAL LETTER I WITH DOT BELOW
("o5" ?) ; LATIN SMALL LETTER O WITH DOT BELOW
("O5" ?) ; LATIN CAPITAL LETTER O WITH DOT BELOW
("o3" ?) ; LATIN SMALL LETTER O WITH HO6K ABOVE
("O3" ?) ; LATIN CAPITAL LETTER O WITH HO6K ABOVE
("o61" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND ACUTE
("O61" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND ACUTE
("o62" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND GRAVE
("O62" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND GRAVE
("o63" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND HO6K ABOVE
("O63" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND HO6K ABOVE
("o64" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND TILDE
("O64" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND TILDE
("o65" ?) ; LATIN SMALL LETTER O WITH CIRCUMFLEX AND DOT BELO7
("O65" ?) ; LATIN CAPITAL LETTER O WITH CIRCUMFLEX AND DOT BELO7
("o71" ?) ; LATIN SMALL LETTER O WITH HORN AND ACUTE
("O71" ?) ; LATIN CAPITAL LETTER O WITH HORN AND ACUTE
("o72" ?) ; LATIN SMALL LETTER O WITH HORN AND GRAVE
("O72" ?) ; LATIN CAPITAL LETTER O WITH HORN AND GRAVE
("o73" ?) ; LATIN SMALL LETTER O WITH HORN AND HO6K ABOVE
("O73" ?) ; LATIN CAPITAL LETTER O WITH HORN AND HO6K ABOVE
("o74" ?) ; LATIN SMALL LETTER O WITH HORN AND TILDE
("O74" ?) ; LATIN CAPITAL LETTER O WITH HORN AND TILDE
("o75" ?) ; LATIN SMALL LETTER O WITH HORN AND DOT BELO7
("O75" ?) ; LATIN CAPITAL LETTER O WITH HORN AND DOT BELO7
("u5" ?) ; LATIN SMALL LETTER U WITH DOT BELO7
("U5" ?) ; LATIN CAPITAL LETTER U WITH DOT BELO7
("u3" ?) ; LATIN SMALL LETTER U WITH HO6K ABOVE
("U3" ?) ; LATIN CAPITAL LETTER U WITH HO6K ABOVE
("u71" ?) ; LATIN SMALL LETTER U WITH HORN AND ACUTE
("U71" ?) ; LATIN CAPITAL LETTER U WITH HORN AND ACUTE
("u72" ?) ; LATIN SMALL LETTER U WITH HORN AND GRAVE
("U72" ?) ; LATIN CAPITAL LETTER U WITH HORN AND GRAVE
("u73" ?) ; LATIN SMALL LETTER U WITH HORN AND HO6K ABOVE
("U73" ?) ; LATIN CAPITAL LETTER U WITH HORN AND HO6K ABOVE
("u74" ?) ; LATIN SMALL LETTER U WITH HORN AND TILDE
("U74" ?) ; LATIN CAPITAL LETTER U WITH HORN AND TILDE
("u75" ?) ; LATIN SMALL LETTER U WITH HORN AND DOT BELO7
("U75" ?) ; LATIN CAPITAL LETTER U WITH HORN AND DOT BELO7
("y2" ?) ; LATIN SMALL LETTER Y WITH GRAVE
("Y2" ?) ; LATIN CAPITAL LETTER Y WITH GRAVE
("y5" ?) ; LATIN SMALL LETTER Y WITH DOT BELO7
("Y5" ?) ; LATIN CAPITAL LETTER Y WITH DOT BELO7
("y3" ?) ; LATIN SMALL LETTER Y WITH HO6K ABOVE
("Y3" ?) ; LATIN CAPITAL LETTER Y WITH HO6K ABOVE
("y4" ?) ; LATIN SMALL LETTER Y WITH TILDE
("Y4" ?) ; LATIN CAPITAL LETTER Y WITH TILDE
("d9" ?đ) ; LATIN SMALL LETTER D WITH STROKE
("D9" ?Đ) ; LATIN CAPITAL LETTER D WITH STROKE
;("$$" ?) ; U+20AB DONG SIGN (#### check)
("a22" ["a22"])
("A22" ["A2"])
@ -301,5 +301,5 @@ and postfix: E66 -> E6, a55 -> a5, etc.
;; Local Variables:
;; coding: iso-2022-7bit
;; coding: utf-8
;; End:

Some files were not shown because too many files have changed in this diff Show more