diff --git a/ChangeLog b/ChangeLog index 2fcd7c77114..22607d59529 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,218 @@ +2013-06-03 Michael Albinus + + * 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 + + * .bzrignore: Ignore dirs libexec/, share/ and var/. + +2013-05-29 Xue Fuqiao + + * INSTALL: Fix description. + +2013-05-27 YAMAMOTO Mitsuharu + + * configure.ac (HAVE_XRANDR): Check availability of + XRRGetScreenResources rather than that of XRRQueryExtension. + +2013-05-18 Eli Zaretskii + + * make-dist (files): Add nt/msysconfig.sh, nt/mingw-cfg.site, + nt/epaths.nt, and nt/INSTALL.MSYS. + +2013-05-18 Paul Eggert + + 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 + + * 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 + + 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 + + * Makefile.in (install-doc): DOC file is not version specific any more. + * .bzrignore: Don't ignore DOC-* any more. + +2013-05-13 Paul Eggert + + * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie. + Reported privately by Han Boetes . + +2013-05-08 Juanma Barranquero + + * lib/makefile.w32-in (ACL_H): New macro. + ($(BLD)/acl-errno-valid.$(O)): Update dependencies. + +2013-05-07 Paul Eggert + + 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 + + * configure.ac (HAVE_XRANDR, HAVE_XINERAMA): Define if available. + (XRANDR_LIBS, XINERAMA_LIBS): New AC_SUBSTs. + +2013-05-06 Paul Eggert + + Merge from gnulib, incorporating: + 2013-04-30 utimens, utimensat: work around Solaris UTIME_OMIT bug + +2013-05-01 Paul Eggert + + * make-dist: Keep necessary restrictions on file access. + +2013-04-29 Paul Eggert + + Merge from gnulib, incorporating: + 2013-04-28 extern-inline: work around bug in Sun c99 + +2013-04-27 Paul Eggert + + Merge from gnulib, incorporating: + 2013-04-27 alignof, intprops, malloca: port better to IBM's C compiler + +2013-04-26 Paul Eggert + + 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 + + * 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 (tiny change) + + * configure.ac: Add DragonFly BSD, mostly same as FreeBSD. (Bug#14068) + +2013-04-18 Glenn Morris + + * 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 + + * configure.ac (canonical): Adapt to 64-bit Cygwin, for which + `canonical' is `x86_64-unknown-cygwin'. + +2013-04-09 Ken Brown + + * 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 + + 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 + + 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 + . + +2013-03-27 Paul Eggert + + * configure.ac (HAVE_XKBGETKEYBOARD): Remove. + Subsumed by HAVE_XKB. All uses changed. + +2013-03-25 Jan Djärv + + * configure.ac (HAVE_XKB): Define if Xkb is present. + +2013-03-24 Paul Eggert + + Merge from gnulib, incorporating: + 2013-03-21 sys_select, sys_time: port 2013-01-30 fix to Cygwin + +2013-03-18 Paul Eggert + + 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 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 + + * Merge in all changes up to version 24.3 release. + 2013-03-06 Paul Eggert * 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 - - * lisp/eshell/em-cmpl.el: Corrected "context-related help" - keybinding in commentary. - 2013-02-21 Paul Eggert 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 - - * doc/misc/eshell.texi: Added documentation for Eshell insert - output redirection operator, >>>. - 2013-02-15 Paul Eggert Fix AIX port (Bug#13650). diff --git a/GNUmakefile b/GNUmakefile index b829e93b498..a2a630ba9d5 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -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 diff --git a/INSTALL b/INSTALL index 925c8b2de71..28660998721 100644 --- a/INSTALL +++ b/INSTALL @@ -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'. diff --git a/Makefile.in b/Makefile.in index b112c6abf11..583aa99f83d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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) diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES index c11c3c3b489..a89d1764f7b 100644 --- a/admin/CPP-DEFINES +++ b/admin/CPP-DEFINES @@ -377,7 +377,6 @@ HAVE_WS2TCPIP_H HAVE_XAW3D HAVE_XFT HAVE_XIM -HAVE_XKBGETKEYBOARD HAVE_XPM HAVE_XRMSETDATABASE HAVE_XSCREENNUMBEROFSCREEN diff --git a/admin/ChangeLog b/admin/ChangeLog index 25ce7c0f9e4..ac6031fa205 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,76 @@ +2013-06-02 Eric Ludlam + + * 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 + + * 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 + + * quick-install-emacs: Don't prune DOC-* files a any more. + +2013-05-14 Glenn Morris + + * 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 + + * 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 + + * 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 + + * 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 + + 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 + + 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 + + * 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 * admin.el (manual-pdf, manual-dvi): Pass -I to texi2pdf, texi2dvi. diff --git a/admin/cus-test.el b/admin/cus-test.el index c93a14297f8..6b8ec9abe02 100644 --- a/admin/cus-test.el +++ b/admin/cus-test.el @@ -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) diff --git a/admin/grammars/srecode-template.wy b/admin/grammars/srecode-template.wy index de9bf351ac6..fd3f61905d3 100644 --- a/admin/grammars/srecode-template.wy +++ b/admin/grammars/srecode-template.wy @@ -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-analyzer srecode-template-property-analyzer - srecode-template-wy---regexp-analyzer srecode-template-wy---regexp-analyzer + srecode-template-wy---regexp-analyzer srecode-template-wy---sexp-analyzer srecode-template-wy---string-analyzer semantic-lex-default-action diff --git a/admin/merge-gnulib b/admin/merge-gnulib index 100749191f0..c8bfe0dacc3 100755 --- a/admin/merge-gnulib +++ b/admin/merge-gnulib @@ -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 diff --git a/admin/notes/bugtracker b/admin/notes/bugtracker index ee385f4dd75..7947b17973b 100644 --- a/admin/notes/bugtracker +++ b/admin/notes/bugtracker @@ -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. diff --git a/admin/notes/unicode b/admin/notes/unicode index 7b5e21c864b..6db5bb7d05c 100644 --- a/admin/notes/unicode +++ b/admin/notes/unicode @@ -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 diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs index e74a2a5af49..98bd61f839d 100755 --- a/admin/quick-install-emacs +++ b/admin/quick-install-emacs @@ -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" diff --git a/autogen/Makefile.in b/autogen/Makefile.in index 03e54906b75..140a3558951 100644 --- a/autogen/Makefile.in +++ b/autogen/Makefile.in @@ -36,7 +36,30 @@ # the same distribution terms as the rest of that program. # # Generated by gnulib-tool. -# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dup --avoid=errno --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime pselect pthread_sigmask putenv 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 warnings +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dup --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime 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 warnings + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file 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. +# +# This file 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 file. If not, see . +# +# As a special exception to the GNU General Public License, +# this file may be distributed as part of a program that +# contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# Generated by gnulib-tool. +# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --avoid=dup --avoid=fchdir --avoid=fcntl --avoid=fstat --avoid=malloc-posix --avoid=msvc-inval --avoid=msvc-nothrow --avoid=open --avoid=openat-die --avoid=opendir --avoid=raise --avoid=save-cwd --avoid=select --avoid=sigprocmask --avoid=sys_types --avoid=threadlib --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files alloca-opt c-ctype c-strcase careadlinkat close-stream crypto/md5 crypto/sha1 crypto/sha256 crypto/sha512 dtoastr dtotimespec dup2 environ execinfo faccessat fcntl-h fdatasync fdopendir filemode fstatat fsync getloadavg getopt-gnu gettime gettimeofday ignore-value intprops largefile lstat manywarnings memrchr mktime 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 warnings VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -57,18 +80,164 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/gnulib.mk COPYING -@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_1 = gettext.h +DIST_COMMON = $(srcdir)/../nt/gnulib.mk $(srcdir)/Makefile.am \ + $(srcdir)/Makefile.in $(srcdir)/gnulib.mk COPYING +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_1 = core *.stackdump alloca.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ alloca.h-t errno.h errno.h-t \ +@BUILDING_FOR_WINDOWSNT_TRUE@ execinfo.h execinfo.h-t getopt.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getopt.h-t arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ arg-nonnull.h-t c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c++defs.h-t warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ warn-on-use.h-t stdalign.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stdalign.h-t stdarg.h stdarg.h-t \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stdbool.h stdbool.h-t stddef.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stddef.h-t stdint.h stdint.h-t +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_2 = libgnu.a + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_3 = $(ALLOCA_H) $(ERRNO_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(EXECINFO_H) $(GETOPT_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ arg-nonnull.h c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ warn-on-use.h $(STDALIGN_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(STDARG_H) $(STDBOOL_H) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(STDDEF_H) $(STDINT_H) +@BUILDING_FOR_WINDOWSNT_TRUE@am__append_4 = alloca.in.h close-stream.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ md5.h sha1.h sha256.h sha512.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dosname.h ftoastr.c ftoastr.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dup2.c errno.in.h euidaccess.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ execinfo.c execinfo.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ at-func.c faccessat.c fdatasync.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fdopendir.c filemode.h fpending.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fpending.h at-func.c fstatat.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fsync.c getgroups.c getloadavg.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getopt.c getopt.in.h getopt1.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getopt_int.h gettimeofday.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ group-member.c ignore-value.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ intprops.h lstat.c memrchr.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mktime-internal.h mktime.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ openat.h pathmax.h pselect.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ pthread_sigmask.c putenv.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ acl-internal.h acl.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ acl_entries.c readlink.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ at-func.c readlinkat.c root-uid.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sig2str.c sig2str.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/_Noreturn.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat.c stat-time.h stdalign.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stdarg.in.h stdbool.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stddef.in.h stdint.in.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strftime.h strtoimax.c strtol.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoll.c strtol.c strtoul.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoull.c strtoimax.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoumax.c symlink.c time_r.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec.h u64.h unsetenv.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ utimens.h verify.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ xalloc-oversized.h +@BUILDING_FOR_WINDOWSNT_TRUE@@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_5 = gettext.h +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_6 = core *.stackdump alloca.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ alloca.h-t dirent.h dirent.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ errno.h errno.h-t execinfo.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ execinfo.h-t fcntl.h fcntl.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.h getopt.h-t inttypes.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ inttypes.h-t signal.h signal.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ arg-nonnull.h arg-nonnull.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c++defs.h c++defs.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ warn-on-use.h warn-on-use.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdalign.h stdalign.h-t stdarg.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdarg.h-t stdbool.h stdbool.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stddef.h stddef.h-t stdint.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdint.h-t stdio.h stdio.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdlib.h stdlib.h-t string.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ string.h-t sys/select.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/select.h-t sys/stat.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/stat.h-t sys/time.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/time.h-t time.h time.h-t \ +@BUILDING_FOR_WINDOWSNT_FALSE@ unistd.h unistd.h-t +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_7 = libgnu.a + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. + +# The BUILT_SOURCES created by this Makefile snippet are not used via #include +# statements but through direct file reference. Therefore this snippet must be +# present in all Makefile.am that need it. This is ensured by the applicability +# 'all' defined above. +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_8 = $(ALLOCA_H) dirent.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(ERRNO_H) $(EXECINFO_H) fcntl.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(GETOPT_H) inttypes.h signal.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ arg-nonnull.h c++defs.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ warn-on-use.h $(STDALIGN_H) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(STDARG_H) $(STDBOOL_H) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(STDDEF_H) $(STDINT_H) stdio.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdlib.h string.h sys/select.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys/stat.h sys/time.h time.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ unistd.h +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_9 = alloca.in.h allocator.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ openat-priv.h openat-proc.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ careadlinkat.h close-stream.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ md5.h sha1.h sha256.h sha512.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dirent.in.h dosname.h ftoastr.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ ftoastr.h dup2.c errno.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ euidaccess.c execinfo.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ execinfo.in.h at-func.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ faccessat.c fcntl.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fdatasync.c fdopendir.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ filemode.h fpending.c fpending.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c fstatat.c fsync.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getgroups.c getloadavg.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.c getopt.in.h getopt1.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt_int.h gettimeofday.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ group-member.c ignore-value.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ intprops.h inttypes.in.h lstat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ memrchr.c mktime-internal.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mktime.c openat.h pathmax.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl-internal.h acl.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ acl_entries.c readlink.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ at-func.c readlinkat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ root-uid.h sig2str.c sig2str.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ signal.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/_Noreturn.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stat.c stat-time.h stdalign.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdarg.in.h stdbool.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stddef.in.h stdint.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stdio.in.h stdlib.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.h string.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtol.c strtoll.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtol.c strtoul.c strtoull.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtoumax.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ symlink.c sys_select.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sys_stat.in.h sys_time.in.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ time.in.h time_r.c timespec.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ u64.h unistd.in.h unsetenv.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ utimens.h verify.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ xalloc-oversized.h +@BUILDING_FOR_WINDOWSNT_FALSE@@gl_GNULIB_ENABLED_be453cec5eecf5731a274f2de7f2db36_TRUE@am__append_10 = gettext.h +@BUILDING_FOR_WINDOWSNT_FALSE@am__append_11 = sys sys subdir = lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/00gnulib.m4 \ - $(top_srcdir)/m4/alloca.m4 $(top_srcdir)/m4/c-strtod.m4 \ - $(top_srcdir)/m4/clock_time.m4 \ + $(top_srcdir)/m4/acl.m4 $(top_srcdir)/m4/alloca.m4 \ + $(top_srcdir)/m4/c-strtod.m4 $(top_srcdir)/m4/clock_time.m4 \ $(top_srcdir)/m4/close-stream.m4 $(top_srcdir)/m4/dirent_h.m4 \ $(top_srcdir)/m4/dup2.m4 $(top_srcdir)/m4/environ.m4 \ - $(top_srcdir)/m4/euidaccess.m4 $(top_srcdir)/m4/execinfo.m4 \ - $(top_srcdir)/m4/extensions.m4 \ + $(top_srcdir)/m4/errno_h.m4 $(top_srcdir)/m4/euidaccess.m4 \ + $(top_srcdir)/m4/execinfo.m4 $(top_srcdir)/m4/extensions.m4 \ $(top_srcdir)/m4/extern-inline.m4 \ $(top_srcdir)/m4/faccessat.m4 $(top_srcdir)/m4/fcntl_h.m4 \ $(top_srcdir)/m4/fdatasync.m4 $(top_srcdir)/m4/fdopendir.m4 \ @@ -122,19 +291,68 @@ am__DEPENDENCIES_1 = am__libgnu_a_SOURCES_DIST = allocator.c c-ctype.h c-ctype.c \ c-strcase.h c-strcasecmp.c c-strncasecmp.c careadlinkat.c \ close-stream.c md5.c sha1.c sha256.c sha512.c dtoastr.c \ - dtotimespec.c filemode.c gettext.h gettime.c stat-time.c \ - strftime.c timespec.c timespec-add.c timespec-sub.c u64.c \ - unistd.c utimens.c openat-die.c save-cwd.c + dtotimespec.c filemode.c gettext.h gettime.c acl-errno-valid.c \ + file-has-acl.c qcopy-acl.c qset-acl.c stat-time.c strftime.c \ + timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \ + utimens.c openat-die.c save-cwd.c am__objects_1 = -am_libgnu_a_OBJECTS = allocator.$(OBJEXT) c-ctype.$(OBJEXT) \ - c-strcasecmp.$(OBJEXT) c-strncasecmp.$(OBJEXT) \ - careadlinkat.$(OBJEXT) close-stream.$(OBJEXT) md5.$(OBJEXT) \ - sha1.$(OBJEXT) sha256.$(OBJEXT) sha512.$(OBJEXT) \ - dtoastr.$(OBJEXT) dtotimespec.$(OBJEXT) filemode.$(OBJEXT) \ - $(am__objects_1) gettime.$(OBJEXT) stat-time.$(OBJEXT) \ - strftime.$(OBJEXT) timespec.$(OBJEXT) timespec-add.$(OBJEXT) \ - timespec-sub.$(OBJEXT) u64.$(OBJEXT) unistd.$(OBJEXT) \ - utimens.$(OBJEXT) openat-die.$(OBJEXT) save-cwd.$(OBJEXT) +@BUILDING_FOR_WINDOWSNT_FALSE@am_libgnu_a_OBJECTS = \ +@BUILDING_FOR_WINDOWSNT_FALSE@ allocator.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-ctype.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-strcasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-strncasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ careadlinkat.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ close-stream.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ md5.$(OBJEXT) sha1.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sha256.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sha512.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dtoastr.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dtotimespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ filemode.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(am__objects_1) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ gettime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ acl-errno-valid.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ file-has-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ qcopy-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ qset-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ stat-time.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-add.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-sub.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ u64.$(OBJEXT) unistd.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ utimens.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ openat-die.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ save-cwd.$(OBJEXT) +@BUILDING_FOR_WINDOWSNT_TRUE@am_libgnu_a_OBJECTS = c-ctype.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strcasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strncasecmp.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ close-stream.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ md5.$(OBJEXT) sha1.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sha256.$(OBJEXT) sha512.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dtoastr.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dtotimespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ filemode.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__objects_1) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ gettime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ acl-errno-valid.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ file-has-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ qcopy-acl.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat-time.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strftime.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-add.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-sub.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ u64.$(OBJEXT) utimens.$(OBJEXT) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ $(am__objects_1) +am__EXTRA_libgnu_a_SOURCES_DIST = openat-proc.c ftoastr.c dup2.c \ + euidaccess.c execinfo.c at-func.c faccessat.c fdatasync.c \ + fdopendir.c fpending.c fstatat.c fsync.c getgroups.c \ + getloadavg.c getopt.c getopt1.c gettimeofday.c group-member.c \ + lstat.c memrchr.c mktime.c pselect.c pthread_sigmask.c \ + putenv.c acl_entries.c readlink.c readlinkat.c sig2str.c \ + stat.c strtoimax.c strtol.c strtoll.c strtoul.c strtoull.c \ + strtoumax.c symlink.c time_r.c unsetenv.c libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles @@ -144,11 +362,13 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ SOURCES = $(libgnu_a_SOURCES) $(EXTRA_libgnu_a_SOURCES) -DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) $(EXTRA_libgnu_a_SOURCES) +DIST_SOURCES = $(am__libgnu_a_SOURCES_DIST) \ + $(am__EXTRA_libgnu_a_SOURCES_DIST) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ +ADDSECTION = @ADDSECTION@ ALLOCA = @ALLOCA@ ALLOCA_H = @ALLOCA_H@ ALSA_CFLAGS = @ALSA_CFLAGS@ @@ -172,6 +392,9 @@ CC = @CC@ CCDEPMODE = @CCDEPMODE@ CFLAGS = @CFLAGS@ CFLAGS_SOUND = @CFLAGS_SOUND@ +CLIENTRES = @CLIENTRES@ +CLIENTW = @CLIENTW@ +CM_OBJ = @CM_OBJ@ COM_ERRLIB = @COM_ERRLIB@ CPP = @CPP@ CPPFLAGS = @CPPFLAGS@ @@ -192,8 +415,19 @@ ECHO_C = @ECHO_C@ ECHO_N = @ECHO_N@ ECHO_T = @ECHO_T@ EGREP = @EGREP@ +EMACSRES = @EMACSRES@ +EMACS_HEAPSIZE = @EMACS_HEAPSIZE@ +EMACS_MANIFEST = @EMACS_MANIFEST@ +EMULTIHOP_HIDDEN = @EMULTIHOP_HIDDEN@ +EMULTIHOP_VALUE = @EMULTIHOP_VALUE@ +ENOLINK_HIDDEN = @ENOLINK_HIDDEN@ +ENOLINK_VALUE = @ENOLINK_VALUE@ +EOVERFLOW_HIDDEN = @EOVERFLOW_HIDDEN@ +EOVERFLOW_VALUE = @EOVERFLOW_VALUE@ +ERRNO_H = @ERRNO_H@ EXECINFO_H = @EXECINFO_H@ EXEEXT = @EXEEXT@ +FIRSTFILE_OBJ = @FIRSTFILE_OBJ@ FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@ FONTCONFIG_LIBS = @FONTCONFIG_LIBS@ FONT_OBJ = @FONT_OBJ@ @@ -623,7 +857,6 @@ LD_SWITCH_SYSTEM = @LD_SWITCH_SYSTEM@ LD_SWITCH_SYSTEM_TEMACS = @LD_SWITCH_SYSTEM_TEMACS@ LD_SWITCH_X_SITE = @LD_SWITCH_X_SITE@ LD_SWITCH_X_SITE_RPATH = @LD_SWITCH_X_SITE_RPATH@ -LIBACL_LIBS = @LIBACL_LIBS@ LIBGIF = @LIBGIF@ LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@ LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@ @@ -641,6 +874,7 @@ LIBRESOLV = @LIBRESOLV@ LIBS = @LIBS@ LIBSELINUX_LIBS = @LIBSELINUX_LIBS@ LIBSOUND = @LIBSOUND@ +LIBS_ECLIENT = @LIBS_ECLIENT@ LIBS_GNUSTEP = @LIBS_GNUSTEP@ LIBS_MAIL = @LIBS_MAIL@ LIBS_SYSTEM = @LIBS_SYSTEM@ @@ -655,6 +889,7 @@ LIBXSM = @LIBXSM@ LIBXTR6 = @LIBXTR6@ LIBXT_OTHER = @LIBXT_OTHER@ LIBX_OTHER = @LIBX_OTHER@ +LIB_ACL = @LIB_ACL@ LIB_CLOCK_GETTIME = @LIB_CLOCK_GETTIME@ LIB_EACCESS = @LIB_EACCESS@ LIB_EXECINFO = @LIB_EXECINFO@ @@ -663,7 +898,8 @@ LIB_MATH = @LIB_MATH@ LIB_PTHREAD = @LIB_PTHREAD@ LIB_PTHREAD_SIGMASK = @LIB_PTHREAD_SIGMASK@ LIB_TIMER_TIME = @LIB_TIMER_TIME@ -LN_S = @LN_S@ +LIB_WSOCK32 = @LIB_WSOCK32@ +LN_S_FILEONLY = @LN_S_FILEONLY@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ M17N_FLT_CFLAGS = @M17N_FLT_CFLAGS@ @@ -672,6 +908,7 @@ MAKEINFO = @MAKEINFO@ MKDEPDIR = @MKDEPDIR@ MKDIR_P = @MKDIR_P@ NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@ +NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@ NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@ NEXT_AS_FIRST_DIRECTIVE_GETOPT_H = @NEXT_AS_FIRST_DIRECTIVE_GETOPT_H@ NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H = @NEXT_AS_FIRST_DIRECTIVE_INTTYPES_H@ @@ -688,6 +925,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_DIRENT_H = @NEXT_DIRENT_H@ +NEXT_ERRNO_H = @NEXT_ERRNO_H@ NEXT_FCNTL_H = @NEXT_FCNTL_H@ NEXT_GETOPT_H = @NEXT_GETOPT_H@ NEXT_INTTYPES_H = @NEXT_INTTYPES_H@ @@ -705,6 +943,8 @@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NS_OBJ = @NS_OBJ@ NS_OBJC_OBJ = @NS_OBJC_OBJ@ +NTDIR = @NTDIR@ +NTLIB = @NTLIB@ OBJEXT = @OBJEXT@ OLDXMENU = @OLDXMENU@ OLDXMENU_DEPS = @OLDXMENU_DEPS@ @@ -864,6 +1104,7 @@ STDINT_H = @STDINT_H@ STRIP = @STRIP@ SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC = @SYS_TIME_H_DEFINES_STRUCT_TIMESPEC@ +TEMACS_POST_LINK = @TEMACS_POST_LINK@ TERMCAP_OBJ = @TERMCAP_OBJ@ TIME_H_DEFINES_STRUCT_TIMESPEC = @TIME_H_DEFINES_STRUCT_TIMESPEC@ TOOLKIT_LIBW = @TOOLKIT_LIBW@ @@ -873,11 +1114,11 @@ UNDEFINE_STRTOK_R = @UNDEFINE_STRTOK_R@ UNEXEC_OBJ = @UNEXEC_OBJ@ UNISTD_H_HAVE_WINSOCK2_H = @UNISTD_H_HAVE_WINSOCK2_H@ UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS = @UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS@ +USE_ACL = @USE_ACL@ VERSION = @VERSION@ VMLIMIT_OBJ = @VMLIMIT_OBJ@ W32_LIBS = @W32_LIBS@ W32_OBJ = @W32_OBJ@ -W32_RES = @W32_RES@ W32_RES_LINK = @W32_RES_LINK@ WARN_CFLAGS = @WARN_CFLAGS@ WCHAR_T_SUFFIX = @WCHAR_T_SUFFIX@ @@ -888,11 +1129,16 @@ WINDOWS_64_BIT_ST_SIZE = @WINDOWS_64_BIT_ST_SIZE@ WINDOW_SYSTEM_OBJ = @WINDOW_SYSTEM_OBJ@ WINDRES = @WINDRES@ WINT_T_SUFFIX = @WINT_T_SUFFIX@ +XARGS_LIMIT = @XARGS_LIMIT@ XFT_CFLAGS = @XFT_CFLAGS@ XFT_LIBS = @XFT_LIBS@ +XINERAMA_CFLAGS = @XINERAMA_CFLAGS@ +XINERAMA_LIBS = @XINERAMA_LIBS@ XMENU_OBJ = @XMENU_OBJ@ XMKMF = @XMKMF@ XOBJ = @XOBJ@ +XRANDR_CFLAGS = @XRANDR_CFLAGS@ +XRANDR_LIBS = @XRANDR_LIBS@ X_TOOLKIT_TYPE = @X_TOOLKIT_TYPE@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ @@ -971,86 +1217,99 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ version = @version@ x_default_search_path = @x_default_search_path@ - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. - -# The BUILT_SOURCES created by this Makefile snippet are not used via #include -# statements but through direct file reference. Therefore this snippet must be -# present in all Makefile.am that need it. This is ensured by the applicability -# 'all' defined above. -BUILT_SOURCES = $(ALLOCA_H) dirent.h $(EXECINFO_H) fcntl.h $(GETOPT_H) \ - inttypes.h signal.h arg-nonnull.h c++defs.h warn-on-use.h \ - $(STDALIGN_H) $(STDARG_H) $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) \ - stdio.h stdlib.h string.h sys/select.h sys/stat.h sys/time.h \ - time.h unistd.h -EXTRA_DIST = alloca.in.h allocator.h openat-priv.h openat-proc.c \ - careadlinkat.h close-stream.h md5.h sha1.h sha256.h sha512.h \ - dirent.in.h dosname.h ftoastr.c ftoastr.h dup2.c euidaccess.c \ - execinfo.c execinfo.in.h at-func.c faccessat.c fcntl.in.h \ - fdatasync.c fdopendir.c filemode.h fpending.c fpending.h \ - at-func.c fstatat.c fsync.c getgroups.c getloadavg.c getopt.c \ - getopt.in.h getopt1.c getopt_int.h gettimeofday.c \ - group-member.c ignore-value.h intprops.h inttypes.in.h lstat.c \ - memrchr.c mktime-internal.h mktime.c openat.h pathmax.h \ - pselect.c pthread_sigmask.c putenv.c readlink.c at-func.c \ - readlinkat.c root-uid.h sig2str.c sig2str.h signal.in.h \ - $(top_srcdir)/build-aux/snippet/_Noreturn.h \ - $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - $(top_srcdir)/build-aux/snippet/c++defs.h \ - $(top_srcdir)/build-aux/snippet/warn-on-use.h stat.c \ - stat-time.h stdalign.in.h stdarg.in.h stdbool.in.h stddef.in.h \ - stdint.in.h stdio.in.h stdlib.in.h strftime.h string.in.h \ - strtoimax.c strtol.c strtoll.c strtol.c strtoul.c strtoull.c \ - strtoimax.c strtoumax.c symlink.c sys_select.in.h \ - sys_stat.in.h sys_time.in.h time.in.h time_r.c timespec.h \ - u64.h unistd.in.h unsetenv.c utimens.h verify.h \ - xalloc-oversized.h -MOSTLYCLEANDIRS = sys sys -MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t dirent.h \ - dirent.h-t execinfo.h execinfo.h-t fcntl.h fcntl.h-t getopt.h \ - getopt.h-t inttypes.h inttypes.h-t signal.h signal.h-t \ - arg-nonnull.h arg-nonnull.h-t c++defs.h c++defs.h-t \ - warn-on-use.h warn-on-use.h-t stdalign.h stdalign.h-t stdarg.h \ - stdarg.h-t stdbool.h stdbool.h-t stddef.h stddef.h-t stdint.h \ - stdint.h-t stdio.h stdio.h-t stdlib.h stdlib.h-t string.h \ - string.h-t sys/select.h sys/select.h-t sys/stat.h sys/stat.h-t \ - sys/time.h sys/time.h-t time.h time.h-t unistd.h unistd.h-t -noinst_LIBRARIES = libgnu.a -AM_CFLAGS = $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) +BUILT_SOURCES = $(am__append_3) $(am__append_8) +CLEANFILES = +EXTRA_DIST = $(am__append_4) $(am__append_9) +MOSTLYCLEANDIRS = $(am__append_11) +MOSTLYCLEANFILES = $(am__append_1) $(am__append_6) +noinst_LIBRARIES = $(am__append_2) $(am__append_7) +SUFFIXES = +AM_CFLAGS = $(PROFILING_CFLAGS) $(GNULIB_WARN_CFLAGS) $(WERROR_CFLAGS) DEFAULT_INCLUDES = -I. -I$(top_srcdir)/lib -I../src -I$(top_srcdir)/src -libgnu_a_SOURCES = allocator.c c-ctype.h c-ctype.c c-strcase.h \ - c-strcasecmp.c c-strncasecmp.c careadlinkat.c close-stream.c \ - md5.c sha1.c sha256.c sha512.c dtoastr.c dtotimespec.c \ - filemode.c $(am__append_1) gettime.c stat-time.c strftime.c \ - timespec.c timespec-add.c timespec-sub.c u64.c unistd.c \ - utimens.c openat-die.c save-cwd.c -libgnu_a_LIBADD = $(gl_LIBOBJS) -libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) -EXTRA_libgnu_a_SOURCES = openat-proc.c ftoastr.c dup2.c euidaccess.c \ - execinfo.c at-func.c faccessat.c fdatasync.c fdopendir.c \ - fpending.c at-func.c fstatat.c fsync.c getgroups.c \ - getloadavg.c getopt.c getopt1.c gettimeofday.c group-member.c \ - lstat.c memrchr.c mktime.c pselect.c pthread_sigmask.c \ - putenv.c readlink.c at-func.c readlinkat.c sig2str.c stat.c \ - strtoimax.c strtol.c strtoll.c strtol.c strtoul.c strtoull.c \ - strtoimax.c strtoumax.c symlink.c time_r.c unsetenv.c +@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_SOURCES = allocator.c c-ctype.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-ctype.c c-strcase.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ c-strcasecmp.c c-strncasecmp.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ careadlinkat.c close-stream.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ md5.c sha1.c sha256.c sha512.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ dtoastr.c dtotimespec.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ filemode.c $(am__append_10) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ gettime.c acl-errno-valid.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ file-has-acl.c qcopy-acl.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ qset-acl.c stat-time.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strftime.c timespec.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ timespec-add.c timespec-sub.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ u64.c unistd.c utimens.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ openat-die.c save-cwd.c +@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_SOURCES = c-ctype.h c-ctype.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strcase.h c-strcasecmp.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ c-strncasecmp.c close-stream.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ md5.c sha1.c sha256.c sha512.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ dtoastr.c dtotimespec.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ filemode.c $(am__append_5) \ +@BUILDING_FOR_WINDOWSNT_TRUE@ gettime.c acl-errno-valid.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ file-has-acl.c qcopy-acl.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat-time.c strftime.c timespec.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ timespec-add.c timespec-sub.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ u64.c utimens.c $(am__append_10) +@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_LIBADD = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_LIBADD = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_FALSE@libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_TRUE@libgnu_a_DEPENDENCIES = $(gl_LIBOBJS) +@BUILDING_FOR_WINDOWSNT_FALSE@EXTRA_libgnu_a_SOURCES = openat-proc.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ ftoastr.c dup2.c euidaccess.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ execinfo.c at-func.c faccessat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fdatasync.c fdopendir.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fpending.c at-func.c fstatat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fsync.c getgroups.c getloadavg.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ getopt.c getopt1.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ gettimeofday.c group-member.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ lstat.c memrchr.c mktime.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ pselect.c pthread_sigmask.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ putenv.c acl_entries.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ readlink.c at-func.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ readlinkat.c sig2str.c stat.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtol.c strtoll.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtol.c strtoul.c strtoull.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ strtoimax.c strtoumax.c \ +@BUILDING_FOR_WINDOWSNT_FALSE@ symlink.c time_r.c unsetenv.c +@BUILDING_FOR_WINDOWSNT_TRUE@EXTRA_libgnu_a_SOURCES = ftoastr.c dup2.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ euidaccess.c execinfo.c at-func.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ faccessat.c fdatasync.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fdopendir.c fpending.c at-func.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fstatat.c fsync.c getgroups.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ getloadavg.c getopt.c getopt1.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ gettimeofday.c group-member.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ lstat.c memrchr.c mktime.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ pselect.c pthread_sigmask.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ putenv.c acl_entries.c readlink.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ at-func.c readlinkat.c sig2str.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ stat.c strtoimax.c strtol.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoll.c strtol.c strtoul.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoull.c strtoimax.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ strtoumax.c symlink.c time_r.c \ +@BUILDING_FOR_WINDOWSNT_TRUE@ unsetenv.c # Because this Makefile snippet defines a variable used by other # gnulib Makefile snippets, it must be present in all Makefile.am that # need it. This is ensured by the applicability 'all' defined above. -_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h -ARG_NONNULL_H = arg-nonnull.h -CXXDEFS_H = c++defs.h -WARN_ON_USE_H = warn-on-use.h +@BUILDING_FOR_WINDOWSNT_FALSE@_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h + +# Because this Makefile snippet defines a variable used by other +# gnulib Makefile snippets, it must be present in all Makefile.am that +# need it. This is ensured by the applicability 'all' defined above. +@BUILDING_FOR_WINDOWSNT_TRUE@_NORETURN_H = $(top_srcdir)/build-aux/snippet/_Noreturn.h +@BUILDING_FOR_WINDOWSNT_FALSE@ARG_NONNULL_H = arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_TRUE@ARG_NONNULL_H = arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_FALSE@CXXDEFS_H = c++defs.h +@BUILDING_FOR_WINDOWSNT_TRUE@CXXDEFS_H = c++defs.h +@BUILDING_FOR_WINDOWSNT_FALSE@WARN_ON_USE_H = warn-on-use.h +@BUILDING_FOR_WINDOWSNT_TRUE@WARN_ON_USE_H = warn-on-use.h all: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: .SUFFIXES: .c .o .obj -$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/gnulib.mk $(am__configure_deps) +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(srcdir)/../nt/gnulib.mk $(srcdir)/gnulib.mk $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ @@ -1094,6 +1353,8 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl-errno-valid.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acl_entries.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/allocator.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/at-func.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/c-ctype.Po@am__quote@ @@ -1109,6 +1370,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/faccessat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdatasync.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fdopendir.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-has-acl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filemode.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpending.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fstatat.Po@am__quote@ @@ -1130,6 +1392,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pselect.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pthread_sigmask.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/putenv.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qcopy-acl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/qset-acl.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlink.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/readlinkat.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/save-cwd.Po@am__quote@ @@ -1276,6 +1540,7 @@ mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) @@ -1373,881 +1638,1091 @@ uninstall-am: # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ -@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ -@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ -@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status -@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ - -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ - -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ - -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ - -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ - -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ - -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ - -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ - -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ - -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ - -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ - -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ - -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \ - -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ - -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \ - -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \ - -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ - -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ - -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \ - -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \ - -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \ - -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/dirent.in.h; \ - } > $@-t && \ - mv $@-t $@ +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works. -@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status -@GL_GENERATE_EXECINFO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_EXECINFO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_EXECINFO_H_TRUE@ cat $(srcdir)/execinfo.in.h; \ -@GL_GENERATE_EXECINFO_H_TRUE@ } > $@-t && \ -@GL_GENERATE_EXECINFO_H_TRUE@ mv $@-t $@ -@GL_GENERATE_EXECINFO_H_FALSE@execinfo.h: $(top_builddir)/config.status -@GL_GENERATE_EXECINFO_H_FALSE@ rm -f $@ - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ - -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ - -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ - -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ - -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ - -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ - -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ - -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ - -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ - -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/fcntl.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ cat $(srcdir)/execinfo.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_FALSE@execinfo.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_EXECINFO_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - < $(srcdir)/getopt.in.h; \ - } > $@-t && \ - mv -f $@-t $@ - -# We need the following in order to create when the system -# doesn't have one that works with the given compiler. -inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ - -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ - -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ - -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ - -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ - -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ - -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ - -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ - -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ - -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ - -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ - -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ - -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ - -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ - -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ - -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ - -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ - -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ - -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/inttypes.in.h; \ - } > $@-t && \ - mv $@-t $@ - -# We need the following in order to create when the system -# doesn't have a complete one. -signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ - -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ - -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ - -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ - -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ - -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ - -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ - -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ - -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ - -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ - -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ - -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ - -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ - -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ - -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ - -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/signal.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(srcdir)/getopt.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv -f $@-t $@ # The arg-nonnull.h that gets inserted into generated .h files is the same as # build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut # off. -arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/GL_ARG_NONNULL/,$$p' \ - < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ - > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -n -e '/GL_ARG_NONNULL/,$$p' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv $@-t $@ # The c++defs.h that gets inserted into generated .h files is the same as # build-aux/snippet/c++defs.h, except that it has the copyright header cut off. -c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/_GL_CXXDEFS/,$$p' \ - < $(top_srcdir)/build-aux/snippet/c++defs.h \ - > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -n -e '/_GL_CXXDEFS/,$$p' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv $@-t $@ # The warn-on-use.h that gets inserted into generated .h files is the same as # build-aux/snippet/warn-on-use.h, except that it has the copyright header cut # off. -warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h - $(AM_V_GEN)rm -f $@-t $@ && \ - sed -n -e '/^.ifndef/,$$p' \ - < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ - > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +@BUILDING_FOR_WINDOWSNT_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ sed -n -e '/^.ifndef/,$$p' \ +@BUILDING_FOR_WINDOWSNT_TRUE@ < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_TRUE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works. -@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ -@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status -@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status -@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ -@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ -@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status -@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works. -@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ -@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status -@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ -@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ -@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ -@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status -@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ -@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ -@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ -@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ -@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ -@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ -@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status -@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_TRUE@@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ + +@BUILDING_FOR_WINDOWSNT_TRUE@mostlyclean-local: mostlyclean-generic +@BUILDING_FOR_WINDOWSNT_TRUE@ @for dir in '' $(MOSTLYCLEANDIRS); do \ +@BUILDING_FOR_WINDOWSNT_TRUE@ if test -n "$$dir" && test -d $$dir; then \ +@BUILDING_FOR_WINDOWSNT_TRUE@ echo "rmdir $$dir"; rmdir $$dir; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ fi; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ done; \ +@BUILDING_FOR_WINDOWSNT_TRUE@ : + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@alloca.h: alloca.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ cat $(srcdir)/alloca.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_TRUE@ mv -f $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_FALSE@alloca.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ALLOCA_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@dirent.h: dirent.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DIRENT_H''@|$(HAVE_DIRENT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_DIRENT_H''@|$(NEXT_DIRENT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OPENDIR''@/$(GNULIB_OPENDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READDIR''@/$(GNULIB_READDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REWINDDIR''@/$(GNULIB_REWINDDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CLOSEDIR''@/$(GNULIB_CLOSEDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DIRFD''@/$(GNULIB_DIRFD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FDOPENDIR''@/$(GNULIB_FDOPENDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SCANDIR''@/$(GNULIB_SCANDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ALPHASORT''@/$(GNULIB_ALPHASORT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_OPENDIR''@/$(HAVE_OPENDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_READDIR''@/$(HAVE_READDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_REWINDDIR''@/$(HAVE_REWINDDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_CLOSEDIR''@/$(HAVE_CLOSEDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_DIRFD''@|$(HAVE_DECL_DIRFD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FDOPENDIR''@|$(HAVE_DECL_FDOPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FDOPENDIR''@|$(HAVE_FDOPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SCANDIR''@|$(HAVE_SCANDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_ALPHASORT''@|$(HAVE_ALPHASORT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OPENDIR''@|$(REPLACE_OPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CLOSEDIR''@|$(REPLACE_CLOSEDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DIRFD''@|$(REPLACE_DIRFD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FDOPENDIR''@|$(REPLACE_FDOPENDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/dirent.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that is POSIX compliant. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@errno.h: errno.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''NEXT_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ < $(srcdir)/errno.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_FALSE@errno.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_ERRNO_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@execinfo.h: execinfo.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ cat $(srcdir)/execinfo.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_FALSE@execinfo.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_EXECINFO_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@fcntl.h: fcntl.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCNTL''@/$(GNULIB_FCNTL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_NONBLOCKING''@/$(GNULIB_NONBLOCKING)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OPEN''@/$(GNULIB_OPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OPENAT''@/$(GNULIB_OPENAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/fcntl.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/getopt.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv -f $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_INTTYPES_H''@|$(NEXT_INTTYPES_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''PRI_MACROS_BROKEN''@/$(PRI_MACROS_BROKEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''PRIPTR_PREFIX''@/$(PRIPTR_PREFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_IMAXABS''@/$(GNULIB_IMAXABS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_IMAXDIV''@/$(GNULIB_IMAXDIV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOIMAX''@/$(GNULIB_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOUMAX''@/$(GNULIB_STRTOUMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_IMAXABS''@/$(HAVE_DECL_IMAXABS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_IMAXDIV''@/$(HAVE_DECL_IMAXDIV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''UINT64_MAX_EQ_ULONG_MAX''@/$(UINT64_MAX_EQ_ULONG_MAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/inttypes.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have a complete one. +@BUILDING_FOR_WINDOWSNT_FALSE@signal.h: signal.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SIGNAL_H''@|$(NEXT_SIGNAL_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''GNULIB_PTHREAD_SIGMASK''@|$(GNULIB_PTHREAD_SIGMASK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''GNULIB_RAISE''@|$(GNULIB_RAISE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SIGNAL_H_SIGPIPE''@/$(GNULIB_SIGNAL_H_SIGPIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SIGPROCMASK''@/$(GNULIB_SIGPROCMASK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SIGACTION''@/$(GNULIB_SIGACTION)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_POSIX_SIGNALBLOCKING''@|$(HAVE_POSIX_SIGNALBLOCKING)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PTHREAD_SIGMASK''@|$(HAVE_PTHREAD_SIGMASK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RAISE''@|$(HAVE_RAISE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGSET_T''@|$(HAVE_SIGSET_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGINFO_T''@|$(HAVE_SIGINFO_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGACTION''@|$(HAVE_SIGACTION)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRUCT_SIGACTION_SA_SIGACTION''@|$(HAVE_STRUCT_SIGACTION_SA_SIGACTION)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_TYPE_VOLATILE_SIG_ATOMIC_T''@|$(HAVE_TYPE_VOLATILE_SIG_ATOMIC_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SIGHANDLER_T''@|$(HAVE_SIGHANDLER_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PTHREAD_SIGMASK''@|$(REPLACE_PTHREAD_SIGMASK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RAISE''@|$(REPLACE_RAISE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/signal.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ +# The arg-nonnull.h that gets inserted into generated .h files is the same as +# build-aux/snippet/arg-nonnull.h, except that it has the copyright header cut +# off. +@BUILDING_FOR_WINDOWSNT_FALSE@arg-nonnull.h: $(top_srcdir)/build-aux/snippet/arg-nonnull.h +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -n -e '/GL_ARG_NONNULL/,$$p' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(top_srcdir)/build-aux/snippet/arg-nonnull.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ +# The c++defs.h that gets inserted into generated .h files is the same as +# build-aux/snippet/c++defs.h, except that it has the copyright header cut off. +@BUILDING_FOR_WINDOWSNT_FALSE@c++defs.h: $(top_srcdir)/build-aux/snippet/c++defs.h +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -n -e '/_GL_CXXDEFS/,$$p' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(top_srcdir)/build-aux/snippet/c++defs.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ +# The warn-on-use.h that gets inserted into generated .h files is the same as +# build-aux/snippet/warn-on-use.h, except that it has the copyright header cut +# off. +@BUILDING_FOR_WINDOWSNT_FALSE@warn-on-use.h: $(top_srcdir)/build-aux/snippet/warn-on-use.h +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -n -e '/^.ifndef/,$$p' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(top_srcdir)/build-aux/snippet/warn-on-use.h \ +@BUILDING_FOR_WINDOWSNT_FALSE@ > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@stdalign.h: stdalign.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ cat $(srcdir)/stdalign.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_FALSE@stdalign.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDALIGN_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ < $(srcdir)/stdarg.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_FALSE@stdarg.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDARG_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@stdbool.h: stdbool.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_FALSE@stdbool.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDBOOL_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ < $(srcdir)/stddef.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_FALSE@stddef.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDDEF_H_FALSE@ rm -f $@ + +# We need the following in order to create when the system +# doesn't have one that works with the given compiler. +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ < $(srcdir)/stdint.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_TRUE@ mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_FALSE@stdint.h: $(top_builddir)/config.status +@BUILDING_FOR_WINDOWSNT_FALSE@@GL_GENERATE_STDINT_H_FALSE@ rm -f $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ - -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ - -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ - -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ - -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ - -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ - -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ - -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ - -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ - -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ - -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ - -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ - -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ - -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ - -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ - -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ - -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ - -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ - -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ - -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ - -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ - -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ - -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ - -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ - -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ - -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ - -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ - -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ - -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ - -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ - -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ - -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ - -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ - -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ - -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ - -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ - -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ - -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ - -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ - -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ - -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ - -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ - -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ - -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ - -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ - -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ - < $(srcdir)/stdio.in.h | \ - sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ - -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ - -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ - -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ - -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ - -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ - -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ - -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ - -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ - -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ - -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ - -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ - -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ - -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ - -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ - -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ - -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ - -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ - -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ - -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ - -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ - -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ - -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ - -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ - -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ - -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ - -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ - -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ - -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ - -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ - -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ - -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ - -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ - -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ - -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ - -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ - -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ - -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ - -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ - -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ - -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ - -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ - -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ - -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ - -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ - -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ - -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ - -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ - -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DPRINTF''@/$(GNULIB_DPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCLOSE''@/$(GNULIB_FCLOSE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FDOPEN''@/$(GNULIB_FDOPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FFLUSH''@/$(GNULIB_FFLUSH)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FGETC''@/$(GNULIB_FGETC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FGETS''@/$(GNULIB_FGETS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FOPEN''@/$(GNULIB_FOPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPRINTF''@/$(GNULIB_FPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPRINTF_POSIX''@/$(GNULIB_FPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPURGE''@/$(GNULIB_FPURGE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPUTC''@/$(GNULIB_FPUTC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FPUTS''@/$(GNULIB_FPUTS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FREAD''@/$(GNULIB_FREAD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FREOPEN''@/$(GNULIB_FREOPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSCANF''@/$(GNULIB_FSCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSEEK''@/$(GNULIB_FSEEK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSEEKO''@/$(GNULIB_FSEEKO)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FTELL''@/$(GNULIB_FTELL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FTELLO''@/$(GNULIB_FTELLO)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FWRITE''@/$(GNULIB_FWRITE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETC''@/$(GNULIB_GETC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PERROR''@/$(GNULIB_PERROR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_POPEN''@/$(GNULIB_POPEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PRINTF''@/$(GNULIB_PRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PRINTF_POSIX''@/$(GNULIB_PRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTC''@/$(GNULIB_PUTC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTCHAR''@/$(GNULIB_PUTCHAR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTS''@/$(GNULIB_PUTS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REMOVE''@/$(GNULIB_REMOVE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RENAME''@/$(GNULIB_RENAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RENAMEAT''@/$(GNULIB_RENAMEAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SCANF''@/$(GNULIB_SCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SNPRINTF''@/$(GNULIB_SNPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SPRINTF_POSIX''@/$(GNULIB_SPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STDIO_H_NONBLOCKING''@/$(GNULIB_STDIO_H_NONBLOCKING)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STDIO_H_SIGPIPE''@/$(GNULIB_STDIO_H_SIGPIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TMPFILE''@/$(GNULIB_TMPFILE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VASPRINTF''@/$(GNULIB_VASPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VDPRINTF''@/$(GNULIB_VDPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VFPRINTF''@/$(GNULIB_VFPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VFPRINTF_POSIX''@/$(GNULIB_VFPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VFSCANF''@/$(GNULIB_VFSCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VSCANF''@/$(GNULIB_VSCANF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VPRINTF''@/$(GNULIB_VPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VPRINTF_POSIX''@/$(GNULIB_VPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VSNPRINTF''@/$(GNULIB_VSNPRINTF)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_VSPRINTF_POSIX''@/$(GNULIB_VSPRINTF_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/stdio.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FSEEKO''@|$(HAVE_DECL_FSEEKO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FTELLO''@|$(HAVE_DECL_FTELLO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PCLOSE''@|$(HAVE_PCLOSE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_POPEN''@|$(HAVE_POPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FDOPEN''@|$(REPLACE_FDOPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STDIO_READ_FUNCS''@|$(REPLACE_STDIO_READ_FUNCS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''ASM_SYMBOL_PREFIX''@|$(ASM_SYMBOL_PREFIX)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ - $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ - -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ - -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ - -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ - -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ - -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ - -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ - -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ - -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ - -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ - -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ - -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ - -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ - -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ - -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ - -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ - -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ - -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ - -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ - -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ - -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ - -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ - -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ - -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ - -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ - -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ - -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ - -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ - -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ - -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ - -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ - -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ - < $(srcdir)/stdlib.in.h | \ - sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ - -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ - -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ - -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ - -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ - -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ - -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ - -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ - -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ - -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ - -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ - -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ - -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ - -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ - -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ - -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ - -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ - -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ - -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ - -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ - -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ - -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ - -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ - -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ - -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ - -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ - -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ - -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ - -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ - -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ - -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ - -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ - -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ - -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ - -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ - -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ - -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ - -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ - -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ - -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ - -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _Noreturn/r $(_NORETURN_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) \ +@BUILDING_FOR_WINDOWSNT_FALSE@ $(_NORETURN_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB__EXIT''@/$(GNULIB__EXIT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ATOLL''@/$(GNULIB_ATOLL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CALLOC_POSIX''@/$(GNULIB_CALLOC_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CANONICALIZE_FILE_NAME''@/$(GNULIB_CANONICALIZE_FILE_NAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLOADAVG''@/$(GNULIB_GETLOADAVG)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETSUBOPT''@/$(GNULIB_GETSUBOPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GRANTPT''@/$(GNULIB_GRANTPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MALLOC_POSIX''@/$(GNULIB_MALLOC_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBTOWC''@/$(GNULIB_MBTOWC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKDTEMP''@/$(GNULIB_MKDTEMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKOSTEMP''@/$(GNULIB_MKOSTEMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKOSTEMPS''@/$(GNULIB_MKOSTEMPS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKSTEMP''@/$(GNULIB_MKSTEMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKSTEMPS''@/$(GNULIB_MKSTEMPS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_POSIX_OPENPT''@/$(GNULIB_POSIX_OPENPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PTSNAME''@/$(GNULIB_PTSNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PTSNAME_R''@/$(GNULIB_PTSNAME_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PUTENV''@/$(GNULIB_PUTENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RANDOM''@/$(GNULIB_RANDOM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RANDOM_R''@/$(GNULIB_RANDOM_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REALLOC_POSIX''@/$(GNULIB_REALLOC_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_REALPATH''@/$(GNULIB_REALPATH)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RPMATCH''@/$(GNULIB_RPMATCH)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SECURE_GETENV''@/$(GNULIB_SECURE_GETENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SETENV''@/$(GNULIB_SETENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOD''@/$(GNULIB_STRTOD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOLL''@/$(GNULIB_STRTOLL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOULL''@/$(GNULIB_STRTOULL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SYSTEM_POSIX''@/$(GNULIB_SYSTEM_POSIX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNLOCKPT''@/$(GNULIB_UNLOCKPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNSETENV''@/$(GNULIB_UNSETENV)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_WCTOMB''@/$(GNULIB_WCTOMB)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/stdlib.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE__EXIT''@|$(HAVE__EXIT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_POSIX_OPENPT''@|$(HAVE_POSIX_OPENPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PTSNAME_R''@|$(HAVE_PTSNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RANDOM''@|$(HAVE_RANDOM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SECURE_GETENV''@|$(HAVE_SECURE_GETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_SETENV''@|$(HAVE_DECL_SETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_UNSETENV''@|$(HAVE_DECL_UNSETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CALLOC''@|$(REPLACE_CALLOC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MALLOC''@|$(REPLACE_MALLOC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MBTOWC''@|$(REPLACE_MBTOWC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PTSNAME''@|$(REPLACE_PTSNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PTSNAME_R''@|$(REPLACE_PTSNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RANDOM_R''@|$(REPLACE_RANDOM_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_REALLOC''@|$(REPLACE_REALLOC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_WCTOMB''@|$(REPLACE_WCTOMB)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _Noreturn/r $(_NORETURN_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ - -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ - -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ - -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ - -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ - -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ - -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ - -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ - -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ - -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ - -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ - -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ - -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ - -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ - -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ - -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ - -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ - -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ - -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ - -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ - -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ - -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ - -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ - -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ - -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ - -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ - -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ - -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ - -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ - -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ - -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ - -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ - -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ - -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ - -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ - -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ - -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ - -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ - < $(srcdir)/string.in.h | \ - sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ - -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ - -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ - -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ - -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ - -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ - -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ - -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ - -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ - -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ - -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ - -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ - -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ - -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ - -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ - -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ - -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ - -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ - -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ - -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ - -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ - -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ - -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ - -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ - -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ - -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ - -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ - -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ - -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ - -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ - -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ - -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ - -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ - -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ - -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ - -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - < $(srcdir)/string.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@string.h: string.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FFSL''@/$(GNULIB_FFSL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FFSLL''@/$(GNULIB_FFSLL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSLEN''@/$(GNULIB_MBSLEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSNLEN''@/$(GNULIB_MBSNLEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCHR''@/$(GNULIB_MBSCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSRCHR''@/$(GNULIB_MBSRCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSSTR''@/$(GNULIB_MBSSTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCASECMP''@/$(GNULIB_MBSCASECMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSNCASECMP''@/$(GNULIB_MBSNCASECMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSPCASECMP''@/$(GNULIB_MBSPCASECMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCASESTR''@/$(GNULIB_MBSCASESTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSCSPN''@/$(GNULIB_MBSCSPN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSPBRK''@/$(GNULIB_MBSPBRK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSSPN''@/$(GNULIB_MBSSPN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSSEP''@/$(GNULIB_MBSSEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MBSTOK_R''@/$(GNULIB_MBSTOK_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMCHR''@/$(GNULIB_MEMCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMMEM''@/$(GNULIB_MEMMEM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMPCPY''@/$(GNULIB_MEMPCPY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MEMRCHR''@/$(GNULIB_MEMRCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RAWMEMCHR''@/$(GNULIB_RAWMEMCHR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STPCPY''@/$(GNULIB_STPCPY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STPNCPY''@/$(GNULIB_STPNCPY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRCHRNUL''@/$(GNULIB_STRCHRNUL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRDUP''@/$(GNULIB_STRDUP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRNCAT''@/$(GNULIB_STRNCAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRNDUP''@/$(GNULIB_STRNDUP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRNLEN''@/$(GNULIB_STRNLEN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRPBRK''@/$(GNULIB_STRPBRK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRSEP''@/$(GNULIB_STRSEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRSTR''@/$(GNULIB_STRSTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRCASESTR''@/$(GNULIB_STRCASESTR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRTOK_R''@/$(GNULIB_STRTOK_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRERROR''@/$(GNULIB_STRERROR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRERROR_R''@/$(GNULIB_STRERROR_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRSIGNAL''@/$(GNULIB_STRSIGNAL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRVERSCMP''@/$(GNULIB_STRVERSCMP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/string.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE_FFSL''@|$(HAVE_FFSL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FFSLL''@|$(HAVE_FFSLL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRERROR_R''@|$(HAVE_DECL_STRERROR_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRCHRNUL''@|$(REPLACE_STRCHRNUL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRERROR_R''@|$(REPLACE_STRERROR_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRNLEN''@|$(REPLACE_STRNLEN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/string.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ - -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ - -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ - -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ - -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ - -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_select.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@sys/select.h: sys_select.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_at)$(MKDIR_P) sys +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SYS_SELECT_H''@|$(NEXT_SYS_SELECT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYS_SELECT_H''@|$(HAVE_SYS_SELECT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PSELECT''@/$(GNULIB_PSELECT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SELECT''@/$(GNULIB_SELECT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PSELECT''@|$(HAVE_PSELECT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PSELECT''@|$(REPLACE_PSELECT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SELECT''@|$(REPLACE_SELECT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/sys_select.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # has one that is incomplete. -sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ - -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ - -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ - -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ - -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ - -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ - -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ - -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ - -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ - -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ - -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ - -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ - -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ - -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ - -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ - -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ - -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ - -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ - -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ - -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ - -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ - -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \ - -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \ - -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ - -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ - -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ - -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ - -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ - -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ - -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ - -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ - -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \ - -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \ - -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \ - -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_stat.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_at)$(MKDIR_P) sys +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCHMODAT''@/$(GNULIB_FCHMODAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSTAT''@/$(GNULIB_FSTAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSTATAT''@/$(GNULIB_FSTATAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FUTIMENS''@/$(GNULIB_FUTIMENS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LCHMOD''@/$(GNULIB_LCHMOD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LSTAT''@/$(GNULIB_LSTAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKDIRAT''@/$(GNULIB_MKDIRAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKFIFO''@/$(GNULIB_MKFIFO)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKFIFOAT''@/$(GNULIB_MKFIFOAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKNOD''@/$(GNULIB_MKNOD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKNODAT''@/$(GNULIB_MKNODAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STAT''@/$(GNULIB_STAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UTIMENSAT''@/$(GNULIB_UTIMENSAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/sys_stat.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_at)$(MKDIR_P) sys - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ - -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ - -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ - -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ - -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ - -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ - -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/sys_time.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@sys/time.h: sys_time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_at)$(MKDIR_P) sys +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_SYS_TIME_H''@/$(HAVE_SYS_TIME_H)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_SYS_TIME_H''@|$(NEXT_SYS_TIME_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETTIMEOFDAY''@/$(GNULIB_GETTIMEOFDAY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_GETTIMEOFDAY''@/$(HAVE_GETTIMEOFDAY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_STRUCT_TIMEVAL''@/$(HAVE_STRUCT_TIMEVAL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_GETTIMEOFDAY''@/$(REPLACE_GETTIMEOFDAY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRUCT_TIMEVAL''@/$(REPLACE_STRUCT_TIMEVAL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/sys_time.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create when the system # doesn't have one that works with the given compiler. -time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ - -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ - -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ - -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ - -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ - -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ - -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ - -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ - -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ - -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ - -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ - -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ - -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ - -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ - -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ - < $(srcdir)/time.in.h; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_MKTIME''@/$(GNULIB_MKTIME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_NANOSLEEP''@/$(GNULIB_NANOSLEEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_STRPTIME''@/$(GNULIB_STRPTIME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TIMEGM''@/$(GNULIB_TIMEGM)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TIME_R''@/$(GNULIB_TIME_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_LOCALTIME_R''@|$(HAVE_DECL_LOCALTIME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PTHREAD_H_DEFINES_STRUCT_TIMESPEC''@|$(PTHREAD_H_DEFINES_STRUCT_TIMESPEC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/time.in.h; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ # We need the following in order to create an empty placeholder for # when the system doesn't have one. -unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) - $(AM_V_GEN)rm -f $@-t $@ && \ - { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - sed -e 's|@''GUARD_PREFIX''@|GL|g' \ - -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ - -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ - -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ - -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ - -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ - -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ - -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ - -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ - -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ - -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ - -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ - -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ - -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ - -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ - -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ - -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ - -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ - -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ - -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ - -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ - -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ - -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ - -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ - -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ - -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ - -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ - -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ - -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ - -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ - -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ - -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ - -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ - -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ - -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ - -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ - -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ - -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ - -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ - -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ - -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ - -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ - -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ - -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ - -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ - -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ - -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ - -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ - -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ - -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ - -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ - -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ - -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ - -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ - -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ - -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ - < $(srcdir)/unistd.in.h | \ - sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ - -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ - -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ - -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ - -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ - -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ - -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ - -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ - -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ - -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ - -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ - -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ - -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ - -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ - -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ - -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ - -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ - -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ - -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ - -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ - -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ - -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ - -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ - -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ - -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ - -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ - -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ - -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ - -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ - -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ - -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ - -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ - -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ - -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ - -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ - -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ - -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ - -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ - -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ - -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ - -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ - -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ - | \ - sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ - -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ - -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ - -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ - -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ - -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ - -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ - -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ - -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ - -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ - -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ - -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ - -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ - -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ - -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ - -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ - -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ - -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ - -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ - -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ - -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ - -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ - -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ - -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ - -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ - -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ - -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ - -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ - -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ - -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ - -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ - -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ - } > $@-t && \ - mv $@-t $@ +@BUILDING_FOR_WINDOWSNT_FALSE@unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) +@BUILDING_FOR_WINDOWSNT_FALSE@ $(AM_V_GEN)rm -f $@-t $@ && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''WINDOWS_64_BIT_OFF_T''@|$(WINDOWS_64_BIT_OFF_T)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CHDIR''@/$(GNULIB_CHDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CHOWN''@/$(GNULIB_CHOWN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_CLOSE''@/$(GNULIB_CLOSE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DUP''@/$(GNULIB_DUP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DUP2''@/$(GNULIB_DUP2)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_DUP3''@/$(GNULIB_DUP3)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ENVIRON''@/$(GNULIB_ENVIRON)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_EUIDACCESS''@/$(GNULIB_EUIDACCESS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FACCESSAT''@/$(GNULIB_FACCESSAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCHDIR''@/$(GNULIB_FCHDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FCHOWNAT''@/$(GNULIB_FCHOWNAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FDATASYNC''@/$(GNULIB_FDATASYNC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FSYNC''@/$(GNULIB_FSYNC)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_FTRUNCATE''@/$(GNULIB_FTRUNCATE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETCWD''@/$(GNULIB_GETCWD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETDOMAINNAME''@/$(GNULIB_GETDOMAINNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETDTABLESIZE''@/$(GNULIB_GETDTABLESIZE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETGROUPS''@/$(GNULIB_GETGROUPS)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETHOSTNAME''@/$(GNULIB_GETHOSTNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLOGIN''@/$(GNULIB_GETLOGIN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETLOGIN_R''@/$(GNULIB_GETLOGIN_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETPAGESIZE''@/$(GNULIB_GETPAGESIZE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GETUSERSHELL''@/$(GNULIB_GETUSERSHELL)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_GROUP_MEMBER''@/$(GNULIB_GROUP_MEMBER)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_ISATTY''@/$(GNULIB_ISATTY)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LCHOWN''@/$(GNULIB_LCHOWN)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LINK''@/$(GNULIB_LINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LINKAT''@/$(GNULIB_LINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_LSEEK''@/$(GNULIB_LSEEK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PIPE''@/$(GNULIB_PIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PIPE2''@/$(GNULIB_PIPE2)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PREAD''@/$(GNULIB_PREAD)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_PWRITE''@/$(GNULIB_PWRITE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READ''@/$(GNULIB_READ)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READLINK''@/$(GNULIB_READLINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_READLINKAT''@/$(GNULIB_READLINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_RMDIR''@/$(GNULIB_RMDIR)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SETHOSTNAME''@/$(GNULIB_SETHOSTNAME)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SLEEP''@/$(GNULIB_SLEEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SYMLINK''@/$(GNULIB_SYMLINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_SYMLINKAT''@/$(GNULIB_SYMLINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_TTYNAME_R''@/$(GNULIB_TTYNAME_R)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNISTD_H_GETOPT''@/0$(GNULIB_GL_UNISTD_H_GETOPT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNISTD_H_NONBLOCKING''@/$(GNULIB_UNISTD_H_NONBLOCKING)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNISTD_H_SIGPIPE''@/$(GNULIB_UNISTD_H_SIGPIPE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNLINK''@/$(GNULIB_UNLINK)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_UNLINKAT''@/$(GNULIB_UNLINKAT)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_USLEEP''@/$(GNULIB_USLEEP)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''GNULIB_WRITE''@/$(GNULIB_WRITE)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ < $(srcdir)/unistd.in.h | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FDATASYNC''@|$(HAVE_FDATASYNC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_GROUP_MEMBER''@|$(HAVE_GROUP_MEMBER)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PIPE''@|$(HAVE_PIPE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_PWRITE''@|$(HAVE_PWRITE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SETHOSTNAME''@|$(HAVE_SETHOSTNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FCHDIR''@|$(HAVE_DECL_FCHDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_FDATASYNC''@|$(HAVE_DECL_FDATASYNC)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETDOMAINNAME''@|$(HAVE_DECL_GETDOMAINNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_SETHOSTNAME''@|$(HAVE_DECL_SETHOSTNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_DECL_TTYNAME_R''@|$(HAVE_DECL_TTYNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ | \ +@BUILDING_FOR_WINDOWSNT_FALSE@ sed -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_FTRUNCATE''@|$(REPLACE_FTRUNCATE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETDOMAINNAME''@|$(REPLACE_GETDOMAINNAME)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETLOGIN_R''@|$(REPLACE_GETLOGIN_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_ISATTY''@|$(REPLACE_ISATTY)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_PWRITE''@|$(REPLACE_PWRITE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_READ''@|$(REPLACE_READ)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_TTYNAME_R''@|$(REPLACE_TTYNAME_R)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ } > $@-t && \ +@BUILDING_FOR_WINDOWSNT_FALSE@ mv $@-t $@ -mostlyclean-local: mostlyclean-generic - @for dir in '' $(MOSTLYCLEANDIRS); do \ - if test -n "$$dir" && test -d $$dir; then \ - echo "rmdir $$dir"; rmdir $$dir; \ - fi; \ - done; \ - : +@BUILDING_FOR_WINDOWSNT_FALSE@mostlyclean-local: mostlyclean-generic +@BUILDING_FOR_WINDOWSNT_FALSE@ @for dir in '' $(MOSTLYCLEANDIRS); do \ +@BUILDING_FOR_WINDOWSNT_FALSE@ if test -n "$$dir" && test -d $$dir; then \ +@BUILDING_FOR_WINDOWSNT_FALSE@ echo "rmdir $$dir"; rmdir $$dir; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ fi; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ done; \ +@BUILDING_FOR_WINDOWSNT_FALSE@ : # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/autogen/aclocal.m4 b/autogen/aclocal.m4 index d782216bac5..eb324b06b37 100644 --- a/autogen/aclocal.m4 +++ b/autogen/aclocal.m4 @@ -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]) diff --git a/autogen/config.in b/autogen/config.in index dd10c1d0a2d..a25d43cc4cb 100644 --- a/autogen/config.in +++ b/autogen/config.in @@ -110,6 +110,9 @@ along with GNU Emacs. If not, see . */ /* 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 . */ #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 . */ /* 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 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 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 . */ /* 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 . */ /* 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 . */ /* 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 . */ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP +/* Define to 1 if you have the 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 . */ /* Define to 1 if you have the 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 . */ /* Define to 1 if `speed_t' is declared by . */ #undef HAVE_SPEED_T +/* Define to 1 if you have the `statacl' function. */ +#undef HAVE_STATACL + /* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H @@ -946,6 +1030,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the `sync' function. */ #undef HAVE_SYNC +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_ACL_H + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_BITYPES_H @@ -1056,6 +1143,9 @@ along with GNU Emacs. If not, see . */ /* Define to 1 if you have the header file. */ #undef HAVE_VFORK_H +/* Define to 1 to use w32notify. */ +#undef HAVE_W32NOTIFY + /* Define to 1 if you have the header file. */ #undef HAVE_WCHAR_H @@ -1106,15 +1196,27 @@ along with GNU Emacs. If not, see . */ /* 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 . */ /* 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 . */ /* 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 . */ Suppress extern inline with HP-UX cc, as it appears to be broken; see . - 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., . 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: */ - diff --git a/autogen/configure b/autogen/configure index 5b5d7d7b95a..f7a67c56fef 100755 --- a/autogen/configure +++ b/autogen/configure @@ -605,6 +605,9 @@ LTLIBOBJS LIBOBJS SUBDIR_MAKEFILES_IN WINDOW_SYSTEM_OBJ +EMACS_HEAPSIZE +TEMACS_POST_LINK +ADDSECTION LD_SWITCH_SYSTEM_TEMACS LIBGNU_LTLIBDEPS LIBGNU_LIBDEPS @@ -781,6 +784,8 @@ GL_GENERATE_STDALIGN_H_TRUE STDALIGN_H NEXT_AS_FIRST_DIRECTIVE_SIGNAL_H NEXT_SIGNAL_H +USE_ACL +LIB_ACL LIB_PTHREAD_SIGMASK REPLACE_RAISE REPLACE_PTHREAD_SIGMASK @@ -1076,6 +1081,17 @@ GL_GENERATE_EXECINFO_H_FALSE GL_GENERATE_EXECINFO_H_TRUE LIB_EXECINFO EXECINFO_H +EOVERFLOW_VALUE +EOVERFLOW_HIDDEN +ENOLINK_VALUE +ENOLINK_HIDDEN +EMULTIHOP_VALUE +EMULTIHOP_HIDDEN +GL_GENERATE_ERRNO_H_FALSE +GL_GENERATE_ERRNO_H_TRUE +ERRNO_H +NEXT_AS_FIRST_DIRECTIVE_ERRNO_H +NEXT_ERRNO_H HAVE_DIRENT_H NEXT_AS_FIRST_DIRECTIVE_DIRENT_H NEXT_DIRENT_H @@ -1286,6 +1302,10 @@ LIBS_MAIL liblockfile LIBXML2_LIBS LIBXML2_CFLAGS +XINERAMA_LIBS +XINERAMA_CFLAGS +XRANDR_LIBS +XRANDR_CFLAGS LIBXSM LIBGPM LIBGIF @@ -1305,7 +1325,6 @@ FONTCONFIG_LIBS FONTCONFIG_CFLAGS LIBXMU LIBXTR6 -LIBACL_LIBS LIBGNUTLS_LIBS LIBGNUTLS_CFLAGS LIBSELINUX_LIBS @@ -1331,8 +1350,18 @@ LIB_PTHREAD VMLIMIT_OBJ GMALLOC_OBJ HAVE_XSERVER +XARGS_LIMIT +NTLIB +LIB_WSOCK32 +LIBS_ECLIENT +CM_OBJ +NTDIR +FIRSTFILE_OBJ W32_RES_LINK -W32_RES +CLIENTW +CLIENTRES +EMACS_MANIFEST +EMACSRES W32_LIBS W32_OBJ WINDRES @@ -1363,7 +1392,7 @@ HAVE_MAKEINFO PAXCTL GZIP_PROG INSTALL_INFO -LN_S +LN_S_FILEONLY GNULIB_WARN_CFLAGS WARN_CFLAGS WERROR_CFLAGS @@ -1373,6 +1402,8 @@ AR EGREP GREP CPP +BUILDING_FOR_WINDOWSNT_FALSE +BUILDING_FOR_WINDOWSNT_TRUE am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE @@ -1497,7 +1528,6 @@ with_dbus with_gconf with_gsettings with_selinux -with_acl with_gnutls with_inotify with_makeinfo @@ -1517,6 +1547,7 @@ enable_largefile enable_gcc_warnings enable_link_time_optimization with_x +enable_acl ' ac_precious_vars='build_alias host_alias @@ -2183,6 +2214,7 @@ Optional Features: --enable-link-time-optimization build emacs with link-time optimization. This is supported only for GCC since 4.5.0. + --disable-acl do not support ACLs Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -2217,14 +2249,13 @@ Optional Packages: --without-xaw3d don't use Xaw3d --without-xim don't use X11 XIM --with-ns use NeXTstep (Cocoa or GNUstep) windowing system - --with-w32 use native MS Windows GUI + --with-w32 use native MS Windows GUI in a Cygwin build --without-gpm don't use -lgpm for mouse support on a GNU/Linux console --without-dbus don't compile with D-Bus support --without-gconf don't compile with GConf support --without-gsettings don't compile with GSettings support --without-selinux don't compile with SELinux support - --without-acl don't compile with ACL support --without-gnutls don't use -lgnutls for SSL/TLS support --without-inotify don't compile with inotify (file-watch) support --without-makeinfo don't require makeinfo for building manuals @@ -4293,14 +4324,6 @@ else fi -# Check whether --with-acl was given. -if test "${with_acl+set}" = set; then : - withval=$with_acl; -else - with_acl=$with_features -fi - - # Check whether --with-gnutls was given. if test "${with_gnutls+set}" = set; then : withval=$with_gnutls; @@ -4516,7 +4539,7 @@ fi ## Make sure CDPATH doesn't affect cd (in case PWD is relative). unset CDPATH case "${srcdir}" in - /* ) ;; + [\\/]* | ?:[\\/]*) ;; . ) ## We may be able to use the $PWD environment variable to make this ## absolute. But sometimes PWD is inaccurate. @@ -4640,6 +4663,11 @@ case "${canonical}" in opsys=freebsd ;; + ## DragonFly ports + *-*-dragonfly* ) + opsys=dragonfly + ;; + ## FreeBSD kernel + glibc based userland *-*-kfreebsd*gnu* ) opsys=gnu-kfreebsd @@ -4672,6 +4700,11 @@ case "${canonical}" in ## fi ;; + ## Cygwin ports + *-*-cygwin ) + opsys=cygwin + ;; + ## HP 9000 series 700 and 800, running HP/UX hppa*-hp-hpux10.2* ) opsys=hpux10-20 @@ -4745,8 +4778,12 @@ case "${canonical}" in ## Intel 386 machines where we don't care about the manufacturer. i[3456]86-*-* ) case "${canonical}" in - *-cygwin ) opsys=cygwin ;; *-darwin* ) opsys=darwin ;; + *-mingw32 ) + opsys=mingw32 + # MinGW overrides and adds some system headers in nt/inc. + GCC_TEST_OPTIONS="-I $srcdir/nt/inc" + ;; *-sysv4.2uw* ) opsys=unixware ;; *-sysv5uw* ) opsys=unixware ;; *-sysv5OpenUNIX* ) opsys=unixware ;; @@ -5897,6 +5934,15 @@ else test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi + if test "x$opsys" = "xmingw32"; then + BUILDING_FOR_WINDOWSNT_TRUE= + BUILDING_FOR_WINDOWSNT_FALSE='#' +else + BUILDING_FOR_WINDOWSNT_TRUE='#' + BUILDING_FOR_WINDOWSNT_FALSE= +fi + + # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. @@ -7176,6 +7222,7 @@ esac # Code from module dtotimespec: # Code from module dup2: # Code from module environ: + # Code from module errno: # Code from module euidaccess: # Code from module execinfo: # Code from module extensions: @@ -7214,6 +7261,7 @@ esac # Code from module pselect: # Code from module pthread_sigmask: # Code from module putenv: + # Code from module qacl: # Code from module readlink: # Code from module readlinkat: # Code from module root-uid: @@ -7262,10 +7310,10 @@ esac # Code from module xalloc-oversized: -# It's helpful to have C macros available to GDB, so prefer -g3 to -g -# if -g3 works and the user does not specify CFLAGS. -# This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains. if test "$ac_test_CFLAGS" != set; then + # It's helpful to have C macros available to GDB, so prefer -g3 to -g + # if -g3 works and the user does not specify CFLAGS. + # This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains. case $CFLAGS in '-g') emacs_g3_CFLAGS='-g3';; @@ -7303,12 +7351,52 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_prog_cc_g3" >&5 $as_echo "$emacs_cv_prog_cc_g3" >&6; } - if test $emacs_cv_prog_cc_g3 = yes; then - CFLAGS=$emacs_g3_CFLAGS - else + if test $emacs_cv_prog_cc_g3 != yes; then CFLAGS=$emacs_save_CFLAGS fi + if test $opsys = mingw32; then + CFLAGS="$CFLAGS -gdwarf-2" + fi fi + + case $CFLAGS in + *-O*) ;; + *) + # No optimization flag was inferred for this non-GCC compiler. + # Try -O. This is needed for xlc on AIX; see Bug#14258. + emacs_save_CFLAGS=$CFLAGS + test -z "$CFLAGS" || CFLAGS="$CFLAGS " + CFLAGS=${CFLAGS}-O + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -O" >&5 +$as_echo_n "checking whether $CC accepts -O... " >&6; } +if test "${emacs_cv_prog_cc_o+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + emacs_cv_prog_cc_o=yes +else + emacs_cv_prog_cc_o=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_prog_cc_o" >&5 +$as_echo "$emacs_cv_prog_cc_o" >&6; } + if test $emacs_cv_prog_cc_o != yes; then + CFLAGS=$emacs_save_CFLAGS + fi ;; + esac fi # Check whether --enable-gcc-warnings was given. @@ -7389,14 +7477,51 @@ else nw="$nw -Wwrite-strings" ;; *) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror -Wunknown-warning-option" >&5 +$as_echo_n "checking whether C compiler handles -Werror -Wunknown-warning-option... " >&6; } +if test "${gl_cv_warn_c__Werror__Wunknown_warning_option+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror -Wunknown-warning-option" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_warn_c__Werror__Wunknown_warning_option=yes +else + gl_cv_warn_c__Werror__Wunknown_warning_option=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Werror__Wunknown_warning_option" >&5 +$as_echo "$gl_cv_warn_c__Werror__Wunknown_warning_option" >&6; } +if test "x$gl_cv_warn_c__Werror__Wunknown_warning_option" = x""yes; then : + gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror' +else + gl_unknown_warnings_are_errors= +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Werror" >&5 $as_echo_n "checking whether C compiler handles -Werror... " >&6; } if test "${gl_cv_warn_c__Werror+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Werror" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Werror" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7428,27 +7553,13 @@ fi esac - nw="$nw -Waggregate-return" # anachronistic - nw="$nw -Wlong-long" # C90 is anachronistic - nw="$nw -Wc++-compat" # We don't care about C++ compilers - nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib - nw="$nw -Wtraditional" # Warns on #elif which we use often - nw="$nw -Wcast-qual" # Too many warnings for now - nw="$nw -Wconversion" # Too many warnings for now nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wsign-conversion" # Too many warnings for now nw="$nw -Woverlength-strings" # Not a problem these days - nw="$nw -Wtraditional-conversion" # Too many warnings for now - nw="$nw -Wunreachable-code" # so buggy that it's now silently ignored - nw="$nw -Wpadded" # Our structs are not padded - nw="$nw -Wredundant-decls" # we regularly (re)declare functions nw="$nw -Wlogical-op" # any use of fwrite provokes this nw="$nw -Wformat-nonliteral" # we do this a lot nw="$nw -Wvla" # warnings in gettext.h nw="$nw -Wnested-externs" # use of XARGMATCH/verify_function__ - nw="$nw -Wswitch-enum" # Too many warnings for now nw="$nw -Wswitch-default" # Too many warnings for now - nw="$nw -Wfloat-equal" # warns about high-quality code nw="$nw -Winline" # OK to ignore 'inline' nw="$nw -Wjump-misses-init" # We sometimes safely jump over init. nw="$nw -Wstrict-overflow" # OK to optimize assuming that @@ -7466,6 +7577,40 @@ fi # The following line should be removable at some point. nw="$nw -Wsuggest-attribute=pure" + # clang is unduly picky about some things. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5 +$as_echo_n "checking whether the compiler is clang... " >&6; } +if test "${emacs_cv_clang+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #ifndef __clang__ + #error "not clang" + #endif + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + emacs_cv_clang=yes +else + emacs_cv_clang=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_clang" >&5 +$as_echo "$emacs_cv_clang" >&6; } + if test $emacs_cv_clang = yes; then + nw="$nw -Wcast-align" + fi + if test -n "$GCC"; then @@ -7579,6 +7724,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -W \ -Wabi \ -Waddress \ + -Waggressive-loop-optimizations \ -Wall \ -Warray-bounds \ -Wattributes \ @@ -7606,7 +7752,6 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wformat-security \ -Wformat-y2k \ -Wformat-zero-length \ - -Wformat=2 \ -Wfree-nonheap-object \ -Wignored-qualifiers \ -Wimplicit \ @@ -7624,9 +7769,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wmissing-braces \ -Wmissing-declarations \ -Wmissing-field-initializers \ - -Wmissing-format-attribute \ -Wmissing-include-dirs \ - -Wmissing-noreturn \ -Wmissing-parameter-type \ -Wmissing-prototypes \ -Wmudflap \ @@ -7647,6 +7790,7 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wpointer-sign \ -Wpointer-to-int-cast \ -Wpragmas \ + -Wreturn-local-addr \ -Wreturn-type \ -Wsequence-point \ -Wshadow \ @@ -7668,7 +7812,6 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } -Wtype-limits \ -Wuninitialized \ -Wunknown-pragmas \ - -Wunreachable-code \ -Wunsafe-loop-optimizations \ -Wunused \ -Wunused-but-set-parameter \ @@ -7719,7 +7862,8 @@ $as_echo "$gl_cv_cc_uninitialized_supported" >&6; } ws=$gl_warn_set for w in $ws; do - as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh` + +as_gl_Warn=`$as_echo "gl_cv_warn_c_$w" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles $w" >&5 $as_echo_n "checking whether C compiler handles $w... " >&6; } if { as_var=$as_gl_Warn; eval "test \"\${$as_var+set}\" = set"; }; then : @@ -7727,7 +7871,7 @@ if { as_var=$as_gl_Warn; eval "test \"\${$as_var+set}\" = set"; }; then : else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " $w" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors $w" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7758,14 +7902,15 @@ fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-missing-field-initializers" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-missing-field-initializers" >&5 $as_echo_n "checking whether C compiler handles -Wno-missing-field-initializers... " >&6; } if test "${gl_cv_warn_c__Wno_missing_field_initializers+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-missing-field-initializers" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-missing-field-initializers" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7793,14 +7938,15 @@ if test "x$gl_cv_warn_c__Wno_missing_field_initializers" = x""yes; then : fi # We need this one - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-sign-compare" >&5 $as_echo_n "checking whether C compiler handles -Wno-sign-compare... " >&6; } if test "${gl_cv_warn_c__Wno_sign_compare+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-sign-compare" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-sign-compare" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7828,14 +7974,15 @@ if test "x$gl_cv_warn_c__Wno_sign_compare" = x""yes; then : fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-type-limits" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-type-limits" >&5 $as_echo_n "checking whether C compiler handles -Wno-type-limits... " >&6; } if test "${gl_cv_warn_c__Wno_type_limits+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-type-limits" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-type-limits" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7863,14 +8010,15 @@ if test "x$gl_cv_warn_c__Wno_type_limits" = x""yes; then : fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-switch" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-switch" >&5 $as_echo_n "checking whether C compiler handles -Wno-switch... " >&6; } if test "${gl_cv_warn_c__Wno_switch+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-switch" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-switch" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7898,14 +8046,15 @@ if test "x$gl_cv_warn_c__Wno_switch" = x""yes; then : fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-parameter" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-parameter" >&5 $as_echo_n "checking whether C compiler handles -Wno-unused-parameter... " >&6; } if test "${gl_cv_warn_c__Wno_unused_parameter+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-unused-parameter" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-parameter" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7933,14 +8082,15 @@ if test "x$gl_cv_warn_c__Wno_unused_parameter" = x""yes; then : fi # Too many warnings for now - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-nonliteral" >&5 $as_echo_n "checking whether C compiler handles -Wno-format-nonliteral... " >&6; } if test "${gl_cv_warn_c__Wno_format_nonliteral+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-format-nonliteral" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-nonliteral" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -7971,14 +8121,15 @@ fi # In spite of excluding -Wlogical-op above, it is enabled, as of # gcc 4.5.0 20090517. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-logical-op" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-logical-op" >&5 $as_echo_n "checking whether C compiler handles -Wno-logical-op... " >&6; } if test "${gl_cv_warn_c__Wno_logical_op+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -Wno-logical-op" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-logical-op" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8007,14 +8158,163 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5 + # More things that clang is unduly picky about. + if test $emacs_cv_clang = yes; then + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-format-extra-args" >&5 +$as_echo_n "checking whether C compiler handles -Wno-format-extra-args... " >&6; } +if test "${gl_cv_warn_c__Wno_format_extra_args+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-format-extra-args" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_warn_c__Wno_format_extra_args=yes +else + gl_cv_warn_c__Wno_format_extra_args=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_format_extra_args" >&5 +$as_echo "$gl_cv_warn_c__Wno_format_extra_args" >&6; } +if test "x$gl_cv_warn_c__Wno_format_extra_args" = x""yes; then : + as_fn_append WARN_CFLAGS " -Wno-format-extra-args" +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-tautological-constant-out-of-range-compare" >&5 +$as_echo_n "checking whether C compiler handles -Wno-tautological-constant-out-of-range-compare... " >&6; } +if test "${gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-tautological-constant-out-of-range-compare" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare=yes +else + gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" >&5 +$as_echo "$gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" >&6; } +if test "x$gl_cv_warn_c__Wno_tautological_constant_out_of_range_compare" = x""yes; then : + as_fn_append WARN_CFLAGS " -Wno-tautological-constant-out-of-range-compare" +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-command-line-argument" >&5 +$as_echo_n "checking whether C compiler handles -Wno-unused-command-line-argument... " >&6; } +if test "${gl_cv_warn_c__Wno_unused_command_line_argument+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-command-line-argument" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_warn_c__Wno_unused_command_line_argument=yes +else + gl_cv_warn_c__Wno_unused_command_line_argument=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_unused_command_line_argument" >&5 +$as_echo "$gl_cv_warn_c__Wno_unused_command_line_argument" >&6; } +if test "x$gl_cv_warn_c__Wno_unused_command_line_argument" = x""yes; then : + as_fn_append WARN_CFLAGS " -Wno-unused-command-line-argument" +fi + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-value" >&5 +$as_echo_n "checking whether C compiler handles -Wno-unused-value... " >&6; } +if test "${gl_cv_warn_c__Wno_unused_value+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_compiler_FLAGS="$CFLAGS" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -Wno-unused-value" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_warn_c__Wno_unused_value=yes +else + gl_cv_warn_c__Wno_unused_value=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_compiler_FLAGS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_warn_c__Wno_unused_value" >&5 +$as_echo "$gl_cv_warn_c__Wno_unused_value" >&6; } +if test "x$gl_cv_warn_c__Wno_unused_value" = x""yes; then : + as_fn_append WARN_CFLAGS " -Wno-unused-value" +fi + + + fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -fdiagnostics-show-option" >&5 $as_echo_n "checking whether C compiler handles -fdiagnostics-show-option... " >&6; } if test "${gl_cv_warn_c__fdiagnostics_show_option+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -fdiagnostics-show-option" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -fdiagnostics-show-option" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8042,14 +8342,15 @@ if test "x$gl_cv_warn_c__fdiagnostics_show_option" = x""yes; then : fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -funit-at-a-time" >&5 $as_echo_n "checking whether C compiler handles -funit-at-a-time... " >&6; } if test "${gl_cv_warn_c__funit_at_a_time+set}" = set; then : $as_echo_n "(cached) " >&6 else gl_save_compiler_FLAGS="$CFLAGS" - as_fn_append CFLAGS " -funit-at-a-time" + as_fn_append CFLAGS " $gl_unknown_warnings_are_errors -funit-at-a-time" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8111,17 +8412,39 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 -$as_echo_n "checking whether ln -s works... " >&6; } -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5 -$as_echo "no, using $LN_S" >&6; } + + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works for files in the same directory" >&5 +$as_echo_n "checking whether ln -s works for files in the same directory... " >&6; } +rm -f conf$$ conf$$.file + +LN_S_FILEONLY='cp -p' + +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + LN_S_FILEONLY='ln -s' + elif ln conf$$.file conf$$ 2>/dev/null; then + LN_S_FILEONLY=ln + fi fi +rm -f conf$$ conf$$.file + +if test "$LN_S_FILEONLY" = "ln -s"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S_FILEONLY" >&5 +$as_echo "no, using $LN_S_FILEONLY" >&6; } +fi + + + + +if test "$opsys" = "mingw32"; then + LN_S="ln" +fi # Extract the first word of "install-info", so it can be a program name with args. set dummy install-info; ac_word=$2 @@ -8409,7 +8732,6 @@ $as_echo "#define CANNOT_DUMP 1" >>confdefs.h UNEXEC_OBJ=unexelf.o case "$opsys" in # MSDOS uses unexcoff.o - # MSWindows uses unexw32.o aix4-2) UNEXEC_OBJ=unexaix.o ;; @@ -8422,6 +8744,9 @@ case "$opsys" in hpux10-20 | hpux11) UNEXEC_OBJ=unexhp9k800.o ;; + mingw32) + UNEXEC_OBJ=unexw32.o + ;; sol2-10) # Use the Solaris dldump() function, called from unexsol.c, to dump # emacs, instead of the generic ELF dump code found in unexelf.c. @@ -8440,7 +8765,7 @@ esac LD_SWITCH_SYSTEM= case "$opsys" in - freebsd) + freebsd|dragonfly) ## Let `ld' find image libs and similar things in /usr/local/lib. ## The system compiler, GCC, has apparently been modified to not ## look there, contrary to what a stock GCC would do. @@ -8461,7 +8786,7 @@ case "$opsys" in ;; openbsd) - ## Han Boetes says this is necessary, + ## Han Boetes says this is necessary, ## otherwise Emacs dumps core on elf systems. LD_SWITCH_SYSTEM="-Z" ;; @@ -8520,6 +8845,7 @@ C_SWITCH_SYSTEM= ## additional optimization. --nils@exp-math.uni-essen.de test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \ C_SWITCH_SYSTEM="-ma -qmaxmem=4000" +test "$opsys" = "mingw32" && C_SWITCH_SYSTEM="-mtune=pentium4" ## gnu-linux might need -D_BSD_SOURCE on old libc5 systems. ## It is redundant in glibc2, since we define _GNU_SOURCE. @@ -8530,7 +8856,7 @@ case "$opsys" in ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; - freebsd) LIBS_SYSTEM="-lutil" ;; + freebsd|dragonfly) LIBS_SYSTEM="-lutil" ;; hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; @@ -8567,13 +8893,17 @@ case $opsys in ## Adding -lm confuses the dynamic linker, so omit it. LIB_MATH= ;; - freebsd ) + freebsd | dragonfly ) SYSTEM_TYPE=berkeley-unix ;; gnu-linux | gnu-kfreebsd ) ;; hpux10-20 | hpux11 ) ;; + mingw32 ) + LIB_MATH= + SYSTEM_TYPE=windows-nt + ;; netbsd | openbsd ) SYSTEM_TYPE=berkeley-unix ;; @@ -8639,13 +8969,18 @@ fi - if test "${with_sound}" != "no"; then - # Sound support for GNU/Linux and the free BSDs. - for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h + # Sound support for GNU/Linux, the free BSDs, and MinGW. + for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " + #ifdef __MINGW32__ + #define WIN32_LEAN_AND_MEAN + #include + #endif + +" eval as_val=\$$as_ac_Header if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF @@ -8811,7 +9146,7 @@ $as_echo "#define HAVE_ALSA 1" >>confdefs.h if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then case "$opsys" in - gnu-linux|freebsd|netbsd) + gnu-linux|freebsd|netbsd|mingw32) $as_echo "#define HAVE_SOUND 1" >>confdefs.h @@ -9725,21 +10060,72 @@ CPPFLAGS="$tmp_CPPFLAGS" HAVE_W32=no W32_OBJ= W32_LIBS= -W32_RES= +EMACSRES= +CLIENTRES= +CLIENTW= W32_RES_LINK= +EMACS_MANIFEST= if test "${with_w32}" != no; then - if test "${opsys}" != "cygwin"; then - as_fn_error "Using w32 with an autotools build is only supported for Cygwin." "$LINENO" 5 - fi - ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" + case "${opsys}" in + cygwin) + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" if test "x$ac_cv_header_windows_h" = x""yes; then : HAVE_W32=yes else as_fn_error "\`--with-w32' was specified, but windows.h - cannot be found." "$LINENO" 5 + cannot be found." "$LINENO" 5 fi + ;; + mingw32) + ## Using --with-w32 with MinGW is a no-op, but we allow it. + ;; + *) + as_fn_error "Using w32 with an autotools build is only supported for Cygwin and MinGW32." "$LINENO" 5 + ;; + esac +fi + +if test "${opsys}" = "mingw32"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Windows API headers are recent enough" >&5 +$as_echo_n "checking whether Windows API headers are recent enough... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include +int +main () +{ +void test(PIMAGE_NT_HEADERS pHeader) + {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);} + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + emacs_cv_w32api=yes + HAVE_W32=yes +else + emacs_cv_w32api=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_w32api" >&5 +$as_echo "$emacs_cv_w32api" >&6; } + if test "${emacs_cv_w32api}" = "no"; then + as_fn_error "the Windows API headers are too old to support this build." "$LINENO" 5 + fi +fi + +FIRSTFILE_OBJ= +NTDIR= +LIBS_ECLIENT= +LIB_WSOCK32= +NTLIB= +CM_OBJ="cm.o" +XARGS_LIMIT= +if test "${HAVE_W32}" = "yes"; then $as_echo "#define HAVE_NTGUI 1" >>confdefs.h @@ -9837,18 +10223,49 @@ fi W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" - W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" - W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" - W32_RES="emacs.res" - # Tell the linker that emacs.res is an object (which we compile from - # the rc file), not a linker script. - W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res" + EMACSRES="emacs.res" + case "$canonical" in + x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; + *) EMACS_MANIFEST="emacs-x86.manifest" ;; + esac + if test "${opsys}" = "cygwin"; then + W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" + # Tell the linker that emacs.res is an object (which we compile from + # the rc file), not a linker script. + W32_RES_LINK="-Wl,emacs.res" + else + W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" + W32_OBJ="$W32_OBJ w32notify.o" + W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10" + W32_RES_LINK="\$(EMACSRES)" + CLIENTRES="emacsclient.res" + CLIENTW="emacsclientw\$(EXEEXT)" + FIRSTFILE_OBJ=firstfile.o + NTDIR=nt + CM_OBJ= + LIBS_ECLIENT="-lcomctl32" + LIB_WSOCK32="-lwsock32" + NTLIB="ntlib.$ac_objext" + XARGS_LIMIT="-s 10000" + fi fi + + + + + + + + + + if test "${HAVE_W32}" = "yes"; then window_system=w32 with_xft=no @@ -10634,7 +11051,7 @@ rm -f core conftest.err conftest.$ac_objext \ $as_echo "$emacs_xkb" >&6; } if test $emacs_xkb = yes; then -$as_echo "#define HAVE_XKBGETKEYBOARD 1" >>confdefs.h +$as_echo "#define HAVE_XKB 1" >>confdefs.h fi @@ -10710,7 +11127,7 @@ fi ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. HAVE_RSVG=no -if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then if test "${with_rsvg}" != "no"; then RSVG_REQUIRED=2.11.0 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" @@ -10785,7 +11202,8 @@ if test "${HAVE_X11}" = "yes"; then ## 6.2.8 is the earliest version known to work, but earlier versions ## might work - let us know if you find one. ## 6.0.7 does not work. See bug#7955. - IMAGEMAGICK_MODULE="Wand >= 6.2.8" + ## 6.8.2 makes Emacs crash; see Bug#13867. + IMAGEMAGICK_MODULE="Wand >= 6.2.8 Wand != 6.8.2" succeeded=no @@ -10868,10 +11286,11 @@ HAVE_GTK=no GTK_OBJ= check_gtk2=no gtk3_pkg_errors= -if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.28 - GTK_REQUIRED=3.0 - GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" +if test "${opsys}" != "mingw32"; then + if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then + GLIB_REQUIRED=2.28 + GTK_REQUIRED=3.0 + GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" succeeded=no @@ -10924,29 +11343,30 @@ $as_echo "no" >&6; } pkg_check_gtk=no fi - if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then - as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 - fi - if test "$pkg_check_gtk" = "yes"; then + if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then + as_fn_error "$GTK_PKG_ERRORS" "$LINENO" 5 + fi + if test "$pkg_check_gtk" = "yes"; then $as_echo "#define HAVE_GTK3 1" >>confdefs.h - GTK_OBJ=emacsgtkfixed.o - term_header=gtkutil.h - USE_GTK_TOOLKIT="GTK3" - if test "x$ac_enable_gtk_deprecation_warnings" = x; then - GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" - fi - else - check_gtk2=yes - gtk3_pkg_errors="$GTK_PKG_ERRORS " + GTK_OBJ=emacsgtkfixed.o + term_header=gtkutil.h + USE_GTK_TOOLKIT="GTK3" + if test "x$ac_enable_gtk_deprecation_warnings" = x; then + GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" + GTK_CFLAGS="$GTK_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" + fi + else + check_gtk2=yes + gtk3_pkg_errors="$GTK_PKG_ERRORS " + fi fi -fi -if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then - GLIB_REQUIRED=2.10 - GTK_REQUIRED=2.10 - GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" + if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 + GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" succeeded=no @@ -10999,12 +11419,13 @@ $as_echo "no" >&6; } pkg_check_gtk=no fi - if test "$pkg_check_gtk" = "no" && - { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } - then - as_fn_error "$gtk3_pkg_errors$GTK_PKG_ERRORS" "$LINENO" 5 + if test "$pkg_check_gtk" = "no" && + { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } + then + as_fn_error "$gtk3_pkg_errors$GTK_PKG_ERRORS" "$LINENO" 5 + fi + test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi - test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi if test x"$pkg_check_gtk" = xyes; then @@ -11553,6 +11974,8 @@ $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h fi + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" LIBS="$LIBGNUTLS_LIBS $LIBS" for ac_func in gnutls_certificate_set_verify_function @@ -11572,6 +11995,13 @@ done $as_echo "#define HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY 1" >>confdefs.h fi + + # Windows loads GnuTLS dynamically + if test "${opsys}" = "mingw32"; then + CFLAGS=$OLD_CFLAGS + LIBS=$OLD_LIBS + LIBGNUTLS_LIBS= + fi fi @@ -11604,73 +12034,6 @@ $as_echo "#define HAVE_INOTIFY 1" >>confdefs.h fi -HAVE_POSIX_ACL=no -LIBACL_LIBS= -if test "${with_acl}" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_set_file in -lacl" >&5 -$as_echo_n "checking for acl_set_file in -lacl... " >&6; } -if test "${ac_cv_lib_acl_acl_set_file+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lacl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char acl_set_file (); -int -main () -{ -return acl_set_file (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_acl_acl_set_file=yes -else - ac_cv_lib_acl_acl_set_file=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_acl_acl_set_file" >&5 -$as_echo "$ac_cv_lib_acl_acl_set_file" >&6; } -if test "x$ac_cv_lib_acl_acl_set_file" = x""yes; then : - HAVE_POSIX_ACL=yes -else - HAVE_POSIX_ACL=no -fi - - if test "$HAVE_POSIX_ACL" = yes; then - -$as_echo "#define HAVE_POSIX_ACL 1" >>confdefs.h - - LIBACL_LIBS=-lacl - else - ac_fn_c_check_func "$LINENO" "acl_set_file" "ac_cv_func_acl_set_file" -if test "x$ac_cv_func_acl_set_file" = x""yes; then : - HAVE_POSIX_ACL=yes -else - HAVE_POSIX_ACL=no -fi - - if test "$HAVE_POSIX_ACL" = yes; then - -$as_echo "#define HAVE_POSIX_ACL 1" >>confdefs.h - - fi - fi -fi - - HAVE_XAW3D=no LUCID_LIBW= if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then @@ -11914,6 +12277,9 @@ case $opsys in hpux* | aix4-2 ) test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" != "Xyes" && LIBXMU= ;; + mingw32 ) + LIBXMU= + ;; esac @@ -12698,10 +13064,10 @@ fi ### Use -lXpm if available, unless `--with-xpm=no'. +### mingw32 doesn't use -lXpm, since it loads the library dynamically. HAVE_XPM=no LIBXPM= - -if test "${HAVE_W32}" = "yes"; then +if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then if test "${with_xpm}" != "no"; then SAVE_CPPFLAGS="$CPPFLAGS" SAVE_LDFLAGS="$LDFLAGS" @@ -12878,12 +13244,70 @@ $as_echo "#define HAVE_XPM 1" >>confdefs.h fi fi +### FIXME: Perhaps regroup to minimize code duplication due to MinGW's +### slightly different requirements wrt image libraries (it doesn't +### use -lXpm because it loads the xpm shared library dynamically at +### run time). +if test "${opsys}" = "mingw32"; then + if test "${with_xpm}" != "no"; then + ac_fn_c_check_header_compile "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" " +#define FOR_MSW 1 +" +if test "x$ac_cv_header_X11_xpm_h" = x""yes; then : + HAVE_XPM=yes +else + HAVE_XPM=no +fi + + + fi + + if test "${HAVE_XPM}" = "yes"; then + +$as_echo "#define HAVE_XPM 1" >>confdefs.h + + fi +fi + ### Use -ljpeg if available, unless `--with-jpeg=no'. +### mingw32 doesn't use -ljpeg, since it loads the library dynamically. HAVE_JPEG=no LIBJPEG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_jpeg}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" +if test "x$ac_cv_header_jerror_h" = x""yes; then : + HAVE_JPEG=yes +else + HAVE_JPEG=no +fi + + + fi + if test "${HAVE_JPEG}" = "yes"; then + $as_echo "#define HAVE_JPEG 1" >>confdefs.h + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + version=JPEG_LIB_VERSION + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "version= *(6[2-9]|[7-9][0-9])" >/dev/null 2>&1; then : + $as_echo "#define HAVE_JPEG 1" >>confdefs.h + +else + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libjpeg found, but not version 6b or later" >&5 +$as_echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;} + HAVE_JPEG=no +fi +rm -f conftest* + + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_jpeg}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default" if test "x$ac_cv_header_jerror_h" = x""yes; then : @@ -12948,7 +13372,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libjpeg found, but not version 6b or later" >&5 $as_echo "$as_me: WARNING: libjpeg found, but not version 6b or later" >&2;} - HAVE_JPEG=no + HAVE_JPEG=no fi rm -f conftest* @@ -12960,9 +13384,42 @@ fi ### Use -lpng if available, unless `--with-png=no'. +### mingw32 doesn't use -lpng, since it loads the library dynamically. HAVE_PNG=no LIBPNG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_png}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "png.h" "ac_cv_header_png_h" "$ac_includes_default" +if test "x$ac_cv_header_png_h" = x""yes; then : + HAVE_PNG=yes +else + HAVE_PNG=no +fi + + + fi + if test "${HAVE_PNG}" = "yes"; then + +$as_echo "#define HAVE_PNG 1" >>confdefs.h + + + ac_fn_c_check_decl "$LINENO" "png_longjmp" "ac_cv_have_decl_png_longjmp" "#ifdef HAVE_LIBPNG_PNG_H + # include + #else + # include + #endif + +" +if test "x$ac_cv_have_decl_png_longjmp" = x""yes; then : + +else + +$as_echo "#define PNG_DEPSTRUCT /**/" >>confdefs.h + +fi + + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_png}" != "no"; then # Debian unstable as of July 2003 has multiple libpngs, and puts png.h # in /usr/include/libpng. @@ -13050,9 +13507,26 @@ fi ### Use -ltiff if available, unless `--with-tiff=no'. +### mingw32 doesn't use -ltiff, since it loads the library dynamically. HAVE_TIFF=no LIBTIFF= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_tiff}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" +if test "x$ac_cv_header_tiffio_h" = x""yes; then : + HAVE_TIFF=yes +else + HAVE_TIFF=no +fi + + + fi + if test "${HAVE_TIFF}" = "yes"; then + +$as_echo "#define HAVE_TIFF 1" >>confdefs.h + + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_tiff}" != "no"; then ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default" if test "x$ac_cv_header_tiffio_h" = x""yes; then : @@ -13114,9 +13588,26 @@ fi ### Use -lgif or -lungif if available, unless `--with-gif=no'. +### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. HAVE_GIF=no LIBGIF= -if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ +if test "${opsys}" = "mingw32"; then + if test "${with_gif}" != "no"; then + ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" +if test "x$ac_cv_header_gif_lib_h" = x""yes; then : + HAVE_GIF=yes +else + HAVE_GIF=no +fi + + + fi + if test "${HAVE_GIF}" = "yes"; then + +$as_echo "#define HAVE_GIF 1" >>confdefs.h + + fi +elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ || test "${HAVE_W32}" = "yes"; then ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default" if test "x$ac_cv_header_gif_lib_h" = x""yes; then : @@ -13405,7 +13896,259 @@ $as_echo "#define HAVE_X_SM 1" >>confdefs.h fi +### Use XRandr (-lXrandr) if available +HAVE_XRANDR=no +if test "${HAVE_X11}" = "yes"; then + XRANDR_REQUIRED=1.2.2 + XRANDR_MODULES="xrandr >= $XRANDR_REQUIRED" + + succeeded=no + + if test "$PKG_CONFIG" = "no" ; then + HAVE_XRANDR=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if "$PKG_CONFIG" --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XRANDR_MODULES" >&5 +$as_echo_n "checking for $XRANDR_MODULES... " >&6; } + + if "$PKG_CONFIG" --exists "$XRANDR_MODULES" 2>&5 && + XRANDR_CFLAGS=`"$PKG_CONFIG" --cflags "$XRANDR_MODULES" 2>&5` && + XRANDR_LIBS=`"$PKG_CONFIG" --libs "$XRANDR_MODULES" 2>&5`; then + edit_cflags=" + s,///*,/,g + s/^/ / + s/ -I/ $isystem/g + s/^ // + " + XRANDR_CFLAGS=`$as_echo "$XRANDR_CFLAGS" | sed -e "$edit_cflags"` + XRANDR_LIBS=`$as_echo "$XRANDR_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$XRANDR_CFLAGS' LIBS='$XRANDR_LIBS'" >&5 +$as_echo "yes CFLAGS='$XRANDR_CFLAGS' LIBS='$XRANDR_LIBS'" >&6; } + succeeded=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + XRANDR_CFLAGS="" + XRANDR_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. Do it in a subshell + ## to capture any diagnostics in invoking pkg-config. + XRANDR_PKG_ERRORS=`("$PKG_CONFIG" --print-errors "$XRANDR_MODULES") 2>&1` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_XRANDR=yes + else + HAVE_XRANDR=no + fi + + if test $HAVE_XRANDR = no; then + # Test old way in case pkg-config doesn't have it (older machines). + ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRGetScreenResources in -lXrandr" >&5 +$as_echo_n "checking for XRRGetScreenResources in -lXrandr... " >&6; } +if test "${ac_cv_lib_Xrandr_XRRGetScreenResources+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXrandr $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XRRGetScreenResources (); +int +main () +{ +return XRRGetScreenResources (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xrandr_XRRGetScreenResources=yes +else + ac_cv_lib_Xrandr_XRRGetScreenResources=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRGetScreenResources" >&5 +$as_echo "$ac_cv_lib_Xrandr_XRRGetScreenResources" >&6; } +if test "x$ac_cv_lib_Xrandr_XRRGetScreenResources" = x""yes; then : + HAVE_XRANDR=yes +fi + +fi + + + if test $HAVE_XRANDR = yes; then + XRANDR_LIBS=-lXrandr + + fi + fi + if test $HAVE_XRANDR = yes; then + SAVE_CFLAGS="$CFLAGS" + SAVE_LIBS="$LIBS" + CFLAGS="$XRANDR_CFLAGS $CFLAGS" + LIBS="$XRANDR_LIBS $LIBS" + for ac_func in XRRGetOutputPrimary XRRGetScreenResourcesCurrent +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + CFLAGS="$SAVE_CFLAGS" + LIBS="$SAVE_LIBS" + + +$as_echo "#define HAVE_XRANDR 1" >>confdefs.h + + fi +fi + +### Use Xinerama (-lXinerama) if available +HAVE_XINERAMA=no +if test "${HAVE_X11}" = "yes"; then + XINERAMA_REQUIRED=1.0.2 + XINERAMA_MODULES="xinerama >= $XINERAMA_REQUIRED" + + succeeded=no + + if test "$PKG_CONFIG" = "no" ; then + HAVE_XINERAMA=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if "$PKG_CONFIG" --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $XINERAMA_MODULES" >&5 +$as_echo_n "checking for $XINERAMA_MODULES... " >&6; } + + if "$PKG_CONFIG" --exists "$XINERAMA_MODULES" 2>&5 && + XINERAMA_CFLAGS=`"$PKG_CONFIG" --cflags "$XINERAMA_MODULES" 2>&5` && + XINERAMA_LIBS=`"$PKG_CONFIG" --libs "$XINERAMA_MODULES" 2>&5`; then + edit_cflags=" + s,///*,/,g + s/^/ / + s/ -I/ $isystem/g + s/^ // + " + XINERAMA_CFLAGS=`$as_echo "$XINERAMA_CFLAGS" | sed -e "$edit_cflags"` + XINERAMA_LIBS=`$as_echo "$XINERAMA_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$XINERAMA_CFLAGS' LIBS='$XINERAMA_LIBS'" >&5 +$as_echo "yes CFLAGS='$XINERAMA_CFLAGS' LIBS='$XINERAMA_LIBS'" >&6; } + succeeded=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + XINERAMA_CFLAGS="" + XINERAMA_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. Do it in a subshell + ## to capture any diagnostics in invoking pkg-config. + XINERAMA_PKG_ERRORS=`("$PKG_CONFIG" --print-errors "$XINERAMA_MODULES") 2>&1` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_XINERAMA=yes + else + HAVE_XINERAMA=no + fi + + if test $HAVE_XINERAMA = no; then + # Test old way in case pkg-config doesn't have it (older machines). + ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default" +if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaQueryExtension in -lXinerama" >&5 +$as_echo_n "checking for XineramaQueryExtension in -lXinerama... " >&6; } +if test "${ac_cv_lib_Xinerama_XineramaQueryExtension+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXinerama $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XineramaQueryExtension (); +int +main () +{ +return XineramaQueryExtension (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xinerama_XineramaQueryExtension=yes +else + ac_cv_lib_Xinerama_XineramaQueryExtension=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xinerama_XineramaQueryExtension" >&6; } +if test "x$ac_cv_lib_Xinerama_XineramaQueryExtension" = x""yes; then : + HAVE_XINERAMA=yes +fi + +fi + + + if test $HAVE_XINERAMA = yes; then + XINERAMA_LIBS=-lXinerama + + fi + fi + if test $HAVE_XINERAMA = yes; then + +$as_echo "#define HAVE_XINERAMA 1" >>confdefs.h + + fi +fi + + ### Use libxml (-lxml2) if available +### mingw32 doesn't use -lxml2, since it loads the library dynamically. HAVE_LIBXML2=no if test "${with_xml2}" != "no"; then ### I'm not sure what the version number should be, so I just guessed. @@ -13461,8 +14204,9 @@ $as_echo "no" >&6; } fi if test "${HAVE_LIBXML2}" = "yes"; then - LIBS="$LIBXML2_LIBS $LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 + if test "${opsys}" != "mingw32"; then + LIBS="$LIBXML2_LIBS $LIBS" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5 $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; } if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -13504,6 +14248,9 @@ else HAVE_LIBXML2=no fi + else + LIBXML2_LIBS="" + fi if test "${HAVE_LIBXML2}" = "yes"; then $as_echo "#define HAVE_LIBXML2 1" >>confdefs.h @@ -13518,6 +14265,10 @@ fi # If netdb.h doesn't declare h_errno, we must declare it by hand. +# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c. +if test "${opsys}" = "mingw32"; then + emacs_cv_netdb_declares_h_errno=yes +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5 $as_echo_n "checking whether netdb declares h_errno... " >&6; } if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then : @@ -13551,8 +14302,9 @@ $as_echo "#define HAVE_H_ERRNO 1" >>confdefs.h fi # sqrt and other floating-point functions such as fmod and frexp -# are found in -lm on most systems. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 +# are found in -lm on most systems, but mingw32 doesn't use -lm. +if test "${opsys}" != "mingw32"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5 $as_echo_n "checking for sqrt in -lm... " >&6; } if test "${ac_cv_lib_m_sqrt+set}" = set; then : $as_echo_n "(cached) " >&6 @@ -13597,6 +14349,7 @@ _ACEOF fi +fi # Check for mail-locking functions in a "mail" library. Probably this should # have the same check as for liblockfile below. @@ -13760,7 +14513,7 @@ mail_lock=no case "$opsys" in aix4-2) mail_lock="lockf" ;; - gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; + gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; ## On GNU/Linux systems, both methods are used by various mail programs. ## I assume most people are using newer mailers that have heard of flock. @@ -13782,6 +14535,9 @@ case "$opsys" in test $ac_cv_header_maillock_h = yes && mail_lock=no fi ;; + + mingw32) + mail_lock="none-needed" ;; esac BLESSMAIL_TARGET= @@ -13794,6 +14550,8 @@ $as_echo "#define MAIL_USE_FLOCK 1" >>confdefs.h $as_echo "#define MAIL_USE_LOCKF 1" >>confdefs.h ;; + none-needed) ;; + *) BLESSMAIL_TARGET="need-blessmail" ;; esac @@ -13993,19 +14751,22 @@ $as_echo_n "checking for library containing tputs... " >&6; } # tputs in the test program, due to portability hassles. When # cross-compiling, assume the test program will run if it links. -# Maybe curses should be tried earlier? -# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 -for tputs_library in '' tinfo ncurses terminfo termcap curses; do - OLIBS=$LIBS - if test -z "$tputs_library"; then - LIBS_TERMCAP= - msg='none required' - else - LIBS_TERMCAP=-l$tputs_library - msg=$LIBS_TERMCAP - LIBS="$LIBS_TERMCAP $LIBS" - fi - if test "$cross_compiling" = yes; then : +if test "${opsys}" = "mingw32"; then + msg='none required' +else + # Maybe curses should be tried earlier? + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 + for tputs_library in '' tinfo ncurses terminfo termcap curses; do + OLIBS=$LIBS + if test -z "$tputs_library"; then + LIBS_TERMCAP= + msg='none required' + else + LIBS_TERMCAP=-l$tputs_library + msg=$LIBS_TERMCAP + LIBS="$LIBS_TERMCAP $LIBS" + fi + if test "$cross_compiling" = yes; then : cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14047,11 +14808,12 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LIBS=$OLIBS - if test "X$msg" != Xno; then - break - fi -done + LIBS=$OLIBS + if test "X$msg" != Xno; then + break + fi + done +fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $msg" >&5 $as_echo "$msg" >&6; } if test "X$msg" = Xno; then @@ -14120,6 +14882,11 @@ $as_echo "$emacs_cv_freebsd_terminfo" >&6; } fi ;; + mingw32) + TERMINFO=no + LIBS_TERMCAP= + ;; + netbsd) if test "x$LIBS_TERMCAP" != "x-lterminfo"; then TERMINFO=no @@ -14127,7 +14894,7 @@ $as_echo "$emacs_cv_freebsd_terminfo" >&6; } fi ;; - openbsd) LIBS_TERMCAP="-lncurses" ;; + openbsd | dragonfly) LIBS_TERMCAP="-lncurses" ;; ## hpux: Make sure we get select from libc rather than from libcurses ## because libcurses on HPUX 10.10 has a broken version of select. @@ -15395,18 +16162,22 @@ $as_echo "#define __restrict_arr __restrict" >>confdefs.h fi +if test "${opsys}" != "mingw32"; then $as_echo "#define AMPERSAND_FULL_NAME 1" >>confdefs.h +fi $as_echo "#define CLASH_DETECTION 1" >>confdefs.h ## Note: PTYs are broken on darwin <6. Use at your own risk. +if test "${opsys}" != "mingw32"; then $as_echo "#define HAVE_PTYS 1" >>confdefs.h +fi $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h @@ -15415,12 +16186,22 @@ $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h -$as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h +if test "${opsys}" = "mingw32"; then + $as_echo "#define NULL_DEVICE \"NUL:\"" >>confdefs.h + +else + $as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h + +fi +if test "${opsys}" = "mingw32"; then + $as_echo "#define SEPCHAR ';'" >>confdefs.h -$as_echo "#define SEPCHAR ':'" >>confdefs.h +else + $as_echo "#define SEPCHAR ':'" >>confdefs.h +fi $as_echo "#define subprocesses 1" >>confdefs.h @@ -15436,8 +16217,22 @@ $as_echo "#define DIRECTORY_SEP '/'" >>confdefs.h +if test "${opsys}" = "mingw32"; then + $as_echo "#define DEVICE_SEP ':'" >>confdefs.h +$as_echo "#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)" >>confdefs.h + + + +$as_echo "#define IS_DIRECTORY_SEP(_c_) ((_c_) == '/' || (_c_) == '\\\\')" >>confdefs.h + + + +$as_echo "#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP(_c_))" >>confdefs.h + +else + $as_echo "#define IS_DEVICE_SEP(_c_) 0" >>confdefs.h @@ -15448,7 +16243,7 @@ $as_echo "#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)" >>confdefs.h $as_echo "#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))" >>confdefs.h - +fi @@ -15504,7 +16299,7 @@ $as_echo "#define HAVE_PROCFS 1" >>confdefs.h esac case $opsys in - darwin | freebsd | netbsd | openbsd ) + darwin | dragonfly | freebsd | netbsd | openbsd ) $as_echo "#define DONT_REOPEN_PTY 1" >>confdefs.h @@ -15586,7 +16381,7 @@ case $opsys in ;; - gnu-linux | gnu-kfreebsd | freebsd | netbsd ) + gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd ) if test "x$ac_cv_func_grantpt" = xyes; then $as_echo "#define UNIX98_PTYS 1" >>confdefs.h @@ -15665,7 +16460,7 @@ esac case $opsys in - aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin ) + aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin ) $as_echo "#define SIGNALS_VIA_CHARACTERS 1" >>confdefs.h ;; @@ -15729,7 +16524,7 @@ case $opsys in darwin) $as_echo "#define TAB3 OXTABS" >>confdefs.h ;; - gnu | freebsd | netbsd | openbsd ) + gnu | dragonfly | freebsd | netbsd | openbsd ) $as_echo "#define TABDLY OXTABS" >>confdefs.h @@ -15808,7 +16603,7 @@ if test x$GCC = xyes; then else case $opsys in - freebsd | netbsd | openbsd | irix6-5 | sol2* ) + dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* ) $as_echo "#define GC_SETJMP_WORKS 1" >>confdefs.h ;; @@ -15822,6 +16617,9 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include + #ifdef __MINGW32__ + # define _longjmp longjmp + #endif int main () @@ -15981,6 +16779,19 @@ $as_echo "#define IRIX6_5 /**/" >>confdefs.h ;; + mingw32) + $as_echo "#define DOS_NT /**/" >>confdefs.h + + +$as_echo "#define WINDOWSNT 1" >>confdefs.h + + if test "x$ac_enable_checking" != "x" ; then + +$as_echo "#define EMACSDEBUG 1" >>confdefs.h + + fi + ;; + sol2*) $as_echo "#define USG /**/" >>confdefs.h @@ -16013,6 +16824,10 @@ else emacs_cv_usable_FIONREAD=no ;; + mingw32) + emacs_cv_usable_FIONREAD=yes + ;; + *) cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16195,6 +17010,13 @@ _ACEOF +case $opsys in + mingw32) + $as_echo "#define config_opsysfile " >>confdefs.h + + ;; +esac + XMENU_OBJ= XOBJ= FONT_OBJ= @@ -16262,12 +17084,14 @@ case "$USE_X_TOOLKIT" in esac -if test "$USE_X_TOOLKIT" = "none"; then - LIBXT_OTHER="\$(LIBXSM)" - OLDXMENU_TARGET="really-oldXMenu" -else - LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" - OLDXMENU_TARGET="really-lwlib" +if test "${opsys}" != "mingw32"; then + if test "$USE_X_TOOLKIT" = "none"; then + LIBXT_OTHER="\$(LIBXSM)" + OLDXMENU_TARGET="really-oldXMenu" + else + LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" + OLDXMENU_TARGET="really-lwlib" + fi fi @@ -16341,6 +17165,10 @@ if test "$opsys" = "cygwin"; then ## Cygwin differs because of its unexec(). PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o +elif test "$opsys" = "mingw32"; then + CYGWIN_OBJ= + PRE_ALLOC_OBJ= + POST_ALLOC_OBJ=lastfile.o else CYGWIN_OBJ= PRE_ALLOC_OBJ=lastfile.o @@ -17154,6 +17982,378 @@ $as_echo "#define HAVE_ENVIRON_DECL 1" >>confdefs.h + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for complete errno.h" >&5 +$as_echo_n "checking for complete errno.h... " >&6; } +if test "${gl_cv_header_errno_h_complete+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#if !defined ETXTBSY +booboo +#endif +#if !defined ENOMSG +booboo +#endif +#if !defined EIDRM +booboo +#endif +#if !defined ENOLINK +booboo +#endif +#if !defined EPROTO +booboo +#endif +#if !defined EMULTIHOP +booboo +#endif +#if !defined EBADMSG +booboo +#endif +#if !defined EOVERFLOW +booboo +#endif +#if !defined ENOTSUP +booboo +#endif +#if !defined ENETRESET +booboo +#endif +#if !defined ECONNABORTED +booboo +#endif +#if !defined ESTALE +booboo +#endif +#if !defined EDQUOT +booboo +#endif +#if !defined ECANCELED +booboo +#endif +#if !defined EOWNERDEAD +booboo +#endif +#if !defined ENOTRECOVERABLE +booboo +#endif +#if !defined EILSEQ +booboo +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "booboo" >/dev/null 2>&1; then : + gl_cv_header_errno_h_complete=no +else + gl_cv_header_errno_h_complete=yes +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_complete" >&5 +$as_echo "$gl_cv_header_errno_h_complete" >&6; } + if test $gl_cv_header_errno_h_complete = yes; then + ERRNO_H='' + else + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_errno_h='<'errno.h'>' + else + { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of " >&5 +$as_echo_n "checking absolute name of ... " >&6; } +if test "${gl_cv_next_errno_h+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + + gl_header_literal_regex=`echo 'errno.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + gl_cv_next_errno_h='"'`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"`'"' + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_errno_h" >&5 +$as_echo "$gl_cv_next_errno_h" >&6; } + fi + NEXT_ERRNO_H=$gl_cv_next_errno_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'errno.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_errno_h + fi + NEXT_AS_FIRST_DIRECTIVE_ERRNO_H=$gl_next_as_first_directive + + + + + ERRNO_H='errno.h' + fi + + if test -n "$ERRNO_H"; then + GL_GENERATE_ERRNO_H_TRUE= + GL_GENERATE_ERRNO_H_FALSE='#' +else + GL_GENERATE_ERRNO_H_TRUE='#' + GL_GENERATE_ERRNO_H_FALSE= +fi + + + if test -n "$ERRNO_H"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EMULTIHOP value" >&5 +$as_echo_n "checking for EMULTIHOP value... " >&6; } +if test "${gl_cv_header_errno_h_EMULTIHOP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef EMULTIHOP +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + gl_cv_header_errno_h_EMULTIHOP=yes +else + gl_cv_header_errno_h_EMULTIHOP=no +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_EMULTIHOP = no; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef EMULTIHOP +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + gl_cv_header_errno_h_EMULTIHOP=hidden +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_EMULTIHOP = hidden; then + if ac_fn_c_compute_int "$LINENO" "EMULTIHOP" "gl_cv_header_errno_h_EMULTIHOP" " +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include +"; then : + +fi + + fi + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EMULTIHOP" >&5 +$as_echo "$gl_cv_header_errno_h_EMULTIHOP" >&6; } + case $gl_cv_header_errno_h_EMULTIHOP in + yes | no) + EMULTIHOP_HIDDEN=0; EMULTIHOP_VALUE= + ;; + *) + EMULTIHOP_HIDDEN=1; EMULTIHOP_VALUE="$gl_cv_header_errno_h_EMULTIHOP" + ;; + esac + + + fi + + + if test -n "$ERRNO_H"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ENOLINK value" >&5 +$as_echo_n "checking for ENOLINK value... " >&6; } +if test "${gl_cv_header_errno_h_ENOLINK+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef ENOLINK +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + gl_cv_header_errno_h_ENOLINK=yes +else + gl_cv_header_errno_h_ENOLINK=no +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_ENOLINK = no; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef ENOLINK +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + gl_cv_header_errno_h_ENOLINK=hidden +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_ENOLINK = hidden; then + if ac_fn_c_compute_int "$LINENO" "ENOLINK" "gl_cv_header_errno_h_ENOLINK" " +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include +"; then : + +fi + + fi + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_ENOLINK" >&5 +$as_echo "$gl_cv_header_errno_h_ENOLINK" >&6; } + case $gl_cv_header_errno_h_ENOLINK in + yes | no) + ENOLINK_HIDDEN=0; ENOLINK_VALUE= + ;; + *) + ENOLINK_HIDDEN=1; ENOLINK_VALUE="$gl_cv_header_errno_h_ENOLINK" + ;; + esac + + + fi + + + if test -n "$ERRNO_H"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EOVERFLOW value" >&5 +$as_echo_n "checking for EOVERFLOW value... " >&6; } +if test "${gl_cv_header_errno_h_EOVERFLOW+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include +#ifdef EOVERFLOW +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + gl_cv_header_errno_h_EOVERFLOW=yes +else + gl_cv_header_errno_h_EOVERFLOW=no +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_EOVERFLOW = no; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#define _XOPEN_SOURCE_EXTENDED 1 +#include +#ifdef EOVERFLOW +yes +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "yes" >/dev/null 2>&1; then : + gl_cv_header_errno_h_EOVERFLOW=hidden +fi +rm -f conftest* + + if test $gl_cv_header_errno_h_EOVERFLOW = hidden; then + if ac_fn_c_compute_int "$LINENO" "EOVERFLOW" "gl_cv_header_errno_h_EOVERFLOW" " +#define _XOPEN_SOURCE_EXTENDED 1 +#include +/* The following two lines are a workaround against an autoconf-2.52 bug. */ +#include +#include +"; then : + +fi + + fi + fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_errno_h_EOVERFLOW" >&5 +$as_echo "$gl_cv_header_errno_h_EOVERFLOW" >&6; } + case $gl_cv_header_errno_h_EOVERFLOW in + yes | no) + EOVERFLOW_HIDDEN=0; EOVERFLOW_VALUE= + ;; + *) + EOVERFLOW_HIDDEN=1; EOVERFLOW_VALUE="$gl_cv_header_errno_h_EOVERFLOW" + ;; + esac + + + fi + + + + @@ -21060,6 +22260,7 @@ $as_echo "$gl_cv_func_dup2_works" >&6; } + LIB_EXECINFO='' EXECINFO_H='execinfo.h' @@ -23425,6 +24626,449 @@ _ACEOF + # Check whether --enable-acl was given. +if test "${enable_acl+set}" = set; then : + enableval=$enable_acl; +else + enable_acl=auto +fi + + + LIB_ACL= + use_acl=0 + if test "x$enable_acl" != "xno"; then + for ac_header in sys/acl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "sys/acl.h" "ac_cv_header_sys_acl_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_acl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_SYS_ACL_H 1 +_ACEOF + +fi + +done + + if test $ac_cv_header_sys_acl_h = yes; then + ac_save_LIBS=$LIBS + + if test $use_acl = 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_get_file" >&5 +$as_echo_n "checking for library containing acl_get_file... " >&6; } +if test "${ac_cv_search_acl_get_file+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acl_get_file (); +int +main () +{ +return acl_get_file (); + ; + return 0; +} +_ACEOF +for ac_lib in '' acl pacl; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_acl_get_file=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_acl_get_file+set}" = set; then : + break +fi +done +if test "${ac_cv_search_acl_get_file+set}" = set; then : + +else + ac_cv_search_acl_get_file=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_get_file" >&5 +$as_echo "$ac_cv_search_acl_get_file" >&6; } +ac_res=$ac_cv_search_acl_get_file +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "$ac_cv_search_acl_get_file" != "none required"; then + LIB_ACL=$ac_cv_search_acl_get_file + fi + for ac_func in acl_get_file acl_get_fd acl_set_file acl_set_fd \ + acl_free acl_from_mode acl_from_text \ + acl_delete_def_file acl_extended_file \ + acl_delete_fd_np acl_delete_file_np \ + acl_copy_ext_native acl_create_entry_np \ + acl_to_short_text acl_free_text +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +eval as_val=\$$as_ac_var + if test "x$as_val" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + # If the acl_get_file bug is detected, don't enable the ACL support. + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working acl_get_file" >&5 +$as_echo_n "checking for working acl_get_file... " >&6; } +if test "${gl_cv_func_working_acl_get_file+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + gl_cv_func_working_acl_get_file=cross-compiling +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include + #include + #include + +int +main () +{ +if (!acl_get_file (".", ACL_TYPE_ACCESS) && errno == ENOENT) + return 1; + return 0; + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + gl_cv_func_working_acl_get_file=yes +else + gl_cv_func_working_acl_get_file=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_func_working_acl_get_file" >&5 +$as_echo "$gl_cv_func_working_acl_get_file" >&6; } + + if test $gl_cv_func_working_acl_get_file = yes; then : + use_acl=1 +fi + + if test $use_acl = 1; then + for ac_header in acl/libacl.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "acl/libacl.h" "ac_cv_header_acl_libacl_h" "$ac_includes_default" +if test "x$ac_cv_header_acl_libacl_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_LIBACL_H 1 +_ACEOF + +fi + +done + + + + + + + + + + for ac_func in acl_entries +do : + ac_fn_c_check_func "$LINENO" "acl_entries" "ac_cv_func_acl_entries" +if test "x$ac_cv_func_acl_entries" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_ENTRIES 1 +_ACEOF + +else + + gl_LIBOBJS="$gl_LIBOBJS $ac_func.$ac_objext" + +fi +done + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_FIRST_ENTRY" >&5 +$as_echo_n "checking for ACL_FIRST_ENTRY... " >&6; } +if test "${gl_cv_acl_ACL_FIRST_ENTRY+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int type = ACL_FIRST_ENTRY; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_acl_ACL_FIRST_ENTRY=yes +else + gl_cv_acl_ACL_FIRST_ENTRY=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_FIRST_ENTRY" >&5 +$as_echo "$gl_cv_acl_ACL_FIRST_ENTRY" >&6; } + if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then + +$as_echo "#define HAVE_ACL_FIRST_ENTRY 1" >>confdefs.h + + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ACL_TYPE_EXTENDED" >&5 +$as_echo_n "checking for ACL_TYPE_EXTENDED... " >&6; } +if test "${gl_cv_acl_ACL_TYPE_EXTENDED+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +#include +int type = ACL_TYPE_EXTENDED; +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_acl_ACL_TYPE_EXTENDED=yes +else + gl_cv_acl_ACL_TYPE_EXTENDED=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_acl_ACL_TYPE_EXTENDED" >&5 +$as_echo "$gl_cv_acl_ACL_TYPE_EXTENDED" >&6; } + if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then + +$as_echo "#define HAVE_ACL_TYPE_EXTENDED 1" >>confdefs.h + + fi + else + LIB_ACL= + fi + +fi + + fi + + if test $use_acl = 0; then + for ac_func in facl +do : + ac_fn_c_check_func "$LINENO" "facl" "ac_cv_func_facl" +if test "x$ac_cv_func_facl" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_FACL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_facl = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing acl_trivial" >&5 +$as_echo_n "checking for library containing acl_trivial... " >&6; } +if test "${ac_cv_search_acl_trivial+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char acl_trivial (); +int +main () +{ +return acl_trivial (); + ; + return 0; +} +_ACEOF +for ac_lib in '' sec; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_acl_trivial=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if test "${ac_cv_search_acl_trivial+set}" = set; then : + break +fi +done +if test "${ac_cv_search_acl_trivial+set}" = set; then : + +else + ac_cv_search_acl_trivial=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_acl_trivial" >&5 +$as_echo "$ac_cv_search_acl_trivial" >&6; } +ac_res=$ac_cv_search_acl_trivial +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + if test "$ac_cv_search_acl_trivial" != "none required"; then + LIB_ACL=$ac_cv_search_acl_trivial + fi + +fi + + for ac_func in acl_trivial +do : + ac_fn_c_check_func "$LINENO" "acl_trivial" "ac_cv_func_acl_trivial" +if test "x$ac_cv_func_acl_trivial" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACL_TRIVIAL 1 +_ACEOF + +fi +done + + use_acl=1 + fi + fi + + if test $use_acl = 0; then + for ac_func in getacl +do : + ac_fn_c_check_func "$LINENO" "getacl" "ac_cv_func_getacl" +if test "x$ac_cv_func_getacl" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_GETACL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_getacl = yes; then + use_acl=1 + fi + for ac_header in aclv.h +do : + ac_fn_c_check_header_compile "$LINENO" "aclv.h" "ac_cv_header_aclv_h" "#include +" +if test "x$ac_cv_header_aclv_h" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACLV_H 1 +_ACEOF + +fi + +done + + fi + + if test $use_acl = 0; then + for ac_func in aclx_get +do : + ac_fn_c_check_func "$LINENO" "aclx_get" "ac_cv_func_aclx_get" +if test "x$ac_cv_func_aclx_get" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACLX_GET 1 +_ACEOF + +fi +done + + if test $ac_cv_func_aclx_get = yes; then + use_acl=1 + fi + fi + + if test $use_acl = 0 || test "$ac_cv_func_aclx_get" = yes; then + for ac_func in statacl +do : + ac_fn_c_check_func "$LINENO" "statacl" "ac_cv_func_statacl" +if test "x$ac_cv_func_statacl" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STATACL 1 +_ACEOF + +fi +done + + if test $ac_cv_func_statacl = yes; then + use_acl=1 + fi + fi + + if test $use_acl = 0; then + for ac_func in aclsort +do : + ac_fn_c_check_func "$LINENO" "aclsort" "ac_cv_func_aclsort" +if test "x$ac_cv_func_aclsort" = x""yes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_ACLSORT 1 +_ACEOF + +fi +done + + if test $ac_cv_func_aclsort = yes; then + use_acl=1 + fi + fi + + LIBS=$ac_save_LIBS + fi + if test "x$enable_acl$use_acl" = "xyes0"; then + as_fn_error "ACLs enabled but support not detected" "$LINENO" 5 + elif test "x$enable_acl$use_acl" = "xauto0"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libacl development library was not found or not usable." >&5 +$as_echo "$as_me: WARNING: libacl development library was not found or not usable." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: emacs will be built without ACL support." >&5 +$as_echo "$as_me: WARNING: emacs will be built without ACL support." >&2;} + fi + fi + + +cat >>confdefs.h <<_ACEOF +#define USE_ACL $use_acl +_ACEOF + + USE_ACL=$use_acl + + + if test $ac_cv_func_readlink = no; then @@ -23964,8 +25608,9 @@ else #if \ (__GNUC__ || __IBMC__ || __IBMCPP__ \ || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) - int alignas (8) alignas_int = 1; - char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1]; + struct alignas_test { char c; char alignas (8) alignas_8; }; + char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 + ? 1 : -1]; #endif int @@ -26629,6 +28274,12 @@ fi CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS +if test "${opsys}" = "mingw32"; then + CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I $srcdir/nt/inc" + # Remove unneeded switches from the value of CC that goes to Makefiles + CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"` +fi + case "$opsys" in aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;; @@ -26639,6 +28290,9 @@ case "$opsys" in ## each); under Cocoa 31 commands are required. if test "$HAVE_NS" = "yes"; then libs_nsgui="-framework AppKit" + if test "$NS_IMPL_COCOA" = "yes"; then + libs_nsgui="$libs_nsgui -framework IOKit" + fi headerpad_extra=6C8 else libs_nsgui= @@ -26662,9 +28316,46 @@ case "$opsys" in ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; + mingw32) + ## MinGW64 does not prepend an underscore to symbols, so we must + ## pass a different -entry switch to linker. FIXME: It is better + ## to make the entry points the same by changing unexw32.c. + case "$canonical" in + x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,_start -Wl,-Map,./temacs.map" ;; + *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;; + esac + ;; + + openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;; + *) LD_SWITCH_SYSTEM_TEMACS= ;; esac +if test x$ac_enable_profiling != x ; then + case $opsys in + *freebsd | gnu-linux) ;; + *) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -pg" ;; + esac +fi + + + +## MinGW-specific post-link processing of temacs. +TEMACS_POST_LINK=":" +ADDSECTION= +EMACS_HEAPSIZE= +if test "${opsys}" = "mingw32"; then + TEMACS_POST_LINK="\$(MINGW_TEMACS_POST_LINK)" + ADDSECTION="../nt/addsection\$(EXEEXT)" + ## Preload heap size of temacs.exe in MB. + case "$canonical" in + x86_64-*-*) EMACS_HEAPSIZE=42 ;; + *) EMACS_HEAPSIZE=27 ;; + esac +fi + + + ## Common for all window systems @@ -26783,9 +28474,9 @@ if test "$HAVE_NS" = "yes"; then fi fi -SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" -ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" opt_makefile=test/automated/Makefile @@ -26932,6 +28623,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${BUILDING_FOR_WINDOWSNT_TRUE}" && test -z "${BUILDING_FOR_WINDOWSNT_FALSE}"; then + as_fn_error "conditional \"BUILDING_FOR_WINDOWSNT\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then as_fn_error "conditional \"GL_COND_LIBTOOL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -26941,6 +28636,10 @@ if test -z "${GL_GENERATE_ALLOCA_H_TRUE}" && test -z "${GL_GENERATE_ALLOCA_H_FAL Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${GL_GENERATE_ERRNO_H_TRUE}" && test -z "${GL_GENERATE_ERRNO_H_FALSE}"; then + as_fn_error "conditional \"GL_GENERATE_ERRNO_H\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GL_GENERATE_EXECINFO_H_TRUE}" && test -z "${GL_GENERATE_EXECINFO_H_FALSE}"; then as_fn_error "conditional \"GL_GENERATE_EXECINFO_H\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -27641,7 +29340,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # INIT-COMMANDS # AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" -GCC="$GCC" CPPFLAGS="$CPPFLAGS" +GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys" _ACEOF @@ -27670,6 +29369,7 @@ do "lisp/Makefile") CONFIG_FILES="$CONFIG_FILES lisp/Makefile" ;; "leim/Makefile") CONFIG_FILES="$CONFIG_FILES leim/Makefile" ;; "nextstep/Makefile") CONFIG_FILES="$CONFIG_FILES nextstep/Makefile" ;; + "nt/Makefile") CONFIG_FILES="$CONFIG_FILES nt/Makefile" ;; "test/automated/Makefile") CONFIG_FILES="$CONFIG_FILES test/automated/Makefile" ;; "admin/unidata/Makefile") CONFIG_FILES="$CONFIG_FILES admin/unidata/Makefile" ;; "mkdirs") CONFIG_COMMANDS="$CONFIG_COMMANDS mkdirs" ;; @@ -28400,7 +30100,11 @@ done ;; "epaths":C) echo creating src/epaths.h -${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force +if test "${opsys}" = "mingw32"; then + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 +else + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force +fi ;; "gdbinit":C) if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then diff --git a/build-aux/update-subdirs b/build-aux/update-subdirs index 8fdf1609e6f..3c429b8b5e4 100755 --- a/build-aux/update-subdirs +++ b/build-aux/update-subdirs @@ -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 diff --git a/configure.ac b/configure.ac index af60ba0ac13..cd667d74a44 100644 --- a/configure.ac +++ b/configure.ac @@ -192,16 +192,31 @@ OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars]) OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d]) OPTION_DEFAULT_ON([xim],[don't use X11 XIM]) OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system]) -OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI]) +OPTION_DEFAULT_OFF([w32], [use native MS Windows GUI in a Cygwin build]) OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console]) OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support]) OPTION_DEFAULT_ON([gconf],[don't compile with GConf support]) OPTION_DEFAULT_ON([gsettings],[don't compile with GSettings support]) OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support]) -OPTION_DEFAULT_ON([acl],[don't compile with ACL support]) OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support]) -OPTION_DEFAULT_ON([inotify],[don't compile with inotify (file-watch) support]) + +AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB], + [use a file notification library (LIB one of: yes, gfile, inotify, w32, no)])], + [ case "${withval}" in + y | ye | yes ) val=yes ;; + n | no ) val=no ;; + g | gf | gfi | gfil | gfile ) val=gfile ;; + i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;; + w | w3 | w32 ) val=w32 ;; + * ) AC_MSG_ERROR([`--with-file-notification=$withval' is invalid; +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.]) + ;; + esac + with_file_notification=$val + ], + [with_file_notification=yes]) ## For the times when you want to build Emacs but don't have ## a suitable makeinfo, and can live without the manuals. @@ -377,7 +392,7 @@ AC_ARG_ENABLE(gtk-deprecation-warnings, ## Make sure CDPATH doesn't affect cd (in case PWD is relative). unset CDPATH case "${srcdir}" in - /* ) ;; + [[\\/]]* | ?:[[\\/]]*) ;; . ) ## We may be able to use the $PWD environment variable to make this ## absolute. But sometimes PWD is inaccurate. @@ -439,6 +454,11 @@ case "${canonical}" in opsys=freebsd ;; + ## DragonFly ports + *-*-dragonfly* ) + opsys=dragonfly + ;; + ## FreeBSD kernel + glibc based userland *-*-kfreebsd*gnu* ) opsys=gnu-kfreebsd @@ -471,6 +491,11 @@ case "${canonical}" in ## fi ;; + ## Cygwin ports + *-*-cygwin ) + opsys=cygwin + ;; + ## HP 9000 series 700 and 800, running HP/UX hppa*-hp-hpux10.2* ) opsys=hpux10-20 @@ -544,8 +569,12 @@ case "${canonical}" in ## Intel 386 machines where we don't care about the manufacturer. i[3456]86-*-* ) case "${canonical}" in - *-cygwin ) opsys=cygwin ;; *-darwin* ) opsys=darwin ;; + *-mingw32 ) + opsys=mingw32 + # MinGW overrides and adds some system headers in nt/inc. + GCC_TEST_OPTIONS="-I $srcdir/nt/inc" + ;; *-sysv4.2uw* ) opsys=unixware ;; *-sysv5uw* ) opsys=unixware ;; *-sysv5OpenUNIX* ) opsys=unixware ;; @@ -594,6 +623,11 @@ else test "x$NON_GCC_TEST_OPTIONS" != x && CC="$CC $NON_GCC_TEST_OPTIONS" fi +dnl This is used in lib/Makefile.am to use nt/gnulib.mk, the +dnl alternative to lib/gnulib.mk, so as to avoid generating header files +dnl that clash with MinGW. +AM_CONDITIONAL([BUILDING_FOR_WINDOWSNT], [test "x$opsys" = "xmingw32"]) + # Avoid gnulib's tests for HAVE_WORKING_O_NOATIME and HAVE_WORKING_O_NOFOLLOW, # as we don't use them. AC_DEFUN([gl_FCNTL_O_FLAGS]) @@ -604,10 +638,10 @@ AC_DEFUN([gl_THREADLIB]) dnl Amongst other things, this sets AR and ARFLAGS. gl_EARLY -# It's helpful to have C macros available to GDB, so prefer -g3 to -g -# if -g3 works and the user does not specify CFLAGS. -# This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains. if test "$ac_test_CFLAGS" != set; then + # It's helpful to have C macros available to GDB, so prefer -g3 to -g + # if -g3 works and the user does not specify CFLAGS. + # This test must follow gl_EARLY; otherwise AC_LINK_IFELSE complains. case $CFLAGS in '-g') emacs_g3_CFLAGS='-g3';; @@ -623,13 +657,32 @@ if test "$ac_test_CFLAGS" != set; then [emacs_cv_prog_cc_g3], [AC_LINK_IFELSE([AC_LANG_PROGRAM()], [emacs_cv_prog_cc_g3=yes], - [emacs_cv_prog_cc_g3=no])]) - if test $emacs_cv_prog_cc_g3 = yes; then - CFLAGS=$emacs_g3_CFLAGS - else + [emacs_cv_prog_cc_g3=no])]) + if test $emacs_cv_prog_cc_g3 != yes; then CFLAGS=$emacs_save_CFLAGS fi + if test $opsys = mingw32; then + CFLAGS="$CFLAGS -gdwarf-2" + fi fi + + case $CFLAGS in + *-O*) ;; + *) + # No optimization flag was inferred for this non-GCC compiler. + # Try -O. This is needed for xlc on AIX; see Bug#14258. + emacs_save_CFLAGS=$CFLAGS + test -z "$CFLAGS" || CFLAGS="$CFLAGS " + CFLAGS=${CFLAGS}-O + AC_CACHE_CHECK([whether $CC accepts -O], + [emacs_cv_prog_cc_o], + [AC_LINK_IFELSE([AC_LANG_PROGRAM()], + [emacs_cv_prog_cc_o=yes], + [emacs_cv_prog_cc_o=no])]) + if test $emacs_cv_prog_cc_o != yes; then + CFLAGS=$emacs_save_CFLAGS + fi ;; + esac fi AC_ARG_ENABLE([gcc-warnings], @@ -710,27 +763,13 @@ else esac AC_SUBST([WERROR_CFLAGS]) - nw="$nw -Waggregate-return" # anachronistic - nw="$nw -Wlong-long" # C90 is anachronistic - nw="$nw -Wc++-compat" # We don't care about C++ compilers - nw="$nw -Wundef" # Warns on '#if GNULIB_FOO' etc in gnulib - nw="$nw -Wtraditional" # Warns on #elif which we use often - nw="$nw -Wcast-qual" # Too many warnings for now - nw="$nw -Wconversion" # Too many warnings for now nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wsign-conversion" # Too many warnings for now nw="$nw -Woverlength-strings" # Not a problem these days - nw="$nw -Wtraditional-conversion" # Too many warnings for now - nw="$nw -Wunreachable-code" # so buggy that it's now silently ignored - nw="$nw -Wpadded" # Our structs are not padded - nw="$nw -Wredundant-decls" # we regularly (re)declare functions nw="$nw -Wlogical-op" # any use of fwrite provokes this nw="$nw -Wformat-nonliteral" # we do this a lot nw="$nw -Wvla" # warnings in gettext.h nw="$nw -Wnested-externs" # use of XARGMATCH/verify_function__ - nw="$nw -Wswitch-enum" # Too many warnings for now nw="$nw -Wswitch-default" # Too many warnings for now - nw="$nw -Wfloat-equal" # warns about high-quality code nw="$nw -Winline" # OK to ignore 'inline' nw="$nw -Wjump-misses-init" # We sometimes safely jump over init. nw="$nw -Wstrict-overflow" # OK to optimize assuming that @@ -748,6 +787,20 @@ else # The following line should be removable at some point. nw="$nw -Wsuggest-attribute=pure" + # clang is unduly picky about some things. + AC_CACHE_CHECK([whether the compiler is clang], [emacs_cv_clang], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifndef __clang__ + #error "not clang" + #endif + ]])], + [emacs_cv_clang=yes], + [emacs_cv_clang=no])]) + if test $emacs_cv_clang = yes; then + nw="$nw -Wcast-align" + fi + gl_MANYWARN_ALL_GCC([ws]) gl_MANYWARN_COMPLEMENT([ws], [$ws], [$nw]) for w in $ws; do @@ -764,6 +817,14 @@ else # gcc 4.5.0 20090517. gl_WARN_ADD([-Wno-logical-op]) + # More things that clang is unduly picky about. + if test $emacs_cv_clang = yes; then + gl_WARN_ADD([-Wno-format-extra-args]) + gl_WARN_ADD([-Wno-tautological-constant-out-of-range-compare]) + gl_WARN_ADD([-Wno-unused-command-line-argument]) + gl_WARN_ADD([-Wno-unused-value]) + fi + gl_WARN_ADD([-fdiagnostics-show-option]) gl_WARN_ADD([-funit-at-a-time]) @@ -795,7 +856,48 @@ dnl AC_PROG_MKDIR_P dnl if test "x$RANLIB" = x; then dnl AC_PROG_RANLIB dnl fi -AC_PROG_LN_S + + +dnl Sadly, AC_PROG_LN_S is too restrictive. It also tests whether links +dnl can be made to directories. This is not relevant for our usage, and +dnl excludes some cases that work fine for us. Eg MS Windows or files +dnl hosted on AFS, both examples where simple links work, but links to +dnl directories fail. We use a cut-down version instead. +dnl AC_PROG_LN_S + +AC_MSG_CHECKING([whether ln -s works for files in the same directory]) +rm -f conf$$ conf$$.file + +LN_S_FILEONLY='cp -p' + +if (echo >conf$$.file) 2>/dev/null; then + if ln -s conf$$.file conf$$ 2>/dev/null; then + LN_S_FILEONLY='ln -s' + elif ln conf$$.file conf$$ 2>/dev/null; then + LN_S_FILEONLY=ln + fi +fi + +rm -f conf$$ conf$$.file + +if test "$LN_S_FILEONLY" = "ln -s"; then + AC_MSG_RESULT([yes]) +else + AC_MSG_RESULT([no, using $LN_S_FILEONLY]) +fi + +AC_SUBST(LN_S_FILEONLY) + + +dnl AC_PROG_LN_S sets LN_S to 'cp -pR' for MinGW, on the premise that 'ln' +dnl doesn't support links to directories, as in "ln file dir". But that +dnl use is non-portable, and OTOH MinGW wants to use hard links for Emacs +dnl executables at "make install" time. +dnl See http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00475.html +dnl for more details. +if test "$opsys" = "mingw32"; then + LN_S="ln" +fi AC_PATH_PROG(INSTALL_INFO, install-info, :, $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) @@ -902,7 +1004,6 @@ AC_SUBST(CANNOT_DUMP) UNEXEC_OBJ=unexelf.o case "$opsys" in # MSDOS uses unexcoff.o - # MSWindows uses unexw32.o aix4-2) UNEXEC_OBJ=unexaix.o ;; @@ -915,6 +1016,9 @@ case "$opsys" in hpux10-20 | hpux11) UNEXEC_OBJ=unexhp9k800.o ;; + mingw32) + UNEXEC_OBJ=unexw32.o + ;; sol2-10) # Use the Solaris dldump() function, called from unexsol.c, to dump # emacs, instead of the generic ELF dump code found in unexelf.c. @@ -933,7 +1037,7 @@ esac LD_SWITCH_SYSTEM= case "$opsys" in - freebsd) + freebsd|dragonfly) ## Let `ld' find image libs and similar things in /usr/local/lib. ## The system compiler, GCC, has apparently been modified to not ## look there, contrary to what a stock GCC would do. @@ -954,7 +1058,7 @@ case "$opsys" in ;; openbsd) - ## Han Boetes says this is necessary, + ## Han Boetes says this is necessary, ## otherwise Emacs dumps core on elf systems. LD_SWITCH_SYSTEM="-Z" ;; @@ -1009,6 +1113,7 @@ C_SWITCH_SYSTEM= ## additional optimization. --nils@exp-math.uni-essen.de test "$opsys" = "aix4.2" && test "x$GCC" != "xyes" && \ C_SWITCH_SYSTEM="-ma -qmaxmem=4000" +test "$opsys" = "mingw32" && C_SWITCH_SYSTEM="-mtune=pentium4" ## gnu-linux might need -D_BSD_SOURCE on old libc5 systems. ## It is redundant in glibc2, since we define _GNU_SOURCE. AC_SUBST(C_SWITCH_SYSTEM) @@ -1019,7 +1124,7 @@ case "$opsys" in ## IBM's X11R5 uses -lIM and -liconv in AIX 3.2.2. aix4-2) LIBS_SYSTEM="-lrts -lIM -liconv" ;; - freebsd) LIBS_SYSTEM="-lutil" ;; + freebsd|dragonfly) LIBS_SYSTEM="-lutil" ;; hpux*) LIBS_SYSTEM="-l:libdld.sl" ;; @@ -1028,8 +1133,8 @@ case "$opsys" in ## Motif needs -lgen. unixware) LIBS_SYSTEM="-lsocket -lnsl -lelf -lgen" ;; esac -AC_SUBST(LIBS_SYSTEM) +AC_SUBST(LIBS_SYSTEM) ### Make sure subsequent tests use flags consistent with the build flags. @@ -1060,13 +1165,17 @@ case $opsys in ## Adding -lm confuses the dynamic linker, so omit it. LIB_MATH= ;; - freebsd ) + freebsd | dragonfly ) SYSTEM_TYPE=berkeley-unix ;; gnu-linux | gnu-kfreebsd ) ;; hpux10-20 | hpux11 ) ;; + mingw32 ) + LIB_MATH= + SYSTEM_TYPE=windows-nt + ;; dnl NB this may be adjusted below. netbsd | openbsd ) SYSTEM_TYPE=berkeley-unix @@ -1142,11 +1251,15 @@ AC_DEFUN([PKG_CHECK_MODULES], [ fi ]) - if test "${with_sound}" != "no"; then - # Sound support for GNU/Linux and the free BSDs. - AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h, - have_sound_header=yes) + # Sound support for GNU/Linux, the free BSDs, and MinGW. + AC_CHECK_HEADERS(machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h, + have_sound_header=yes, [], [ + #ifdef __MINGW32__ + #define WIN32_LEAN_AND_MEAN + #include + #endif + ]) # Emulation library used on NetBSD. AC_CHECK_LIB(ossaudio, _oss_ioctl, LIBSOUND=-lossaudio, LIBSOUND=) AC_SUBST(LIBSOUND) @@ -1186,7 +1299,7 @@ if test "${with_sound}" != "no"; then if test x$have_sound_header = xyes || test $HAVE_ALSA = yes; then case "$opsys" in dnl defined __FreeBSD__ || defined __NetBSD__ || defined __linux__ - gnu-linux|freebsd|netbsd) + gnu-linux|freebsd|netbsd|mingw32) AC_DEFINE(HAVE_SOUND, 1, [Define to 1 if you have sound support.]) ;; esac @@ -1508,31 +1621,97 @@ AC_SUBST(NS_OBJC_OBJ) HAVE_W32=no W32_OBJ= W32_LIBS= -W32_RES= +EMACSRES= +CLIENTRES= +CLIENTW= W32_RES_LINK= +EMACS_MANIFEST= if test "${with_w32}" != no; then - if test "${opsys}" != "cygwin"; then - AC_MSG_ERROR([Using w32 with an autotools build is only supported for Cygwin.]) + case "${opsys}" in + cygwin) + AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], + [AC_MSG_ERROR([`--with-w32' was specified, but windows.h + cannot be found.])]) + ;; + mingw32) + ## Using --with-w32 with MinGW is a no-op, but we allow it. + ;; + *) + AC_MSG_ERROR([Using w32 with an autotools build is only supported for Cygwin and MinGW32.]) + ;; + esac +fi + +if test "${opsys}" = "mingw32"; then + AC_MSG_CHECKING([whether Windows API headers are recent enough]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + #include + #include ]], + [[void test(PIMAGE_NT_HEADERS pHeader) + {PIMAGE_SECTION_HEADER pSection = IMAGE_FIRST_SECTION(pHeader);}]])], + [emacs_cv_w32api=yes + HAVE_W32=yes], + emacs_cv_w32api=no) + AC_MSG_RESULT($emacs_cv_w32api) + if test "${emacs_cv_w32api}" = "no"; then + AC_MSG_ERROR([the Windows API headers are too old to support this build.]) fi - AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], - [AC_MSG_ERROR([`--with-w32' was specified, but windows.h - cannot be found.])]) +fi + +FIRSTFILE_OBJ= +NTDIR= +LIBS_ECLIENT= +LIB_WSOCK32= +NTLIB= +CM_OBJ="cm.o" +XARGS_LIMIT= +if test "${HAVE_W32}" = "yes"; then AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.]) AC_CHECK_TOOL(WINDRES, [windres], [AC_MSG_ERROR([No resource compiler found.])]) W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o" W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o" - W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" - W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" - W32_RES="emacs.res" - # Tell the linker that emacs.res is an object (which we compile from - # the rc file), not a linker script. - W32_RES_LINK="-Wl,-bpe-i386 -Wl,emacs.res" + EMACSRES="emacs.res" + case "$canonical" in + x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;; + *) EMACS_MANIFEST="emacs-x86.manifest" ;; + esac + if test "${opsys}" = "cygwin"; then + W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool" + # Tell the linker that emacs.res is an object (which we compile from + # the rc file), not a linker script. + W32_RES_LINK="-Wl,emacs.res" + else + W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o" + W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32" + W32_LIBS="$W32_LIBS -lmpr -lwinspool -lole32 -lcomctl32 -lusp10" + W32_RES_LINK="\$(EMACSRES)" + CLIENTRES="emacsclient.res" + CLIENTW="emacsclientw\$(EXEEXT)" + FIRSTFILE_OBJ=firstfile.o + NTDIR=nt + CM_OBJ= + LIBS_ECLIENT="-lcomctl32" + LIB_WSOCK32="-lwsock32" + NTLIB="ntlib.$ac_objext" + XARGS_LIMIT="-s 10000" + fi fi AC_SUBST(W32_OBJ) AC_SUBST(W32_LIBS) -AC_SUBST(W32_RES) +AC_SUBST(EMACSRES) +AC_SUBST(EMACS_MANIFEST) +AC_SUBST(CLIENTRES) +AC_SUBST(CLIENTW) AC_SUBST(W32_RES_LINK) +AC_SUBST(FIRSTFILE_OBJ) +AC_SUBST(NTDIR) +AC_SUBST(CM_OBJ) +AC_SUBST(LIBS_ECLIENT) +AC_SUBST(LIB_WSOCK32) +AC_SUBST(NTLIB) +AC_SUBST(XARGS_LIMIT) if test "${HAVE_W32}" = "yes"; then window_system=w32 @@ -1821,7 +2000,7 @@ if test "${HAVE_X11}" = "yes"; then emacs_xkb=yes, emacs_xkb=no) AC_MSG_RESULT($emacs_xkb) if test $emacs_xkb = yes; then - AC_DEFINE(HAVE_XKBGETKEYBOARD, 1, [Define to 1 if you have the XkbGetKeyboard function.]) + AC_DEFINE(HAVE_XKB, 1, [Define to 1 if you have the Xkb extension.]) fi AC_CHECK_FUNCS(XrmSetDatabase XScreenResourceString \ @@ -1857,7 +2036,7 @@ fi ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. HAVE_RSVG=no -if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes"; then +if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then if test "${with_rsvg}" != "no"; then RSVG_REQUIRED=2.11.0 RSVG_MODULE="librsvg-2.0 >= $RSVG_REQUIRED" @@ -1880,7 +2059,8 @@ if test "${HAVE_X11}" = "yes"; then ## 6.2.8 is the earliest version known to work, but earlier versions ## might work - let us know if you find one. ## 6.0.7 does not work. See bug#7955. - IMAGEMAGICK_MODULE="Wand >= 6.2.8" + ## 6.8.2 makes Emacs crash; see Bug#13867. + IMAGEMAGICK_MODULE="Wand >= 6.2.8 Wand != 6.8.2" PKG_CHECK_MODULES(IMAGEMAGICK, $IMAGEMAGICK_MODULE, HAVE_IMAGEMAGICK=yes, :) AC_SUBST(IMAGEMAGICK_CFLAGS) AC_SUBST(IMAGEMAGICK_LIBS) @@ -1899,43 +2079,46 @@ HAVE_GTK=no GTK_OBJ= check_gtk2=no gtk3_pkg_errors= -if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then - GLIB_REQUIRED=2.28 - GTK_REQUIRED=3.0 - GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" +if test "${opsys}" != "mingw32"; then + if test "${with_gtk3}" = "yes" || test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then + GLIB_REQUIRED=2.28 + GTK_REQUIRED=3.0 + GTK_MODULES="gtk+-3.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" - dnl Checks for libraries. - PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) - if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then - AC_MSG_ERROR($GTK_PKG_ERRORS) + dnl Checks for libraries. + PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) + if test "$pkg_check_gtk" = "no" && test "$with_gtk3" = "yes"; then + AC_MSG_ERROR($GTK_PKG_ERRORS) + fi + if test "$pkg_check_gtk" = "yes"; then + AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) + GTK_OBJ=emacsgtkfixed.o + term_header=gtkutil.h + USE_GTK_TOOLKIT="GTK3" + if test "x$ac_enable_gtk_deprecation_warnings" = x; then + GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" + GTK_CFLAGS="$GTK_CFLAGS -DGLIB_DISABLE_DEPRECATION_WARNINGS" + fi + else + check_gtk2=yes + gtk3_pkg_errors="$GTK_PKG_ERRORS " + fi fi - if test "$pkg_check_gtk" = "yes"; then - AC_DEFINE(HAVE_GTK3, 1, [Define to 1 if using GTK 3 or later.]) - GTK_OBJ=emacsgtkfixed.o - term_header=gtkutil.h - USE_GTK_TOOLKIT="GTK3" - if test "x$ac_enable_gtk_deprecation_warnings" = x; then - GTK_CFLAGS="$GTK_CFLAGS -DGDK_DISABLE_DEPRECATION_WARNINGS" - fi - else - check_gtk2=yes - gtk3_pkg_errors="$GTK_PKG_ERRORS " - fi -fi -if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then - GLIB_REQUIRED=2.10 - GTK_REQUIRED=2.10 - GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" + if test "${with_gtk2}" = "yes" || test "$check_gtk2" = "yes"; then + GLIB_REQUIRED=2.10 + GTK_REQUIRED=2.10 + GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED" - dnl Checks for libraries. - PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) - if test "$pkg_check_gtk" = "no" && - { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } - then - AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS) + dnl Checks for libraries. + PKG_CHECK_MODULES(GTK, $GTK_MODULES, pkg_check_gtk=yes, pkg_check_gtk=no) + if test "$pkg_check_gtk" = "no" && + { test "$with_gtk" = yes || test "$with_gtk2" = "yes"; } + then + AC_MSG_ERROR($gtk3_pkg_errors$GTK_PKG_ERRORS) + fi + test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi - test "$pkg_check_gtk" = "yes" && USE_GTK_TOOLKIT="GTK2" fi if test x"$pkg_check_gtk" = xyes; then @@ -2105,6 +2288,8 @@ if test "${with_gnutls}" = "yes" ; then AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.]) fi + OLD_CFLAGS=$CFLAGS + OLD_LIBS=$LIBS CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" LIBS="$LIBGNUTLS_LIBS $LIBS" AC_CHECK_FUNCS(gnutls_certificate_set_verify_function, HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes) @@ -2112,38 +2297,68 @@ if test "${with_gnutls}" = "yes" ; then if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then AC_DEFINE(HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY, 1, [Define if using GnuTLS certificate verification callbacks.]) fi + + # Windows loads GnuTLS dynamically + if test "${opsys}" = "mingw32"; then + CFLAGS=$OLD_CFLAGS + LIBS=$OLD_LIBS + LIBGNUTLS_LIBS= + fi fi AC_SUBST(LIBGNUTLS_LIBS) AC_SUBST(LIBGNUTLS_CFLAGS) -dnl inotify is only available on GNU/Linux. -if test "${with_inotify}" = "yes"; then - AC_CHECK_HEADERS(sys/inotify.h) - if test "$ac_cv_header_sys_inotify_h" = yes ; then - AC_CHECK_FUNC(inotify_init1) +NOTIFY_OBJ= +NOTIFY_SUMMARY=no + +dnl Set defaults of $with_file_notification. +if test "${with_file_notification}" = "yes"; then + if test "${opsys}" = "mingw32"; then + with_file_notification=w32 + else + with_file_notification=gfile fi fi -if test "$ac_cv_func_inotify_init1" = yes; then - AC_DEFINE(HAVE_INOTIFY, 1, [Define to 1 to use inotify.]) -fi -dnl POSIX ACL support: provided by libacl on GNU/Linux, by libc on FreeBSD. -HAVE_POSIX_ACL=no -LIBACL_LIBS= -if test "${with_acl}" = "yes"; then - AC_CHECK_LIB([acl], [acl_set_file], HAVE_POSIX_ACL=yes, HAVE_POSIX_ACL=no) - if test "$HAVE_POSIX_ACL" = yes; then - AC_DEFINE(HAVE_POSIX_ACL, 1, [Define to 1 if using POSIX ACL support.]) - LIBACL_LIBS=-lacl - else - AC_CHECK_FUNC(acl_set_file, HAVE_POSIX_ACL=yes, HAVE_POSIX_ACL=no) - if test "$HAVE_POSIX_ACL" = yes; then - AC_DEFINE(HAVE_POSIX_ACL, 1, [Define to 1 if using POSIX ACL support.]) - fi - fi +dnl g_file_monitor exists since glib 2.18. It has been tested under +dnl GNU/Linux only. We take precedence over inotify, but this makes +dnl only sense when glib has been compiled with inotify support. How +dnl to check? +if test "${with_file_notification}" = "gfile"; then + PKG_CHECK_MODULES(GFILENOTIFY, gio-2.0 >= 2.18, HAVE_GFILENOTIFY=yes, HAVE_GFILENOTIFY=no) + if test "$HAVE_GFILENOTIFY" = "yes"; then + AC_DEFINE(HAVE_GFILENOTIFY, 1, [Define to 1 if using GFile.]) + LIBS="$LIBS $GFILENOTIFY_LIBS" + NOTIFY_OBJ=gfilenotify.o + NOTIFY_SUMMARY="yes -lgio (gfile)" + fi fi -AC_SUBST(LIBACL_LIBS) +dnl inotify is only available on GNU/Linux. +if test "${with_file_notification}" = "inotify"; then + AC_CHECK_HEADER(sys/inotify.h) + if test "$ac_cv_header_sys_inotify_h" = yes ; then + AC_CHECK_FUNC(inotify_init1) + if test "$ac_cv_func_inotify_init1" = yes; then + AC_DEFINE(HAVE_INOTIFY, 1, [Define to 1 to use inotify.]) + NOTIFY_OBJ=inotify.o + NOTIFY_SUMMARY="yes -lglibc (inotify)" + fi + fi +fi +dnl MS Windows native file monitor is available for mingw32 only. +if test "${with_file_notification}" = "w32"; then + AC_CHECK_HEADER(windows.h) + if test "$ac_cv_header_windows_h" = yes ; then + AC_DEFINE(HAVE_W32NOTIFY, 1, [Define to 1 to use w32notify.]) + NOTIFY_OBJ=w32notify.o + NOTIFY_SUMMARY="yes (w32)" + fi +fi +if test -n "$NOTIFY_OBJ"; then + AC_DEFINE(USE_FILE_NOTIFY, 1, [Define to 1 if using file notifications.]) +fi +AC_SUBST(NOTIFY_OBJ) dnl Do not put whitespace before the #include statements below. dnl Older compilers (eg sunos4 cc) choke on it. @@ -2244,6 +2459,9 @@ case $opsys in hpux* | aix4-2 ) test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" != "Xyes" && LIBXMU= ;; + mingw32 ) + LIBXMU= + ;; esac AC_SUBST(LIBXMU) @@ -2502,10 +2720,10 @@ AC_SUBST(M17N_FLT_CFLAGS) AC_SUBST(M17N_FLT_LIBS) ### Use -lXpm if available, unless `--with-xpm=no'. +### mingw32 doesn't use -lXpm, since it loads the library dynamically. HAVE_XPM=no LIBXPM= - -if test "${HAVE_W32}" = "yes"; then +if test "${HAVE_W32}" = "yes" && test "${opsys}" = "cygwin"; then if test "${with_xpm}" != "no"; then SAVE_CPPFLAGS="$CPPFLAGS" SAVE_LDFLAGS="$LDFLAGS" @@ -2566,19 +2784,33 @@ no_return_alloc_pixels fi fi +### FIXME: Perhaps regroup to minimize code duplication due to MinGW's +### slightly different requirements wrt image libraries (it doesn't +### use -lXpm because it loads the xpm shared library dynamically at +### run time). +if test "${opsys}" = "mingw32"; then + if test "${with_xpm}" != "no"; then + AC_CHECK_HEADER(X11/xpm.h, HAVE_XPM=yes, HAVE_XPM=no, [ +#define FOR_MSW 1]) + fi + + if test "${HAVE_XPM}" = "yes"; then + AC_DEFINE(HAVE_XPM, 1, [Define to 1 if you have the Xpm library (-lXpm).]) + fi +fi + AC_SUBST(LIBXPM) ### Use -ljpeg if available, unless `--with-jpeg=no'. +### mingw32 doesn't use -ljpeg, since it loads the library dynamically. HAVE_JPEG=no LIBJPEG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then if test "${with_jpeg}" != "no"; then dnl Checking for jpeglib.h can lose because of a redefinition of - dnl HAVE_STDLIB_H. - AC_CHECK_HEADER(jerror.h, - [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)]) + dnl HAVE_STDLIB_H. + AC_CHECK_HEADER(jerror.h, HAVE_JPEG=yes, HAVE_JPEG=no) fi - AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl if test "${HAVE_JPEG}" = "yes"; then AC_DEFINE(HAVE_JPEG) @@ -2590,6 +2822,25 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then [AC_MSG_WARN([libjpeg found, but not version 6b or later]) HAVE_JPEG=no]) fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then + if test "${with_jpeg}" != "no"; then + dnl Checking for jpeglib.h can lose because of a redefinition of + dnl HAVE_STDLIB_H. + AC_CHECK_HEADER(jerror.h, + [AC_CHECK_LIB(jpeg, jpeg_destroy_compress, HAVE_JPEG=yes)]) + fi + + AH_TEMPLATE(HAVE_JPEG, [Define to 1 if you have the jpeg library (-ljpeg).])dnl + if test "${HAVE_JPEG}" = "yes"; then + AC_DEFINE(HAVE_JPEG) + AC_EGREP_CPP([version= *(6[2-9]|[7-9][0-9])], + [#include + version=JPEG_LIB_VERSION +], + [AC_DEFINE(HAVE_JPEG)], + [AC_MSG_WARN([libjpeg found, but not version 6b or later]) + HAVE_JPEG=no]) + fi if test "${HAVE_JPEG}" = "yes"; then LIBJPEG=-ljpeg fi @@ -2597,9 +2848,30 @@ fi AC_SUBST(LIBJPEG) ### Use -lpng if available, unless `--with-png=no'. +### mingw32 doesn't use -lpng, since it loads the library dynamically. HAVE_PNG=no LIBPNG= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_png}" != "no"; then + AC_CHECK_HEADER(png.h, HAVE_PNG=yes, HAVE_PNG=no) + fi + if test "${HAVE_PNG}" = "yes"; then + AC_DEFINE(HAVE_PNG, 1, [Define to 1 if you have the png library (-lpng).]) + + AC_CHECK_DECL(png_longjmp, + [], + [AC_DEFINE(PNG_DEPSTRUCT, [], + [Define to empty to suppress deprecation warnings when building + with --enable-gcc-warnings and with libpng versions before 1.5, + which lack png_longjmp.])], + [[#ifdef HAVE_LIBPNG_PNG_H + # include + #else + # include + #endif + ]]) + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_png}" != "no"; then # Debian unstable as of July 2003 has multiple libpngs, and puts png.h # in /usr/include/libpng. @@ -2630,9 +2902,17 @@ fi AC_SUBST(LIBPNG) ### Use -ltiff if available, unless `--with-tiff=no'. +### mingw32 doesn't use -ltiff, since it loads the library dynamically. HAVE_TIFF=no LIBTIFF= -if test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then +if test "${opsys}" = "mingw32"; then + if test "${with_tiff}" != "no"; then + AC_CHECK_HEADER(tiffio.h, HAVE_TIFF=yes, HAVE_TIFF=no) + fi + if test "${HAVE_TIFF}" = "yes"; then + AC_DEFINE(HAVE_TIFF, 1, [Define to 1 if you have the tiff library (-ltiff).]) + fi +elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then if test "${with_tiff}" != "no"; then AC_CHECK_HEADER(tiffio.h, [tifflibs="-lz -lm" @@ -2650,9 +2930,17 @@ fi AC_SUBST(LIBTIFF) ### Use -lgif or -lungif if available, unless `--with-gif=no'. +### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. HAVE_GIF=no LIBGIF= -if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ +if test "${opsys}" = "mingw32"; then + if test "${with_gif}" != "no"; then + AC_CHECK_HEADER(gif_lib.h, HAVE_GIF=yes, HAVE_GIF=no) + fi + if test "${HAVE_GIF}" = "yes"; then + AC_DEFINE(HAVE_GIF, 1, [Define to 1 if you have a gif (or ungif) library.]) + fi +elif test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no" \ || test "${HAVE_W32}" = "yes"; then AC_CHECK_HEADER(gif_lib.h, # EGifPutExtensionLast only exists from version libungif-4.1.0b1. @@ -2757,14 +3045,69 @@ if test "${HAVE_X11}" = "yes"; then fi AC_SUBST(LIBXSM) +### Use XRandr (-lXrandr) if available +HAVE_XRANDR=no +if test "${HAVE_X11}" = "yes"; then + XRANDR_REQUIRED=1.2.2 + XRANDR_MODULES="xrandr >= $XRANDR_REQUIRED" + PKG_CHECK_MODULES(XRANDR, $XRANDR_MODULES, HAVE_XRANDR=yes, HAVE_XRANDR=no) + if test $HAVE_XRANDR = no; then + # Test old way in case pkg-config doesn't have it (older machines). + AC_CHECK_HEADER(X11/extensions/Xrandr.h, + [AC_CHECK_LIB(Xrandr, XRRGetScreenResources, HAVE_XRANDR=yes)]) + if test $HAVE_XRANDR = yes; then + XRANDR_LIBS=-lXrandr + AC_SUBST(XRANDR_LIBS) + fi + fi + if test $HAVE_XRANDR = yes; then + SAVE_CFLAGS="$CFLAGS" + SAVE_LIBS="$LIBS" + CFLAGS="$XRANDR_CFLAGS $CFLAGS" + LIBS="$XRANDR_LIBS $LIBS" + AC_CHECK_FUNCS(XRRGetOutputPrimary XRRGetScreenResourcesCurrent) + CFLAGS="$SAVE_CFLAGS" + LIBS="$SAVE_LIBS" + + AC_DEFINE(HAVE_XRANDR, 1, [Define to 1 if you have the XRandr extension.]) + fi +fi + +### Use Xinerama (-lXinerama) if available +HAVE_XINERAMA=no +if test "${HAVE_X11}" = "yes"; then + XINERAMA_REQUIRED=1.0.2 + XINERAMA_MODULES="xinerama >= $XINERAMA_REQUIRED" + PKG_CHECK_MODULES(XINERAMA, $XINERAMA_MODULES, HAVE_XINERAMA=yes, + HAVE_XINERAMA=no) + if test $HAVE_XINERAMA = no; then + # Test old way in case pkg-config doesn't have it (older machines). + AC_CHECK_HEADER(X11/extensions/Xinerama.h, + [AC_CHECK_LIB(Xinerama, XineramaQueryExtension, HAVE_XINERAMA=yes)]) + if test $HAVE_XINERAMA = yes; then + XINERAMA_LIBS=-lXinerama + AC_SUBST(XINERAMA_LIBS) + fi + fi + if test $HAVE_XINERAMA = yes; then + AC_DEFINE(HAVE_XINERAMA, 1, [Define to 1 if you have the Xinerama extension.]) + fi +fi + + ### Use libxml (-lxml2) if available +### mingw32 doesn't use -lxml2, since it loads the library dynamically. HAVE_LIBXML2=no if test "${with_xml2}" != "no"; then ### I'm not sure what the version number should be, so I just guessed. PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) if test "${HAVE_LIBXML2}" = "yes"; then - LIBS="$LIBXML2_LIBS $LIBS" - AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) + if test "${opsys}" != "mingw32"; then + LIBS="$LIBXML2_LIBS $LIBS" + AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no) + else + LIBXML2_LIBS="" + fi if test "${HAVE_LIBXML2}" = "yes"; then AC_DEFINE(HAVE_LIBXML2, 1, [Define to 1 if you have the libxml library (-lxml2).]) else @@ -2777,6 +3120,10 @@ AC_SUBST(LIBXML2_LIBS) AC_SUBST(LIBXML2_CFLAGS) # If netdb.h doesn't declare h_errno, we must declare it by hand. +# On MinGW, that is provided by nt/inc/sys/socket.h and w32.c. +if test "${opsys}" = "mingw32"; then + emacs_cv_netdb_declares_h_errno=yes +fi AC_CACHE_CHECK(whether netdb declares h_errno, emacs_cv_netdb_declares_h_errno, [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], @@ -2787,8 +3134,10 @@ if test $emacs_cv_netdb_declares_h_errno = yes; then fi # sqrt and other floating-point functions such as fmod and frexp -# are found in -lm on most systems. -AC_CHECK_LIB(m, sqrt) +# are found in -lm on most systems, but mingw32 doesn't use -lm. +if test "${opsys}" != "mingw32"; then + AC_CHECK_LIB(m, sqrt) +fi # Check for mail-locking functions in a "mail" library. Probably this should # have the same check as for liblockfile below. @@ -2830,7 +3179,7 @@ mail_lock=no case "$opsys" in aix4-2) mail_lock="lockf" ;; - gnu|freebsd|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; + gnu|freebsd|dragonfly|netbsd|openbsd|darwin|irix6-5) mail_lock="flock" ;; ## On GNU/Linux systems, both methods are used by various mail programs. ## I assume most people are using newer mailers that have heard of flock. @@ -2852,6 +3201,9 @@ case "$opsys" in test $ac_cv_header_maillock_h = yes && mail_lock=no fi ;; + + mingw32) + mail_lock="none-needed" ;; esac BLESSMAIL_TARGET= @@ -2860,6 +3212,8 @@ case "$mail_lock" in lockf) AC_DEFINE(MAIL_USE_LOCKF, 1, [Define if the mailer uses lockf to interlock the mail spool.]) ;; + none-needed) ;; + *) BLESSMAIL_TARGET="need-blessmail" ;; esac AC_SUBST(BLESSMAIL_TARGET) @@ -2931,25 +3285,29 @@ AC_DEFUN([tputs_link_source], [ return 0; }]]) ]) -# Maybe curses should be tried earlier? -# See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 -for tputs_library in '' tinfo ncurses terminfo termcap curses; do - OLIBS=$LIBS - if test -z "$tputs_library"; then - LIBS_TERMCAP= - msg='none required' - else - LIBS_TERMCAP=-l$tputs_library - msg=$LIBS_TERMCAP - LIBS="$LIBS_TERMCAP $LIBS" - fi - AC_RUN_IFELSE([tputs_link_source], [], [msg=no], - [AC_LINK_IFELSE([tputs_link_source], [], [msg=no])]) - LIBS=$OLIBS - if test "X$msg" != Xno; then - break - fi -done +if test "${opsys}" = "mingw32"; then + msg='none required' +else + # Maybe curses should be tried earlier? + # See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9736#35 + for tputs_library in '' tinfo ncurses terminfo termcap curses; do + OLIBS=$LIBS + if test -z "$tputs_library"; then + LIBS_TERMCAP= + msg='none required' + else + LIBS_TERMCAP=-l$tputs_library + msg=$LIBS_TERMCAP + LIBS="$LIBS_TERMCAP $LIBS" + fi + AC_RUN_IFELSE([tputs_link_source], [], [msg=no], + [AC_LINK_IFELSE([tputs_link_source], [], [msg=no])]) + LIBS=$OLIBS + if test "X$msg" != Xno; then + break + fi + done +fi AC_MSG_RESULT([$msg]) if test "X$msg" = Xno; then AC_MSG_ERROR([The required function `tputs' was not found in any library. @@ -2995,6 +3353,11 @@ fail; fi ;; + mingw32) + TERMINFO=no + LIBS_TERMCAP= + ;; + netbsd) if test "x$LIBS_TERMCAP" != "x-lterminfo"; then TERMINFO=no @@ -3002,7 +3365,7 @@ fail; fi ;; - openbsd) LIBS_TERMCAP="-lncurses" ;; + openbsd | dragonfly) LIBS_TERMCAP="-lncurses" ;; ## hpux: Make sure we get select from libc rather than from libcurses ## because libcurses on HPUX 10.10 has a broken version of select. @@ -3284,11 +3647,14 @@ dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and tcsetatt dnl fi dnl Turned on June 1996 supposing nobody will mind it. -AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that & - in the full name stands for the login id.]) +dnl MinGW emulates passwd database, so this feature doesn't make sense there. +if test "${opsys}" != "mingw32"; then + AC_DEFINE(AMPERSAND_FULL_NAME, 1, [Define to use the convention that & + in the full name stands for the login id.]) +fi -dnl Every platform that uses configure (ie every non-MS platform) -dnl supports this. There is a create-lockfiles option you can +dnl Every platform that uses configure supports this. +dnl There is a create-lockfiles option you can dnl customize if you do not want the lock files to be written. dnl So it is not clear that this #define still needs to exist. AC_DEFINE(CLASH_DETECTION, 1, [Define if you want lock files to be written, @@ -3298,7 +3664,9 @@ AC_DEFINE(CLASH_DETECTION, 1, [Define if you want lock files to be written, dnl Everybody supports this, except MS. dnl Seems like the kind of thing we should be testing for, though. ## Note: PTYs are broken on darwin <6. Use at your own risk. -AC_DEFINE(HAVE_PTYS, 1, [Define if the system supports pty devices.]) +if test "${opsys}" != "mingw32"; then + AC_DEFINE(HAVE_PTYS, 1, [Define if the system supports pty devices.]) +fi dnl Everybody supports this, except MS-DOS. dnl Seems like the kind of thing we should be testing for, though. @@ -3308,10 +3676,20 @@ AC_DEFINE(HAVE_SOCKETS, 1, [Define if the system supports AH_TEMPLATE(INTERNAL_TERMINAL, [This is substituted when $TERM is "internal".]) -AC_DEFINE(NULL_DEVICE, ["/dev/null"], [Name of the file to open to get +AH_TEMPLATE(NULL_DEVICE, [Name of the file to open to get a null file, or a data sink.]) +if test "${opsys}" = "mingw32"; then + AC_DEFINE(NULL_DEVICE, ["NUL:"]) +else + AC_DEFINE(NULL_DEVICE, ["/dev/null"]) +fi -AC_DEFINE(SEPCHAR, [':'], [Character that separates PATH elements.]) +AH_TEMPLATE(SEPCHAR, [Character that separates PATH elements.]) +if test "${opsys}" = "mingw32"; then + AC_DEFINE(SEPCHAR, [';']) +else + AC_DEFINE(SEPCHAR, [':']) +fi dnl Everybody supports this, except MS-DOS. AC_DEFINE(subprocesses, 1, [Define to enable asynchronous subprocesses.]) @@ -3322,19 +3700,28 @@ AC_DEFINE(USER_FULL_NAME, [pw->pw_gecos], [How to get a user's full name.]) AC_DEFINE(DIRECTORY_SEP, ['/'], [Character that separates directories in a file name.]) -dnl Only used on MS platforms. AH_TEMPLATE(DEVICE_SEP, [Character that separates a device in a file name.]) +if test "${opsys}" = "mingw32"; then + dnl Only used on MS platforms. + AC_DEFINE(DEVICE_SEP, ':') + AC_DEFINE(IS_DEVICE_SEP(_c_), [((_c_) == DEVICE_SEP)], + [Returns true if character is a device separator.]) -AC_DEFINE(IS_DEVICE_SEP(_c_), 0, - [Returns true if character is a device separator.]) + AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == '/' || (_c_) == '\\')], + [Returns true if character is a directory separator.]) -AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == DIRECTORY_SEP)], - [Returns true if character is a directory separator.]) + AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_) || IS_DEVICE_SEP(_c_))], + [Returns true if character is any form of separator.]) +else + AC_DEFINE(IS_DEVICE_SEP(_c_), 0, + [Returns true if character is a device separator.]) -dnl On MS, this also accepts IS_DEVICE_SEP. -AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_))], - [Returns true if character is any form of separator.]) + AC_DEFINE(IS_DIRECTORY_SEP(_c_), [((_c_) == DIRECTORY_SEP)], + [Returns true if character is a directory separator.]) + AC_DEFINE(IS_ANY_SEP(_c_), [(IS_DIRECTORY_SEP (_c_))], + [Returns true if character is any form of separator.]) +fi AH_TEMPLATE(NO_EDITRES, [Define if XEditRes should not be used.]) @@ -3425,7 +3812,7 @@ case $opsys in esac case $opsys in - darwin | freebsd | netbsd | openbsd ) + darwin | dragonfly | freebsd | netbsd | openbsd ) AC_DEFINE(DONT_REOPEN_PTY, 1, [Define if process.c does not need to close a pty to make it a controlling terminal (it is already a controlling terminal of the subprocess, because we did ioctl TIOCSCTTY).]) @@ -3531,7 +3918,7 @@ case $opsys in AC_DEFINE(FIRST_PTY_LETTER, ['p']) ;; - gnu-linux | gnu-kfreebsd | freebsd | netbsd ) + gnu-linux | gnu-kfreebsd | dragonfly | freebsd | netbsd ) dnl if HAVE_GRANTPT if test "x$ac_cv_func_grantpt" = xyes; then AC_DEFINE(UNIX98_PTYS, 1, [Define if the system has Unix98 PTYs.]) @@ -3614,7 +4001,7 @@ AH_TEMPLATE(SIGNALS_VIA_CHARACTERS, [Make process_send_signal work by case $opsys in dnl Perry Smith says this is correct for AIX. dnl thomas@mathematik.uni-bremen.de says this is needed for IRIX. - aix4-2 | cygwin | gnu | irix6-5 | freebsd | netbsd | openbsd | darwin ) + aix4-2 | cygwin | gnu | irix6-5 | dragonfly | freebsd | netbsd | openbsd | darwin ) AC_DEFINE(SIGNALS_VIA_CHARACTERS, 1) ;; @@ -3663,7 +4050,7 @@ AH_TEMPLATE(TAB3, [Undocumented.]) case $opsys in darwin) AC_DEFINE(TAB3, OXTABS) ;; - gnu | freebsd | netbsd | openbsd ) + gnu | dragonfly | freebsd | netbsd | openbsd ) AC_DEFINE(TABDLY, OXTABS, [Undocumented.]) AC_DEFINE(TAB3, OXTABS) ;; @@ -3717,16 +4104,20 @@ if test x$GCC = xyes; then else case $opsys in dnl irix: Tested on Irix 6.5. SCM worked on earlier versions. - freebsd | netbsd | openbsd | irix6-5 | sol2* ) + dragonfly | freebsd | netbsd | openbsd | irix6-5 | sol2* ) AC_DEFINE(GC_SETJMP_WORKS, 1) ;; esac fi dnl GCC? +dnl In a weird quirk, MS runtime uses _setjmp and longjmp. AC_CACHE_CHECK([for _setjmp], [emacs_cv_func__setjmp], [AC_LINK_IFELSE( [AC_LANG_PROGRAM( [[#include + #ifdef __MINGW32__ + # define _longjmp longjmp + #endif ]], [[jmp_buf j; if (! _setjmp (j)) @@ -3821,6 +4212,14 @@ case $opsys in AC_DEFINE(IRIX6_5, [], [Define if the system is IRIX.]) ;; + mingw32) + AC_DEFINE(DOS_NT, []) + AC_DEFINE(WINDOWSNT, 1, [Define if compiling for native MS Windows.]) + if test "x$ac_enable_checking" != "x" ; then + AC_DEFINE(EMACSDEBUG, 1, [Define to 1 to enable w32 debug facilities.]) + fi + ;; + sol2*) AC_DEFINE(USG, []) AC_DEFINE(USG5, []) @@ -3842,6 +4241,10 @@ AC_CACHE_CHECK([for usable FIONREAD], [emacs_cv_usable_FIONREAD], emacs_cv_usable_FIONREAD=no ;; + mingw32) + emacs_cv_usable_FIONREAD=yes + ;; + *) AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include @@ -3982,6 +4385,12 @@ AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${emacs_config_options}", AH_TEMPLATE(config_opsysfile, [Some platforms that do not use configure define this to include extra configuration information.]) +case $opsys in + mingw32) + AC_DEFINE(config_opsysfile, , []) + ;; +esac + XMENU_OBJ= XOBJ= FONT_OBJ= @@ -4042,12 +4451,14 @@ case "$USE_X_TOOLKIT" in esac AC_SUBST(TOOLKIT_LIBW) -if test "$USE_X_TOOLKIT" = "none"; then - LIBXT_OTHER="\$(LIBXSM)" - OLDXMENU_TARGET="really-oldXMenu" -else - LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" - OLDXMENU_TARGET="really-lwlib" +if test "${opsys}" != "mingw32"; then + if test "$USE_X_TOOLKIT" = "none"; then + LIBXT_OTHER="\$(LIBXSM)" + OLDXMENU_TARGET="really-oldXMenu" + else + LIBXT_OTHER="\$(LIBXMU) -lXt \$(LIBXTR6) -lXext" + OLDXMENU_TARGET="really-lwlib" + fi fi AC_SUBST(LIBXT_OTHER) @@ -4121,6 +4532,10 @@ if test "$opsys" = "cygwin"; then ## Cygwin differs because of its unexec(). PRE_ALLOC_OBJ= POST_ALLOC_OBJ=lastfile.o +elif test "$opsys" = "mingw32"; then + CYGWIN_OBJ= + PRE_ALLOC_OBJ= + POST_ALLOC_OBJ=lastfile.o else CYGWIN_OBJ= PRE_ALLOC_OBJ=lastfile.o @@ -4148,6 +4563,12 @@ gl_INIT CFLAGS=$SAVE_CFLAGS LIBS=$SAVE_LIBS +if test "${opsys}" = "mingw32"; then + CPPFLAGS="$CPPFLAGS -DUSE_CRT_DLL=1 -I $srcdir/nt/inc" + # Remove unneeded switches from the value of CC that goes to Makefiles + CC=`echo $CC | sed -e "s,$GCC_TEST_OPTIONS,,"` +fi + case "$opsys" in aix4-2) LD_SWITCH_SYSTEM_TEMACS="-Wl,-bnodelcsect" ;; @@ -4158,6 +4579,9 @@ case "$opsys" in ## each); under Cocoa 31 commands are required. if test "$HAVE_NS" = "yes"; then libs_nsgui="-framework AppKit" + if test "$NS_IMPL_COCOA" = "yes"; then + libs_nsgui="$libs_nsgui -framework IOKit" + fi headerpad_extra=6C8 else libs_nsgui= @@ -4181,11 +4605,48 @@ case "$opsys" in ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; + mingw32) + ## MinGW64 does not prepend an underscore to symbols, so we must + ## pass a different -entry switch to linker. FIXME: It is better + ## to make the entry points the same by changing unexw32.c. + case "$canonical" in + x86_64-*-*) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,_start -Wl,-Map,./temacs.map" ;; + *) LD_SWITCH_SYSTEM_TEMACS="-Wl,-stack,0x00800000 -Wl,-heap,0x00100000 -Wl,-image-base,0x01000000 -Wl,-entry,__start -Wl,-Map,./temacs.map" ;; + esac + ;; + + openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;; + *) LD_SWITCH_SYSTEM_TEMACS= ;; esac +if test x$ac_enable_profiling != x ; then + case $opsys in + *freebsd | gnu-linux) ;; + *) LD_SWITCH_SYSTEM_TEMACS="$LD_SWITCH_SYSTEM_TEMACS -pg" ;; + esac +fi + AC_SUBST(LD_SWITCH_SYSTEM_TEMACS) +## MinGW-specific post-link processing of temacs. +TEMACS_POST_LINK=":" +ADDSECTION= +EMACS_HEAPSIZE= +if test "${opsys}" = "mingw32"; then + TEMACS_POST_LINK="\$(MINGW_TEMACS_POST_LINK)" + ADDSECTION="../nt/addsection\$(EXEEXT)" + ## Preload heap size of temacs.exe in MB. + case "$canonical" in + x86_64-*-*) EMACS_HEAPSIZE=42 ;; + *) EMACS_HEAPSIZE=27 ;; + esac +fi + +AC_SUBST(ADDSECTION) +AC_SUBST(TEMACS_POST_LINK) +AC_SUBST(EMACS_HEAPSIZE) + ## Common for all window systems if test "$window_system" != "none"; then AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) @@ -4276,6 +4737,7 @@ echo " Does Emacs use -lgpm? ${HAVE_GPM}" echo " Does Emacs use -ldbus? ${HAVE_DBUS}" echo " Does Emacs use -lgconf? ${HAVE_GCONF}" echo " Does Emacs use GSettings? ${HAVE_GSETTINGS}" +echo " Does Emacs use a file notification library? ${NOTIFY_SUMMARY}" echo " Does Emacs use -lselinux? ${HAVE_LIBSELINUX}" echo " Does Emacs use -lgnutls? ${HAVE_GNUTLS}" echo " Does Emacs use -lxml2? ${HAVE_LIBXML2}" @@ -4344,12 +4806,12 @@ dnl This will work, but you get a config.status that is not quite right dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). dnl That doesn't have any obvious consequences for Emacs, but on the whole dnl it seems better to just live with the duplication. -SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile" +SUBDIR_MAKEFILES="lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile nextstep/Makefile nt/Makefile" AC_CONFIG_FILES([Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \ doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \ doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile \ - leim/Makefile nextstep/Makefile]) + leim/Makefile nextstep/Makefile nt/Makefile]) dnl test/ is not present in release tarfiles. opt_makefile=test/automated/Makefile @@ -4392,8 +4854,12 @@ dnl by configure. This also explains the `move-if-change' test and dnl the use of force in the `epaths-force' rule in Makefile.in. AC_CONFIG_COMMANDS([epaths], [ echo creating src/epaths.h -${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force -], [GCC="$GCC" CPPFLAGS="$CPPFLAGS"]) +if test "${opsys}" = "mingw32"; then + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 +else + ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force +fi +], [GCC="$GCC" CPPFLAGS="$CPPFLAGS" opsys="$opsys"]) AC_CONFIG_COMMANDS([gdbinit], [ if test ! -f src/.gdbinit && test -f "$srcdir/src/.gdbinit"; then diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index d2554349d01..be906fd96fb 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,11 +1,68 @@ +2013-06-02 Michael Albinus + + * 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 + + * 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 + + * programs.texi (Semantic): Fix typo. + +2013-05-30 Xue Fuqiao + + * maintaining.texi (Types of Log File): Supplement some + information of change log files. + +2013-05-15 Juri Linkov + + * search.texi (Repeat Isearch): Mention key `RET' to finish + editing the string. (Bug#13348) + +2013-05-14 Glenn Morris + + * ack.texi (Acknowledgments): Don't mention obsolete sup-mouse.el. + +2013-05-09 Glenn Morris + + * 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 + + `write-region-inhibit-fsync' defaults to noninteractive (Bug#14273). + * cmdargs.texi (Initial Options): + * files.texi (Customize Save): Document this. + +2013-05-04 Glenn Morris + + * calendar.texi (Importing Diary): Mention diary-from-outlook-function. + +2013-03-17 Paul Eggert + + 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 + . + 2013-03-16 Glenn Morris * emacs.texi (Top): Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-04 Paul Eggert Prefer UTF-8 for documentation. diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi index 439e2a09cae..92874ad6276 100644 --- a/doc/emacs/ack.texi +++ b/doc/emacs/ack.texi @@ -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 diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index 52b966b76e1..075d753ae7a 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -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 diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 19b439afc7f..3dc64fdd127 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -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}. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index fae61252724..45fa45191f3 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -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. diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index f5ec8946e1b..482d7e7741a 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi @@ -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 diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index e78eb7845f3..d2ec2154024 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -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 diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 1f78747eaa6..13fa516af66 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -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 diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index c8d9e9f2087..33e398ebf75 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -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 diff --git a/doc/emacs/programs.texi b/doc/emacs/programs.texi index 459221a9088..70eecf1c97b 100644 --- a/doc/emacs/programs.texi +++ b/doc/emacs/programs.texi @@ -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: diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 377264223a5..e146177255e 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -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 diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi index 4c8af7e650e..1402d8a85be 100644 --- a/doc/emacs/sending.texi +++ b/doc/emacs/sending.texi @@ -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 diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 1c667bc56cb..d0b6b5191c1 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -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 diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi index 7ed0c682296..7c80cefcc7e 100644 --- a/doc/emacs/windows.texi +++ b/doc/emacs/windows.texi @@ -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 diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index e12c57d4b76..5e4655506f6 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,11 +1,39 @@ +2013-04-24 Eli Zaretskii + + * makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last + commit. + +2013-04-24 Glenn Morris + + * 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 + + * 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 + + * 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 * emacs-lisp-intro.texi: Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. - 2013-03-03 Glenn Morris * emacs-lisp-intro.texi (Digression into C): Update example. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index a6b50b88ad9..338b4ad86c4 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -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}/" \ diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index c42ed210cbc..ce4da17658e 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -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

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 diff --git a/doc/lispintro/makefile.w32-in b/doc/lispintro/makefile.w32-in index 377112a80d2..39760ba5612 100644 --- a/doc/lispintro/makefile.w32-in +++ b/doc/lispintro/makefile.w32-in @@ -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 diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 7455881518a..8f675bfcda6 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,10 +1,66 @@ +2013-05-29 Stefan Monnier + + * functions.texi (Lambda Expressions): Lambda expressions don't + evaluate to themselves in general (bug#11782). + +2013-05-15 Stefan Monnier + + * loading.texi (Autoload): + * help.texi (Documentation Basics, Accessing Documentation) + (Accessing Documentation, Accessing Documentation): DOC-* is now DOC. + +2013-04-23 Glenn Morris + + * internals.texi (Writing Emacs Primitives): Remove obvious example. + Tweak other to avoid overly long line. + +2013-04-21 Xue Fuqiao + + * 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 + + * tips.texi (Coding Conventions): Mention separation of package + descriptor and name of internal symbols by two hyphens. + +2013-04-13 Stephen Berman + + * windows.texi (Splitting Windows): Change category of + split-window from a command to a function. + +2013-04-06 Chong Yidong + + * 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 + + * compile.texi (Byte-Code Objects): Add index entry. + (Disassembly): Add cross-references. + +2013-03-23 Eli Zaretskii + + * frames.texi (Size Parameters): More accurate description of the + difference between 'fullboth' and 'maximized'. (Bug#13935) + +2013-03-17 Christopher Schmidt + + * symbols.texi (Standard Properties): Document pure. (Bug#13823) + 2013-03-16 Glenn Morris * elisp.texi: Add some stuff specific to www.gnu.org. -2013-03-16 Glenn Morris - - * Version 24.3 released. 2013-03-11 Teodor Zlatanov * control.texi (Pattern matching case statement): Fix typo. @@ -2005,8 +2061,8 @@ 2012-02-04 Chong Yidong - * 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 - * 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 diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi index d60ffebae70..522a88da61e 100644 --- a/doc/lispref/compile.texi +++ b/doc/lispref/compile.texi @@ -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 diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index eae6af9969d..4adcfdf8f4f 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -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. diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 7d56d38ffad..01d2d1d6c45 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -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 diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 999923f5b84..7768c147827 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -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 diff --git a/doc/lispref/help.texi b/doc/lispref/help.texi index 9fe069b84d0..aa77ba1f36d 100644 --- a/doc/lispref/help.texi +++ b/doc/lispref/help.texi @@ -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 diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index 3269776b626..06375c1e18e 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi @@ -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 diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 51a060bc6c6..5c92307f7d5 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -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 diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi index 87d4051d6f0..386d5bdde4c 100644 --- a/doc/lispref/searching.texi +++ b/doc/lispref/searching.texi @@ -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 \| diff --git a/doc/lispref/symbols.texi b/doc/lispref/symbols.texi index 9f916549902..82dfa0f4917 100644 --- a/doc/lispref/symbols.texi +++ b/doc/lispref/symbols.texi @@ -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 diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index c6cbfa5b3f8..6d5a39d887a 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -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 diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi index 4c443da3af8..c40ae408f7f 100644 --- a/doc/lispref/tips.texi +++ b/doc/lispref/tips.texi @@ -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 diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 792002add81..f2a4b3849dd 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -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}. diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 8a2a90f7895..8b550dc4417 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -1,3 +1,7 @@ +2013-04-20 Petr Hracek (tiny change) + + * emacs.1: Add some more command-line options. (Bug#14165) + 2012-12-02 Kevin Ryde * etags.1: Mention effect of --declarations in Lisp. diff --git a/doc/man/emacs.1 b/doc/man/emacs.1 index 3d0c5107adc..9149be2c523 100644 --- a/doc/man/emacs.1 +++ b/doc/man/emacs.1 @@ -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 diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 45862f93f0c..8ee12718980 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,50 @@ +2013-05-28 Xue Fuqiao + + * erc.texi (Special Features): ERC is being maintained within + Emacs now. + +2013-05-25 Xue Fuqiao + + * flymake.texi: Changing from one space between sentences to two. + +2013-05-04 Stefan Monnier + + * cl.texi (Obsolete Macros): Describe replacements for `flet' + (bug#14293). + +2013-04-16 Michael Albinus + + * tramp.texi (Frequently Asked Questions): Precise, how to define + an own ControlPath. + +2013-04-15 Michael Albinus + + * tramp.texi (Frequently Asked Questions): New item for + ControlPath settings. + +2013-03-31 Jay Belanger + + * calc.texi: (Basic Operations on Units): Streamline some + descriptions. + +2013-03-27 Aidan Gauland + + * eshell.texi (Built-ins): Update manual to mention tramp module. + +2013-03-18 Michael Albinus + + * 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 + + doc: convert some TeX accents to UTF-8 + * emacs-mime.texi (Interface Functions): Use 'ï' rather than + '@"{@dotless{i}}'. + 2013-03-15 Michael Albinus 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 + + * eshell.texi (Input/Output): Document insert output redirection operator, >>>. + 2011-02-18 Glenn Morris * dired-x.texi (Optional Installation File At Point): Simplify. diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index 44462d1d5a8..b2b054ec1ea 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi @@ -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. diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 83df411cb23..90f8a258d23 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi @@ -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 diff --git a/doc/misc/emacs-mime.texi b/doc/misc/emacs-mime.texi index 5f377e57725..cbb78af9d59 100644 --- a/doc/misc/emacs-mime.texi +++ b/doc/misc/emacs-mime.texi @@ -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 diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi index cc61cd1ab5b..33686fd79fd 100644 --- a/doc/misc/erc.texi +++ b/doc/misc/erc.texi @@ -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 diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index ec01f731daf..dca95da2d10 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi @@ -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 diff --git a/doc/misc/flymake.texi b/doc/misc/flymake.texi index 5dedda16ee1..f88bd95008c 100644 --- a/doc/misc/flymake.texi +++ b/doc/misc/flymake.texi @@ -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}: diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 983887d721d..a7a9647fd81 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -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. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 4a3e0ebc33c..4c3740f02f7 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -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{#} 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} diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index 18c4252e6d2..c22141335e1 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -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 diff --git a/etc/.gitignore b/etc/.gitignore index 618d09438f8..8e12acbee0c 100644 --- a/etc/.gitignore +++ b/etc/.gitignore @@ -1,3 +1,2 @@ DOC -DOC-* icons/ diff --git a/etc/ChangeLog b/etc/ChangeLog index dfbefedc323..5b6441f06c5 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,122 @@ +2013-06-03 Tassilo Horn + + * NEWS: Document eshell visual subcommands and options. + +2013-06-02 Eric Ludlam + + * srecode/c.srt (header_guard): Add :c parameter so it works + standalone + +2013-06-01 Alex Ott + + * tutorials/TUTORIAL.ru: Fix incorrectly translated wording. + +2013-05-31 Tassilo Horn + + * themes/tsdh-dark-theme.el (tsdh-dark): Refine mode-line faces. + +2013-05-25 Xue Fuqiao + + * refcards/refcard.tex: Refine some entries. (Bug#14087) + + * refcards/dired-ref.tex: Refine some entries. (Bug#14072) + +2013-05-24 Fabrice Niessen + + * themes/leuven-theme.el: Update theme. + +2013-05-16 Eli Zaretskii + + * NEWS: Advertise the MSYS build on MS-Windows. + +2013-05-15 Stefan Monnier + + * .gitignore: Don't ignore DOC-* any more. + +2013-05-07 Paul Eggert + + 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 + + * NEWS: Mention multi-monitor support. + +2013-05-05 Paul Eggert + + `write-region-inhibit-fsync' defaults to noninteractive (Bug#14273). + * NEWS: Document this. + +2013-04-24 Tassilo Horn + + * themes/tsdh-dark-theme.el (tsdh-dark): Add ido faces and remove + :box from outline faces. + +2013-04-18 Leo Liu + + * NEWS: Mention new key ? for describe-prefix-bindings. + +2013-04-15 Christopher Schmidt + + * NEWS: Mention separation of package descriptor and name of + internal symbols by two hyphens. + +2013-04-13 Stephen Berman + + * NEWS: Mention fixing `split-window' to be non-interactive. + +2013-04-09 Tassilo Horn + + * themes/tsdh-dark-theme.el (tsdh-dark): Add some more faces. + +2013-04-09 Masatake YAMATO + + * NEWS: Mention `sh-mode' own `add-log-current-defun-function'. + +2013-04-07 Jan Djärv + + * PROBLEMS: Mention Ubuntu warnings about libdbusmenu. + +2013-04-02 Fabrice Niessen + + * themes/leuven-theme.el: Update theme. + +2013-04-01 Paul Eggert + + 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 + + * NEWS: Mention `kmacro-to-register' and new eldoc feature. + +2013-03-29 Aidan Gauland + + * NEWS (Eshell): New entry for em-tramp change in 2013-03-26T22:08:58Z!aidalgol@no8wireless.co.nz + +2013-03-21 Eric Ludlam + + * 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 + + * srecode/java.srt (empty-main): New. + (class-tag): Decapitalize class. + +2013-03-18 Paul Eggert + + 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 Add coding tags for iso-2022-7bit files that are not already tagged. diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF index 671d8a06755..aeefe031359 100644 --- a/etc/MORE.STUFF +++ b/etc/MORE.STUFF @@ -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 . +* WikEmacs + is an alternative wiki for Emacs. + * Emacs slides and tutorials can be found here: diff --git a/etc/NEWS b/etc/NEWS index a4691f7f181..45a3632f5c9 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -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 and M-, 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 --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/ additionally to ~/.. 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 diff --git a/etc/PROBLEMS b/etc/PROBLEMS index b38a1240540..7556c23daee 100644 --- a/etc/PROBLEMS +++ b/etc/PROBLEMS @@ -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. diff --git a/etc/grep.txt b/etc/grep.txt index 70f250101ff..86f725899eb 100644 --- a/etc/grep.txt +++ b/etc/grep.txt @@ -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/* diff --git a/etc/refcards/dired-ref.tex b/etc/refcards/dired-ref.tex index 0fdc2d41630..13230dd603a 100644 --- a/etc/refcards/dired-ref.tex +++ b/etc/refcards/dired-ref.tex @@ -302,8 +302,7 @@ For copies of the GNU Emacs manual, see: \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 @@ For copies of the GNU Emacs manual, see: \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 @@ For copies of the GNU Emacs manual, see: \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 @@ For copies of the GNU Emacs manual, see: \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 @@ For copies of the GNU Emacs manual, see: \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)}{\&} diff --git a/etc/refcards/refcard.tex b/etc/refcards/refcard.tex index 84e19b03067..c930eb27e28 100644 --- a/etc/refcards/refcard.tex +++ b/etc/refcards/refcard.tex @@ -355,6 +355,7 @@ If Emacs is still searching, \kbd{C-g} cancels only the part not matched. \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 @@ minibuffer. Type \kbd{F10} to activate menu bar items on text terminals. \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 @@ minibuffer. Type \kbd{F10} to activate menu bar items on text terminals. \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 @@ minibuffer. Type \kbd{F10} to activate menu bar items on text terminals. \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 @@ minibuffer. Type \kbd{F10} to activate menu bar items on text terminals. \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 @@ Moving within a node: \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 @@ Other: \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 @@ An example: \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 @@ With ARG, put point on line ARG." \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 diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt index 6c7139f3184..03e4c369307 100644 --- a/etc/srecode/c.srt +++ b/etc/srecode/c.srt @@ -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 diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt index d2ec61a0a93..5eb2d2d24e5 100644 --- a/etc/srecode/ede-autoconf.srt +++ b/etc/srecode/ede-autoconf.srt @@ -1,21 +1,23 @@ -;; ede/templates/autoconf.srt --- Templates for autoconf used by EDE. -;; -;; Copyright (C) 2010 Eric M. Ludlam -;; -;; Author: Eric M. Ludlam -;; -;; 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 + +;; 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 . +;; along with GNU Emacs. If not, see . 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) diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index f12744e89b7..36bae085cc9 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt @@ -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. diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index a4a6fc2e863..e1fbb50eff6 100644 --- a/etc/srecode/java.srt +++ b/etc/srecode/java.srt @@ -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}}; + +{{: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}} +{ {{^}} }; ---- diff --git a/etc/themes/leuven-theme.el b/etc/themes/leuven-theme.el index 7945526b0e4..c890997c8b6 100644 --- a/etc/themes/leuven-theme.el +++ b/etc/themes/leuven-theme.el @@ -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) diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el index 011133808a2..cd76f22aab1 100644 --- a/etc/themes/tsdh-dark-theme.el +++ b/etc/themes/tsdh-dark-theme.el @@ -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) diff --git a/etc/tutorials/TUTORIAL.ko b/etc/tutorials/TUTORIAL.ko index 78ea63ff9e0..9aad280bf96 100644 --- a/etc/tutorials/TUTORIAL.ko +++ b/etc/tutorials/TUTORIAL.ko @@ -1,1002 +1,1002 @@ -$(C@L8F=:(B(Emacs) $(CAvD'<-@T4O4Y(B. -$(C3!?!4B(B $(C:9;g(B $(CA60G@L(B -$(C@V=@4O4Y(B. $(CAv1](B $(C@P0m(B $(C@V4B(B $(C@L(B $(C1[@:(B $(C@L8F=:(B(Emacs) $(CAvD'<-@T4O4Y(B. +이맥스(Emacs) 지침서입니다. +끝에는 복사 조건이 +있습니다. 지금 읽고 있는 이 글은 이맥스(Emacs) 지침서입니다. -$(C@L8F=:(B $(C8m7I5i@:(B $(C4k03(B $(CA&>n21b(B $(C:84Y4B(B $(C?l8.4B(B $(C4Y@=0z(B $(C00@:(B $(C>`=D(B $(CG%Gv@;(B $(C>21b7N(B $(CGU=C4Y(B: +이맥스 명령들은 대개 제어쇠 (CTRL이나 CTL이라고도 표시) 혹은 +META쇠 (EDIT이나 ALT라고도 표시)를 사용합니다. 이런 글쇠를 매번 다 +쓰기 보다는 우리는 다음과 같은 약식 표현을 쓰기로 합시다: - C-<$(C9.@Z(B> $(CA&>n $(C1[n META$(C $(C1[x@88i(B $(C3*?H $(C1[$(C@L6s0m(B - $(C>21b7N(B $(CGU4O4Y(B. + C-<문자> 제어쇠를 누른 채 <문자> 글쇠를 칩니다. 즉, C-f는 제어쇠를 + 누른 상태에서 f 글쇠를 치는 것을 말합니다. + M-<문자> META쇠나 EDIT쇠 혹은 교체쇠(ALT)를 누른 채 <문자> 글쇠를 + 칩니다. META쇠, EDIT쇠 혹은 교체쇠가 없으면 나옴쇠(ESC)를 + 눌렀다 놓은 후 <문자> 글쇠를 칩니다. 나옴쇠는 이라고 + 쓰기로 합니다. -$(C@/@G(B: C-x C-c$(C8&(B $(CD!8i(B $(C@L8F=:8&(B $(CA>7aGR(B $(C>"$(C4B(B $(C56@Z0!(B $(C8m7I@;(B $(C=GG`GX(B $(C:8557O(B -$(CGO0m@Z(B $(CGT@;(B $(CAv=CGU4O4Y(B. $(C?98&(B $(C5i>n(B: -<> ->> $(C4Y@=(B $(CH-8i@87N(B $(C?rAw@L1b(B $(C@'GX<-4B(B C-v ($(C4Y@=(B $(CH-8i(B $(C:81b(B)$(C8&(B $(CD(4O4Y(B. - ($(CGX(B $(C:8=J=C?@(B. $(CA&>nz@;(B $(C6'864Y(B $(C@L780T(B $(CGX>_(B $(CGU4O4Y(B. +유의: C-x C-c를 치면 이맥스를 종료할 수 있습니다. (두 문자.) +왼쪽 가장자리에 있는 문자 ">>"는 독자가 명령을 실행해 보도록 +하고자 함을 지시합니다. 예를 들어: +<> +>> 다음 화면으로 움직이기 위해서는 C-v (다음 화면 보기)를 칩니다. + (해 보십시오. 제어쇠를 누른 채 v 글쇠를 치면 됩니다.) + 지금부터는 한 화면을 다 읽었을 때마다 이렇게 해야 합니다. -$(CGQ(B $(CH-8i?!<-(B $(C4Y8%(B $(CH-8i@87N(B $(C?rAw@O(B $(C6'(B $(C5N(B $(CAY@L(B $(C0cD#4Y4B(B $(C0M@;(B -$(C@/@GGO=J=C?@(B; $(C@L4B(B $(CGQ(B $(C9.@e@;(B $(C0h_(B $(CGO4B(B $(C0M@:(B $(C9.@e@G(B $(CGQ(B $(C0w?!<-(B $(C4Y8%(B $(C0w@87N(B $(C?rAw@L4B(B -$(C0M@T4O4Y(B. C-v$(C7N(B $(CGQ(B $(CH-8i@;(B $(C>UBJ@87N(B $(C?rAw@L4B(B $(C0M@:(B $(C@L9L(B $(C>K0m(B $(C@V=@4O4Y(B. -$(C5^BJ@87N(B $(CGQ(B $(CH-8i@;(B $(C?rAw@L1b(B $(C@'GX<-4B(B M-v$(C8&(B (META$(Cx@;(B $(C0f?l(B v$(C8&(B $(CD(4O4Y(B). +첫번째로 익혀야 하는 것은 문장의 한 곳에서 다른 곳으로 움직이는 +것입니다. C-v로 한 화면을 앞쪽으로 움직이는 것은 이미 알고 있습니다. +뒷쪽으로 한 화면을 움직이기 위해서는 M-v를 (META쇠를 누른채 v 글쇠를 +치거나, META쇠나 EDIT쇠, 혹은 교체쇠가 없을 경우 v를 칩니다). ->> $(C8n(B $(C9x(B M-v$(C?M(B C-v$(C8&(B $(C9x0%>F(B $(CCD(B $(C:8=J=C?@(B. +>> 몇 번 M-v와 C-v를 번갈아 쳐 보십시오. -* $(C?d>`(B +* 요약 ------ -$(C4Y@=@:(B $(C@|CUBJ@87N(B $(C?rAw@N4Y(B - ESC v $(CGQ(B $(C@|C<(B $(CH-8i@;(B $(C5^BJ@87N(B $(C?rAw@N4Y(B - C-l $(CH-8i@;(B $(CAv?l0m(B $(C8p5g(B $(C1[?y@;(B $(C4Y=C(B $(CH-8i(B $(CG%=CGO8i<-(B - $(C1t:}@L0!(B $(C@V4B(B $(C1[?y@;(B $(CH-8i@G(B $(CA_>S?!(B $(C?@0T(B $(CGQ4Y(B. - ($(CA&>nF4O6s(B $(CA&>n> $(C1t9Z@L8&(B $(CC#>F<-(B $(C1W(B $(C0w@G(B $(C1[?y@;(B $(C1b>oGO=J=C?@(B. - $(C1W8.0m4B(B C-l$(C@;(B $(CD!=J=C?@(B. - $(C1t9Z@L8&(B $(C4Y=C(B $(CC#>F<-(B $(C00@:(B $(C1[?y@L(B $(C1t9Z@L@G(B $(C1YC3?!(B $(C@V4B0!8&(B - $(CH.@NGO=J=C?@(B. +>> 깜박이를 찾아서 그 곳의 글월을 기억하십시오. + 그리고는 C-l을 치십시오. + 깜박이를 다시 찾아서 같은 글월이 깜박이의 근처에 있는가를 + 확인하십시오. -* $(C1b:;@{@N(B $(C1t9Z@L@G(B $(CA&>n(B +* 기본적인 깜박이의 제어 ------------------------ -$(CGQ(B $(CH-8i@;(B $(C?rAw@L4B(B $(C0M@:(B $(C@/?kGU4O4Y88(B $(CH-8i@G(B $(CGQ(B $(C1[?y3;?!<-(B $(C>n6;0T(B -$(CA$GXAx(B $(C@e?(B $(C1t9Z@L8&(B $(C?rAw@T4O4Y(B. -$(C?)1b?!(B $(C@L(B $(C3W0!Av(B $(C8m7I5i0z(B $(C1W(B $(C?rAw@L4B(B $(C9fGb@;(B $(C:8?)AV4B(B $(CG%0!(B $(C@V=@4O4Y(B. +이에는 몇가지 방법이 있습니다. 가장 근본적인 방법은 C-p, C-b, C-f +그리고 C-n 명령을 사용하는 것입니다. 각각은 화면에서 정해진 방향으로 +하나의 가로칸이나 하나의 세로칸씩 깜박이를 움직입니다. +여기에 이 네가지 명령들과 그 움직이는 방향을 보여주는 표가 있습니다. - $(C5^(B $(CAY(B, C-p + 뒷 줄, C-p : : - $(C5^BJ@87N(B, C-b .... $(CGv@g@G(B $(C1t9Z@L(B $(C@'D!(B .... $(C>UBJ@87N(B, C-f + 뒷쪽으로, C-b .... 현재의 깜박이 위치 .... 앞쪽으로, C-f : : - $(C>U(B $(CAY(B, C-n + 앞 줄, C-n ->> C-n$(C@L3*(B C-p$(C8&(B $(C=a<-(B $(C1t9Z@L8&(B $(C@'(B $(C55G%@G(B $(C0!?n5%(B $(CAY7N(B $(C?rAw@L=J=C?@(B. - $(C1W8.0m4B(B C-l$(C@;(B $(CCD<-(B $(C@L(B $(C55G%0!(B $(CH-8i@G(B $(CA_>S?!(B $(C@'D!GO4BAv8&(B - $(CH.@NGO=J=C?@(B. +>> C-n이나 C-p를 써서 깜박이를 위 도표의 가운데 줄로 움직이십시오. + 그리고는 C-l을 쳐서 이 도표가 화면의 중앙에 위치하는지를 + 확인하십시오. -$(C@L(B $(C8m7I5i@:(B $(C1[@Z7N(B $(C1b>oGO4B(B $(C0M@L(B $(C=,?o(B $(C0M@T4O4Y(B: P$(C4B(B previous, N$(C@:(B -next, B$(C4B(B backward, F$(C4B(B forward. $(C@L5i@:(B $(C1b:;@{@N(B $(C1t9Z@L(B $(C@L5?(B -$(C8m7I@87N<-(B, $(CGW;s(B $(C;g?kGO0T(B $(C5I(B $(C0M@L9G7N(B $(CAv1](B $(C4g@e(B $(C8S8.(B $(C> C-n$(C@;(B $(C?)7/9x(B $(CCD<-(B $(C1t9Z@L8&(B $(C@L(B $(CAY7N(B $(C0!A.(B $(C?@=J=C?@(B. +>> C-n을 여러번 쳐서 깜박이를 이 줄로 가져 오십시오. ->> C-f$(C8&(B $(CCD<-(B $(CAY(B $(C>H?!<-(B $(C@L5?GX(B $(C:80m(B C-p$(C7N(B $(C5^(B $(CAY7N(B $(C0!=J=C?@(B. - $(C1t9Z@L0!(B $(CAY@G(B $(CA_0#?!(B $(C@V@;(B $(C6'(B C-p$(C0!(B $(C>n62(B $(C@[?k@;(B $(CGO4B0!(B $(C:8=J=C?@(B. +>> C-f를 쳐서 줄 안에서 이동해 보고 C-p로 뒷 줄로 가십시오. + 깜박이가 줄의 중간에 있을 때 C-p가 어떤 작용을 하는가 보십시오. -$(C0"0"@G(B $(CAY@:(B $(C4Y@=?!(B $(C@L>nAv4B(B $(CAY0z(B $(C:P8.GO4B(B $(C;uAY(B $(C9.@Z7N(B $(C3!334O4Y(B. -$(CFD@O@G(B $(C86Av87(B $(CAY@:(B $(C3!?!(B $(C;uAY(B $(C9.@Z0!(B $(C@V>n>_(B $(CGU4O4Y(B ($(C1W7/3*(B $(C@L8F=:4B(B $(C@L8&(B -$(C?d18GOAv(B $(C>J=@4O4Y(B). +각각의 줄은 다음에 이어지는 줄과 분리하는 새줄 문자로 끝납니다. +파일의 마지막 줄은 끝에 새줄 문자가 있어야 합니다 (그러나 이맥스는 이를 +요구하지 않습니다). ->> $(CAY@L(B $(C=C@[GO4B(B $(C0w?!<-(B C-b$(C8&(B $(CCD(B $(C:8=J=C?@(B. $(C1t9Z@L0!(B $(C5^(B $(CAY@G(B $(C3!@87N(B - $(C?rAw?)>_(B $(CGU4O4Y(B. $(C1W(B $(C@L@/4B(B $(C1t9Z@L0!(B $(C;uAY(B $(C9.@Z8&(B $(C3Q>n<-(B $(C5^BJ@87N(B - $(C?rAw@L1b(B $(C6'9.@T4O4Y(B. +>> 줄이 시작하는 곳에서 C-b를 쳐 보십시오. 깜박이가 뒷 줄의 끝으로 + 움직여야 합니다. 그 이유는 깜박이가 새줄 문자를 넘어서 뒷쪽으로 + 움직이기 때문입니다. -C-f$(C55(B C-b$(CC373(B $(C;uAY(B $(C9.@Z8&(B $(C3Q>n<-(B $(C@L5?GR(B $(C> C-b$(C8&(B $(C8n(B $(C9x(B $(C4u(B $(CCD<-(B $(C1t9Z@L0!(B $(C>n5p(B $(C@V4B0!8&(B $(C:80m(B C-f$(C7N(B $(C4Y=C(B $(CAY@G(B - $(C3!1nAv(B $(C@L5?GO=J=C?@(B. - $(C1W(B $(C4Y@=?!(B C-f$(C7N(B $(C4Y@=(B $(CAY7N(B $(C@L5?GO=J=C?@(B. +>> C-b를 몇 번 더 쳐서 깜박이가 어디 있는가를 보고 C-f로 다시 줄의 + 끝까지 이동하십시오. + 그 다음에 C-f로 다음 줄로 이동하십시오. -$(CH-8i@G(B $(C2@4k1b3*(B $(C9X9Y4Z@;(B $(CAv3*CD<-(B $(C@L5?GO8i(B $(C0!@e@Z8.8&(B $(C9~>n3-(B $(C1[?y@:(B -$(CH-8i(B $(C>H@87N(B $(C9P7A(B $(C5i>n(B $(C?I4O4Y(B. $(C@L0M@;(B "$(C5N7g8;1b(B(scrolling)"$(C6s0m(B -$(CGU4O4Y(B. $(C@L4B(B $(C@L8F=:0!(B $(C1t9Z@L8&(B $(CH-8i(B $(C9[@87N(B $(C3;:83;Av(B $(C>J0m(B $(C1[?y@G(B $(CA$GXAx(B -$(C@e> C-n$(C@87N(B $(C1t9Z@L8&(B $(CH-8i@G(B $(C9X9Y4Z(B $(C>F7!7N(B $(C?rAw?)<-(B, $(C>n62(B $(C@O@L(B - $(C9_;}GO4B0!8&(B $(C:8=J=C?@(B. +>> C-n으로 깜박이를 화면의 밑바닥 아래로 움직여서, 어떤 일이 + 발생하는가를 보십시오. -$(CGQ(B $(C9.@Z>?(B $(C@L5?GO4B(B $(C0M@L(B $(C4@8.8i(B, $(CGQ(B $(C398;>?(B $(C?rAw@O(B $(C?(B $(C>UBJ@87N(B, M-b$(C4B(B $(CGQ(B $(C398;>?(B $(C5^BJ@87N(B $(C?rAw@T4O4Y(B. +한 문자씩 이동하는 것이 느리면, 한 낱말씩 움직일 수 있습니다. M-f +(Meta-f)는 한 낱말씩 앞쪽으로, M-b는 한 낱말씩 뒷쪽으로 움직입니다. ->> M-f$(C3*(B M-b$(C8&(B $(C8n(B $(C9x(B $(CCD(B $(C:8=J=C?@(B. +>> M-f나 M-b를 몇 번 쳐 보십시오. -$(C398;@G(B $(CA_0#?!<-4B(B $(C398;@G(B $(C3!@87N(B $(C?rAw@T4O4Y(B. $(C398;(B $(C;g@L@G(B $(C0x0#(B -$(C9.@Z?!<-4B(B M-f$(C0!(B $(C4Y@=(B $(C398;@G(B $(C3!@87N(B $(C?rAw@T4O4Y(B. M-b$(C4B(B $(C9]4k(B $(C9fGb@87N(B -$(C00@:(B $(C@[?k@;(B $(CGU4O4Y(B. +낱말의 중간에서는 낱말의 끝으로 움직입니다. 낱말 사이의 공간 +문자에서는 M-f가 다음 낱말의 끝으로 움직입니다. M-b는 반대 방향으로 +같은 작용을 합니다. ->> $(CA_0#(B $(CA_0#?!(B C-f$(C?M(B C-b$(C8&(B $(CD!8i<-(B M-f$(C?M(B M-b$(C8&(B $(C8n(B $(C9x(B - $(C?,=@GO=J=C?@(B. $(C1W7/8i(B $(C398;@G(B $(C3;:N3*(B $(CA_0#?!<-(B M-f$(C?M(B M-b$(C0!(B $(C>n62(B - $(C@[?k@;(B $(CGO4B0!8&(B $(C:<(B $(C> 중간 중간에 C-f와 C-b를 치면서 M-f와 M-b를 몇 번 + 연습하십시오. 그러면 낱말의 내부나 중간에서 M-f와 M-b가 어떤 + 작용을 하는가를 볼 수 있습니다. -C-f$(C?M(B C-b, M-f$(C?M(B M-b$(C@G(B $(C@/;g<:?!(B $(C@/@GGO=J=C?@(B. $(C4k:N:P(B Meta $(C9.@Z4B(B -$(C>p>n0!(B $(CA$@GGO4B(B $(C4\@'(B($(C398;(B, $(C9.@e(B, $(C4\6t(B)$(C@G(B $(C@[5??!(B $(C;g?k5G0m(B $(CA&>n(B -$(C9.@Z4B(B $(CFmA}GO4B(B $(C0M0z4B(B $(C0|0h>x4B(B $(C1b:;(B $(C4\@'(B($(C9.@Z(B, $(CAY(B $(C5n5n(B)$(C?!(B -$(C;g?k5K4O4Y(B. +C-f와 C-b, M-f와 M-b의 유사성에 유의하십시오. 대부분 Meta 문자는 +언어가 정의하는 단위(낱말, 문장, 단락)의 작동에 사용되고 제어 +문자는 편집하는 것과는 관계없는 기본 단위(문자, 줄 등등)에 +사용됩니다. -$(C4Y@=@:(B $(CAY0z(B $(C9.@e(B $(C;g@L?!(B $(C@{?k5G4B(B $(C@/;g<:@T4O4Y(B: C-a$(C?M(B C-e$(C4B(B $(CAY@G(B -$(C=C@[@L3*(B $(C3!@87N(B $(C?rAw@L0m(B, M-a$(C?M(B M-e$(C4B(B $(C9.@e@G(B $(C=C@[@L3*(B $(C3!@87N(B -$(C?rAw@T4O4Y(B. +다음은 줄과 문장 사이에 적용되는 유사성입니다: C-a와 C-e는 줄의 +시작이나 끝으로 움직이고, M-a와 M-e는 문장의 시작이나 끝으로 +움직입니다. ->> C-a$(C8&(B $(C5N<<9x(B $(CD#(B $(CHD(B C-e$(C8&(B $(C5N<<9x(B $(CCD(B $(C:8=J=C?@(B. - M-a$(C8&(B $(C5N<<9x(B $(CD#(B $(CHD(B M-e$(C8&(B $(C5N<<9x(B $(CCD(B $(C:8=J=C?@(B. +>> C-a를 두세번 친 후 C-e를 두세번 쳐 보십시오. + M-a를 두세번 친 후 M-e를 두세번 쳐 보십시오. -C-a$(C4B(B $(C5N(B $(C9x(B $(C@L;s(B $(C9]:9GX55(B $(C>F9+71(B $(C@[?k@;(B $(CGOAv(B $(C>JAv88(B M-a$(C4B(B $(CGQ(B $(C9.@e@;(B -$(C4u(B $(C5Z7N(B $(C?rAw@L4B(B $(C0M?!(B $(C@/@GGO=J=C?@(B. $(C@L4B(B $(C:q7O(B $(C@/;g<:@:(B $(C>F4OAv88(B -$(C4g?,GQ(B $(C;g=G7N(B $(C?)0\A}4O4Y(B. +C-a는 두 번 이상 반복해도 아무런 작용을 하지 않지만 M-a는 한 문장을 +더 뒤로 움직이는 것에 유의하십시오. 이는 비록 유사성은 아니지만 +당연한 사실로 여겨집니다. -$(C9.<-?!(B $(C@V4B(B $(C1t9Z@L@G(B $(C@'D!4B(B "$(CA!(B(point)"$(C@L6s0m(B $(C:N8(4O4Y(B. $(C:N?,GO@Z8i(B, -$(C1t9Z@L4B(B $(CH-8i;s?!<-(B, $(C9.<-(B $(C3;?!(B $(CA!@L(B $(C>n5p?!(B $(C@'D!GO0m(B $(C@V4B0!8&(B -$(C:8?)A]4O4Y(B. +문서에 있는 깜박이의 위치는 "점(point)"이라고 부릅니다. 부연하자면, +깜박이는 화면상에서, 문서 내에 점이 어디에 위치하고 있는가를 +보여줍니다. -$(C4Y@=@:(B $(C398;0z(B $(C9.@e(B $(C4\@'@G(B $(C@L5?@;(B $(CFwGTGQ(B $(C4\`GO?4=@4O4Y(B. +다음은 낱말과 문장 단위의 이동을 포함한 단순한 깜박이 이동 작동을 +요약하였습니다. - C-f $(CGQ(B $(C9.@Z(B $(C>UBJ@87N(B $(C?rAw@N4Y(B - C-b $(CGQ(B $(C9.@Z(B $(C5^BJ@87N(B $(C?rAw@N4Y(B + C-f 한 문자 앞쪽으로 움직인다 + C-b 한 문자 뒷쪽으로 움직인다 - M-f $(CGQ(B $(C4\>n(B $(C>UBJ@87N(B $(C?rAw@N4Y(B - M-b $(CGQ(B $(C4\>n(B $(C5^BJ@87N(B $(C?rAw@N4Y(B + M-f 한 단어 앞쪽으로 움직인다 + M-b 한 단어 뒷쪽으로 움직인다 - C-n $(C>U(B $(CAY7N(B $(C?rAw@N4Y(B - C-p $(C5^(B $(CAY7N(B $(C?rAw@N4Y(B + C-n 앞 줄로 움직인다 + C-p 뒷 줄로 움직인다 - C-a $(CAY@G(B $(C=C@[@87N(B $(C?rAw@N4Y(B - C-e $(CAY@G(B $(C3!@87N(B $(C?rAw@N4Y(B + C-a 줄의 시작으로 움직인다 + C-e 줄의 끝으로 움직인다 - M-a $(C9.@e@G(B $(C=C@[@87N(B $(C?rAw@N4Y(B - M-e $(C9.@e@G(B $(C3!@87N(B $(C?rAw@N4Y(B + M-a 문장의 시작으로 움직인다 + M-e 문장의 끝으로 움직인다 ->> $(C@L(B $(C8p5g(B $(C8m7I@;(B $(C8n(B $(C9x(B $(C?,=@GX(B $(C:8=J=C?@(B. $(C@L(B $(C8m7I5i@:(B $(C0!@e(B $(C@ZAV(B - $(C;g?k5G4B(B $(C8m7I5i@T4O4Y(B. +>> 이 모든 명령을 몇 번 연습해 보십시오. 이 명령들은 가장 자주 + 사용되는 명령들입니다. -$(C1t9Z@L8&(B $(C?rAw@L4B(B $(C4Y8%(B $(C5N0!Av(B $(CA_?dGQ(B $(C8m7I@:(B $(C@|(B $(C9.<-@G(B $(C=C@[@87N(B -$(C?rAw@L4B(B M-< (Meta$(C -(Meta$(C +(Meta쇠 더큼 글쇠)입니다. ->> M-<$(C8&(B $(CAv1](B $(CCD<-(B $(CAvD'<-@G(B $(C=C@[@87N(B $(C?rAw?)(B $(C:8=J=C?@(B. $(C1W8.0m4B(B C-v$(C8&(B - $(C9]:9GX<-(B $(C4Y=C(B $(C?)1b7N(B $(C59>F(B $(C?@=J=C?@(B. +>> M-<를 지금 쳐서 지침서의 시작으로 움직여 보십시오. 그리고는 C-v를 + 반복해서 다시 여기로 돌아 오십시오. ->> M->$(C8&(B $(CCD<-(B $(CAvD'<-@G(B $(C3!@87N(B $(C0!=J=C?@(B. $(C1W8.0m4B(B M-v$(C8&(B $(C9]:9GX<-(B $(C4Y=C(B - $(C?)1b7N(B $(C59>F(B $(C?@=J=C?@(B. +>> M->를 쳐서 지침서의 끝으로 가십시오. 그리고는 M-v를 반복해서 다시 + 여기로 돌아 오십시오. -$(C4\8;1b?!(B $(CH-;lG%(B $(C1[24B(B -$(C0M@;(B $(C1G@eGU4O4Y(B. $(CC9B07N(B, $(C@L5i@:(B $(C8p5g(B $(CA>7y@G(B $(C4\8;1b?!<-(B $(C;g?kGR(B $(C24B(B $(C0M?!(B $(C@Mn(B -$(C9.@Z@;(B $(CD!4B(B $(C0M@L(B $(CH-;lG%(B $(C1[@(B $(C:|8#4Y4B(B $(C0M@;(B $(C>K0T(B $(C5I(B -$(C0M@T4O4Y(B ($(CE8@Z(B $(C@'D!?!<-(B $(Cx1b(B $(C6'9.?!(B). $(Cn(B $(C9.@Z(B $(C8m7I@;(B $(C>24B(B $(C=@0|@L(B $(C5i8i(B $(C1t9Z@L8&(B $(C?rAw@L4B(B $(C4Y8%(B -$(C0m1^(B $(C8m7I5i55(B $(C=10T(B $(C9h?o(B $(CnA}4O4Y(B. META$(Cn62(B -$(C4\8;1b?!<-55(B $(C;g?kGR(B $(Cn(B, C-u 8 C-f$(C4B(B $(C9.@Z(B $(C?)4|03@G(B $(C>UBJ@87N(B $(C?rAw@T4O4Y(B. +예를 들어, C-u 8 C-f는 문자 여덟개의 앞쪽으로 움직입니다. ->> $(CGQ(B $(C9x@G(B $(C8m7I@87N(B $(C1t9Z@L0!(B $(C@L(B $(CAY(B $(C1YC3?!(B $(C?@557O(B, $(C<}@Z(B $(C@NnAx(B - C-n $(CH$@:(B C-p$(C8&(B $(C=C55GX(B $(C:8=J=C?@(B. +>> 한 번의 명령으로 깜박이가 이 줄 근처에 오도록, 숫자 인수가 주어진 + C-n 혹은 C-p를 시도해 보십시오. -$(C4k:N:P@G(B $(C8m7I5i@:(B $(C<}@Z(B $(C@N5(B $(CJ0m(B $(C1W(B -$(C88E-@G(B $(CAY@;(B $(CH-8i@G(B $(C@'3*(B $(C>F7!7N(B $(C5N7g8;1b(B $(CGU4O4Y(B. $(CAo(B, C-u 4 C-v$(C4B(B -$(CH-8i@;(B 4 $(CAY(B $(C88E-(B $(C5N7g8;1b(B $(CGU4O4Y(B. +대부분의 명령들은 숫자 인수를 반복 횟수로 사용하지만 경우에 따라서는 +예외적인 명령들이 다른 용도로 쓸 수 있습니다. C-v와 M-v는 이런 예외에 +속합니다. 인수를 주면 그 만큼의 화면 수를 두루말기 하지 않고 그 +만큼의 줄을 화면의 위나 아래로 두루말기 합니다. 즉, C-u 4 C-v는 +화면을 4 줄 만큼 두루말기 합니다. ->> $(C@LA&(B C-u 8 C-v$(C8&(B $(CCD(B $(C:8=J=C?@(B. +>> 이제 C-u 8 C-v를 쳐 보십시오. -$(C@L7N<-(B $(CH-8i@:(B 8 $(CAY@L(B $(C@'7N(B $(C5N7g8;1b(B $(C5F@;(B $(C0M@T4O4Y(B. $(C4Y=C(B $(C9X@87N(B -$(C5N7g8;1b(B $(CGO1b(B $(C@'GX<-4B(B $(C@N5(B $(C0f?l?!4B(B $(C@L8F=:(B $(CC"@G(B -$(C?^Fm?!(B $(C5N7g8;1b(B $(C874k6s0m(B $(C:R8.?l4B(B $(C1b4Y6u(B $(C;g0"G|(B $(C8p>g@G(B $(CEM0!(B $(C@V@;(B -$(C0M@T4O4Y(B. $(C@L(B $(C5N7g8;1b(B $(C874k?!(B $(C4Y6wAc8&(B $(C5~1oGT@87N=a(B $(C1[?y@;(B $(C5N7g8;1b(B $(CGR(B -$(C> $(C5N7g8;1b(B $(C874k(B $(C3;?!<-(B $(C4+?!(B $(C6g4B(B $(C:N:P@G(B $(C2@4k1b8&(B $(CA_0#(B $(C4\C_7N(B $(C4-7/(B - $(C:8=J=C?@(B. $(C1W7/8i(B $(C1[?y@:(B $(C4Y6wAc7N(B $(C4)8%(B $(C@'D!?!(B $(C5{8%(B $(C>g(B $(C88E-@G(B $(C@'D!8&(B - $(C@'3*(B $(C>F7!7N(B $(C5N7g8;1b(B $(C5I(B $(C0M@T4O4Y(B. +>> 두루말기 막대 내에서 눈에 띄는 부분의 꼭대기를 중간 단추로 눌러 + 보십시오. 그러면 글월은 다람쥐로 누른 위치에 따른 양 만큼의 위치를 + 위나 아래로 두루말기 될 것입니다. ->> $(C4Y6wAc8&(B $(CA_0#(B $(C4\C_0!(B $(C4-7/Ax(B $(C;sEB?!<-(B $(C@'3*(B $(C>F7!7N(B $(C?rAw?)(B $(C:8=J=C?@(B. - $(C1W7/8i(B $(C1[?y@L(B $(C4Y6wAc0!(B $(C?rAw@L4B4k7N(B $(C@'3*(B $(C>F7!7N(B $(C5N7g8;1b(B $(C5I(B - $(C0M@T4O4Y(B. +>> 다람쥐를 중간 단추가 눌러진 상태에서 위나 아래로 움직여 보십시오. + 그러면 글월이 다람쥐가 움직이는대로 위나 아래로 두루말기 될 + 것입니다. -* $(C@L8F=:@G(B $(C@[5?@L(B $(C4\@}5I(B $(C6'(B +* 이맥스의 작동이 단절될 때 --------------------------- -$(C8m7I@;(B $(CAV>n55(B $(C@L8F=:0!(B $(C9]@@@;(B $(CGOAv(B $(C>J@;(B $(C6'4B(B C-g$(C8&(B $(CCD<-(B $(C@L8F=:@G(B $(C@[5?@;(B -$(C>H@|GO0T(B $(CA$Av=CE3(B $(Cn62(B $(C8m7I@;(B $(C=C@[GO?4Av88(B $(C=GG`=CE00m(B -$(C=MAv(B $(C>J@;(B $(C6'?!55(B $(C;g?k5I(B $(C> C-u 100$(C@;(B $(CCD<-(B $(C<}@Z(B $(C@Nx>]@=@87N(B $(CGQ(B - $(C9.@Z88(B $(C>U@87N(B $(C?rAw?)>_(B $(CGU4O4Y(B. +>> C-u 100을 쳐서 숫자 인수를 100으로 하고 난 후 C-g를 쳐 + 보십시오. 그리고 나서 C-f를 칩니다. 인수는 C-g로써 없앴음으로 한 + 문자만 앞으로 움직여야 합니다. -* $(C9+4I(B $(C8m7I(B +* 무능 명령 ----------- -$(C>n62(B $(C@L8F=:(B $(C8m7I@:(B "$(CGc?k5GAv(B $(C>J>F<-(B"(disabled) $(CCJ:8@Z0!(B $(C@_8x(B $(C;g?kGOAv(B -$(C>J557O(B $(C5G>n(B $(C@V=@4O4Y(B. +어떤 이맥스 명령은 "허용되지 않아서"(disabled) 초보자가 잘못 사용하지 +않도록 되어 있습니다. -$(C@L71(B $(C9+4I(B $(C8m7I@;(B $(C>28i(B, $(C@L8F=:4B(B $(C@L(B $(C8m7I@L(B $(C9+>y@L>z@88g(B, $(C@L(B $(C8m7I@;(B $(C1W3I(B -$(C1W4k7N(B $(C=GG`GR(B $(C0M@NAv8&(B $(C90>n(B $(C:84B(B $(C>K828;@;(B $(CH-8i(B $(CG%=CGU4O4Y(B. +이런 무능 명령을 쓰면, 이맥스는 이 명령이 무엇이었으며, 이 명령을 그냥 +그대로 실행할 것인지를 물어 보는 알림말을 화면 표시합니다. -$(C?x7!0!(B $(C@L(B $(C8m7I@;(B $(C>20m@Z(B $(CGO?44Y8i(B, $(C90@=?!(B $(C4kGX(B $(C;g@L(B $(C9.@Z(B(Space)$(C8&(B $(CCD<-(B -$(C4dGO=J=C?@(B. $(C:8Ek@:(B $(C9+4I(B $(C8m7I@;(B $(C=GG`=CE0Av(B $(C>J1b(B $(C@'GX(B $(C90@=?!(B "n"$(C@87N(B -$(C4dGU4O4Y(B. +원래가 이 명령을 쓰고자 하였다면, 물음에 대해 사이 문자(Space)를 쳐서 +답하십시오. 보통은 무능 명령을 실행시키지 않기 위해 물음에 "n"으로 +답합니다. ->> C-x C-l ($(C9+4I(B $(C8m7I@G(B $(CGO3*(B)$(C@;(B $(CD#(B $(CHD(B n$(C@87N(B $(C90@=?!(B $(C4dGO=J=C?@(B. +>> C-x C-l (무능 명령의 하나)을 친 후 n으로 물음에 답하십시오. -* $(CC"(B +* 창 ---- -$(C@L8F=:4B(B $(C?)7/(B $(CC"@;(B $(C0!Az(B $(C24B(B $(C9f9}?!(B $(C4kGX<-4B(B $(C3*A_?!(B $(C<38mGO1b7N(B $(CGU4O4Y(B. $(CAv1]@:(B -$(C4Y8%(B $(CC"@;(B $(C>x>V0m(B $(C?x7!?!(B $(C@V4x(B $(CC"(B $(CGO3*7N(B $(C59>F0!(B $(CFmA}@;(B $(C0hx>[4O4Y(B). + C-x 1 창을 하나로 만들기 (즉, 다른 창들을 없앱니다). -$(C@L0M@:(B $(CA&>n2557O(B $(CGU4O4Y(B. $(C4Y8%(B $(CC"5i@:(B $(CAv?vA}4O4Y(B. +이것은 제어쇠-x 다음에 숫자 글쇠 1입니다. C-x 1은 깜박이가 있는 +창을 확장해서 전체 화면을 쓰도록 합니다. 다른 창들은 지워집니다. ->> $(C1t9Z@L8&(B $(C@L(B $(CAY7N(B $(C?rAw@N(B $(CHD(B C-u 0 C-l$(C@;(B $(CD!=J=C?@(B. ->> $(CA&>nnnn6;0T(B $(CAY>n(B $(C5e4B0!8&(B $(C0|B{GO=J=C?@(B. +>> 깜박이를 이 줄로 움직인 후 C-u 0 C-l을 치십시오. +>> 제어쇠-h k 제어쇠-f를 치십시오. + 제어쇠-f 명령에 대한 문서화를 화면 표시하기 위해 새 창이 + 나타나면서 이 창이 어떻게 줄어 드는가를 관찰하십시오. ->> C-x 1$(C@;(B $(CCD<-(B $(C9.<-H-(B $(C8q7O(B $(C@[<:(B $(CC"@L(B $(C>n6;0T(B $(C;g6sAv4B0!8&(B $(C:8=J=C?@(B. +>> C-x 1을 쳐서 문서화 목록 작성 창이 어떻게 사라지는가를 보십시오. -$(C@L(B $(C8m7I@:(B $(C5N(B $(C9.@Z7N(B $(C18<:5G>n(B $(C@V4Y4B(B $(CA!?!<-(B $(CAv1]1nAv(B $(C9h?n(B $(C4Y8%(B $(C8m7I5i0z(B -$(C4Y8(4O4Y(B. $(C=C@[@:(B $(CA&>nn94O4Y(B. +이 명령은 두 문자로 구성되어 있다는 점에서 지금까지 배운 다른 명령들과 +다릅니다. 시작은 제어쇠-x로 합니다. 제어쇠-x로 시작하는 명령들은 +무척 많습니다; 그런 많은 명령들은 창이나 파일, 사이칸(buffer) 내지는 +그런 것과 연관성이 있는 명령들입니다. 이런 명령들은 둘, 셋 혹은 +네개의 문자를 씁니다. -* $(C3"?l1b?M(B $(CAv?l1b(B +* 끼우기와 지우기 ----------------- -$(C1[?y@;(B $(C3"?l1b(B $(C@'GX<-4B(B $(C1W(B $(C1[?y@;(B $(CE8@ZD!8i(B $(C5K4O4Y(B. A, 7, *, $(C5n5n0z(B -$(C00@L(B, $(C:<(B $(C($(C:91M(복귀쇠)를 치면 새줄 문자가 끼워집니다. -$(C8&(B $(CD!8i(B $(C86Av87@87N(B $(C@T7B5H(B $(C9.@Z0!(B $(CAv?vA}4O4Y(B. $(C4B(B -$(C1[n62(B $(C0f?l?!4B(B -"Backspace" $(C1[$(C@G(B $(C?*GR@;(B $(CGO1b55(B $(CGOAv88(B $(CGW;s(B $(C1W78Av4B(B -$(C>J=@4O4Y(B! +를 치면 마지막으로 입력된 문자가 지워집니다. 는 +글쇠판에 "Del"이라고도 이름표가 달려 있습니다. 어떤 경우에는 +"Backspace" 글쇠가 의 역할을 하기도 하지만 항상 그렇지는 +않습니다! -$(CA;(B $(C4u(B $(C@O9]@{@87N(B, $(C4B(B $(C1t9Z@L(B $(CGv@'D!@G(B $(C9Y7N(B $(C@|?!(B $(C@V4B(B $(C9.@Z8&(B -$(CAv?s4O4Y(B. +좀 더 일반적으로, 는 깜박이 현위치의 바로 전에 있는 문자를 +지웁니다. ->> $(C1W(B $(C0M@;(B $(CGX(B $(C:8=J=C?@(B--$(C8n8n(B $(C9.@Z8&(B $(CD#(B $(CHD(B $(C8&(B $(CCD<-(B - $(CAv?v:8=J=C?@(B. $(C@L(B $(CFD@O@L(B $(C:/0f5G4B(B $(C0M?!(B $(C4kGQ(B $(C0FA$@:(B $(CGOAv(B $(C>J>F55(B - $(C5K4O4Y(B; $(C@86d(B $(CAvD'<-4B(B $(C:/0f5GAv(B $(C>J=@4O4Y(B. $(C@L(B $(CFD@O@:(B $(C@86d(B $(CAvD'<-@G(B - $(C03@N?k(B $(C:9;g:;@T4O4Y(B. +>> 그 것을 해 보십시오--몇몇 문자를 친 후 를 쳐서 + 지워보십시오. 이 파일이 변경되는 것에 대한 걱정은 하지 않아도 + 됩니다; 으뜸 지침서는 변경되지 않습니다. 이 파일은 으뜸 지침서의 + 개인용 복사본입니다. -$(C1[?y@L(B $(CH-8i@G(B $(CGQ(B $(CAY?!(B $(C4Y(B $(C5i>n0!Av(B $(C8xGR(B $(CA$557N(B $(CD?Av8i(B $(C1[?y@G(B $(CAY@:(B -$(CH-8i@G(B $(C5N9xB0(B $(CAY?!<-(B "$(C0hnAv4B(B $(C0M@;(B $(C0!8.E54O4Y(B. +글월이 화면의 한 줄에 다 들어가지 못할 정도로 커지면 글월의 줄은 +화면의 두번째 줄에서 "계속"됩니다. 오른쪽 한계에 있는 역사선 문자 +("\")는 줄이 다음 줄로 이어지는 것을 가리킵니다. ->> $(C1[?y@;(B $(C0hn<-557O(B $(CGO=J=C?@(B. $(C1W7/8i(B $(CAY(B - $(C0h> 글월을 계속 끼워서 오른쪽 한계를 넘어서도록 하십시오. 그러면 줄 + 계속 표시가 나타날 것입니다. ->> $(C8&(B $(C=a<-(B $(C1[?y@G(B $(CAY@L(B $(CGQ(B $(CH-8i(B $(CAY?!(B $(C2K(B $(CBw557O(B $(C4Y=C(B - $(CAv?l=J=C?@(B. $(CAY(B $(C0hx>nA}4O4Y(B. +>> 를 써서 글월의 줄이 한 화면 줄에 꽉 차도록 다시 + 지우십시오. 줄 계속 표시는 없어집니다. -$(C;uAY(B $(C9.@Z55(B $(C4Y8%(B $(C9.@ZC373(B $(CAv?o(B $(Cn<-(B -$(CH-8i@G(B $(C3J:q8&(B $(C3Q>n<-8i(B $(C1W(B $(CAY@:(B $(CAY(B $(C0h> $(C1t9Z@L8&(B $(CAY@G(B $(C=C@[@87N(B $(C?rAw?)<-(B $(C8&(B $(CD!=J=C?@(B. $(C1W7/8i(B $(C1W(B - $(CAY@L(B $(C@L@|(B $(CAY0z(B $(CGUCDAz(B $(C0M@T4O4Y(B. +>> 깜박이를 줄의 시작으로 움직여서 를 치십시오. 그러면 그 + 줄이 이전 줄과 합쳐질 것입니다. ->> $(C4Y=C(B $(C@;(B $(CCD<-(B $(CAv?vAx(B $(C;uAY(B $(C9.@Z8&(B $(C3"?l=J=C?@(B. +>> 다시 을 쳐서 지워진 새줄 문자를 끼우십시오. -$(C4k:N:P@G(B $(C@L8F=:(B $(C8m7I?!4B(B $(C9]:9(B $(CH=oGO=J=C?@(B; -$(C1[?y(B $(C9.@Z55(B $(CGX4g5K4O4Y(B. $(C1[?y(B $(C9.@Z8&(B $(C9]:9GO4B(B $(C0M@:(B $(C1W(B $(C0M@;(B $(C?)7/9x(B -$(C3"?l4B(B $(C0M@T4O4Y(B. +대부분의 이맥스 명령에는 반복 횟수를 줄 수 있다는 것을 기억하십시오; +글월 문자도 해당됩니다. 글월 문자를 반복하는 것은 그 것을 여러번 +끼우는 것입니다. ->> $(C1W(B $(C0M@;(B $(CAv1](B $(CGX(B $(C:>4O4Y(B -- C-u 8 *$(C@;(B $(CCD<-(B ********$(C@;(B $(C3"?l=J=C?@(B. +>> 그 것을 지금 해 봅니다 -- C-u 8 *을 쳐서 ********을 끼우십시오. -$(C@LA&(B $(C@L8F=:?!<-(B $(C9+>p0!8&(B $(CD!0m(B $(CBx?@8&(B $(C13A$GO4B(B $(C0!@e(B $(C1b:;@{@N(B $(C9f9}@;(B -$(C9h?|=@4O4Y(B. $(C398;@L3*(B $(CAY55(B $(CGQ9x?!(B $(CAv?o(B $(C`GU4O4Y(B. +이제 이맥스에서 무언가를 치고 착오를 교정하는 가장 기본적인 방법을 +배웠습니다. 낱말이나 줄도 한번에 지울 수 있습니다. 여기에 지우는 +작동을 요약합니다. - $(C1t9Z@L(B $(CAw@|@G(B $(C9.@Z(B $(CAv?l1b(B - C-d $(C1t9Z@L(B $(C4Y@=@G(B $(C9.@Z(B $(CAv?l1b(B + 깜박이 직전의 문자 지우기 + C-d 깜박이 다음의 문자 지우기 - M- $(C1t9Z@L(B $(CAw@|@G(B $(C398;(B $(CAW@L1b(B - M-d $(C1t9Z@L(B $(C4Y@=@G(B $(C398;(B $(CAW@L1b(B + M- 깜박이 직전의 낱말 죽이기 + M-d 깜박이 다음의 낱말 죽이기 - C-k $(C1t9Z@L(B $(C@'D!7N:NEM(B $(CAY(B $(C3!1nAv(B $(CAW@L1b(B - M-k $(CGv@g(B $(C9.@e@G(B $(C3!1nAv(B $(CAW@L1b(B + C-k 깜박이 위치로부터 줄 끝까지 죽이기 + M-k 현재 문장의 끝까지 죽이기 -C-f$(C?M(B M-f$(C?!<-(B $(C=C@[GQ(B $(C@/;g<:@L(B $(C?M(B C-d $(C1W8.0m(B M-$(C?M(B M-d$(C7N(B -$(C@L>nAv4B(B $(C0M@;(B $(C@/@GGO=J=C?@(B ($(C4B(B $(CAxA$GQ(B $(CA&>n(B $(C9.@Z4B(B $(C>F4OAv88(B -$(C1W715%?!(B $(C;s3dGOAv(B $(C>J557O(B $(CGU=C4Y(B). $(CAY0z(B $(C9.@e@L(B $(C4Y8#5m@L(B C-k$(C?M(B M-k$(C4B(B -C-e$(C?M(B M-e$(C?M(B $(C4Y8(4O4Y(B. +C-f와 M-f에서 시작한 유사성이 와 C-d 그리고 M-와 M-d로 +이어지는 것을 유의하십시오 (는 진정한 제어 문자는 아니지만 +그런데에 상념하지 않도록 합시다). 줄과 문장이 다르듯이 C-k와 M-k는 +C-e와 M-e와 다릅니다. -$(C@O7|@{@N(B $(C9f9}(B $(CGO3*7N(B $(C;g@LD-@G(B $(C>n62(B $(C:N:P55(B $(CAW@O(B $(C> $(C1t:}@L8&(B $(C@|(B $(C9.4\@G(B $(C=C@[@N(B `$(C@O(B'$(C@Z7N(B $(C?rAw@L=J=C?@(B. ->> C-SPC$(C8&(B $(CD!=C?@(B. $(C@L8F=:4B(B $(CH-8i@G(B $(C9Y4Z?!(B "Mark set"$(C@L6s4B(B $(C>K828;@;(B - $(C:8?)AY(B $(C0M@T4O4Y(B. ->> $(C1t:}@L8&(B $(C@'(B $(C9.4\@G(B $(C5N9xB0(B $(CAY?!(B $(C@V4B(B `$(C3!(B'$(C@Z7N(B $(C?rAw@L=C?@(B. ->> C-w$(C8&(B $(CD!=C?@(B. $(C1W7/8i(B `$(C@O(B'$(C@Z7N(B $(C=C@[GX<-(B `$(C3!(B'$(C@Z1nAv@G(B $(C1[?y@L(B $(CAW?)Az(B - $(C0M@T4O4Y(B. +>> 깜빡이를 전 문단의 시작인 `일'자로 움직이십시오. +>> C-SPC를 치시오. 이맥스는 화면의 바닥에 "Mark set"이라는 알림말을 + 보여줄 것입니다. +>> 깜빡이를 위 문단의 두번째 줄에 있는 `끝'자로 움직이시오. +>> C-w를 치시오. 그러면 `일'자로 시작해서 `끝'자까지의 글월이 죽여질 + 것입니다. -"$(CAW@L1b(B"$(C?M(B "$(CAv?l1b(B"$(C@G(B $(C4Y8%(B $(CA!@:(B "$(CAW?)Ax(B" $(C1[?y@:(B $(C@gBw(B $(C3"?v3V@;(B $(Cx4Y4B(B $(C0M@T4O4Y(B. $(CAW?)Ax(B $(C1[?y@;(B -$(C4Y=C(B $(C;g?kGO4B(B $(C0M@;(B "$(C@b>F4g1b1b(B(yanking)"$(C6s0m(B $(CGU4O4Y(B. $(C@O9]@{@87N(B $(C89@:(B -$(C1[?y@;(B $(CA&0EGO4B(B $(C8m7I@:(B $(C1[?y@;(B $(CAW@L3*(B ($(C1W71(B $(C8m7I5i@:(B $(C1W(B $(C1[?y5i@;(B $(C4Y=C(B -$(C@b>F4g1f(B $(CnA.(B $(C@V=@4O4Y(B), $(CGQ(B $(C9.@Z8&(B $(CA&0EGO0E3*(B -$(C:s(B $(CAY(B $(CH$@:(B $(C0x0#9.@Z8&(B $(CA&0EGO4B(B $(C8m7I5i@:(B $(CAv?r@[?k@;(B $(CGU4O4Y(B ($(C1W7!<-(B $(C1W(B -$(C1[?y5i@:(B $(C4Y=C(B $(C@b>F(B $(C4g1f(B $(Cx=@4O4Y(B). +"죽이기"와 "지우기"의 다른 점은 "죽여진" 글월은 재차 끼워넣을 수 있는 +반면 "지워진" 것들은 다시 끼워넣을 수 없다는 것입니다. 죽여진 글월을 +다시 사용하는 것을 "잡아당기기(yanking)"라고 합니다. 일반적으로 많은 +글월을 제거하는 명령은 글월을 죽이나 (그런 명령들은 그 글월들을 다시 +잡아당길 수 있도록 그렇게 설정되어져 있습니다), 한 문자를 제거하거나 +빈 줄 혹은 공간문자를 제거하는 명령들은 지움작용을 합니다 (그래서 그 +글월들은 다시 잡아 당길 수 없습니다). ->> $(C1t9Z@L8&(B $(C:q>nA.(B $(C@VAv(B $(C>J@:(B $(CAY@G(B $(C=C@[@87N(B $(C?rAw@L=J=C?@(B. $(C1W8.0m4B(B - C-k$(C8&(B $(CCD<-(B $(C1W(B $(CAY@G(B $(C1[?y@;(B $(CAW@L=J=C?@(B. ->> C-k$(C8&(B $(C4Y=C(B $(CD!=J=C?@(B. $(C1W7/8i(B $(C1W(B $(CAY(B $(C4Y@=?!(B $(C@V4B(B $(C;uAY(B $(C9.@Z0!(B $(CAW?)Av4B(B - $(C0M@;(B $(C:<(B $(C> 깜박이를 비어져 있지 않은 줄의 시작으로 움직이십시오. 그리고는 + C-k를 쳐서 그 줄의 글월을 죽이십시오. +>> C-k를 다시 치십시오. 그러면 그 줄 다음에 있는 새줄 문자가 죽여지는 + 것을 볼 수 있습니다. -C-k$(C8&(B $(CGQ(B $(C9x(B $(CD!8i(B $(C1W(B $(CAY@G(B $(C3;?k@;(B $(CAW@L0m(B $(C5N9xB0?!4B(B $(C1W(B $(CAY(B $(C@ZC<8&(B -$(CAW@S@87N<-(B $(C@L>nAv4B(B $(C8p5g(B $(CAY@;(B $(C@'7N(B $(C?C834O4Y(B. C-k$(C4B(B $(C<}@Z(B $(C@NF4U4O4Y(B. C-u 2 C-k$(C4B(B $(C5N(B $(CAY0z(B $(C1W(B $(CAY@G(B $(C;uAY(B $(C9.@Z8&(B -$(CAW@T4O4Y(B; C-k$(C8&(B $(C5N(B $(C9x(B $(CD!8i(B $(C1W78Av(B $(C>J=@4O4Y(B. +C-k를 한 번 치면 그 줄의 내용을 죽이고 두번째에는 그 줄 자체를 +죽임으로서 이어지는 모든 줄을 위로 올립니다. C-k는 숫자 인수를 특별히 +취급합니다: 그 숫자만큼의 줄과 그 줄의 내용을 함께 죽입니다. 이것은 +단순한 반복이 아닙니다. C-u 2 C-k는 두 줄과 그 줄의 새줄 문자를 +죽입니다; C-k를 두 번 치면 그렇지 않습니다. -$(CAW?)Ax(B $(C1[?y@;(B $(C4Y=C(B $(CH8F4g1b1b(B"$(C6s0m(B $(C:N8(4O4Y(B. ($(C4)1:0!0!(B -$(C;/>F0#(B $(C0M@;(B $(C4Y=C(B $(C@b>F(B $(C4g1b4B(B $(C0MC373(B $(C;}0"GO=J=C?@(B.) $(CAW?)Ax(B $(C1[?y@:(B -$(CAW?)Ax(B $(C1W(B $(C0w?!(B $(C4Y=C(B $(C@b>F(B $(C4g0\Az(B $(CF4g0\Az(B $(CF4g0\A|@87N=a(B $(C?)7/(B $(C:9;g:;@;(B $(C885i0T(B $(C5I(B $(CF4g1b1b(B $(C8m7I@:(B C-y$(C@T4O4Y(B. $(C1W7/8i(B $(C0!@e(B $(C86Av87@87N(B $(CAW?)Ax(B $(C1[?y@;(B -$(CGv@g@G(B $(C1t:}@L(B $(C@'D!?!(B $(CH8> $(CGX(B $(C:8=J=C?@(B; C-y$(C8&(B $(CCD<-(B $(C1[?y@;(B $(C4Y=C(B $(C@b>F4g1b=J=C?@(B. +>> 해 보십시오; C-y를 쳐서 글월을 다시 잡아당기십시오. -$(CGQ(B $(C0!7ND-?!<-(B C-k$(C8&(B $(C?)7/9x(B $(C>28i(B $(CAW?)Ax(B $(C1[?y5i@L(B $(CGT22(B $(C0%9+8.5G>n(B $(C1W(B $(CAY(B -$(C8p5N8&(B C-y $(CGQ(B $(C9x@87N(B $(C@b>F4g1f(B $(C> C-k$(C8&(B $(C?)7/9x(B $(CCD<-(B $(C1W(B $(C0M@;(B $(CGX(B $(C:8=J=C?@(B. +>> C-k를 여러번 쳐서 그 것을 해 보십시오. -$(CAW?)Ax(B $(C1[?y@;(B $(CH8> C-y$(C8&(B $(CD!=J=C?@(B. $(C1W8.0m4B(B $(C1t9Z@L8&(B $(C8n(B $(CAY(B $(C>F7!7N(B $(C?rAw?)<-(B C-y$(C8&(B $(C4Y=C(B - $(CD!=J=C?@(B. $(C1[?y@L(B $(C>n6;0T(B $(C:9;g5G4B0!8&(B $(C>K(B $(C> C-y를 치십시오. 그리고는 깜박이를 몇 줄 아래로 움직여서 C-y를 다시 + 치십시오. 글월이 어떻게 복사되는가를 알 수 있습니다. -$(C4Y=C(B $(C@b>F4g1f(B $(C1[?y@L(B $(C@V4B5%(B $(C4Y8%(B $(C0M@;(B $(C6G(B $(CAW@L8i(B $(C>n6;0T(B $(C5G0Z=@4O1n(B? -C-y$(C4B(B $(C4u(B $(CCV1Y?!(B $(CAW?)Ax(B $(C0M@;(B $(C@b>F4g1f(B $(C0M@T4O4Y(B. $(C1W7/3*(B $(C1W(B $(C@|@G(B $(C1[?y@:(B -$(C@R>n9v80(B $(C0M@L(B $(C>F4U4O4Y(B. $(C1W(B $(C0M@:(B M-y $(C8m7I@;(B $(C=a<-(B $(CH8F4g0\A34x(B -$(C1[?y@L(B $(C1W(B $(C@|?!(B $(CAW?)Ax(B $(C0M@87N(B $(C;u7N9Y2n>nA}4O4Y(B(replace). M-y$(C8&(B $(CC$Bw(B -$(C?,0EG*(B $(CD!8i(B $(C@L@|?!(B $(CAW?)Ax(B $(C0M5i@L(B $(CBw7J7N(B $(C3*?I4O4Y(B. $(CC#0m@Z(B $(CGO4B(B $(C1[?y@L(B -$(C3*?@8i(B $(C4Y8%(B $(C@O@;(B $(CGR(B $(CGJ?d0!(B $(C>x=@4O4Y(B. $(C4\F4g0\Ax(B $(C1[?y@L(B $(C1W0w?!(B $(C32>F(B $(C@V0T(B $(C5K4O4Y(B. +다시 잡아당길 글월이 있는데 다른 것을 또 죽이면 어떻게 되겠습니까? +C-y는 더 최근에 죽여진 것을 잡아당길 것입니다. 그러나 그 전의 글월은 +잃어버린 것이 아닙니다. 그 것은 M-y 명령을 써서 회수할 수 있습니다. +가장 최신에 죽여진 글월을 C-y로 회수한 후 M-y를 치면 그 잡아당겨졌던 +글월이 그 전에 죽여진 것으로 새로바뀌어집니다(replace). M-y를 채차 +연거푸 치면 이전에 죽여진 것들이 차례로 나옵니다. 찾고자 하는 글월이 +나오면 다른 일을 할 필요가 없습니다. 단순히 편집을 계속하면 +잡아당겨진 글월이 그곳에 남아 있게 됩니다. -M-y$(C8&(B $(C0hF(B $(C?I4O4Y(B. +M-y를 계속 치면 출발점 (가장 최근에 죽여진 것)으로 되돌아 옵니다. ->> $(CGQ(B $(CAY@;(B $(CAW@L0m(B $(CAV@'7N(B $(C?rAw@N(B $(CHD(B $(C4Y8%(B $(CAY@;(B $(CAW@L=J=C?@(B. - $(C1W8.0m4B(B C-y$(C7N(B $(C5N9xB0(B $(CAW?)Ax(B $(CAY@;(B $(CH8y@L(B $(C3*?@4B0!8&(B $(C:8=J=C?@(B. $(C5N9xB0(B $(CAW?)Ax(B $(CAY@L(B $(C3*?C(B - $(C6'1n4O(B $(C1W780T(B $(C0hg> 한 줄을 죽이고 주위로 움직인 후 다른 줄을 죽이십시오. + 그리고는 C-y로 두번째 죽여진 줄을 회수하십시오. + 그런 다음에 M-y를 치면 첫번째에 죽여진 줄로 새로바뀌게 됩니다. + M-y를 더 쳐서 무엇이 나오는가를 보십시오. 두번째 죽여진 줄이 나올 + 때까니 그렇게 계속 한 후 몇 번 더 하십시오. + 원하면, M-y에 양수나 음수의 인수를 줄 수 있습니다. -* $(C9+8#1b(B +* 무르기 -------- -$(C1[?y@;(B $(C:/0fGO0m<-(B $(C1W(B $(C0M@L(B $(C=GK0T(B $(C5G8i(B $(C9+8#1b(B(undo) $(C8m7I(B, C-x -u$(C7N(B $(C:/0f;gGW@;(B $(C9+8&(B $(CJ4B(B $(C8m7I@:(B $(C0m7A(B -$(C4k;s?!<-(B $(CA&?\5K4O4Y(B ($(C?)1b?!4B(B $(C1t9Z@L8&(B $(C?rAw@L4B(B $(C8m7I0z(B $(CH-8i(B $(C5N7g8;1b(B -$(C8m7I@L(B $(C@V=@4O4Y(B). $(C1W8.0m(B $(C@ZC<3"?l1b(B(self-inserting) $(C9.@Z5i@:(B -$(CFr;s@{@87N(B 20$(C031nAv@G(B $(CA}4\@87N(B $(CC38.5K4O4Y(B. ($(C@L4B(B $(C1[?y(B $(C3"?l1b8&(B $(C9+8#1b(B -$(C@'GX<-(B $(CE8@ZGX>_(B $(CGO4B(B C-x u$(C@G(B $(C> $(C@L(B $(CAY@;(B C-k$(C7N(B $(CAW@N(B $(CHD(B C-x u$(C8&(B $(CD!8i(B $(CAY@L(B $(C4Y=C(B $(C3*E83/(B $(C0M@T4O4Y(B. +>> 이 줄을 C-k로 죽인 후 C-x u를 치면 줄이 다시 나타날 것입니다. -C-_$(C4B(B $(C9+8#1b(B $(C8m7I@G(B $(C4Y8%(B $(CG|EB@T4O4Y(B; C-x u$(C?M(B $(C00@:(B $(C@[?k@;(B $(CGOAv88(B $(CGQ(B -$(C0!7ND-?!<-(B $(C?)7/9x(B $(CE8@ZGO1b?!(B $(CFmGU4O4Y(B. C-_$(C@G(B $(C4\A!@:(B, $(C>n62(B -$(C1[n6;0T(B $(CE8@ZGX>_(B $(C5G4B0!0!(B $(C:R8m7aGO4Y4B(B $(C0M@T4O4Y(B. -$(C1W7!<-(B C-x u$(C55(B $(C;g?kGR(B $(Cn(B $(C@V4B(B $(C0M@T4O4Y(B. $(C>n62(B -$(C4\8;1b?!<-4B(B, CONTROL$(Cn62(B $(C0M@;(B $(CAW@L4B(B $(C0M0z(B $(CAv?l4B(B $(C0M@G(B $(CBw@LA!@:(B C-y$(C7N(B $(C@b>F4g1f(B $(Cx=@4O4Y(B. +글월의 지우기를 무르는 것은 글월 죽이기를 무르는 것과 같은 식으로 +합니다. 어떤 것을 죽이는 것과 지우는 것의 차이점은 C-y로 잡아당길 수 +있느냐는 사실에 있습니다; 무르기에는 차이점이 없습니다. -* $(CFD@O(B +* 파일 ------ -$(CFmA}GQ(B $(C1[?y@;(B $(C?518@{@87N(B $(CGO1b(B $(C@'GX<-4B(B $(CFD@O?!(B $(C3V>n(B $(C5N>n>_(B $(CGU4O4Y(B. -$(C1W780T(B $(CGOAv(B $(C>J@88i(B, $(C@L8F=:0!(B $(C>x>nA|0z(B $(CGT22(B $(C1[?y55(B $(C;g6sA}4O4Y(B. $(C1[?y@;(B -$(CFD@O?!(B $(C3V1b(B $(C@'GX<-4B(B $(C1W7/1b(B $(C@|?!(B $(C1W(B $(CFD@O@;(B "$(CC#>F>_(B" $(CGU4O4Y(B. ($(C@L4B(B -$(CFD@O@;(B "$(C9f9.GO4B(B $(C0M(B"$(C@L6s0m55(B $(CGU4O4Y(B.) +편집한 글월을 영구적으로 하기 위해서는 파일에 넣어 두어야 합니다. +그렇게 하지 않으면, 이맥스가 없어짐과 함께 글월도 사라집니다. 글월을 +파일에 넣기 위해서는 그러기 전에 그 파일을 "찾아야" 합니다. (이는 +파일을 "방문하는 것"이라고도 합니다.) -$(CFD@O@;(B $(CC#4B4Y4B(B $(C0M@:(B $(C@L8F=:(B $(C>H?!<-(B $(C1W(B $(CFD@O@G(B $(C3;?k@;(B $(C:;4Y4B(B $(C0M@;(B -$(C@G9LGU4O4Y(B. $(C?)7/0!Av(B $(C8i?!<-(B, $(C1W0M@:(B $(C1W(B $(CFD@O(B $(C@ZC<8&(B $(CFmA}GO7A4B(B $(C0M0z(B -$(C4Y8'>x=@4O4Y(B. $(C1W7/3*(B, $(C@L8F=:7N(B $(C:/0fGQ(B $(C;gGW@:(B $(C1W(B $(CFD@O@;(B "$(C0%9+8.(B"$(CGO1b(B -$(C@|1nAv4B(B $(C?518@{@LAv(B $(C8xGU4O4Y(B. $(C@L4B(B $(C@}9]Bk(B $(C:/0f5H(B $(CFD@O@;(B $(C?xD!(B $(C>J0T(B -$(C?n?5(B $(CC<0h?!(B $(C320\(B $(C5N4B(B $(C0M@;(B $(CGGGO1b(B $(C@'GX<-(B $(C1W78=@4O4Y(B. $(C0%9+8.8&(B $(CGX55(B -$(C@L8F=:4B(B $(C:/0f(B $(C;gGW@L(B $(C3*A_?!(B $(C=GHGX(B $(C1Y?x(B -$(CFD@O@;(B $(C:/0f5H(B $(C@L8'@87N(B $(C320\5S4O4Y(B. +파일을 찾는다는 것은 이맥스 안에서 그 파일의 내용을 본다는 것을 +의미합니다. 여러가지 면에서, 그것은 그 파일 자체를 편집하려는 것과 +다름없습니다. 그러나, 이맥스로 변경한 사항은 그 파일을 "갈무리"하기 +전까지는 영구적이지 못합니다. 이는 절반쯤 변경된 파일을 원치 않게 +운영 체계에 남겨 두는 것을 피하기 위해서 그렇습니다. 갈무리를 해도 +이맥스는 변경 사항이 나중에 실수였다고 결정되는 경우를 감안해 근원 +파일을 변경된 이름으로 남겨둡니다. -$(CH-8i@G(B $(C9Y4Z(B $(C0!1n@L8&(B $(C:88i(B "--:-- TUTORIAL.ko"$(C?M(B $(C00@:(B $(C=D@87N(B $(C=C@[GO4B(B, -$(C4k=C(B $(C9.@Z7N(B $(C=C@[GX<-(B $(C4k=C(B $(C9.@Z7N(B $(C3!3*4B(B $(CAY@L(B $(C@V@;(B $(C0M@T4O4Y(B. $(CH-8i@G(B $(C@L(B -$(C:N:P@:(B $(C:8Ek(B, $(C9f9.GO0m(B $(C@V4B(B $(CFD@O@G(B $(C@L8'@;(B $(C:8?)(B $(CA]4O4Y(B. $(CAv1]@:(B $(C@L8F=:(B -$(CAvD'<-@G(B $(C:9;g:;@N(B "TUTORIAL.ko"$(C6s4B(B $(CFD@O@;(B $(C9f9.GO0m(B $(C@V4B(B $(CA_@T4O4Y(B. -$(C@L8F=:7N(B $(CFD@O(B $(CC#1b8&(B $(CGO8i(B $(CA$H.Hw(B $(C1W(B $(C0w?!(B $(CFD@O@G(B $(C@L8'@L(B $(C3*E8334O4Y(B. +화면의 바닥 가까이를 보면 "--:-- TUTORIAL.ko"와 같은 식으로 시작하는, +대시 문자로 시작해서 대시 문자로 끝나는 줄이 있을 것입니다. 화면의 이 +부분은 보통, 방문하고 있는 파일의 이름을 보여 줍니다. 지금은 이맥스 +지침서의 복사본인 "TUTORIAL.ko"라는 파일을 방문하고 있는 중입니다. +이맥스로 파일 찾기를 하면 정확히 그 곳에 파일의 이름이 나타납니다. -$(CFD@O(B $(CC#1b(B $(C8m7I@G(B $(CF/:0GQ(B $(CA!@:(B $(C?xGO4B(B $(CFD@O@G(B $(C@L8'@;(B $(C8;GX>_(B $(CGO4B(B -$(C0M@T4O4Y(B. $(C8m7I@L(B "$(C4\8;1b7N:NEM(B $(C@NF7!@G(B $(C8m7I@;(B $(CD!0m(B $(C3*8i(B +파일 찾기 명령의 특별한 점은 원하는 파일의 이름을 말해야 하는 +것입니다. 명령이 "단말기로부터 인수를 읽는다"라고 합니다 (이 경우, +인수는 파일의 이름입니다). 아래의 명령을 치고 나면 - C-x C-f $(CFD@O(B $(CC#1b(B + C-x C-f 파일 찾기 -$(C@L8F=:4B(B $(CFD@O@G(B $(C@L8'@;(B $(CD!6s0m(B $(C?d18GU4O4Y(B. $(CFD@O(B $(C@L8'@;(B $(CD!8i(B $(CH-8i@G(B $(C9Y4Z(B -$(CAY?!(B $(C@L8'@L(B $(C3*E8334O4Y(B. $(C@L71(B $(CA>7y@G(B $(C@T7B?!(B $(C>2@O(B $(C6'?!4B(B $(C9Y4Z(B $(CAY@;(B $(C@[@:(B -$(C;g@LD-(B(minibuffer)$(C@L6s0m(B $(C:N8(4O4Y(B. $(CFr;s=C?!(B $(C>24B(B $(C@L8F=:@G(B $(CFmA}(B -$(C8m7I@87N(B $(CFD@O(B $(C@L8'@;(B $(CFmA}GR(B $(C7y@G(B $(C@[@:(B $(C;g@LD-(B $(C@T7B@;(B) $(C3V@;(B $(C6'(B, $(C8m7I@G(B -$(CCk> C-x C-f$(C8&(B $(CD!0m(B C-g$(C8&(B $(CD!=J=C?@(B. $(C@L4B(B $(C@[@:(B $(C;g@LD-@;(B $(CCk20m(B $(C@V4B(B C-x C-f $(C8m7I55(B $(CCkF9+(B - $(CFD@O55(B $(CC#Av(B $(C>J4B(B $(C0M@T4O4Y(B. +>> C-x C-f를 치고 C-g를 치십시오. 이는 작은 사이칸을 취소하고 또, + 작은 사이칸을 쓰고 있는 C-x C-f 명령도 취소합니다. 그러므로 아무 + 파일도 찾지 않는 것입니다. -$(CFD@O(B $(C@L8'@;(B $(C4Y(B $(C1b@TG_@88i(B $(C@;(B $(CCD<-(B $(CA>7aGO=J=C?@(B. $(C1W7/8i(B C-x -C-f $(C8m7I@L(B $(C@[5?5G>n(B $(C<1EC5H(B $(CFD@O@;(B $(CC#1b(B $(C=C@[GU4O4Y(B. C-x C-f $(C8m7I@L(B -$(C3!3*8i(B $(C@[@:(B $(C;g@LD-@:(B $(C;g6sA}4O4Y(B. +파일 이름을 다 기입했으면 을 쳐서 종료하십시오. 그러면 C-x +C-f 명령이 작동되어 선택된 파일을 찾기 시작합니다. C-x C-f 명령이 +끝나면 작은 사이칸은 사라집니다. -$(C@a=C(B $(CHD?!4B(B $(CFD@O@G(B $(C3;?k@L(B $(CH-8i?!(B $(C3*E83*0m(B $(C1W(B $(C3;?k@;(B $(CFmA}GR(B $(Cn(B $(C3u@=@87N=a(B $(C@R>n9v81(B -$(C?l7A8&(B $(C9fAvGU4O4Y(B. $(C;u(B $(C@L8'@:(B $(C1Y?x(B $(CFD@O(B $(C@L8'@G(B $(C3!?!(B "~"$(C@;(B $(C4uGT@87N=a(B -$(C885i>nA}4O4Y(B. +이 명령은 이맥스 내의 글월을 파일에 복사합니다. 이 명령이 첫번째로 +수행될 때는 이맥스가 근원 파일을 새 이름으로 바꾸어 놓음으로써 잃어버릴 +우려를 방지합니다. 새 이름은 근원 파일 이름의 끝에 "~"을 더함으로써 +만들어집니다. -$(C0%9+8.0!(B $(C3!3*8i(B $(C@L8F=:4B(B $(C>2?)Ax(B $(CFD@O@G(B $(C@L8'@;(B $(C@NFAV(B -$(C@ZAV(B $(C0%9+8.GT@87N=a(B $(C?n?5(B $(CC<0h0!(B $(C?M8#8#(B $(C9+3JA.55(B $(C89@:(B $(C@[>w@L(B $(CJ557O(B $(CGU4O4Y(B. +갈무리가 끝나면 이맥스는 쓰여진 파일의 이름을 인쇄합니다. 파일은 아주 +자주 갈무리함으로써 운영 체계가 와르르 무너져도 많은 작업이 손실되지 +않도록 합니다. ->> C-x C-s$(C8&(B $(CCD<-(B $(CAvD'<-@G(B $(C:9;g:;@;(B $(C0%9+8.(B $(CGO=J=C?@(B. - $(C1W7/8i(B "Wrote ...TUTORIAL.ko"$(C6s0m(B $(CH-8i@G(B $(C9Y4Z?!(B $(C@N> C-x C-s를 쳐서 지침서의 복사본을 갈무리 하십시오. + 그러면 "Wrote ...TUTORIAL.ko"라고 화면의 바닥에 인쇄될 것입니다. -$(C:80E3*(B $(CFmA}GO1b(B $(C@'GX(B, $(CA8@gGO4B(B $(CFD@O@;(B $(CC#@;(B $(CJ4B(B $(CFD@O55(B $(CC#@;(B $(CF<-(B $(C1[?y@;(B $(C3"?l1b(B $(C=C@[GU4O4Y(B. -$(CFD@O@;(B "$(C0%9+8.(B"$(CGO557O(B $(C?dC;GO8i(B $(C@L8F=:4B(B $(C3"?vAx(B $(C1[?y@;(B $(C3;?k@87N(B $(CGO4B(B -$(CFD@O@;(B $(C=GA&7N(B $(C885i>n(B $(C3@4O4Y(B. $(C1W71(B $(CHD?!4B(B $(C@L(B $(CFD@O@:(B $(C@L9L(B $(CA8@gGO4B(B -$(CFD@O@L(B $(C5K4O4Y(B. +보거나 편집하기 위해, 존재하는 파일을 찾을 수 있습니다. 또한 존재하지 +않는 파일도 찾을 수 있습니다. 이렇게 하면 이맥스로 파일을 만들게 +됩니다: 빈 내용으로 시작되는 파일을 찾아서 글월을 끼우기 시작합니다. +파일을 "갈무리"하도록 요청하면 이맥스는 끼워진 글월을 내용으로 하는 +파일을 실제로 만들어 냅니다. 그런 후에는 이 파일은 이미 존재하는 +파일이 됩니다. -* $(C;g@LD-(B +* 사이칸 -------- -$(C5N9xB0(B $(CFD@O@;(B C-x C-f$(C7N(B $(CC#@88i(B, $(CC99xB0(B $(CFD@O@:(B $(C@L8F=:@G(B $(C3;:N?!(B $(C32>F(B -$(C@V=@4O4Y(B. $(C1W(B $(CFD@O@:(B C-x C-f$(C7N(B $(C@gBw(B $(CC#@=@87N<-(B $(C4Y=C(B $(C>y9Y2\(B $(C> C-x C-f foo $(C@;(B $(CCD<-(B "foo"$(C6s4B(B $(C@L8'@G(B $(CFD@O@;(B $(C885e=J=C?@(B. - $(C1W8.0m4B(B $(C1[?y@;(B $(C3"?l0m(B $(CFmA}GO?)(B C-x C-s$(C7N(B "foo"$(C8&(B $(C0%9+8.GO=J=C?@(B. - $(C86Av87@87N(B, C-x C-f TUTORIAL.ko $(C@;(B $(CCD<-(B $(CAvD'<-7N(B $(C4Y=C(B $(C59>F(B - $(C?@=J=C?@(B. +>> C-x C-f foo 을 쳐서 "foo"라는 이름의 파일을 만드십시오. + 그리고는 글월을 끼우고 편집하여 C-x C-s로 "foo"를 갈무리하십시오. + 마지막으로, C-x C-f TUTORIAL.ko 을 쳐서 지침서로 다시 돌아 + 오십시오. -$(C@L8F=:4B(B $(C0"(B $(CFD@O@G(B $(C1[?y@;(B "$(C;g@LD-(B"$(C@L6s0m(B $(C:R8.?l4B(B $(C0M(B $(C>H?!(B $(C@z@eGU4O4Y(B. -$(CFD@O@;(B $(CC#4B(B $(C0M@:(B $(C@L8F=:@G(B $(C3;:N?!(B $(C;u(B $(C;g@LD-@;(B $(C885e4B(B $(C0M0z(B $(C00=@4O4Y(B. -$(C@L8F=:@G(B $(C@O7N(B $(CGvA8GO0m(B $(C@V4B(B $(C;g@LD-@G(B $(C8q7O@;(B $(C:81b(B $(C@'GX<-4B(B $(C4Y@=0z(B $(C00@L(B -$(CD!=J=C?@(B. +이맥스는 각 파일의 글월을 "사이칸"이라고 불리우는 것 안에 저장합니다. +파일을 찾는 것은 이맥스의 내부에 새 사이칸을 만드는 것과 같습니다. +이맥스의 일로 현존하고 있는 사이칸의 목록을 보기 위해서는 다음과 같이 +치십시오. - C-x C-b $(C;g@LD-(B $(C8q7O(B + C-x C-b 사이칸 목록 ->> C-x C-b$(C8&(B $(CAv1](B $(CCD(B $(C:8=J=C?@(B. +>> C-x C-b를 지금 쳐 보십시오. -$(C0"(B $(C;g@LD-@L(B $(C>n62(B $(C@L8'@;(B $(C0.0m(B $(C@V4B0!(B $(C:8=J=C?@(B. $(C;g@LD-@:(B $(C0#AwGO0m(B $(C@V4B(B -$(C1[?y@G(B $(C8pC<0!(B $(C5G4B(B $(CFD@O@G(B $(C@L8'@;(B $(C0.0m(B $(C@V@;(B $(Cn62(B -$(C;g@LD-5i@:(B $(CFD@O0z(B $(C9+0|GU4O4Y(B. $(C?98&(B $(C5i>n(B, "*Buffer List*"$(C6s4B(B $(C;g@LD-@:(B -$(C>F9+(B $(CFD@O55(B $(C0.0m(B $(C@VAv(B $(C>J=@4O4Y(B. $(C@L(B $(C;g@LD-@:(B C-x C-b$(C7N(B $(C885i>nAx(B $(C;g@LD-(B -$(C8q7O@;(B $(C4c0m(B $(C@V@;(B $(C;S@T4O4Y(B. $(C@L8F=:(B $(CC"(B $(C>H?!<-(B $(C:<(B $(Cn62(B $(C;g@LD-@G(B $(C@O:N:P(B $(C@T4O4Y(B. +각 사이칸이 어떤 이름을 갖고 있는가 보십시오. 사이칸은 간직하고 있는 +글월의 모체가 되는 파일의 이름을 갖고 있을 수도 있습니다. 어떤 +사이칸들은 파일과 무관합니다. 예를 들어, "*Buffer List*"라는 사이칸은 +아무 파일도 갖고 있지 않습니다. 이 사이칸은 C-x C-b로 만들어진 사이칸 +목록을 담고 있을 뿐입니다. 이맥스 창 안에서 볼 수 있는 모든 글월은 +어떤 사이칸의 일부분 입니다. ->> C-x 1$(C@;(B $(CCD<-(B $(C;g@LD-(B $(C8q7O@;(B $(C>x>V=J=C?@(B. +>> C-x 1을 쳐서 사이칸 목록을 없애십시오. -$(CGQ(B $(CFD@O@G(B $(C1[?y@;(B $(C:/0fGQ(B $(CHD(B $(C4Y8%(B $(CFD@O@;(B $(CC#@88i(B $(CC99xB0(B $(CFD@O@:(B $(C0%9+8.5GAv(B -$(C>J@:(B $(C0M@T4O4Y(B. $(C1W(B $(C:/0f(B $(C;gGW@:(B $(C@L8F=:(B $(C3;:N@G(B $(CFD@O(B $(C;g@LD-?!88(B $(C32>F(B -$(C@V=@4O4Y(B. $(C5N9xB0(B $(CFD@O@G(B $(C;g@LD-@;(B $(C885i0E3*(B $(CFmA}GO4B(B $(C0M@:(B $(CC99xB0(B $(CFD@O@G(B -$(C;g@LD-?!(B $(C@|Gt(B $(C?5Gb@;(B $(CAVAv(B $(C>J=@4O4Y(B. $(C@L4B(B $(C8E?l(B $(C@/?kGO1b4B(B $(CGO3*(B $(C4Y8%(B -$(C8i?!<-4B(B $(CC99xB0(B $(CFD@O@G(B $(C;g@LD-@;(B $(C0%9+8.GR(B $(Cy9Y2[(B $(CHD(B -C-x C-s$(C7N(B $(C0%9+8.GO4B(B $(C0M@:(B $(C1MBz@:(B $(C@O@T4O4Y(B. $(C1W7!<-(B $(C4Y@=0z(B $(C00@:(B $(C8m7I@L(B -$(C@V=@4O4Y(B +한 파일의 글월을 변경한 후 다른 파일을 찾으면 첫번째 파일은 갈무리되지 +않은 것입니다. 그 변경 사항은 이맥스 내부의 파일 사이칸에만 남아 +있습니다. 두번째 파일의 사이칸을 만들거나 편집하는 것은 첫번째 파일의 +사이칸에 전혀 영향을 주지 않습니다. 이는 매우 유용하기는 하나 다른 +면에서는 첫번째 파일의 사이칸을 갈무리할 수 있는 간편한 다른 방법이 +필요하다는 것을 의미합니다. C-x C-f를 쳐서 그 사이칸으로 엇바꾼 후 +C-x C-s로 갈무리하는 것은 귀찮은 일입니다. 그래서 다음과 같은 명령이 +있습니다 - C-x s $(C8n8n(B $(C;g@LD-(B $(C0%9+8.(B + C-x s 몇몇 사이칸 갈무리 -C-x s$(C4B(B, $(C:/0f5G>zAv88(B $(C0%9+8.5GAv(B $(C>J@:(B $(C;g@LD-@L(B $(C@V3*(B $(CA6;gGX(B $(C:>4O4Y(B. -$(C1W8.0m4B(B $(C1W71(B $(C;g@LD-5i?!(B $(C4kGX<-(B $(C1W(B $(C0M@;(B $(C0%9+8.GR(B $(C0M@N0!8&(B $(C90>n(B -$(C:>4O4Y(B. +C-x s는, 변경되었지만 갈무리되지 않은 사이칸이 있나 조사해 봅니다. +그리고는 그런 사이칸들에 대해서 그 것을 갈무리할 것인가를 물어 +봅니다. ->> $(CGQ(B $(CAY@G(B $(C1[?y@;(B $(C3"?n(B $(CHD(B C-x s$(C8&(B $(CD!=J=C?@(B. - $(C1W7/8i(B TUTORIAL.ko$(C6s4B(B $(C@L8'@G(B $(C;g@LD-@;(B $(C0%9+8.GR(B $(C0M@NAv(B $(C90>n(B $(C:<(B - $(C0M@T4O4Y(B. "y"$(C8&(B $(CCD<-(B $(C90@=?!(B $(C?96s0m(B $(C4dGO=J=C?@(B. +>> 한 줄의 글월을 끼운 후 C-x s를 치십시오. + 그러면 TUTORIAL.ko라는 이름의 사이칸을 갈무리할 것인지 물어 볼 + 것입니다. "y"를 쳐서 물음에 예라고 답하십시오. -* $(C8m7I>n@G(B $(CH.@e(B +* 명령어의 확장 --------------- -$(C@L8F=:@G(B $(C8m7I>n4B(B $(C3J9+(B $(C89>F<-(B $(C@L(B $(C8p5g(B $(C8m7I@;(B $(CA&>nx=@4O4Y(B. $(C@L8F=:4B(B $(C@L71(B $(C9.A&8&(B X (eXtend) $(C8m7I@87N(B $(CGX0aGU4O4Y(B. -$(C@L?!4B(B $(C5N0!Av(B $(CA>7y0!(B $(C@V=@4O4Y(B: +이맥스의 명령어는 너무 많아서 이 모든 명령을 제어쇠나 meta쇠에 할당할 +수 없습니다. 이맥스는 이런 문제를 X (eXtend) 명령으로 해결합니다. +이에는 두가지 종류가 있습니다: - C-x $(C9.@Z(B $(CH.@e(B. $(C9.@Z(B $(CGO3*0!(B $(C5Z5{8'(B. - M-x $(C@L8'(B $(C8m7I@G(B $(CH.@e(B. $(C1d(B $(C@L8'@L(B $(C5Z5{8'(B. + C-x 문자 확장. 문자 하나가 뒤따름. + M-x 이름 명령의 확장. 긴 이름이 뒤따름. -$(C@L(B $(C8m7I5i@:(B $(C4k03(B $(C@/?kGOAv88(B, $(CAv1]1nAv(B $(C9h?v(B $(C?B(B $(C8m7I5i:84Y4B(B $(C4z(B $(C:s9xGO0T(B -$(C;g?k5K4O4Y(B. $(C@L71(B $(CA>7y@G(B $(C8m7I@;(B $(C@L9L(B $(C5N(B $(C03(B $(C>K0m(B $(C@V=@4O4Y(B: $(CFD@O(B -$(C8m7I(B $(CA_?!(B C-x C-f$(C7N(B $(CC#1b?M(B C-x C-s$(C7N(B $(C0%9+8.GO1b(B. $(C4Y8%(B $(C?94B(B $(C@L8F=:(B $(C@[>w(B -$(C=C0#@;(B $(C86D!4B(B $(C8m7I@T4O4Y(B--$(C@L4B(B C-x C-c $(C8m7I(B. ($(C:/0f(B $(C;gGW@;(B -$(C@R>n9v8.Av3*(B $(C>J@;1n(B $(CGO4B(B $(C0FA$@:(B $(C>J(B $(CGX55(B $(C5K4O4Y(B; C-x C-c$(C4B(B $(C@L8F=:8&(B -$(CAW@L1b(B $(C@|?!(B $(C0"0"@G(B $(C:/0f5H(B $(CFD@O@;(B $(C0%9+8.GR(B $(C1bH88&(B $(CA]4O4Y(B.) +이 명령들은 대개 유용하지만, 지금까지 배워 온 명령들보다는 덜 빈번하게 +사용됩니다. 이런 종류의 명령을 이미 두 개 알고 있습니다: 파일 +명령 중에 C-x C-f로 찾기와 C-x C-s로 갈무리하기. 다른 예는 이맥스 작업 +시간을 마치는 명령입니다--이는 C-x C-c 명령. (변경 사항을 +잃어버리지나 않을까 하는 걱정은 않 해도 됩니다; C-x C-c는 이맥스를 +죽이기 전에 각각의 변경된 파일을 갈무리할 기회를 줍니다.) -C-z$(C4B(B $(C@L8F=:8&(B *$(C@S=C7N(B* $(C3*?@1b(B $(C@'GQ(B $(C8m7I@T4O4Y(B--$(C1W7!<-(B $(C4Y@=?!(B, $(CGO4x(B -$(CA_@G(B $(C@L8F=:(B $(C@[>w(B $(C=C0#@87N(B $(C4Y=C(B $(C5G59>F(B $(C0%(B $(CF(B $(C0!557O(B $(CGOAv88(B $(C@L8F=:8&(B $(CFD1+GO4B(B $(C0M@:(B -$(C>F4U4O4Y(B. $(C4k:N:P@G(B $(CA60!:q?!<-4B(B `fg'$(C3*(B `%emacs'$(C8m7I@87N(B $(C@L8F=:8&(B $(C0hJ4B(B $(C?n?5(B $(CC<0h?!<-4B(B C-z$(C?!(B $(C@GGX(B, $(C@L8F=:(B $(C9X?!<-(B -$(C=GG`5G4B(B $(C>F7'A60!:q0!(B $(C885i>n(B $(CAv0T(B $(C5G4B5%(B $(C?)1b<-(B $(C4Y8%(B $(CGA7N1W7%5i@;(B -$(C=GG`GQ(B $(CHD(B $(C@L8F=:7N(B $(C59>F(B $(C?C(B $(CF4U4O4Y(B. $(C@L(B $(C0f?l(B $(C:8Ek(B, $(CA60!:q(B $(C8m7I@N(B `exit'$(C@87N(B -$(C>F7'A60!:q?!<-(B $(C@L8F=:?!(B $(C5G59>F(B $(C?I4O4Y(B. +중지하는 것을 제공하지 않는 운영 체계에서는 C-z에 의해, 이맥스 밑에서 +실행되는 아랫조가비가 만들어 지게 되는데 여기서 다른 프로그램들을 +실행한 후 이맥스로 돌아 올 수 있는 기회가 있습니다; 사실상 이맥스로부터 +"나가는" 것은 아닙니다. 이 경우 보통, 조가비 명령인 `exit'으로 +아랫조가비에서 이맥스에 되돌아 옵니다. -C-x C-c$(C4B(B $(C@|;j1b?!<-(B $(C9~>n3*1b(B $(CGR(B $(C6'3*(B $(C;g?kGU4O4Y(B. $(CFmAv8&(B $(CCk1^GO4B(B -$(CGA7N1W7%@L3*(B $(C4Y8%(B $(C@b4YGQ(B $(C55?r8p(B(utilities)$(C5i@L(B $(C>_1bGQ(B $(C@L8F=:4B(B -$(CA_Av=CE24Y4B(B $(C0M@;(B $(C8p8#1b(B $(C6'9.?!(B $(C3*0!1b8&(B $(CGX>_(B $(CGU4O4Y(B. $(CGOAv88(B, $(C:8Ek@G(B -$(C0f?l(B, $(C9~>n3*1b8&(B $(CGOAv(B $(C>J4B(B $(CGQ(B, $(C@L8F=:8&(B $(C3*0!1b:84Y4B(B $(CA_AvGO4B(B $(C0M@L(B -$(CAA=@4O4Y(B. +C-x C-c는 전산기에서 벗어나기 할 때나 사용합니다. 편지를 취급하는 +프로그램이나 다른 잡다한 도움모(utilities)들이 야기한 이맥스는 +중지시킨다는 것을 모르기 때문에 나가기를 해야 합니다. 하지만, 보통의 +경우, 벗어나기를 하지 않는 한, 이맥스를 나가기보다는 중지하는 것이 +좋습니다. -C-x $(C8m7I>n4B(B $(C89@L(B $(C@V=@4O4Y(B. $(C@L9L(B $(C9h?n(B $(C0M@;(B $(C>F7!?!(B $(CAW:8@T4O4Y(B. +C-x 명령어는 많이 있습니다. 이미 배운 것을 아래에 죽보입니다. - C-x C-f $(CFD@O(B $(CC#1b(B. - C-x C-s $(CFD@O(B $(C0%9+8.(B. - C-x C-b $(C;g@LD-(B $(C8q7O(B. - C-x C-c $(C@L8F=:(B $(C3!3;1b(B. - C-x u $(C9+8#1b(B. + C-x C-f 파일 찾기. + C-x C-s 파일 갈무리. + C-x C-b 사이칸 목록. + C-x C-c 이맥스 끝내기. + C-x u 무르기. -$(C@L8'(B $(CH.@e(B $(C8m7I@:(B $(C@ZAV(B $(C;g?k5GAv(B $(C>J0E3*(B $(CF/:0GQ(B $(C9f=D?!<-3*(B $(C>2@L4B(B -$(C8m7I@T4O4Y(B. $(CGQ0!Av(B $(C?94B(B replace-string $(C8m7I@N5%(B $(C@L4B(B $(C@|?*@{@87N(B $(CGQ(B -$(C9.@Z?-@;(B $(C4Y8%(B $(C9.@Z?-7N(B $(C;u7N9Y2_4O4Y(B. M-x$(C8&(B $(CD!8i(B $(C@L8F=:4B(B $(CH-8i@G(B -$(C9Y4Z?!<-(B M-x$(C6s0m(B $(C1f@b@LGO?)(B $(C8m7I@G(B $(C@L8'@;(B $(CD!557O(B $(CGU4O4Y(B; $(C@L(B $(C0f?l4B(B -"replace-string". "repl s"$(C88(B $(CCD55(B $(C@L8F=:4B(B $(C@L8'@;(B $(C?O<:=CE3(B -$(C0M@T4O4Y(B. $(C8m7I(B $(C@L8'@:(B $(C@87N(B $(C3!334O4Y(B. +이름 확장 명령은 자주 사용되지 않거나 특별한 방식에서나 쓰이는 +명령입니다. 한가지 예는 replace-string 명령인데 이는 전역적으로 한 +문자열을 다른 문자열로 새로바꿉니다. M-x를 치면 이맥스는 화면의 +바닥에서 M-x라고 길잡이하여 명령의 이름을 치도록 합니다; 이 경우는 +"replace-string". "repl s"만 쳐도 이맥스는 이름을 완성시킬 +것입니다. 명령 이름은 으로 끝납니다. -replace-string $(C8m7I@:(B $(C5N03@G(B $(C@NnA.>_(B $(CGR(B $(C9.@Z?-0z(B -$(C;u7N9Y2n>nAz(B $(C9.@Z?-(B. $(C0"0"@G(B $(C@N$(C@87N(B $(C3!3;>_(B $(CGU4O4Y(B. +replace-string 명령은 두개의 인수를 요구합니다--바뀌어져야 할 문자열과 +새로바뀌어질 문자열. 각각의 인수는 으로 끝내야 합니다. ->> $(C1t9Z@L8&(B $(C@L(B $(CAY?!<-(B $(C5N(B $(CAY(B $(C>F7!@G(B $(C:s(B $(CAY7N(B $(C?rAw@L=J=C?@(B. - $(C1W(B $(CHD(B M-x repl s$(C:/H-5G(B$(C9Y2n(B$(C@;(B $(CD!=J=C?@(B. +>> 깜박이를 이 줄에서 두 줄 아래의 빈 줄로 움직이십시오. + 그 후 M-x repl s변화되바뀌을 치십시오. - $(C@L(B $(CAY@L(B $(C>n6;0T(B $(C:/H-5G>z4B0!8&(B $(C@/@GGO=J=C?@(B: $(C1t9Z@L0!(B $(C@V4B(B $(CCJ1b(B $(C@'D!(B - $(C4Y@=?!(B $(C:/(B-$(CH-(B-$(C5G(B $(C6s4B(B $(C398;@L(B $(C3*?C(B $(C6'864Y(B "$(C9Y2n(B"$(C6s0m(B - $(C;u7N9Y2n>z=@4O4Y(B. + 이 줄이 어떻게 변화되었는가를 유의하십시오: 깜박이가 있는 초기 위치 + 다음에 변-화-되 라는 낱말이 나올 때마다 "바뀌"라고 + 새로바뀌었습니다. -* $(C@Z5?(B $(C0%9+8.(B +* 자동 갈무리 ------------- -$(CFD@O@;(B $(C:/0fGQ(B $(CHD?!(B $(C>FAw(B $(C0%9+8.8&(B $(CGOAv(B $(C>J>R@88i(B $(C@|;j1b0!(B $(C?M8#8#(B -$(C9+3JA|@87N=a(B $(C:/0f(B $(C;gGW@;(B $(C@R>n(B $(C9v81(B $(CS@;(B $(C9fAvGO1b(B -$(C@'GX(B, $(C@L8F=:4B(B $(CFmA}GO0m(B $(C@V4B(B $(C0"0"@G(B $(CFD@O@;(B $(CAV1b@{@87N(B "$(C@Z5?(B $(C0%9+8.(B" -$(CFD@O?!(B $(C>94O4Y(B. $(C@Z5?(B $(C0%9+8.5H(B $(CFD@O@G(B $(C@L8'@:(B $(C>U5Z7N(B # $(C9.@Z0!(B $(C@V=@4O4Y(B; -$(C?98&(B $(C5i>n(B, "hello.c"$(C6s4B(B $(C@L8'@G(B $(CFD@O@:(B "#hello.c#"$(C6s4B(B $(C@L8'@G(B $(C@Z5?(B -$(C0%9+8.(B $(CFD@O@;(B $(C0.0T(B $(C5K4O4Y(B. $(CA$;s@{@87N(B $(CFD@O@;(B $(C0%9+8.GO8i(B $(C@L8F=:4B(B $(C@Z5?(B -$(C0%9+8.(B $(CFD@O@;(B $(CAv?s4O4Y(B. +파일을 변경한 후에 아직 갈무리를 하지 않았으면 전산기가 와르르 +무너짐으로써 변경 사항을 잃어 버릴 수 있습니다. 이런 재앙을 방지하기 +위해, 이맥스는 편집하고 있는 각각의 파일을 주기적으로 "자동 갈무리" +파일에 씁니다. 자동 갈무리된 파일의 이름은 앞뒤로 # 문자가 있습니다; +예를 들어, "hello.c"라는 이름의 파일은 "#hello.c#"라는 이름의 자동 +갈무리 파일을 갖게 됩니다. 정상적으로 파일을 갈무리하면 이맥스는 자동 +갈무리 파일을 지웁니다. -$(C@|;j1b0!(B $(C?M8#8#(B $(C9+3JAv8i(B $(C1W(B $(CFD@O@;(B ($(C@Z5?(B $(C0%9+8.5H(B $(CFD@O@L(B $(C>F4O6s(B -$(CFmA}GO4x(B $(CFD@O(B) $(CFr;s=CC373(B $(CC#@:(B $(CHD(B M-x recover-file$(C@;(B $(CD'@87N=a(B -$(C@Z5?(B $(C0%9+8.5H(B $(CFmA}90@;(B $(CH8:9=CE3(B $(C$(C@;(B $(CCD<-(B $(C0h을 침으로써 +자동 갈무리된 편집물을 회복시킬 수 있습니다. 확인할 것을 요구하면 +yes을 쳐서 계속 진행하여 자동 갈무리된 자료를 회복시키십시오. -* $(C8^>F8.(B $(CEM(B +* 메아리 터 ----------- -$(C@L8F=:0!(B, $(C8m7I@;(B $(CD!4B(B $(CF8.(B -$(CEM(B"$(C6s0m(B $(C:R8.4B(B $(C:s(B $(CEM?!(B $(CD#(B $(C8m7I@;(B $(C:8?)A]4O4Y(B. $(C8^>F8.(B $(CEM4B(B $(CH-8i@G(B $(C9Y4Z(B -$(CAY@T4O4Y(B. +이맥스가, 명령을 치는 속도가 느리다고 인식하면 화면 바닥의 "메아리 +터"라고 불리는 빈 터에 친 명령을 보여줍니다. 메아리 터는 화면의 바닥 +줄입니다. -* $(C9f=D(B $(CAY(B +* 방식 줄 --------- -$(C8^>F8.(B $(CEM@G(B $(C9Y7N(B $(C@-(B $(CAY@:(B "$(C9f=D(B $(CAY(B"$(C@L6s0m(B $(C:N8(4O4Y(B. $(C9f=D(B $(CAY@:(B $(C4Y@=0z(B -$(C00@:(B $(C=D@87N(B $(CG%=C5G>n(B $(C@V=@4O4Y(B. +메아리 터의 바로 윗 줄은 "방식 줄"이라고 부릅니다. 방식 줄은 다음과 +같은 식으로 표시되어 있습니다. --:** TUTORIAL.ko (Fundamental)--L670--58%---------------- -$(C@L(B $(CAY?!4B(B $(C@L8F=:3*(B $(CFmA}GO0m(B $(C@V4B(B $(C1[?y@G(B $(C;sH2?!(B $(C4kGQ(B $(C@/?kGQ(B $(CA$:80!(B -$(C0#Aw5G>n(B $(C@V=@4O4Y(B. +이 줄에는 이맥스나 편집하고 있는 글월의 상황에 대한 유용한 정보가 +간직되어 있습니다. -$(CFD@O(B $(C@L8'@L(B $(C9+>y@;(B $(C@G9LGO4BAv4B(B $(C@L9L(B $(C>K0m(B $(C@V=@4O4Y(B--$(C1W(B $(C0M@:(B $(CC#>R4x(B -$(CFD@O@T4O4Y(B. -NN%--$(C4B(B $(C1[?y?!<-@G(B $(CGv@g(B $(C@'D!8&(B $(C0!8.E54O4Y(B; $(C@L4B(B $(CH-8i(B -$(C2@4k1b(B $(C@'7N(B NN $(CF[<>F.@G(B $(C1[?y@L(B $(C@V@=@;(B $(C@G9LGU4O4Y(B. $(CFD@O@G(B $(C2@4k1b0!(B -$(CH-8i?!(B $(C@V@88i(B --00%-- $(C4k=E?!(B --Top--$(C@L6s0m(B $(CG%=C5K4O4Y(B. $(C1[?y@G(B -$(C9X9Y4Z@L(B $(CH-8i?!(B $(C@V@88i(B --Bot--$(C@L6s0m(B $(CG%=C5K4O4Y(B. $(C1[?y@L(B $(C>FAV(B $(C@[>F<-(B -$(C8p5g(B $(C3;?k@L(B $(CH-8i?!(B $(C4Y(B $(C3*E83*8i(B $(C9f=D(B $(CAY?!4B(B --All--$(C@L6s0m(B $(CG%=C5K4O4Y(B. +파일 이름이 무엇을 의미하는지는 이미 알고 있습니다--그 것은 찾았던 +파일입니다. -NN%--는 글월에서의 현재 위치를 가리킵니다; 이는 화면 +꼭대기 위로 NN 퍼센트의 글월이 있음을 의미합니다. 파일의 꼭대기가 +화면에 있으면 --00%-- 대신에 --Top--이라고 표시됩니다. 글월의 +밑바닥이 화면에 있으면 --Bot--이라고 표시됩니다. 글월이 아주 작아서 +모든 내용이 화면에 다 나타나면 방식 줄에는 --All--이라고 표시됩니다. -$(C0E@G(B $(C>U:N:P?!(B $(C@V4B(B $(C:0(B $(C9.@Z5i@:(B $(C1[?y@L(B $(C:/0f5G>z@=@;(B $(C@G9LGU4O4Y(B. $(CFD@O(B -$(C9f9.(B $(CAwHD3*(B $(C0%9+8.(B $(CAwHD?!4B(B $(C1W(B $(C0w?!(B $(C:0(B $(C9.@Z0!(B $(C>x0m(B $(C4k=C(B $(C9.@Z88(B -$(C@V=@4O4Y(B. +거의 앞부분에 있는 별 문자들은 글월이 변경되었음을 의미합니다. 파일 +방문 직후나 갈무리 직후에는 그 곳에 별 문자가 없고 대시 문자만 +있습니다. -$(C9f=D(B $(CAY@G(B $(C0}H#(B $(C9.@Z>H@:(B $(C>n62(B $(CFmA}(B $(C9f=D@;(B $(C;g?kGO0m(B $(C@V4B0!8&(B -$(C>K7AA]4O4Y(B. $(C>VCJ(B $(C9f=D@:(B Fundamental$(C7N<-(B $(CAv1](B $(C;g?k5G0m(B $(C@V4B(B -$(C9f=D@T4O4Y(B. $(C@L4B(B "$(CAV(B $(C9f=D(B"$(C@G(B $(CGQ(B $(C?9@T4O4Y(B. +방식 줄의 괄호 문자안은 어떤 편집 방식을 사용하고 있는가를 +알려줍니다. 애초 방식은 Fundamental로서 지금 사용되고 있는 +방식입니다. 이는 "주 방식"의 한 예입니다. -$(C@L8F=:?!4B(B $(CAV(B $(C9f=D@L(B $(C89@L(B $(C@V=@4O4Y(B. $(C1W(B $(CA_(B $(C8n0!Av4B(B $(C4Y8%(B $(C>p>n(B $(C6G(B/$(C6G4B(B -$(C4Y8%(B $(CA>7y@G(B $(C1[?y@;(B $(CFmA}GO557O(B $(CGO4B5%(B $(C>2@L8g(B, Lisp $(C9f=D(B, Text $(C9f=D(B -$(C5n5n@L(B $(C@V=@4O4Y(B. $(CGW;s(B $(CGQ(B $(C0!Av(B $(CAV(B $(C9f=D88@L(B $(C@{?k5G8g(B $(CAv1](B -"Fundamental"$(C@L6s0m(B $(C@{Gt(B $(C@V4B(B $(C0w?!(B $(CG%=C5K4O4Y(B. +이맥스에는 주 방식이 많이 있습니다. 그 중 몇가지는 다른 언어 또/또는 +다른 종류의 글월을 편집하도록 하는데 쓰이며, Lisp 방식, Text 방식 +등등이 있습니다. 항상 한 가지 주 방식만이 적용되며 지금 +"Fundamental"이라고 적혀 있는 곳에 표시됩니다. -$(C0"0"@G(B $(CAV(B $(C9f=D@:(B $(C8n8n(B $(C8m7I5i@L(B $(C@[5?@;(B $(C4^8.GO557O(B $(C5G>n(B $(C@V=@4O4Y(B. $(C?98&(B -$(C5i>n(B, $(CGA7N1W7%?!4B(B $(C<38m9.@;(B $(C885e4B(B $(C8m7I@L(B $(C@V4B5%(B, $(CGA7N1W7%(B $(C>p>n5i@:(B -$(C<38m9.@G(B $(CG|EB@;(B $(C0"0"(B $(C4^8.(B $(CGO1b(B $(C6'9.?!(B $(C0"0"@G(B $(CAV(B $(C9f=D@:(B $(C<38m9.@;(B $(C<-7N(B -$(C4Y8#0T(B $(C3"?v(B $(C3V557O(B $(C5G>n(B $(C@V=@4O4Y(B. $(C8p5g(B $(CAV(B $(C9f=D@:(B $(CH.@e(B $(C8m7I@G(B $(C@L8'@;(B -$(C;g?kGO9G7N<-(B $(C1W(B $(C9f=D@87N(B $(C>y9Y2Y4B(B $(C0M@L(B $(C=10T(B $(C@N=D5I(B $(Cy9Y2Y4B(B $(C8m7I@T4O4Y(B. +각각의 주 방식은 몇몇 명령들이 작동을 달리하도록 되어 있습니다. 예를 +들어, 프로그램에는 설명문을 만드는 명령이 있는데, 프로그램 언어들은 +설명문의 형태을 각각 달리 하기 때문에 각각의 주 방식은 설명문을 서로 +다르게 끼워 넣도록 되어 있습니다. 모든 주 방식은 확장 명령의 이름을 +사용하므로서 그 방식으로 엇바꾸는 것이 쉽게 인식될 수 있습니다. 한 +예로 M-x fundamental-mode는 Fundamental 방식으로 엇바꾸는 명령입니다. -$(C@L(B $(CFD@O0z(B $(C00@:(B $(CGQ1[(B $(C1[?y@;(B $(CFmA}GO7A0m(B $(CGQ4Y8i(B Text $(C9f=D@;(B $(C>24B(B $(C0M@L(B -$(CAA@;(B $(C0M@T4O4Y(B. ->> M-x text mode$(C@;(B $(CCD(B $(C:8=J=C?@(B. +이 파일과 같은 한글 글월을 편집하려고 한다면 Text 방식을 쓰는 것이 +좋을 것입니다. +>> M-x text mode을 쳐 보십시오. -$(CAv1]1nAv(B $(C9h?n(B $(C@L8F=:(B $(C8m7I5i@:(B $(C89@L(B $(C4^6sAvAv(B $(C>J@84O(B $(C0FA$GOAv(B $(C>J>F55(B -$(C5K4O4Y(B. $(C1W7/3*(B M-f$(C?M(B M-b$(C0!(B $(C>U@[@:5{?HG%8&(B $(C398;@G(B $(C@O:N7N(B $(CC38.GT@;(B -$(C0|B{GR(B $(CU@[@:5{?HG%8&(B $(C398;(B $(C:P8.(B $(C9.@Z7N(B $(CCk1^GO?4=@4O4Y(B. +지금까지 배운 이맥스 명령들은 많이 달라지지 않으니 걱정하지 않아도 +됩니다. 그러나 M-f와 M-b가 앞작은따옴표를 낱말의 일부로 처리함을 +관찰할 수 있을 것입니다. 전에 Fundamental 방식에서는 M-f와 M-b가 +앞작은따옴표를 낱말 분리 문자로 취급하였습니다. -$(CAV(B $(C9f=D@:(B $(C:8Ek(B $(C4Y@=0z(B $(C00@:(B $(C9L9&GQ(B $(C:/H-8&(B $(CCJ7!GU4O4Y(B: $(C4k:N:P@G(B $(C8m7I5i@:(B -$(C0"0"@G(B $(CAV(B $(C9f=D?!<-(B "$(C00@:(B $(C@O(B"$(C@;(B $(CGOAv88(B $(C>`0#(B $(C4Y8#0T(B $(C@[5?GQ4Y(B. +주 방식은 보통 다음과 같은 미묘한 변화를 초래합니다: 대부분의 명령들은 +각각의 주 방식에서 "같은 일"을 하지만 약간 다르게 작동한다. -$(CGv@g@G(B $(CAV(B $(C9f=D?!(B $(C4kGQ(B $(C9.<-H-8&(B $(C:80m@Z(B $(CGO8i(B C-h m$(C@;(B $(CD!=J=C?@(B. +현재의 주 방식에 대한 문서화를 보고자 하면 C-h m을 치십시오. ->> C-u C-v$(C8&(B $(C8n(B $(C9x(B $(CCD<-(B $(C@L(B $(CAY@;(B $(CH-8i@G(B $(C2@4k1bBk@87N(B $(C?rAw@L=J=C?@(B. ->> C-h m$(C@;(B $(CCD<-(B Text $(C9f=D0z(B Fundamental $(C9f=D@G(B $(CBw@LA!@;(B $(C:8=J=C?@(B. ->> C-x 1$(C@;(B $(CCD<-(B $(C9.<-H-8&(B $(CH-8i?!<-(B $(C>x>V=J=C?@(B. +>> C-u C-v를 몇 번 쳐서 이 줄을 화면의 꼭대기쯤으로 움직이십시오. +>> C-h m을 쳐서 Text 방식과 Fundamental 방식의 차이점을 보십시오. +>> C-x 1을 쳐서 문서화를 화면에서 없애십시오. -$(CAV(B $(C9f=D@:(B $(C:N(B $(C9f=D@L(B $(C@V1b(B $(C6'9.?!(B $(CAV(B $(C9f=D@L6s0m(B $(C:N8(4O4Y(B. $(C:N(B $(C9f=D@:(B $(CAV(B -$(C9f=D@;(B $(C13CF4O6s(B $(CAV(B $(C9f=D@;(B $(C:NBw@{@87N(B $(C2Av(B $(C>J@;(B $(C5(B $(C5(B $(CFAV(B $(C@/?kGQ(B $(C:N(B $(C9f=DA_(B, $(CGQ1[(B $(C1[?y@;(B $(CFmA}GR(B $(C6'(B $(C@ZAV(B $(C;g?k5G4B(B Auto Fill -$(C9f=D@L(B $(C@V=@4O4Y(B. $(C@L(B $(C9f=D@L(B $(CDQA.(B $(C@V@;(B $(C6'(B $(C@L8F=:4B(B, $(CAY@L(B $(C3J9+(B $(C3P>nAv8i(B -$(C1[?y@L(B $(C3"?vA|?!(B $(C5{6s(B $(C398;;g@L?!<-(B $(C@Z5?@87N(B $(CAY9Y2^@;(B $(CGU4O4Y(B. +아주 유용한 부 방식중, 한글 글월을 편집할 때 자주 사용되는 Auto Fill +방식이 있습니다. 이 방식이 켜져 있을 때 이맥스는, 줄이 너무 넓어지면 +글월이 끼워짐에 따라 낱말사이에서 자동으로 줄바꿈을 합니다. -Auto Fill $(C9f=D@;(B $(CDQ1b(B $(C@'GX<-4B(B M-x auto-fill-mode$(C@;(B $(CD(4O4Y(B. -$(C@L(B $(C9f=D@L(B $(CDQA.(B $(C@V@88i(B M-x auto-fill-mode$(C@;(B $(CCD<-(B $(C2x(B $(C을 칩니다. +이 방식이 켜져 있으면 M-x auto-fill-mode을 쳐서 끌 수 +있습니다. 이 방식이 꺼져 있으면 이 명령은 그 방식을 켜고, 반대로 켜져 +있을 때는 이 방식을 끕니다. 우리는 이 명령이 "방식을 똑딱"한다고 +(toggle) 합니다. ->> M-x auto fill mode$(C@;(B $(CAv1](B $(CCD(B $(C:8=J=C?@(B. $(C1W8.0m(B "asdf "$(C6s4B(B - $(CAY@;(B $(C0hn<-(B $(C1W(B $(CAY@L(B $(C5Q7N(B $(C3*45557O(B $(CGO=J=C?@(B. Auto Fill - $(C9f=D@:(B $(C0x0#(B $(C9.@Z?!<-88(B $(CAY9Y2^@;(B $(CGO1b(B $(C6'9.?!(B $(C2@(B $(C0x0#(B $(C9.@Z0!(B $(C5i>n(B - $(C@V>n>_(B $(CGU4O4Y(B. +>> M-x auto fill mode을 지금 쳐 보십시오. 그리고 "asdf "라는 + 줄을 계속 끼워 넣어서 그 줄이 둘로 나뉘도록 하십시오. Auto Fill + 방식은 공간 문자에서만 줄바꿈을 하기 때문에 꼭 공간 문자가 들어 + 있어야 합니다. -$(CGQ0h4B(B $(C:8Ek(B 70$(C03@G(B $(C9.@Z7N(B $(CA$GXA.(B $(C@VAv88(B C-x f $(C8m7I@87N(B $(C1W(B $(C0M@;(B $(C:/0fGR(B -$(C_(B $(CGU4O4Y(B. +한계는 보통 70개의 문자로 정해져 있지만 C-x f 명령으로 그 것을 변경할 +수 있습니다. 원하는 한계 설정은 숫자 인수로 하여야 합니다. ->> 20$(C@L6s4B(B $(C@N> 20이라는 인수로 C-x f를 쳐 보십시오. (C-u 2 0 C-x f). + 그리고 글월을 뭔가 쳐서 이맥스가 20개의 문자로 한 줄을 채우는지를 + 보십시오. 그런 다음에 C-x f를 다시 써서 한계를 70으로 재 + 설정하십시오. -$(C4\6t@G(B $(CA_0#?!<-(B $(C:/0fGO8i(B Auto Fill $(C9f=D@:(B $(CC$?r@;(B $(C4Y=C(B $(CGOAv(B -$(C>J=@4O4Y(B. $(C1W(B $(C4\6t@;(B $(C4Y=C(B $(CC$?l1b(B $(C@'GX<-4B(B $(C1t9Z@L0!(B $(C4\6t(B $(C>H?!(B $(C@V4B(B -$(C;sEB?!<-(B M-q (Meta$(C> $(C1t9Z@L8&(B $(C@L@|(B $(C4\6t@87N(B $(C?rAw@N(B $(CHD(B M-q$(C8&(B $(CD!=J=C?@(B. +>> 깜박이를 이전 단락으로 움직인 후 M-q를 치십시오. -* $(CC#1b(B +* 찾기 ------ -$(C@L8F=:4B(B $(C1[?y@G(B $(C>UBJ@L3*(B $(C5^BJ@87N(B $(C9.@Z?-@;(B ($(C9.@Z?-@:(B $(C?,H?!(B $(CC#1b0!(B -$(C@L7g>nAv0m(B $(C@V4Y4B(B $(C0M@;(B $(C@G9LGU4O4Y(B. +이맥스의 찾기 명령은 "증가적"이라는 점에서 일반 편집기의 찾기 명령과 +다릅니다. 이는 찾고자 하는 문자열을 타자하고 있는 동안에 찾기가 +이루어지고 있다는 것을 의미합니다. -$(CC#1b8&(B $(C=C@[=CE04B(B $(C8m7I@:(B $(C>UBJ@87N(B $(CC#1b0!(B C-s$(C@L0m(B $(C5^BJ@87N(B $(CC#1b0!(B -C-r$(C@T4O4Y(B. $(C1W7/3*(B $(C@a1q(B $(C1b4Y8.=J=C?@(B! $(CAv1](B $(C@L0M@;(B $(C=C55GX(B $(C:8Av(B -$(C86=J=C?@(B. +찾기를 시작시키는 명령은 앞쪽으로 찾기가 C-s이고 뒷쪽으로 찾기가 +C-r입니다. 그러나 잠깐 기다리십시오! 지금 이것을 시도해 보지 +마십시오. -C-s$(C8&(B $(CD!8i(B $(C8^>F8.(B $(CEM?!(B, $(C1f@b@L7N(B "I-search"$(C6s4B(B $(C9.@Z?-@L(B $(C3*E83*4B(B $(C0M@;(B -$(C:<(B $(C$(C@:(B $(CC#1b8&(B -$(C86D(4O4Y(B. +C-s를 치면 메아리 터에, 길잡이로 "I-search"라는 문자열이 나타나는 것을 +볼 수 있습니다. 이는 찾고자 하는 문자열이 타자되기를 기다라면서 +이맥스가 증가적 찾기 중에 있다는 것을 말해 줍니다. 은 찾기를 +마칩니다. ->> $(C@LA&(B C-s$(C8&(B $(CCD<-(B $(CC#1b8&(B $(C=C@[GO=J=C?@(B. $(CC5C5Hw(B, $(CGQ(B $(C9x?!(B $(CGQ(B $(C1[@Z>?(B - 'cursor'$(C6s0m(B $(CD!8i<-(B $(C0"0"@G(B $(C9.@Z8&(B $(CD#(B $(CHD(B $(C1t9Z@L?!(B $(C>n62(B $(C@O@L(B $(C@O>n(B - $(C3*4B0!8&(B $(C@/@GGO=J=C?@(B. - $(C@LA&(B "cursor"$(C8&(B $(CGQ(B $(C9x(B $(CC#@:(B $(C0M@T4O4Y(B. ->> C-s$(C8&(B $(C4Y=C(B $(CCD<-(B $(C4Y@=?!(B $(C3*E83*4B(B "cursor"$(C8&(B $(CC#@8=J=C?@(B. ->> $(C@Z(B, $(C@LA&4B(B $(C8&(B $(C3W(B $(C9x(B $(CCD<-(B $(C1t9Z@L0!(B $(C>n6;0T(B $(C?rAw@L4B0!8&(B - $(C:8=J=C?@(B. ->> $(C@;(B $(CCD<-(B $(CC#1b8&(B $(C3!3;=J=C?@(B. +>> 이제 C-s를 쳐서 찾기를 시작하십시오. 천천히, 한 번에 한 글자씩 + 'cursor'라고 치면서 각각의 문자를 친 후 깜박이에 어떤 일이 일어 + 나는가를 유의하십시오. + 이제 "cursor"를 한 번 찾은 것입니다. +>> C-s를 다시 쳐서 다음에 나타나는 "cursor"를 찾으십시오. +>> 자, 이제는 를 네 번 쳐서 깜박이가 어떻게 움직이는가를 + 보십시오. +>> 을 쳐서 찾기를 끝내십시오. -$(C>n62(B $(CGv;s@L(B $(C@O>n3*4BAv8&(B $(C:8>R=@4O1n(B? $(CAu0!@{(B $(CC#1b?!<-(B $(C@L8F=:4B(B $(C1W6'1nAv(B -$(CE8@ZGQ(B $(C9.@Z?-@;(B $(CC#@87A0m(B $(CGU4O4Y(B. '$(C1t9Z@L(B'$(C0!(B $(C@V4B(B $(C4Y@=(B $(C@ex@88i(B $(C@L8F=:4B(B $(C;`K7A(B $(CAV8g(B C-g$(C7N55(B $(CC#1b8&(B $(C3!3>(B $(Cn62(B $(C?n?5(B $(CC<0h?!<-4B(B C-s$(C8&(B $(CD!8i(B $(CH-8i@;(B $(C5?0a=CDQ<-(B, $(C@L8F=:0!(B $(C>F9+(B -$(CCb7B55(B $(CGOAv(B $(C>J4B(B $(C0M@;(B $(C:<(B $(C0f?l0!(B $(C@V=@4O4Y(B. $(C@L0M@:(B "$(CHe8'(B $(CA&>n(B"$(C6s0m(B -$(C:R8.?l4B(B $(C?n?5(B $(CC<0h@G(B "$(CF/B!(B"$(C@L(B C-s$(C8&(B $(C0!7NC$<-(B $(C@L8F=:8&(B $(CEkGX(B $(C@|4^5GAv(B -$(C>J557O(B $(CGO1b(B $(C6'9.@T4O4Y(B. C-q$(C8&(B $(C4)8#8i(B $(CH-8i@L(B $(CGXA&5K4O4Y(B. $(C1W8.0m(B $(C3*<-(B -$(C@L8F=:(B $(C<38m<-@G(B "Spontaneous Entry to Incremental Search"$(C6s4B(B $(C4\?x@;(B -$(C:88i(B $(C@L71(B "$(CF/B!(B"$(C@;(B $(C>n6;0T(B $(CCk1^GR(B $(Cp@;(B $(C@P@;(B $(C$(C8&(B $(CD!8i(B $(CC#1b(B $(C9.@Z?-@G(B $(C86Av87(B $(C9.@Z0!(B -$(CAv?vAv0m(B $(CC#1b4B(B $(C86Av87@87N(B $(CC#>R4x(B $(C0w?!(B $(C5G59>F(B $(C0!4B(B $(C0M@;(B $(C:<(B $(Cn(B, "c"$(C0!(B $(C>n5p?!(B $(CC3@=@87N(B $(C3*?@4BAv8&(B $(C:81b(B $(C@'GX<-(B -"c"$(C8&(B $(CCF4Y0m(B $(CGU=C4Y(B. $(C@LA&(B "u"$(C8&(B $(CD!8i(B $(C1t9Z@L4B(B "cu"$(C0!(B $(CC3@=@87N(B $(C3*?@4B(B -$(C0w@87N(B $(C?rAw@O(B $(C0M@T4O4Y(B. $(C@LA&(B $(C8&(B $(CD!=J=C?@(B. $(C1W7/8i(B $(CC#1b(B -$(C9.@Z?-?!<-(B "u"$(C0!(B $(CAv?vAv0m(B $(C1t9Z@L4B(B "c"$(C0!(B $(CC3@=(B $(C3*?B(B $(C0w@87N(B $(C5G59>F(B -$(C0)4O4Y(B. +증가적 찾기 도중에 를 치면 찾기 문자열의 마지막 문자가 +지워지고 찾기는 마지막으로 찾았던 곳에 되돌아 가는 것을 볼 수 +있습니다. 예를 들어, "c"가 어디에 처음으로 나오는지를 보기 위해서 +"c"를 쳤다고 합시다. 이제 "u"를 치면 깜박이는 "cu"가 처음으로 나오는 +곳으로 움직일 것입니다. 이제 를 치십시오. 그러면 찾기 +문자열에서 "u"가 지워지고 깜박이는 "c"가 처음 나온 곳으로 되돌아 +갑니다. -$(CC#1bA_?!(B $(CA&>n(B $(C9.@Z3*(B meta $(C9.@Z8&(B $(CD!8i(B ($(C?9?\0!(B $(C@VAv88(B--$(CC#1b?!<-(B $(CF/:0GQ(B -$(C@G9L8&(B $(C0.4B(B C-s$(C3*(B C-r$(C0z(B $(C00@:(B $(C9.@Z5i(B) $(CC#1b4B(B $(C3!3*9v834O4Y(B. +찾기중에 제어 문자나 meta 문자를 치면 (예외가 있지만--찾기에서 특별한 +의미를 갖는 C-s나 C-r과 같은 문자들) 찾기는 끝나버립니다. -C-s$(C4B(B $(C1t9Z@L@G(B $(CGv@g(B $(C@'D!(B $(C4Y@=?!(B $(C9_0_5G4B(B $(CC#1b(B $(C9.@Z?-@;(B $(CC#557O(B -$(C=C@[=CE54O4Y(B. $(C@L@|?!(B $(C3*?B(B $(C1[?y?!<-(B $(C9+>p0!8&(B $(CC#@87A8i(B C-r$(C8&(B $(CD(4O4Y(B. -C-s$(C?!(B $(C@{?k5G4B(B $(C8p5g(B $(C;gGW@:(B $(C9fGb88(B $(C9Y2n>z@;(B $(C;S(B $(C8p5N(B C-r$(C?!(B $(C@{?k5K4O4Y(B. +C-s는 깜박이의 현재 위치 다음에 발견되는 찾기 문자열을 찾도록 +시작시킵니다. 이전에 나온 글월에서 무언가를 찾으려면 C-r를 칩니다. +C-s에 적용되는 모든 사항은 방향만 바뀌었을 뿐 모두 C-r에 적용됩니다. -* $(C4YA_(B $(CC"(B +* 다중 창 --------- -$(C@L8F=:@G(B $(C1&Bz@:(B $(CF/B!(B $(CA_@G(B $(CGO3*7N(B $(CGQ(B $(C03(B $(C@L;s@G(B $(CC"@;(B $(C5?=C?!(B $(CH-8i?!(B $(CG%=CGR(B -$(C> $(C1t9Z@L8&(B $(C@L(B $(CAY7N(B $(C?rAw?)<-(B C-u 0 C-l$(C@;(B $(CCD(B $(C:8=J=C?@(B. +>> 깜박이를 이 줄로 움직여서 C-u 0 C-l을 쳐 보십시오. ->> C-x 2$(C8&(B $(CCD<-(B $(CH-8i@;(B $(C5N(B $(CC"@87N(B $(C3*4)=J=C?@(B. - $(C5N(B $(CC"@:(B $(C@L(B $(CAvD'<-8&(B $(CH-8i(B $(CG%=CGU4O4Y(B. $(C1t9Z@L4B(B $(C@-(B $(CC"?!(B $(C@V=@4O4Y(B. +>> C-x 2를 쳐서 화면을 두 창으로 나누십시오. + 두 창은 이 지침서를 화면 표시합니다. 깜박이는 윗 창에 있습니다. ->> C-M-v$(C8&(B $(CCD<-(B $(C9Y4Z(B $(CC"@;(B $(C5N7g8;1b(B $(CGO=J=C?@(B. - (Meta$(Cx@88i(B ESC C-v$(C8&(B $(CD!=J=C?@(B.) +>> C-M-v를 쳐서 바닥 창을 두루말기 하십시오. + (Meta쇠가 없으면 ESC C-v를 치십시오.) ->> C-x o ("o"$(C4B(B "other"$(C@G(B $(CC9(B $(C1[@Z(B)$(C8&(B $(CCD<-(B $(C1t9Z@L8&(B $(C9Y4Z(B $(CC"@87N(B - $(C?rAw@L=J=C?@(B. ->> $(C9Y4Z(B $(CC"?!<-(B C-v$(C?M(B M-v$(C8&(B $(C=a<-(B $(C5N7g8;1b(B $(CGO=J=C?@(B. - $(C@L(B $(CAv=C8&(B $(C@P4B(B $(C0M@:(B $(C2@4k1b(B $(CC"?!<-(B $(CGU4O4Y(B. +>> C-x o ("o"는 "other"의 첫 글자)를 쳐서 깜박이를 바닥 창으로 + 움직이십시오. +>> 바닥 창에서 C-v와 M-v를 써서 두루말기 하십시오. + 이 지시를 읽는 것은 꼭대기 창에서 합니다. ->> C-x o$(C8&(B $(C4Y=C(B $(CCD<-(B $(C1t9Z@L8&(B $(C4Y=C(B $(C2@4k1b(B $(CC"@87N(B $(C?rAw@L=J=C?@(B. - $(C2@4k1b(B $(CC"?!<-(B, $(C1t9Z@L4B(B $(C@|?!(B $(C@V4x(B $(C0w@87N(B $(C0%(B $(C0M@T4O4Y(B. +>> C-x o를 다시 쳐서 깜박이를 다시 꼭대기 창으로 움직이십시오. + 꼭대기 창에서, 깜박이는 전에 있던 곳으로 갈 것입니다. -C-x o$(C8&(B $(C0hy9Y2Y1b8&(B $(CGR(B $(Cy@L(B -$(CC3@=?!(B $(C?@4B0!0!(B $(C9.A&5GAv(B $(C>J=@4O4Y(B. +C-M-v는 CONTROL-META 문자의 한 예입니다. META쇠가 있으면 CONTROL쇠와 +META쇠를 누른 채 v 글쇠를 치므로써 C-M-v를 칠 수 있습니다. CONTROL쇠나 +META쇠는 타자하는 문자를 변경하는 역할을 하기 때문에 그 둘 중 무엇이 +처음에 오는가가 문제되지 않습니다. -META$(Cx>n<-(B ESC$(Cn_(B $(CGO8g(B $(CA&>nJ=@4O4Y(B. $(C1W(B -$(C@L@/4B(B ESC$(C@L(B $(C:/0fF4O6s(B $(C@ZC<7N<-(B $(C1b4I@;(B $(C0!Ax(B $(C9.@Z@L1b(B $(C6'9.@T4O4Y(B. +META쇠가 없어서 ESC쇠로 대용할 때는 순서가 문제됩니다: ESC쇠를 먼저 +치고 제어쇠-v를 쳐야 하며 제어쇠-ESC v는 작동하지 않습니다. 그 +이유는 ESC이 변경쇠가 아니라 자체로서 기능을 가진 문자이기 때문입니다. ->> C-x 1$(C@;(B ($(C@L(B $(C2@4k1b(B $(CC"?!<-(B) $(CCD<-(B $(C9Y4Z(B $(CC"@;(B $(C>x>V=J=C?@(B. +>> C-x 1을 (이 꼭대기 창에서) 쳐서 바닥 창을 없애십시오. -($(C9Y4Z(B $(CC"?!<-(B C-x 1$(C@;(B $(CD!8i(B $(C2@4k1b(B $(CC"@L(B $(C>x>nAz(B $(C0M@T4O4Y(B. $(C@L(B $(C8m7I@;(B "$(CGQ(B -$(CC"88(B $(C:8A8GO=C?@(B--$(CAv1](B $(C@[>wA_@N(B $(CC"88(B"$(C@L6s0m(B $(C;}0"GO=J=C?@(B.) +(바닥 창에서 C-x 1을 치면 꼭대기 창이 없어질 것입니다. 이 명령을 "한 +창만 보존하시오--지금 작업중인 창만"이라고 생각하십시오.) -$(C>gBJ(B $(CC"?!(B $(C00@:(B $(C;g@LD-@;(B $(CH-8i(B $(CG%=CGR(B $(CGJ?d4B(B $(C>x=@4O4Y(B. $(CGQ(B $(CC"?!<-(B C-x -C-f$(C7N(B $(CFD@O@;(B $(CC#@88i(B $(C4Y8%(B $(CC"@:(B $(C:/H-0!(B $(C>x=@4O4Y(B. $(C0"0"@G(B $(CC"?!<-(B $(CFD@O@;(B -$(C5683@{@87N(B $(CC#@;(B $(C> C-x 4 C-f$(C8&(B $(CD!0m(B $(CFD@O(B $(C@L8'(B $(CGO3*8&(B $(CCD(B $(C:8=J=C?@(B. - $(C@87N(B $(C3!3;=J=C?@(B. $(C1W(B $(CFD@O@L(B $(C9Y4Z(B $(CC"?!(B $(C3*E83*4B(B $(C0M@;(B - $(C:8=J=C?@(B. $(C1t9Z@L55(B $(C1W(B $(C0w@87N(B $(C?rAw@T4O4Y(B. +>> C-x 4 C-f를 치고 파일 이름 하나를 쳐 보십시오. + 으로 끝내십시오. 그 파일이 바닥 창에 나타나는 것을 + 보십시오. 깜박이도 그 곳으로 움직입니다. ->> C-x o$(C8&(B $(CCD<-(B $(C4Y=C(B $(C2@4k1b(B $(CC"@87N(B $(C59>F(B $(C0!<-(B C-x 1$(C7N(B $(C9Y4Z(B $(CC"@;(B - $(CAv?l=J=C?@(B. +>> C-x o를 쳐서 다시 꼭대기 창으로 돌아 가서 C-x 1로 바닥 창을 + 지우십시오. -* $(CH81M@{(B $(CFmA}(B $(CU5Z?!(B $(C@V4B(B $(CK(B $(Cn(B, -(Fundamental) $(C4k=E?!(B [(Fundamental)]$(C@L6s0m(B $(CG%=C5I(B $(C6'(B $(C@T4O4Y(B. +간혹 "회귀적 편집 수준"이라고 (recursive editing level) 불리우는 것에 +봉착하게 됩니다. 방식 줄에서 주 방식 이름의 앞뒤에 있는 소괄호 문자를 +대괄호 문자가 둘러 싸고 있으면 이를 알 수 있습니다. 예를 들어, +(Fundamental) 대신에 [(Fundamental)]이라고 표시될 때 입니다. -$(C@L(B $(CH81M@{(B $(CFmA}(B $(Cn(B $(C3*1b(B $(C@'GX<-4B(B ESC ESC ESC$(C@;(B $(CD(4O4Y(B. -$(C@L(B $(C0M@:(B $(C4Y8q@{(B "$(C9~>n3*1b(B" $(C8m7I@T4O4Y(B. $(CC_0!5H(B $(CC"@;(B $(C>x>V0E3*(B $(C@[@:(B -$(C;g@LD-?!<-(B $(C3*?@1b(B $(C@'GX<-55(B $(C;g?k5I(B $(C> M-x$(C8&(B $(CCD<-(B $(C@[@:(B $(C;g@LD-@87N(B $(C5i>n(B $(C0!=J=C?@(B; $(C1W8.0m4B(B ESC ESC ESC$(C@;(B - $(CCD<-(B $(C:|A.(B $(C3*?@=J=C?@(B. +>> M-x를 쳐서 작은 사이칸으로 들어 가십시오; 그리고는 ESC ESC ESC을 + 쳐서 빠져 나오십시오. -C-g$(C8&(B $(C=a<-4B(B $(CH81M@{(B $(CFmA}(B $(Cn3/(B $(Cx=@4O4Y(B. $(C1W(B $(C@L@/4B(B C-g$(C0!(B -$(CH81M@{(B $(CFmA}(B $(Cr1b(B +* 더 많은 도움말 얻기 --------------------- -$(C@L(B $(CAvD'<-?!<-4B(B $(C@L8F=:(B $(C;g?k@;(B $(C=C@[GO1b?!(B $(CCf:PGQ(B $(CA$:88&(B $(CA&0xGO7A0m(B -$(C3k7BGO?4=@4O4Y(B. $(C@L8F=:?!4B(B $(C3J9+3*(B $(C89@:(B $(C1b4I@L(B $(C@V>n<-(B $(C?)1b<-4B(B $(C8p5N(B $(C4Y(B -$(C<38mGR(B $(Cx=@4O4Y(B. $(C1W7/3*(B, $(C@L8F=:?!4B(B $(C4Y8%(B $(C89@:(B $(C@/?kGQ(B $(CF/B!5i@L(B -$(C@V>n<-(B $(C@L8F=:?!(B $(C4kGX<-(B $(C4u(B $(C89@L(B $(C9h?l0m(B $(C=M@;(B $(C0M(B $(C@T4O4Y(B. $(C@L8F=:4B(B $(C@L8F=:(B -$(C8m7I?!(B $(C4kGQ(B $(C9.<-H-8&(B $(C@P@;(B $(Cn7y@G(B $(C55?r8;@;(B -$(C0!8#E04B(B $(C9.@Z8&(B $(CD(4O4Y(B. $(C@|Gt(B $(C;}0"@L(B $(C>J3*8i(B C-h ?$(C8&(B $(CCD<-(B, $(C@L8F=:0!(B -$(C>n62(B $(CA>7y@G(B $(C55?r8;@;(B $(CA&0xGR(B $(CF9+71(B $(C55?r8;@L(B $(CGJ?d>x4Y0m(B $(CFG4\5G8i(B C-g$(C8&(B $(CCD<-(B $(CCkn62(B $(C0w?!<-4B(B C-h$(C@G(B $(C@G9L8&(B $(C:/0f=CDQ(B $(C3u=@4O4Y(B. $(C1W5i@L(B $(C8p5g(B $(C;g?k@Z?!0T(B -$(C@L785m(B $(C@O0}@{@N(B $(CA6C38&(B $(CCkGX<-4B(B $(C>J5G4B(B $(C0M@L9G7N(B $(C@L0M@:(B $(C?n?5(B $(CC<0h(B -$(C0|8.@Z?!0T(B $(C:RFrGR(B $(CK828;@;(B $(CH-8i(B $(CG%=CGOAv(B $(C>J@88i(B $(C:RFr@L(B $(CGX0a5I(B $(C6'1nAv4B(B F1 $(C1[$(C@;(B $(C4k=E(B $(C;g?kGO557O(B $(CGO=J=C?@(B.) +(어떤 곳에서는 C-h의 의미를 변경시켜 놓습니다. 그들이 모든 사용자에게 +이렇듯 일괄적인 조처를 취해서는 않되는 것이므로 이것은 운영 체계 +관리자에게 불평할 수 있는 충분한 근거가 됩니다. C-h가 화면의 바닥에 +도움 알림말을 화면 표시하지 않으면 불평이 해결될 때까지는 F1 글쇠나 +M-x help 을 대신 사용하도록 하십시오.) -$(C0!@e(B $(C1b:;@{@N(B $(C55?r8;(B $(CF/B!@:(B C-h c $(C@T4O4Y(B. C-h$(C8&(B $(CD!0m(B $(C9.@Z(B c$(C8&(B $(CD#(B $(CHD(B -$(C8m7I(B $(C9.@Z3*(B $(C8m7I(B $(CFAV(B $(C0#4\GQ(B $(C<38m@;(B $(CH-8i(B $(CG%=CGU4O4Y(B. +가장 기본적인 도움말 특징은 C-h c 입니다. C-h를 치고 문자 c를 친 후 +명령 문자나 명령 순차(sequence)를 치십시오; 그러면 이맥스는 그 명령에 +대한 아주 간단한 설명을 화면 표시합니다. ->> C-h c $(CA&>nK828;@:(B $(C4Y@=0z(B $(C00@:(B $(C=D@L>n>_(B $(CGU4O4Y(B. +>> C-h c 제어쇠-p를 치십시오. + 알림말은 다음과 같은 식이어야 합니다. C-p runs the command previous-line -$(C@L4B(B "$(C1b4I@G(B $(C@L8'(B"$(C@;(B $(C8;GX(B $(CA]4O4Y(B. $(C1b4I(B $(C@L8'@:(B $(C@L8F=:8&(B $(C@Z1b(B $(CCkGb?!(B -$(C8B0T(B $(C>20E3*(B $(CH.@eGR(B $(C6'(B $(CAV7N(B $(C;g?k5K4O4Y(B. $(C1W7/3*(B $(C1b4I(B $(C@L8'5i@:(B $(C1W(B $(C8m7I@L(B -$(C>n62(B $(C@O@;(B $(CGO4BAv8&(B $(C>K(B $(CFAV(B $(C0#4\GQ(B -$(C9.<-H-7N55(B -- $(C?)EB1nAv(B $(C9h?n(B $(C8m7I5i@;(B $(C1b>oGO4B5%(B $(CCf:PGR(B $(CA$557N(B -- -$(C;g?k5I(B $(Cv$(C?M(B $(C00@:(B $(C4YA_(B -$(C9.@Z(B $(C8m7I5i55(B C-h c$(C@G(B $(C4Y@=?!(B $(C?C(B $(Cv와 같은 다중 +문자 명령들도 C-h c의 다음에 올 수 있습니다. -$(CGQ(B $(C8m7I?!(B $(C4kGX(B $(C4u(B $(C@Z<r1b(B $(C@'GX<-4B(B C-h c $(C4k=E?!(B C-h k$(C8&(B -$(C;g?kGO=J=C?@(B. +한 명령에 대해 더 자세한 정보를 얻기 위해서는 C-h c 대신에 C-h k를 +사용하십시오. ->> C-h k $(CA&>n> C-h k 제어쇠-p를 쳐 보십시오. -$(C@L4B(B $(C1W(B $(C1b4I@G(B $(C@L8'0z(B $(CGT22(B $(C1W(B $(C9.<-H-8&(B $(C@L8F=:(B $(CC"?!(B $(CH-8i(B $(CG%=CGU4O4Y(B. -$(CCb7B5H(B $(C0M@;(B $(C4Y(B $(C@P>z@88i(B C-x 1$(C7N(B $(C55?r8;(B $(C1[?y@;(B $(C>x>[4O4Y(B. $(C4g@e?!(B $(C>x>Y(B -$(CGJ?d4B(B $(C>x=@4O4Y(B. $(C55?r8;(B $(C1[?y@;(B $(CB|A6GO8i<-(B $(CFmA}@;(B $(CGO4Y0!(B C-x 1$(C@;(B $(CCD55(B -$(C5K4O4Y(B. +이는 그 기능의 이름과 함께 그 문서화를 이맥스 창에 화면 표시합니다. +출력된 것을 다 읽었으면 C-x 1로 도움말 글월을 없앱니다. 당장에 없앨 +필요는 없습니다. 도움말 글월을 참조하면서 편집을 하다가 C-x 1을 쳐도 +됩니다. -$(C?)1b?!(B $(C6G4Y8%(B $(C@/?kGQ(B C-h$(C@G(B $(CC_0!(B $(C<1EC@L(B $(C@V=@4O4Y(B: +여기에 또다른 유용한 C-h의 추가 선택이 있습니다: - C-h f $(C1b4I(B $(C1b> C-h f previous-line$(C@;(B $(CCD(B $(C:8=J=C?@(B. - $(C1W7/8i(B $(C@L8F=:0!(B C-p $(C8m7I@L(B $(CA&0xGO4B(B $(C1b4I?!(B $(C4kGQ(B $(C8p5g(B $(CA$:88&(B $(C@N> C-h f previous-line을 쳐 보십시오. + 그러면 이맥스가 C-p 명령이 제공하는 기능에 대한 모든 정보를 인쇄할 + 것입니다. -$(C@/;gGQ(B $(C8m7I@87N(B C-h v $(C0!(B $(C@V@88g(B $(C@L4B(B $(C@L8F=:@G(B $(CG`5?@;(B $(C@{@}GO0T(B $(CGO4B5%(B -$(C;g?k5G4B(B $(C:/n(B(apropos). $(CGY=I>n8&(B $(CD!8i(B $(C@L8F=:0!(B $(C@L(B - $(CGY=I>n0!(B $(C5i>n(B $(C@V4B(B $(C8p5g(B $(C8m7I5i@G(B $(C8q7O@;(B $(C@[<:GR(B - $(C0M@T4O4Y(B. $(C@L(B $(C8m7I5i@:(B $(C8p5N(B Meta$(Cn62(B $(C8m7I5i?!(B $(C4kGX<-4B(B $(C00@:(B $(C8m7I@;(B $(C=GG`GO4B(B, - $(CGQ5N03@G(B $(C9.@Z7N(B $(C5H(B $(Cn0!(B - $(C@[<:GU4O4Y(B. + C-h a 명령 핵심어(apropos). 핵심어를 치면 이맥스가 이 + 핵심어가 들어 있는 모든 명령들의 목록을 작성할 + 것입니다. 이 명령들은 모두 Meta쇠-x로 부를 수 + 있습니다. 어떤 명령들에 대해서는 같은 명령을 실행하는, + 한두개의 문자로 된 순차에 대한 목록도 명령 핵심어가 + 작성합니다. ->> C-h a file$(C@;(B $(CCD(B $(C:8=J=C?@(B. +>> C-h a file을 쳐 보십시오. -$(C1W7/8i(B $(C@L8'?!(B "file"$(C@L(B $(C5i>n(B $(C@V4B(B $(C8p5g(B M-x $(C8m7I5i@G(B $(C8q7O@L(B $(C@[<:5G?)(B -$(C4Y8%(B $(CC"?!(B $(CH-8i(B $(CG%=C5K4O4Y(B. find-file$(C0z(B $(C00@:(B $(C8m7I5i?!4B(B C-x C-f$(C?M(B $(C00@:(B -$(C9.@Z(B $(C8m7I@G(B $(C8q7O@L(B $(CGX4gGO4B(B $(C8m7I@G(B $(C?7?!(B $(C@[<:5G>n(B $(C@V4B(B $(C0M@;(B $(C:<(B $(C> C-M-v$(C8&(B $(CCD<-(B $(C55?r8;(B $(CC"@;(B $(C5N7g8;1b(B $(CGO=J=C?@(B. $(C@L8&(B $(C8n(B $(C9x(B $(CGO=J=C?@(B. +>> C-M-v를 쳐서 도움말 창을 두루말기 하십시오. 이를 몇 번 하십시오. ->> C-x 1$(C@;(B $(CCD<-(B $(C55?r8;(B $(CC"@;(B $(CAv?l=J=C?@(B. +>> C-x 1을 쳐서 도움말 창을 지우십시오. - C-h i $(C?B6s@N(B $(C<38m<-8&(B $(C@P1b(B ($(CAo(B Info). $(C@L(B $(C8m7I@:(B - `*info*'$(C6s4B(B $(CF/:0GQ(B $(C;g@LD-?!<-(B $(C=C=:E[?!(B $(C<3D!5H(B - $(C2Y7/9L@G(B $(C?B6s@N(B $(C<38m<-8&(B $(C:8?)A]4O4Y(B. m emacs - <$(C:91M$(C8&(B $(CD!8i(B $(C@L8F=:(B $(C<38m<-8&(B $(C@P@;(B $(Cn(B $(C:;(B $(C@{@L(B $(C>x@88i(B ?$(C8&(B $(CD!=J=C?@(B. $(C1W7/8i(B - $(C@L8F=:0!(B Info $(C9f=D@L(B $(C>n62(B $(C1b4I@L(B $(C@V4B(B $(CAv8&(B $(C>H3;GO4B(B - $(C?)G`@L(B $(C=C@[5K4O4Y(B. $(C@L(B $(CAvD'<-8&(B $(C@|:N(B $(C86D!8i(B $(C@L8F=:@G(B - Info $(C<38m<-8&(B $(CAV5H(B $(C9.<-H-7N(B $(C;}0"GX<-(B $(C@P>n>_(B $(CGU4O4Y(B. + C-h i 온라인 설명서를 읽기 (즉 Info). 이 명령은 + `*info*'라는 특별한 사이칸에서 시스템에 설치된 + 꾸러미의 온라인 설명서를 보여줍니다. m emacs + <복귀쇠>를 치면 이맥스 설명서를 읽을 수 있습니다. + 전에 Info를 읽어 본 적이 없으면 ?를 치십시오. 그러면 + 이맥스가 Info 방식이 어떤 기능이 있는 지를 안내하는 + 여행이 시작됩니다. 이 지침서를 전부 마치면 이맥스의 + Info 설명서를 주된 문서화로 생각해서 읽어야 합니다. -* $(C0a7P(B +* 결론 ------ -$(C@L8F=:8&(B $(C?O@|Hw(B $(C3*0!1b(B $(C@'GX<-4B(B C-x C-c$(C8&(B $(C>44Y4B(B $(C;g=G@;(B $(C1b>oGO=J=C?@(B. -$(C@O=C@{@87N(B $(CA60!:q7N(B $(C3*0!<-(B $(CHD?!(B $(C4Y=C(B $(C@L8F=:?!(B $(C5G59>F(B $(C?C(B $(CnA3@89G7N(B -$(C:R:P8mGQ(B $(C;gGW@L(B $(C9_0_5G8i(B $(C>I>F<-(B $(C@Z1b(B $(C@Z=E@;(B $(CE?GOAv(B $(C8;0m(B $(C:RFrGO=J=C?@(B! +이 지침서는 새로운 사용자들 모두가 이해할 수 있도록 만들어졌으므로 +불분명한 사항이 발견되면 앉아서 자기 자신을 탓하지 말고 불평하십시오! -$(C:9;g(B $(CA60G(B +복사 조건 --------- -$(C@L(B $(CAvD'<-4B(B Stuart Cracraft$(C>>0!(B $(C@L8F=:(B $(C1Y?x(B $(C@Z7a8&(B $(C@'GX(B $(C>4(B, $(C1d(B $(C@L8F=:(B -$(CAvD'<-8&(B $(C8pC<7N(B $(CGO?)(B $(C@[<:5H(B $(C0M@L4Y(B. +이 지침서는 Stuart Cracraft씨가 이맥스 근원 자료를 위해 쓴, 긴 이맥스 +지침서를 모체로 하여 작성된 것이다. -GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L(B $(C@V@88g(B $(CF/A$GQ(B $(CA60G@;(B $(C88A7GR(B -$(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(Cn62(B $(C8EC<7N5gAv(B $(C9^@:(B $(C1W4k7N8&(B $(C:9;gGO0E3*(B - $(C:9;g:;@L(B $(C4Y8%(B $(C@L?!0T(B $(C9hFw5G4B(B $(C0M@L(B $(CGc?k5H4Y(B. + 이 문서는 이 저작권 공고와 허용 공고가 그대로 유지되고, 배포자가 + 수취자에게 이 공고에 따라 허용되는 것처럼 또 재분배하는 것을 + 허용하는 조건으로, 어떤 매체로든지 받은 그대로를 복사하거나 + 복사본이 다른 이에게 배포되는 것이 허용된다. - $(C@L(B $(C9.<-@G(B $(Cn8&(B $(C>20m(B $(C885i0m(B $(C0x@/GT@87N=a(B $(Cn(B -$(C9fGX8&(B ("$(C (пробел) в ответ на заданный вопрос. Обычно, если вы не хотите -выполнять запрещенную команду, то ответьте на вопрос нажатием клавиши "n". +Если вы действительно хотите выполнить эту команду, то нажмите клавишу + (пробел) в ответ на заданный вопрос. А если вы не хотите выполнить +запрещенную команду, то ответьте на вопрос нажатием клавиши "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 и посмотрите, как окно с документацией исчезнет. diff --git a/etc/tutorials/TUTORIAL.th b/etc/tutorials/TUTORIAL.th index e313fc71a59..18038baea44 100644 --- a/etc/tutorials/TUTORIAL.th +++ b/etc/tutorials/TUTORIAL.th @@ -1,962 +1,962 @@ -0,T$Yh10AW1M!RCc0*i10MU1aA!0Jl1(B. ,Tb;C40HV1!IR0Jh1G907i1RB"M'0$Yh10AW1MJSK0CQ1:`0'Wh1M9d"c9!RC7SJS`9R(B. -,TJ'G90ET1"0JT1708Tl1(B ,T>(B.,TH(B. 2528 ,Tb4B:0CT10IQ17?0CU1+M?05l1aG0Cl1?RG09l1`40*Q19(B (Free Software -Foundation, Inc); ,T!0CX13R0HV1!IR`0'Wh1M9d"5M907i1RB:7(B. -0,T7h1R9!S0EQ1'0HV1!IR0$Yh10AW1M!RCc0*i10MU1aA!0Jl1(B (Emacs tutorial) ,TM0BYh1c9"3P09Ui1(B. +คู่มือการใช้อีแมกส์. โปรดศึกษาส่วนท้ายของคู่มือสำหรับเงื่อนไขในการทำสำเนา. +สงวนลิขสิทธิ์ พ.ศ. 2528 โดยบริษัทฟรีซอฟต์แวร์ฟาวน์เดชัน (Free Software +Foundation, Inc); กรุณาศึกษาเงื่อนไขตอนท้ายบท. +ท่านกำลังศึกษาคู่มือการใช้อีแมกส์ (Emacs tutorial) อยู่ในขณะนี้. -,Tb4B07Qh1Gd;$S0JQh1'"M'0MU1aA!0Jl1(B (Emacs) ,T(Pc0*i10$Yh10!Q1:0;Xh1A(B CONTROL (,T:R'$0CQi1'MR(`0;g190;Xh1A07Uh10AU1(B -0,TJQ1-0EQ1!I03l1(B CTRL ,TK0CW1M(B CTL) ,TK0CW1M(B 0,T;Xh1A(B META (,T:R'$0CQi1'MR(`0;g190;Xh1A07Uh10AU10JQ1-0EQ1!I03l1(B EDIT ,TK0CW1M(B -ALT). ,Ta7907Uh1(Pc0*i1$S`05g1Ac9!RCM08T1:RB(B, ,T`CR(Pc0*i105Q1G0Bh1M04Q1'05h1Md;09Ui1(B: +โดยทั่วไปคำสั่งของอีแมกส์ (Emacs) จะใช้คู่กับปุ่ม CONTROL (บางครั้งอาจเป็นปุ่มที่มี +สัญลักษณ์ CTRL หรือ CTL) หรือ ปุ่ม META (บางครั้งอาจเป็นปุ่มที่มีสัญลักษณ์ EDIT หรือ +ALT). แทนที่จะใช้คำเต็มในการอธิบาย, เราจะใช้ตัวย่อดังต่อไปนี้: - C- ,TKARB06V1'c0Ki1!40;Xh1A(B CONTROL ,TaEP0;Xh1A0MQ1!IC(B ,T>0Ci1MA0!Q19(B. - 0,T4Q1'09Qi19(B C-f ,T(PKARB06V1'c0Ki1!40;Xh1A(B CONTROL ,TaEP0;Xh1A(B f ,T>0Ci1MA0!Q19(B. - M- ,TKARB06V1'c0Ki1!40;Xh1A(B META ,TK0CW1M(B EDIT ,TK0CW1M(B ALT ,TaEP0;Xh1A0MQ1!IC(B - ,T>0Ci1MA0!Q19(B. ,Tc9!C03U107Uh1d0Ah10AU10;Xh1A(B META, EDIT ,TK0CW1M(B ALT ,Tc0Ki1!40;Xh1A(B - ESC ,Ta0Ei1G;0Eh1MB(B, ,Ta0Ei1G!40;Xh1A(B . ,T`CRc0*i10JQ1-0EQ1!I03l1(B ,Ta790;Xh1A(B ESC. + C- หมายถึงให้กดปุ่ม CONTROL และปุ่มอักษร พร้อมกัน. + ดังนั้น C-f จะหมายถึงให้กดปุ่ม CONTROL และปุ่ม f พร้อมกัน. + M- หมายถึงให้กดปุ่ม META หรือ EDIT หรือ ALT และปุ่มอักษร + พร้อมกัน. ในกรณีที่ไม่มีปุ่ม META, EDIT หรือ ALT ให้กดปุ่ม + ESC แล้วปล่อย, แล้วกดปุ่ม . เราใช้สัญลักษณ์ แทนปุ่ม ESC. -,TKARB`K05X1(B: ,Tc9!C03U107Uh105i1M'!RC`0ET1!c0*i10MU1aA!0Jl1(B, ,Tc0Ki1!40;Xh1A(B C-x C-c. (,TJM'05Q1G0MQ1!IC(B.) -0,T5Q1G0MQ1!IC(B ">>" 0,T7Uh1;CR!/M0BYh17R'"M:0+i1RB0AW1M`0;g19!RCa9P9Sc0Ki107h1R9EM'c0*i1$S0JQh1'(B. 0,T5Q1GM0Bh1R'`0*h19(B: +หมายเหตุ: ในกรณีที่ต้องการเลิกใช้อีแมกส์, ให้กดปุ่ม C-x C-c. (สองตัวอักษร.) +ตัวอักษร ">>" ที่ปรากฏอยู่ทางขอบซ้ายมือเป็นการแนะนำให้ท่านลองใช้คำสั่ง. ตัวอย่างเช่น: <> ->> ,T!40;Xh1A(B C-v (0,T4Y1K09i1R(M06Q14d;(B) ,T`0>Wh1M07Uh1(P`$0EWh1M9d;0BQ1'K09i1R(M06Q14d;(B. - (,TEM'7S04Y1b4B!RC!40;Xh1A(B CONTROL ,TaEP0;Xh1A0MQ1!IC(B v ,T>0Ci1MA0!Q19(B). - ,T(R!09Ui1d;(B, 0,T7h1R9$GC(PEM'c0*i1$S0JQh1'09Ui104Y1`0AWh1M07h1R90Mh1R9K09i1R(M09Ui1(:a0Ei1G(B. +>> กดปุ่ม C-v (ดูหน้าจอถัดไป) เพื่อที่จะเคลื่อนไปยังหน้าจอถัดไป. + (ลองทำดูโดยการกดปุ่ม CONTROL และปุ่มอักษร v พร้อมกัน). + จากนี้ไป, ท่านควรจะลองใช้คำสั่งนี้ดูเมื่อท่านอ่านหน้าจอนี้จบแล้ว. -0,T7h1R9(P0JQ1'`!5`0Kg19d04i10Gh1RJM':CC07Q14"M'K09i1R(M07Uh1a0Ei1G(P0BQ1'$';CR!/c0Ki1`0Kg19:9K09i1R(M06Q14d;(B; 0,T9Uh1(B -,T`0;g19!RC0*h1GBc0Ki107h1R9JRARC60Mh1R9K09i1R(Md04i1M0Bh1R'05h1M`09Wh1M'(B. +ท่านจะสังเกตเห็นได้ว่าสองบรรทัดของหน้าจอที่แล้วจะยังคงปรากฏให้เห็นบนหน้าจอถัดไป; นี่ +เป็นการช่วยให้ท่านสามารถอ่านหน้าจอได้อย่างต่อเนื่อง. -0,TJTh1'aC!07Uh107h1R9(S`0;g1905i1M'0CYi10$W1M!RC`$0EWh1M95SaK09h1'd;ARc90"i1M$GRA(B. ,T"3P09Ui107h1R97CR:(B -0,TGT108U1!RC`$0EWh1M9d;0BQ1'K09i1R(M06Q14d;a0Ei1G04i1GB0;Xh1A(B C-v. ,Tc9!RC07Uh1(P`$0EWh1M9!0EQ1:d;K09Vh1'K09i1R(M(B, ,T!40;Xh1A(B -M-v (,T!40;Xh1A(B META ,TaEP0;Xh1A(B v, ,TK0CW1M!40;Xh1A(B v 0,T6i1R07h1R9d0Ah10AU10;Xh1A(B META, EDIT, ,TK0CW1M(B ALT). +สิ่งแรกที่ท่านจำเป็นต้องรู้คือการเคลื่อนตำแหน่งไปมาในข้อความ. ขณะนี้ท่านทราบ +วิธีการเคลื่อนไปยังหน้าจอถัดไปแล้วด้วยปุ่ม C-v. ในการที่จะเคลื่อนกลับไปหนึ่งหน้าจอ, กดปุ่ม +M-v (กดปุ่ม META และปุ่ม v, หรือกดปุ่ม v ถ้าท่านไม่มีปุ่ม META, EDIT, หรือ ALT). ->> ,TEM'!40;Xh1A(B M-v ,TaEP!40;Xh1A(B C-v 0,T4Y1!RC7S'R90JQ1!JM'JRA$0CQi1'(B. +>> ลองกดปุ่ม M-v และกดปุ่ม C-v ดูการทำงานสักสองสามครั้ง. -* ,TJ0CX1;(B +* สรุป ----- -,T$S0JQh1'05h1Md;09Ui1c0*i1`0AWh1M05i1M'!RC04Y1K09i1R(M05h1R'f(B: +คำสั่งต่อไปนี้ใช้เมื่อต้องการดูหน้าจอต่างๆ: - C-v ,T`$0EWh1M9d;0BQ1'K09i1R(M06Q14d;K09Vh1'K09i1R(M(B - M-v ,T`$0EWh1M9!0EQ1:d;K09Vh1'K09i1R(M(B - C-l ,TE:K09i1R(M(B ,Ta0Ei1GaJ4'0Ci1MA07Qi1'0Bi1RB5SaK09h1'"M'0"i1M$GRA07Uh10AU1(B - ,T`$M0Cl1`+M0Cl1(B (cursor) ,T;CR!/M0BYh1d;aJ4'd0Gi1!ER'(M(B. - (,T$S0JQh1'09Ui10$W1M(B CONTROL-L, ,Td0Ah1c0*h1(B CONTROL-1.) + C-v เคลื่อนไปยังหน้าจอถัดไปหนึ่งหน้าจอ + M-v เคลื่อนกลับไปหนึ่งหน้าจอ + C-l ลบหน้าจอ แล้วแสดงผลหน้าจอใหม่, พร้อมทั้งย้ายตำแหน่งของข้อความที่มี + เคอร์เซอร์ (cursor) ปรากฏอยู่ไปแสดงไว้กลางจอ. + (คำสั่งนี้คือ CONTROL-L, ไม่ใช่ CONTROL-1.) ->> 0,TJQ1'`!55SaK09h1'"M'`$M0Cl1`+M0Cl1(B, ,TaEP0JQ1'`!504Y10Gh1R0AU10"i1M$GRAMPdCM0BYh1c!0Ei1`$M0Cl1`+M0Cl1(B. - ,Ta0Ei1G!40;Xh1A(B C-l. - 0,TJQ1'`!504Y15SaK09h1'"M'`$M0Cl1`+M0Cl10MU1!$0CQi1'(B ,T(P`0Kg190Gh1R0AU10"i1M$GRA`04T1A;CR!/M0BYh1c!0Ei1f(B 0,T!Q1:`$M0Cl1`+M0Cl1(B. +>> สังเกตตำแหน่งของเคอร์เซอร์, และสังเกตดูว่ามีข้อความอะไรอยู่ใกล้เคอร์เซอร์. + แล้วกดปุ่ม C-l. + สังเกตดูตำแหน่งของเคอร์เซอร์อีกครั้ง จะเห็นว่ามีข้อความเดิมปรากฏอยู่ใกล้ๆ กับเคอร์เซอร์. -* ,T!RC$G:0$X1A`$M0Cl1`+M0Cl1`0:Wi1M'05i19(B +* การควบคุมเคอร์เซอร์เบื้องต้น ------------------------ -,T!RC`$0EWh1M9K09i1R(Md;AR09Qi19`0;g190JTh1'(S`0;g19(B ,Ta05h107h1R9(P7SM0Bh1R'dC06i1R07h1R905i1M'!RC(P`$0EWh1M9d;0BQ1'(B -,T5SaK09h1'07Uh105i1M'!RC@RBc90"i1M$GRA07Uh1;CR!/M0BYh1:9K09i1R(M(B? +การเคลื่อนหน้าจอไปมานั้นเป็นสิ่งจำเป็น แต่ท่านจะทำอย่างไรถ้าท่านต้องการจะเคลื่อนไปยัง +ตำแหน่งที่ต้องการภายในข้อความที่ปรากฏอยู่บนหน้าจอ? -0,TAU1KERB0GT108U107Uh1JRARC6(P7Sd04i1(B. 0,TGT108U107Uh10>Wi1907Uh10JX140$W1M!RCc0*i1$S0JQh1'(B C-p, C-b, C-f, ,TaEP(B C-n. -,Ta05h1EP$S0JQh1'(P`$0EWh1M9`$M0Cl1`+M0Cl1d;K09Vh1':CC07Q14K0CW1MK09Vh1'$M0EQ1A09l1c907T1H7R'c407T1H7R'K09Vh1':9K09i1R(M(B. -0,T5h1Md;09Ui1`0;g195RCR'aJ4'$S0JQh1'07Qi1'0JUh1(B ,TaEP07T1H7R'07Uh1`$M0Cl1`+M0Cl1`$0EWh1M9d;(B: +มีหลายวิธีที่สามารถจะทำได้. วิธีที่พื้นที่สุดคือการใช้คำสั่ง C-p, C-b, C-f, และ C-n. +แต่ละคำสั่งจะเคลื่อนเคอร์เซอร์ไปหนึ่งบรรทัดหรือหนึ่งคอลัมน์ในทิศทางใดทิศทางหนึ่งบนหน้าจอ. +ต่อไปนี้เป็นตารางแสดงคำสั่งทั้งสี่ และทิศทางที่เคอร์เซอร์เคลื่อนไป: - ,T:CC07Q140!h1M9K09i1R(B, C-p + บรรทัดก่อนหน้า, C-p : : - 0,TBi1M9!0EQ1:(B, C-b .... ,T5SaK09h1'`$M0Cl1`+M0Cl10;Q1(0(X10:Q19(B .... 0,T"i1R'K09i1R(B, C-f + ย้อนกลับ, C-b .... ตำแหน่งเคอร์เซอร์ปัจจุบัน .... ข้างหน้า, C-f : : - ,T:CC07Q1406Q14d;(B, C-n + บรรทัดถัดไป, C-n ->> ,T`$0EWh1M9`$M0Cl1`+M0Cl1d;07Uh10!Vh1'!ER'"M'0Wh1Mc0Ki10> เคลื่อนเคอร์เซอร์ไปที่กึ่งกลางของผังข้างบนโดยใช้คำสั่ง C-n หรือ C-p. แล้วกดปุ่ม + C-l เพื่อให้ผังปรากฏอยู่กลางหน้าจอ. -0,T7h1R9MR((P(S$S0JQh1'd04i10'h1RB0"Vi19b4B0JQ1'`!505Q1G0MQ1!IC07Uh1c0*i1(B: p ,TJSK0CQ1:(B previous (0,T!h1M9K09i1R(B), n -,TJSK0CQ1:(B next (0,T6Q14d;(B), b ,TJSK0CQ1:(B backward (0,TBi1M9!0EQ1:(B), ,TaEP(B f ,TJSK0CQ1:(B forward -(0,T"i1R'K09i1R(B). ,T`K0Eh1R09Ui10$W1M`0:Wi1M'05i19"M'$S0JQh1'c9!RC$G:0$X1A5SaK09h1'"M'`$M0Cl1`+M0Cl1(B, ,TaEP07h1R9(B -,T(P05i1M'c0*i1$S0JQh1'`K0Eh1R09Ui10:h1MB$0CQi1'(B, ,T)P09Qi190(V1'`0;g19!RC04U107Uh1(P(S$S0JQh1'`K0Eh1R09Ui1d0Gi1(B. +ท่านอาจจะจำคำสั่งได้ง่ายขึ้นโดยสังเกตตัวอักษรที่ใช้: p สำหรับ previous (ก่อนหน้า), n +สำหรับ next (ถัดไป), b สำหรับ backward (ย้อนกลับ), และ f สำหรับ forward +(ข้างหน้า). เหล่านี้คือเบื้องต้นของคำสั่งในการควบคุมตำแหน่งของเคอร์เซอร์, และท่าน +จะต้องใช้คำสั่งเหล่านี้บ่อยครั้ง, ฉะนั้นจึงเป็นการดีที่จะจำคำสั่งเหล่านี้ไว้. ->> ,TEM'c0*i1$S0JQh1'(B C-n 0,T4Y1`0>Wh1M07Uh1(P`$0EWh1M9`$M0Cl1`+M0Cl1E'AR0BQ1':CC07Q1409Ui1(B. +>> ลองใช้คำสั่ง C-n ดูเพื่อที่จะเคลื่อนเคอร์เซอร์ลงมายังบรรทัดนี้. ->> ,TEM'`$0EWh1M9`0"i1Rd;c9:CC07Q14b4Bc0*i1$S0JQh1'(B C-f ,TaEP`$0EWh1M90"Vi190"i1R':9b4Bc0*i1$S0JQh1'(B C-p. - 0,TJQ1'`!504Y10Gh1R`0!T14MPdC0"Vi1906i1Rc0*i1$S0JQh1'(B C-p ,T`0AWh1M5SaK09h1'`$M0Cl1`+M0Cl1;CR!/M0BYh107Uh15C'!ER'(B - ,T"M':CC07Q14(B. +>> ลองเคลื่อนเข้าไปในบรรทัดโดยใช้คำสั่ง C-f และเคลื่อนขึ้นข้างบนโดยใช้คำสั่ง C-p. + สังเกตดูว่าเกิดอะไรขึ้นถ้าใช้คำสั่ง C-p เมื่อตำแหน่งเคอร์เซอร์ปรากฏอยู่ที่ตรงกลาง + ของบรรทัด. -,Ta05h1EP:CC07Q140JTi190JX1404i1GB0MQ1!"CP(B Newline, 0,T+Vh1'c0*i1aJ4'"M:`"5CPK0Gh1R':CC07Q14(B. 0,T7Uh107i1RB0JX14"M'(B -,Td?0El10!g1(P0AU10MQ1!"CP(B Newline ,T`0*h190!Q19(B (,Ta05h1JSK0CQ1:0MU1aA!0Jl1a0Ei1Gd0Ah1(S`0;g19(B). +แต่ละบรรทัดสิ้นสุดด้วยอักขระ Newline, ซึ่งใช้แสดงขอบเขตระหว่างบรรทัด. ที่ท้ายสุดของ +ไฟล์ก็จะมีอักขระ Newline เช่นกัน (แต่สำหรับอีแมกส์แล้วไม่จำเป็น). ->> ,TEM'c0*i1$S0JQh1'(B C-b 0,T7Uh15SaK09h1'`0CTh1A05i19"M':CC07Q1404Y1(B. ,T`$M0Cl1`+M0Cl1(P`$0EWh1M9d;0BQ1'5SaK09h1'(B - 0,T7i1RB0JX14"M':CC07Q140!h1M9K09i1R(B. 0,T9Uh1`0;g19`>CRP0Gh1R`$M0Cl1`+M0Cl1d04i1`$0EWh1M90"i1RA0MQ1!"CP(B Newline ,Td;(B. +>> ลองใช้คำสั่ง C-b ที่ตำแหน่งเริ่มต้นของบรรทัดดู. เคอร์เซอร์จะเคลื่อนไปยังตำแหน่ง + ท้ายสุดของบรรทัดก่อนหน้า. นี่เป็นเพราะว่าเคอร์เซอร์ได้เคลื่อนข้ามอักขระ Newline ไป. -,T$S0JQh1'(B C-f ,TJRARC6`$0EWh1M90"i1RA0MQ1!"CP(B Newline ,Td04i1`0*h19`04U1BG0!Q1:$S0JQh1'(B C-b. +คำสั่ง C-f สามารถเคลื่อนข้ามอักขระ Newline ได้เช่นเดียวกับคำสั่ง C-b. ->> ,TEM'c0*i1$S0JQh1'(B C-b 0,T4Y10MU1!0JQ1!K09h1MB(B, 0,T7h1R9(PJRARC6`0"i1Rc(!RC`$0EWh1M9`$M0Cl1`+M0Cl1d04i104U10"Vi19(B. - ,Ta0Ei1GEM'c0*i1$S0JQh1'(B C-f ,T`0>Wh1M07Uh1(P`$0EWh1M9d;0BQ1'5SaK09h1'07i1RB0JX14"M':CC07Q14(B. - ,Ta0Ei1GEM'c0*i1$S0JQh1'(B C-f 0,TMU1!0JQ1!$0CQi1'`0>Wh1M07Uh1(P`$0EWh1M9d;0BQ1':CC07Q1406Q14d;(B. +>> ลองใช้คำสั่ง C-b ดูอีกสักหน่อย, ท่านจะสามารถเข้าใจการเคลื่อนเคอร์เซอร์ได้ดีขึ้น. + แล้วลองใช้คำสั่ง C-f เพื่อที่จะเคลื่อนไปยังตำแหน่งท้ายสุดของบรรทัด. + แล้วลองใช้คำสั่ง C-f อีกสักครั้งเพื่อที่จะเคลื่อนไปยังบรรทัดถัดไป. -,T`0AWh1M07h1R9`$0EWh1M90> ,TEM'`$0EWh1M9`$M0Cl1`+M0Cl1E'MM!d;9M!K09i1R(Mb4Bc0*i1$S0JQh1'(B C-n, ,Ta0Ei1G04Y10Gh1R0AU1MPdC`0!T140"Vi19(B. +>> ลองเคลื่อนเคอร์เซอร์ลงออกไปนอกหน้าจอโดยใช้คำสั่ง C-n, แล้วดูว่ามีอะไรเกิดขึ้น. -0,T6i1R`$0EWh1M907U1EP05Q1G0MQ1!IC09Qi190*i1Rd;(B, 0,T7h1R90!g1JRARC6(P`$0EWh1M9d04i107U1EP$S(B. ,T$S0JQh1'(B M-f (META-f) -,Tc0*i1c9!RC`$0EWh1M9d;0BQ1'$S07Uh1M0BYh106Q14d;(B ,TaEP(B M-b ,Tc0*i1c9!RC`$0EWh1M9d;0BQ1'$S07Uh1M0BYh10!h1M9K09i1R(B. +ถ้าเคลื่อนทีละตัวอักษรนั้นช้าไป, ท่านก็สามารถจะเคลื่อนได้ทีละคำ. คำสั่ง M-f (META-f) +ใช้ในการเคลื่อนไปยังคำที่อยู่ถัดไป และ M-b ใช้ในการเคลื่อนไปยังคำที่อยู่ก่อนหน้า. ->> ,TEM'c0*i1$S0JQh1'(B M-f ,TaEP(B M-b 0,T4Y10JQ1!JM'JRA$0CQi1'(B. +>> ลองใช้คำสั่ง M-f และ M-b ดูสักสองสามครั้ง. -,T`0AWh1M07h1R9M0BYh107Uh15SaK09h1'!ER'"M'$S(B, ,T$S0JQh1'(B M-f ,T(Pc0*i1`$0EWh1M9d;0BQ1'5SaK09h1'07i1RB"M'$S09Qi19(B. ,T`0AWh1M(B -0,T7h1R9M0BYh107Uh15SaK09h1'`0Gi19GCC$CPK0Gh1R'$S(B, ,T$S0JQh1'(B M-f ,T(Pc0*i1`$0EWh1M9d;0BQ1'5SaK09h1'07i1RB"M'$S(B -0,T7Uh1M0BYh106Q14d;(B. ,T$S0JQh1'(B M-b ,T7SK09i1R07Uh17S9M'`04U1BG0!Q19(B ,Ta05h1`$0EWh1M9d;c907T1H7R'5C'0!Q190"i1RA(B. +เมื่อท่านอยู่ที่ตำแหน่งกลางของคำ, คำสั่ง M-f จะใช้เคลื่อนไปยังตำแหน่งท้ายของคำนั้น. เมื่อ +ท่านอยู่ที่ตำแหน่งเว้นวรรคระหว่างคำ, คำสั่ง M-f จะใช้เคลื่อนไปยังตำแหน่งท้ายของคำ +ที่อยู่ถัดไป. คำสั่ง M-b ทำหน้าที่ทำนองเดียวกัน แต่เคลื่อนไปในทิศทางตรงกันข้าม. -,TKARB`K05X1(B: ,T`09Wh1M'(R!@RIRd7Bd0Ah10AU1!RCc0*i10MQ1!"CP`0Gi19GCC$(B (whitespace) ,Tc9!RCaJ4'(B - ,T"M:`"5"M'$S(B, ,T)P09Qi19`0AWh1MM0BYh1c9bKA4@RIRd7B(B (ThaiText mode) 0,TMU1aA!0Jl1(B - ,T(P7S!RC!S0!Q1:"M:`"5"M'$Sb4BMR0HQ1Bb;Ca!CA05Q14$S(B. ,T$S0JQh1'(B M-f ,TaEP(B M-b - 0,T(V1'(P7S'R9d04i1(B, ,Ta05h1(Pc0Ki1> ,TEM'c0*i1$S0JQh1'(B M-f ,TaEP(B M-b 0,T4Y1(B, ,Tb4B;P;90!Q1:$S0JQh1'(B C-f ,TaEP(B C-b, 0,T7h1R9(P0JQ1'`!5(B - ,T`0Kg19!RC7S'R9"M'$S0JQh1'(B M-f ,TaEP(B M-b ,Tc95SaK09h1'05h1R'f(B 0,T7Qi1'c9$SaEPCPK0Gh1R'$S(B. +>> ลองใช้คำสั่ง M-f และ M-b ดู, โดยปะปนกับคำสั่ง C-f และ C-b, ท่านจะสังเกต + เห็นการทำงานของคำสั่ง M-f และ M-b ในตำแหน่งต่างๆ ทั้งในคำและระหว่างคำ. -0,T7h1R9JRARC60JQ1'`!5d04i10Gh1R$S0JQh1'(B C-f ,TaEP(B C-b 0,T9Qi197SK09i1R07Uh1c90EQ1!I3P`04U1BG0!Q1:$S0JQh1'(B M-f -,TaEP(B M-b, ,Ta05h1M0BYh1:9`!301l107Uh105h1R'0!Q19(B. 0,TJh1G9AR!(B 0,T;Xh1A(B META ,T(P06Y1!!SK94c0Ki1c0*i10!Q1:!RC7S'R9c9(B -,TCP04Q1:07Uh1`0!Uh1BG0"i1M'0!Q1:K09h1GB07Uh1!SK940"Vi197R'@RIR(B (,T`0*h19(B ,T$S(B, ,T;CPbB$(B, 0,TBh1MK09i1R(B, ,T`0;g1905i19(B), -,T"3P07Uh10;Xh1A(B CONTROL 0,T9Qi190AQ1!(P06Y1!!SK94c0Ki1c0*i10!Q1:!RC7S'R9c9CP04Q1:07Uh1`0!Uh1BG0"i1M'0!Q1:K09h1GB0Bh1MB(B -0,TMT1JCP07Uh17S!RCa0!i1d"d04i1(B (,T`0*h19(B 0,T5Q1G0MQ1!IC(B, ,T:CC07Q14(B, ,T`0;g1905i19(B). +ท่านสามารถสังเกตได้ว่าคำสั่ง C-f และ C-b นั้นทำหน้าที่ในลักษณะเดียวกับคำสั่ง M-f +และ M-b, แต่อยู่บนเกณฑ์ที่ต่างกัน. ส่วนมาก ปุ่ม META จะถูกกำหนดให้ใช้กับการทำงานใน +ระดับที่เกี่ยวข้องกับหน่วยที่กำหนดขึ้นทางภาษา (เช่น คำ, ประโยค, ย่อหน้า, เป็นต้น), +ขณะที่ปุ่ม CONTROL นั้นมักจะถูกกำหนดให้ใช้กับการทำงานในระดับที่เกี่ยวข้องกับหน่วยย่อย +อิสระที่ทำการแก้ไขได้ (เช่น ตัวอักษร, บรรทัด, เป็นต้น). -,T!RC7S'R9c97S9M'`04U1BG0!Q19JSK0CQ1::CC07Q140!Q1:;CPbB$(B: ,T$S0JQh1'(B C-a ,TaEP(B C-e ,Tc0*i1`$0EWh1M9(B -,Td;0BQ1'5SaK09h1'`0CTh1A05i19aEP07i1RB"M':CC07Q14(B, ,T"3P`04U1BG0!Q19$S0JQh1'(B M-a ,TaEP(B M-e ,Tc0*i1`$0EWh1M9(B -,Td;0BQ1'5SaK09h1'`0CTh1A05i19aEP07i1RB"M';CPbB$(B. +การทำงานในทำนองเดียวกันสำหรับบรรทัดกับประโยค: คำสั่ง C-a และ C-e ใช้เคลื่อน +ไปยังตำแหน่งเริ่มต้นและท้ายของบรรทัด, ขณะเดียวกันคำสั่ง M-a และ M-e ใช้เคลื่อน +ไปยังตำแหน่งเริ่มต้นและท้ายของประโยค. -,TKARB`K05X1(B: ,T`09Wh1M'(R!@RIRd7Bd0Ah109T1BAc0*i10MQ1!"CPA0KQ1>@R$(B (period) ,Tc9!RCaJ4'0(X140JTi190JX14"M'(B - ,T;CPbB$(B, ,T7Sc0Ki1d0Ah1JRARC6!SK94"M:`"5"M';CPbB$c0Ki106Y1!05i1M'd04i1(B. 0,T4Q1'09Qi19`0AWh1M(B - ,TM0BYh1c9bKA4@RIRd7B(B (ThaiText mode), ,T$S0JQh1'(B M-a ,TaEP(B M-e ,T(P`$0EWh1M9(B - ,T`$M0Cl1`+M0Cl1d;0BQ1'5SaK09h1'`0CTh1A05i19"M'0Bh1MK09i1R(B ,TaEP5SaK09h1'07i1RB0JX14"M'0Bh1MK09i1R(B - ,T5RAES04Q1:(B. ,TB!`0Gi19!C03U107Uh10AU1!RCc0*i10MQ1!"CPA0KQ1>@R$(B. +หมายเหตุ: เนื่องจากภาษาไทยไม่นิยมใช้อักขระมหัพภาค (period) ในการแสดงจุดสิ้นสุดของ + ประโยค, ทำให้ไม่สามารถกำหนดขอบเขตของประโยคให้ถูกต้องได้. ดังนั้นเมื่อ + อยู่ในโหมดภาษาไทย (ThaiText mode), คำสั่ง M-a และ M-e จะเคลื่อน + เคอร์เซอร์ไปยังตำแหน่งเริ่มต้นของย่อหน้า และตำแหน่งท้ายสุดของย่อหน้า + ตามลำดับ. ยกเว้นกรณีที่มีการใช้อักขระมหัพภาค. ->> ,TEM'c0*i1$S0JQh1'(B C-a ,TaEP(B C-e 0,T4Y10JQ1!JM'JRA$0CQi1'(B. - ,TEM'c0*i1$S0JQh1'(B M-a ,TaEP(B M-e 0,T4Y10JQ1!JM'JRA$0CQi1'(B. +>> ลองใช้คำสั่ง C-a และ C-e ดูสักสองสามครั้ง. + ลองใช้คำสั่ง M-a และ M-e ดูสักสองสามครั้ง. -0,TJQ1'`!504Y10Gh1R!RCc0*i1$S0JQh1'(B C-a 0,T+i1Sf(B 0,T!Q19(Pd0Ah1`0!T14> ,TEM'c0*i1$S0JQh1'`K0Eh1R09Ui10JQ1!CPBP`0>Wh1M`0;g19!RC0=V1!0KQ14(B. - ,T$S0JQh1'`K0Eh1R09Ui1`0;g19$S0JQh1'07Uh1c0*i10!Q190:h1MBAR!(B. +>> ลองใช้คำสั่งเหล่านี้สักระยะเพื่อเป็นการฝึกหัด. + คำสั่งเหล่านี้เป็นคำสั่งที่ใช้กันบ่อยมาก. -0,TAU10MU1!JM'$S0JQh1'07Uh1JS0$Q1-c9!RC`$0EWh1M95SaK09h1'0$W1M(B ,T$S0JQh1'(B M-< (META 0,T9i1MB!0Gh1R(B), ,Tc0*i1c9!RC(B -,T`$0EWh1M9d;0BQ1'5SaK09h1'`0CTh1A05i19"M'0"i1M$GRA(B, ,TaEP(B M-> (META ,TAR!!0Gh1R(B), ,Tc0*i1c9!RC`$0EWh1M9(B -,Td;0BQ1'5SaK09h1'07i1RB0JX14"M'0"i1M$GRA(B. +มีอีกสองคำสั่งที่สำคัญในการเคลื่อนตำแหน่งคือ คำสั่ง M-< (META น้อยกว่า), ใช้ในการ +เคลื่อนไปยังตำแหน่งเริ่มต้นของข้อความ, และ M-> (META มากกว่า), ใช้ในการเคลื่อน +ไปยังตำแหน่งท้ายสุดของข้อความ. -,Tc9`$0CWh1M';ERB7R'(B (terminal) 0,TJh1G9cK0-h1(B, 0,TMQ1!"CP(B "<" ,T(PM0BYh1`K09W1M0MQ1!"CP0(X1E@R$(B -(comma), ,T)P09Qi1907h1R905i1M'c0*i10;Xh1A0*T1?05l1(B (shift) ,Tc9!RC0;i1M90MQ1!"CP09Qi19(B. ,TJSK0CQ1:`$0CWh1M'(B -,T;ERB7R'a::09Ui1(B, 0,T7h1R90(V1'05i1M'c0*i10;Xh1A0*T1?05l1c9!RC0;i1M9$S0JQh1'(B M-< ,Tc97S9M'`04U1BG0!Q19(B, 0,T6i1Rd0Ah1(B -,T$S09V1'06V1'0;Xh1A0*T1?05l1(B, 0,T!g1KARB$GRA0Gh1R07h1R9!S0EQ1'0;i1M9$S0JQh1'(B M-comma. +ในเครื่องปลายทาง (terminal) ส่วนใหญ่, อักขระ "<" จะอยู่เหนืออักขระจุลภาค +(comma), ฉะนั้นท่านต้องใช้ปุ่มชิฟต์ (shift) ในการป้อนอักขระนั้น. สำหรับเครื่อง +ปลายทางแบบนี้, ท่านจึงต้องใช้ปุ่มชิฟต์ในการป้อนคำสั่ง M-< ในทำนองเดียวกัน, ถ้าไม่ +คำนึงถึงปุ่มชิฟต์, ก็หมายความว่าท่านกำลังป้อนคำสั่ง M-comma. ->> ,TEM'c0*i1$S0JQh1'(B M-< 0,T4Y1(B, ,T`0>Wh1M`$0EWh1M9d;0BQ1'5SaK09h1'`0CTh1A05i19"M'0$Yh10AW1M!RCc0*i109Ui1(B. - ,Ta0Ei1Gc0*i1$S0JQh1'(B C-v 0,T+i1S0!Q19KERBf(B ,T$0CQi1'`0>Wh1M07Uh1(P`$0EWh1M9!0EQ1:AR0BQ1'5SaK09h1'`04T1A09Ui1(B. +>> ลองใช้คำสั่ง M-< ดู, เพื่อเคลื่อนไปยังตำแหน่งเริ่มต้นของคู่มือการใช้นี้. + แล้วใช้คำสั่ง C-v ซ้ำกันหลายๆ ครั้งเพื่อที่จะเคลื่อนกลับมายังตำแหน่งเดิมนี้. ->> ,TEM'c0*i1$S0JQh1'(B M-> 0,T4Y1(B, ,T`0>Wh1M`$0EWh1M9d;0BQ1'5SaK09h1'07i1RB0JX14"M'0$Yh10AW1M!RCc0*i109Ui1(B. - ,Ta0Ei1Gc0*i1$S0JQh1'(B M-v 0,T+i1S0!Q19KERBf(B ,T$0CQi1'`0>Wh1M07Uh1(P`$0EWh1M9!0EQ1:AR0BQ1'5SaK09h1'`04T1A09Ui1(B. +>> ลองใช้คำสั่ง M-> ดู, เพื่อเคลื่อนไปยังตำแหน่งท้ายสุดของคู่มือการใช้นี้. + แล้วใช้คำสั่ง M-v ซ้ำกันหลายๆ ครั้งเพื่อที่จะเคลื่อนกลับมายังตำแหน่งเดิมนี้. -0,T7h1R9JRARC6`$0EWh1M9`$M0Cl1`+M0Cl1d04i104i1GB0;Xh1A0EY1!HC(B (arrow key), 0,T6i1R`$0CWh1M';ERB7R'"M'07h1R9(B -0,TAU10;Xh1A`K0Eh1R09Ui1M0BYh1(B. ,T`CRa9P9Sc0Ki10=V1!0KQ14c0*i1$S0JQh1'(B C-b, C-f, C-n ,TaEP(B C-p, 0,T4i1GB`K05X1CRP0Gh1R07h1R9d0Ah105i1M'`$0EWh1M90Bi1RB0AW1MMM!(R!5SaK09h1'0AW1M0JQ1A0CRP0Gh1RJRARC6c0*i1d04i10!Q1:`$0CWh1M';ERB7R'07X1!*09T14(B. 0,T5Q1G`E"MR0Cl1(B -0,T!T1G`A905l107Uh1!0Eh1RG06V1'09Ui1`0CU1B!0Gh1R(B ",TMR0Cl10!T1G`A905l1`05T1AK09i1R(B (prefix argument)", ,T`>CRP0Gh1R07h1R9(B -0,T5i1M'0;i1M905Q1G`E"0!h1M907Uh1(P0;i1M9$S0JQh1'(B. +คำสั่งส่วนใหญ่ในอีแมกส์นั้นจะสามารถกำกับตัวเลขอาร์กิวเมนต์ได้; สำหรับคำสั่งส่วนใหญ่, +ตัวเลขเหล่านี้ก็จะหมายถึงจำนวนครั้งของการประมวลผลของคำสั่งต่อไป. การที่จะทำให้มี +การประมวลผลของคำสั่งซ้ำเท่าจำนวนที่ต้องการนั้นสามารถทำได้โดยการป้อนคำสั่ง C-u +แล้วตามด้วยตัวเลขก่อนที่จะป้อนคำสั่งที่ต้องการ. ถ้าท่านมีปุ่ม META (หรือ EDIT หรือ +ALT), ท่านสามารถจะทำได้ด้วยอีกวิธีหนึ่ง: ป้อนตัวเลขขณะที่กดปุ่ม META อยู่. เราแนะนำ +ให้ท่านฝึกหัดใช้คำสั่ง C-u เพราะว่าสามารถใช้ได้กับเครื่องปลายทางทุกชนิด. ตัวเลขอาร์ +กิวเมนต์ที่กล่าวถึงนี้เรียกว่า "อาร์กิวเมนต์เติมหน้า (prefix argument)", เพราะว่าท่าน +ต้องป้อนตัวเลขก่อนที่จะป้อนคำสั่ง. -0,T5Q1GM0Bh1R'`0*h19(B, ,T$S0JQh1'(B C-u 8 C-f ,T(P`$0EWh1M9d;0"i1R'K09i1Ra;405Q1G0MQ1!IC(B. +ตัวอย่างเช่น, คำสั่ง C-u 8 C-f จะเคลื่อนไปข้างหน้าแปดตัวอักษร. ->> ,TEM'c0*i1$S0JQh1'(B C-n ,TK0CW1M(B C-p ,T;CP!M:0!Q1:05Q1G`E"MR0Cl10!T1G`A905l1(B, ,T`0>Wh1M07Uh1(P`$0EWh1M9`$M0Cl1`+M0Cl1(B - ,T`0"i1RARc!0Ei1:CC07Q1409Ui1b4Bc0*i1`0>U1B'$S0JQh1'`04U1BG(B. +>> ลองใช้คำสั่ง C-n หรือ C-p ประกอบกับตัวเลขอาร์กิวเมนต์, เพื่อที่จะเคลื่อนเคอร์เซอร์ + เข้ามาใกล้บรรทัดนี้โดยใช้เพียงคำสั่งเดียว. -,T$S0JQh1'0Jh1G9cK0-h1c0*i105Q1G`E"MR0Cl10!T1G`A905l1`K0Eh1R09Ui1JSK0CQ1:!RC;CPAGE> ,TEM'c0*i1$S0JQh1'(B C-u 8 C-v 0,T4Y1(B. +>> ลองใช้คำสั่ง C-u 8 C-v ดู. -,T$S0JQh1'09Ui1(P`$0EWh1M90Ai1G9K09i1R(M0"Vi19d;a;4:CC07Q14(B. 0,T6i1R07h1R905i1M'!RC(P`$0EWh1M90Ai1G9!0EQ1:AR0MU1!(B, 0,T7h1R9(B -0,T!g17Sd04i1b4B!RC!S0!Q1:05Q1G`E"MR0Cl10!T1G`A905l1c0Ki10!Q1:$S0JQh1'(B M-v. +คำสั่งนี้จะเคลื่อนม้วนหน้าจอขึ้นไปแปดบรรทัด. ถ้าท่านต้องการจะเคลื่อนม้วนกลับมาอีก, ท่าน +ก็ทำได้โดยการกำกับตัวเลขอาร์กิวเมนต์ให้กับคำสั่ง M-v. -0,T6i1R07h1R9!S0EQ1'c0*i1`M!0+l10GT19b40Gl1(B (X Window) ,TM0BYh1(B, ,T(P0AU1a<'`$0EWh1M90Ai1G9(B (scroll bar) 0,T7Uh1(B -,T`0;g190>Wi1907Uh10JUh1`K0EUh1BA0> ,TEM'!40;Xh1A!ER'07Uh10Jh1G9:90JX14"M'0>Wi1907Uh107Uh1`09i19(B (highlight) ,T@RBc9a<'`$0EWh1M90Ai1G9(B. - 0,T"i1M$GRA(P06Y1!`$0EWh1M90Ai1G9d;0BQ1'5SaK09h1'07Uh107Uh107h1R9d04i1$0ET1!(B. +>> ลองกดปุ่มกลางที่ส่วนบนสุดของพื้นที่ที่เน้น (highlight) ภายในแผงเคลื่อนม้วน. + ข้อความจะถูกเคลื่อนม้วนไปยังตำแหน่งที่ที่ท่านได้คลิก. ->> ,TEM'`$0EWh1M9`AR0Jl10"Vi19E'04Y1(B, ,T"3P07Uh10BQ1'!40;Xh1A!ER'M0BYh1(B. 0,T7h1R9(P>:0Gh1R0"i1M$GRA(P`$0EWh1M907Uh10"Vi19(B - ,TE'5RA07Uh107h1R9`$0EWh1M9`AR0Jl1d;(B. +>> ลองเคลื่อนเมาส์ขึ้นลงดู, ขณะที่ยังกดปุ่มกลางอยู่. ท่านจะพบว่าข้อความจะเคลื่อนที่ขึ้น + ลงตามที่ท่านเคลื่อนเมาส์ไป. -* ,T!C03U107Uh10MU1aA!0Jl1K0BX14*P0'Q1!(B (hang up) +* กรณีที่อีแมกส์หยุดชะงัก (hang up) ---------------------------- -0,T6i1R0MU1aA!0Jl1K0BX14aEPd0Ah15M:J9M'$S0JQh1'c4f(B, 0,T7h1R9JRARC6B!`0ET1!$S0JQh1'd04i1M0Bh1R';EM40@Q1Bb4Bc0*i1(B -,T$S0JQh1'(B C-g. 0,T7h1R9JRARC6c0*i1$S0JQh1'(B C-g ,Tc9!RCB!`0ET1!$S0JQh1'07Uh1!S0EQ1'7S'R9M0BYh1d04i1(B. +ถ้าอีแมกส์หยุดและไม่ตอบสนองคำสั่งใดๆ, ท่านสามารถยกเลิกคำสั่งได้อย่างปลอดภัยโดยใช้ +คำสั่ง C-g. ท่านสามารถใช้คำสั่ง C-g ในการยกเลิกคำสั่งที่กำลังทำงานอยู่ได้. -0,T7h1R9JRARC6c0*i1$S0JQh1'(B C-g ,T`0>Wh1MB!`0ET1!05Q1G`E"MR0Cl10!T1G`A905l1K0CW1M$S0JQh1'07Uh107h1R9!S0EQ1'0;i1M9M0BYh1d04i1(B. +ท่านสามารถใช้คำสั่ง C-g เพื่อยกเลิกตัวเลขอาร์กิวเมนต์หรือคำสั่งที่ท่านกำลังป้อนอยู่ได้. ->> ,TEM'0;i1M9$S0JQh1'(B C-u 100 ,T`0>Wh1M07Uh1(Pc0Ki10AU105Q1G`E"MR0Cl10!T1G`A905l1`0;g19(B 100, ,Ta0Ei1G0;i1M9$S0JQh1'(B C-g. - 0,T;i1M9$S0JQh1'(B C-f. ,TU1B'K09Vh1'05Q1G0MQ1!IC(B, ,T`>CRP0Gh1R07h1R9d04i1(B - ,TB!`0ET1!05Q1G`E"MR0Cl10!T1G`A905l1d;a0Ei1G04i1GB$S0JQh1'(B C-g. +>> ลองป้อนคำสั่ง C-u 100 เพื่อที่จะให้มีตัวเลขอาร์กิวเมนต์เป็น 100, แล้วป้อนคำสั่ง C-g. + ป้อนคำสั่ง C-f. ผลที่ได้ก็คือเคอร์เซอร์เคลื่อนไปเพียงหนึ่งตัวอักษร, เพราะว่าท่านได้ + ยกเลิกตัวเลขอาร์กิวเมนต์ไปแล้วด้วยคำสั่ง C-g. -0,T6i1R07h1R90;i1M9$S0JQh1'(B ,Tb4Bd0Ah1d04i105Qi1'c((B, 0,T7h1R90!g1JRARC6(PB!`0ET1!$S0JQh1'09Qi19d04i104i1GB$S0JQh1'(B C-g. +ถ้าท่านป้อนคำสั่ง โดยไม่ได้ตั้งใจ, ท่านก็สามารถจะยกเลิกคำสั่งนั้นได้ด้วยคำสั่ง C-g. -* ,T$S0JQh1'07Uh106Y1!0;T147R'(B (disable) +* คำสั่งที่ถูกปิดทาง (disable) ------------------------ -,T$S0JQh1':R'$S0JQh1'06Y1!0;T147R'd0Gi1(B ,T`0>Wh1M07Uh1(P0;i1M'0!Q19d0Ah1c0Ki10Wh1M5M:0BW190BQ19$GRA05i1M'!RC(B. -,Tb4B;C!05T1a0Ei1G(B, 0,T6i1R07h1R9d0Ah105i1M'!RC(P;CPAGE> ,TEM'c0*i1$S0JQh1'(B C-x C-l (0,T+Vh1'`0;g19$S0JQh1'07Uh106Y1!0;T147R'd0Gi1(B), ,Ta0Ei1G0;i1M9(B "n" ,T`0>Wh1M`0;g19!RC5M:(B - ,T$S6RA(B. +>> ลองใช้คำสั่ง C-x C-l (ซึ่งเป็นคำสั่งที่ถูกปิดทางไว้), แล้วป้อน "n" เพื่อเป็นการตอบ + คำถาม. -* 0,TGT19b40Gl1(B (window) +* วินโดว์ (window) ---------------- -0,TMU1aA!0Jl1JRARC60AU1d04i1KERB0GT19b40Gl1(B, ,Ta05h1EP0GT19b40Gl10!g1(PaJ4'U1B'0GT19b40Gl1`04U1BG(B. 0,T+Vh1'JRARC67Sd04i104Q1'09Ui1(B: +อีแมกส์สามารถมีได้หลายวินโดว์, แต่ละวินโดว์ก็จะแสดงผลของข้อความของตนเอง. เราจะ +อธิบายถึงวิธีการใช้แบบหลายวินโดว์หลังจากนี้. ตอนนี้จะกล่าวถึงวิธีการปิดวินโดว์ที่ไม่ต้อง +การ, แล้วกลับไปใช้เพียงวินโดว์เดียว. ซึ่งสามารถทำได้ดังนี้: - C-x 1 ,TK09Vh1'0GT19b40Gl1(B (0,T$W1M!RC0;T140GT19b40Gl10MWh19f(B 0,T7Qi1'KA4(B) + C-x 1 หนึ่งวินโดว์ (คือการปิดวินโดว์อื่นๆ ทั้งหมด) -0,T9Qh190$W1M`0>U1B'0;i1M9$S0JQh1'(B C-x ,Ta0Ei1G5RA04i1GB`E"(B 1. ,T$S0JQh1'(B C-x 1 ,T(P"BRB0GT19b40Gl107Uh10AU1(B -,T`$M0Cl1`+M0Cl1M0BYh1(B ,Tc0Ki1`05g1AK09i1R(M(B. 0,T+Vh1'(P`0;g19!RC0;T140GT19b40Gl10MWh19f(B 0,T7Qi1'KA4(B. +นั่นคือเพียงป้อนคำสั่ง C-x แล้วตามด้วยเลข 1. คำสั่ง C-x 1 จะขยายวินโดว์ที่มี +เคอร์เซอร์อยู่ ให้เต็มหน้าจอ. ซึ่งจะเป็นการปิดวินโดว์อื่นๆ ทั้งหมด. ->> ,T`$0EWh1M9`$M0Cl1`+M0Cl1AR0BQ1':CC07Q1409Ui1(B ,Ta0Ei1G0;i1M9$S0JQh1'(B C-u 0 C-l. ->> 0,T;i1M9$S0JQh1'(B C-h k C-f. - ,T(P`0Kg190Gh1R0GT19b40Gl109Ui10AU1"9R40Bh1ME'(B ,T"3P07Uh10AU10GT19b40Gl1cK0Ah1`0!T140"Vi19aJ4'> เคลื่อนเคอร์เซอร์มายังบรรทัดนี้ แล้วป้อนคำสั่ง C-u 0 C-l. +>> ป้อนคำสั่ง C-h k C-f. + จะเห็นว่าวินโดว์นี้มีขนาดย่อลง ขณะที่มีวินโดว์ใหม่เกิดขึ้นแสดงผลของเอกสารที่เกี่ยวกับ + คำสั่งของ C-f. ->> 0,T;i1M9$S0JQh1'(B C-x 1 ,Ta0Ei1G(P>:0Gh1R0GT19b40Gl107Uh1aJ4'CRB!RC"M'`M!JRCKRBd;(B. +>> ป้อนคำสั่ง C-x 1 แล้วจะพบว่าวินโดว์ที่แสดงรายการของเอกสารหายไป. -,T$S0JQh1'09Ui105h1R'(R!$S0JQh1'07Uh1d04i1!0Eh1RGAR5C'07Uh10Gh1R$S0JQh1'09Ui1;CP!M:04i1GBJM'05Q1G0MQ1!IC(B. ,T$S0JQh1'09Ui1`0CTh1A05i19(B -0,T4i1GB0MQ1!"CP(B C-x. 0,TAU10*X14"M'$S0JQh1'07Uh10"Vi1905i1904i1GB0MQ1!"CP(B C-x; 0,TJh1G9cK0-h1(P`0!Uh1BG0"i1M'0!Q1:!RC(B -0,T(Q14!RC0!Q1:0GT19b40Gl1(B, ,Ta0?i1A0"i1M0AY1E(B, 0,T:Q1?`?M0Cl1(B, ,TaEP0MWh19f(B ,Tc97S9M'`04U1BG0!Q19(B. ,T$S0JQh1'`K0Eh1R09Ui1(P(B -,T;CP!M:04i1GBJM'(B, ,TJRA(B, ,TK0CW1M0JUh105Q1G0MQ1!IC(B. +คำสั่งนี้ต่างจากคำสั่งที่ได้กล่าวมาตรงที่ว่าคำสั่งนี้ประกอบด้วยสองตัวอักษร. คำสั่งนี้เริ่มต้น +ด้วยอักขระ C-x. มีชุดของคำสั่งที่ขึ้นต้นด้วยอักขระ C-x; ส่วนใหญ่จะเกี่ยวข้องกับการ +จัดการกับวินโดว์, แฟ้มข้อมูล, บัฟเฟอร์, และอื่นๆ ในทำนองเดียวกัน. คำสั่งเหล่านี้จะ +ประกอบด้วยสอง, สาม, หรือสี่ตัวอักษร. -* ,T!RCa7C!(B (inserting) ,TaEP!RCE:(B (deleting) +* การแทรก (inserting) และการลบ (deleting) ---------------------------------------------- -0,T6i1R07h1R905i1M'!RC07Uh1(Pa7C!0"i1M$GRA(B, 0,T!g1JRARC67Sd04i1b4B!RC0;i1M90"i1M$GRA09Qi19`0"i1Rd;`07h1R09Qi19(B. -0,T5Q1G0MQ1!IC07Uh107h1R9`0Kg19(B, ,T`0*h19(B A, 7, *, ,T`0;g1905i19(B, 0,T5h1R'0!g106W1M0Gh1R`0;g190"i1M$GRAaEP06Y1!a7C!`0"i1Rd;(B -0,T7Q1907U107Uh10;i1M9(B. ,T!40;Xh1A(B ,Tc9!RC07Uh1(Pa7C!0MQ1!"CP(B Newline. +ถ้าท่านต้องการที่จะแทรกข้อความ, ก็สามารถทำได้โดยการป้อนข้อความนั้นเข้าไปเท่านั้น. +ตัวอักษรที่ท่านเห็น, เช่น A, 7, *, เป็นต้น, ต่างก็ถือว่าเป็นข้อความและถูกแทรกเข้าไป +ทันทีที่ป้อน. กดปุ่ม ในการที่จะแทรกอักขระ Newline. -0,T7h1R9JRARC6E:05Q1G0MQ1!IC05Q1G0JX1407i1RB07Uh107h1R9d04i10;i1M9`0"i1Rd;d04i1b4B!RC!40;Xh1A(B . 0,T;Xh1A(B - ,T`0;g190;Xh1Af(B ,TK09Vh1':9a0;i190>T1A0>l1(B, 0,T+Vh1':R'$0CQi1'MR(`0;g190;Xh1A07Uh1!S0!Q1:04i1GB(B "Del". ,Tc9:R'(B -,T!C03U1(B, 0,T;Xh1A(B "Backspace" 0,T!g17SK09i1R07Uh1`0*h19`04U1BG0!Q1:0;Xh1A(B , ,Ta05h10!g1d0Ah1`JAMd;(B. +ท่านสามารถลบตัวอักษรตัวสุดท้ายที่ท่านได้ป้อนเข้าไปได้โดยการกดปุ่ม . ปุ่ม + เป็นปุ่มๆ หนึ่งบนแป้นพิมพ์, ซึ่งบางครั้งอาจเป็นปุ่มที่กำกับด้วย "Del". ในบาง +กรณี, ปุ่ม "Backspace" ก็ทำหน้าที่เช่นเดียวกับปุ่ม , แต่ก็ไม่เสมอไป. -,Tb4B07Qh1Gd;a0Ei1G(B, 0,T;Xh1A(B ,T(Pc0*i1JSK0CQ1:E:05Q1G0MQ1!IC07Uh1M0BYh1K09i1R5SaK09h1'"M'`$M0Cl1`+M0Cl10;Q1(0(X10:Q19(B. +โดยทั่วไปแล้ว, ปุ่ม จะใช้สำหรับลบตัวอักษรที่อยู่หน้าตำแหน่งของเคอร์เซอร์ปัจจุบัน. ->> ,TEM'7S04Y1(B--0,T;i1M905Q1G0MQ1!ICc4f(B 0,TJQ1!JM'JRA05Q1G(B, ,Ta0Ei1GE:05Q1G0MQ1!IC09Qi19MM!b4B!40;Xh1A(B - 0,TJQ1!JM'JRA$0CQi1'(B. ,Td0Ah105i1M'0!Q1'GE0Gh1R(P7Sc0Ki10"i1M$GRAc9a0?i1A0"i1M0AY1E09Ui1`;0EUh1B9d;(B; - 0,T7h1R9(Pd0Ah17Sc0Ki10"i1M$GRAc905i19)0:Q1:"M'0$Yh10AW1M!RCc0*i1`;0EUh1B9a;E'(B. 0,T9Uh1`0;g19`0>U1B')0:Q1:JS`9R`07h1R09Qi19(B. +>> ลองทำดู--ป้อนตัวอักษรใดๆ สักสองสามตัว, แล้วลบตัวอักษรนั้นออกโดยกดปุ่ม + สักสองสามครั้ง. ไม่ต้องกังวลว่าจะทำให้ข้อความในแฟ้มข้อมูลนี้เปลี่ยนไป; + ท่านจะไม่ทำให้ข้อความในต้นฉบับของคู่มือการใช้เปลี่ยนแปลง. นี่เป็นเพียงฉบับสำเนาเท่านั้น. -,T`0AWh1M0"i1M$GRAc9:CC07Q14BRG`0!T19!0Gh1RK09Vh1':CC07Q14"M'K09i1R(M(B, 0,T"i1M$GRAc9:CC07Q1409Qi19(P05h1M`09Wh1M'(B -,Td;0BQ1':CC07Q1406Q14d;"M'K09i1R(M(B. 0,TMQ1!"CP(B backslash ("\") 0,T7Uh1;ERB"M'"M:"GR0AW1M(P0:h1'0*Ui1(B -0,TGh1R0"i1M$GRA"M':CC07Q1409Qi1905h1M`09Wh1M'd;0BQ1':CC07Q1406Q14d;(B. +เมื่อข้อความในบรรทัดยาวเกินกว่าหนึ่งบรรทัดของหน้าจอ, ข้อความในบรรทัดนั้นจะต่อเนื่อง +ไปยังบรรทัดถัดไปของหน้าจอ. อักขระ backslash ("\") ที่ปลายของขอบขวามือจะบ่งชี้ +ว่าข้อความของบรรทัดนั้นต่อเนื่องไปยังบรรทัดถัดไป. ->> 0,T;i1M90"i1M$GRA(9!CP07Qh1'06V1'"M:"GR(B, ,Ta0Ei1G0;i1M905h1Md;0MU1!(B. 0,T7h1R9(P`0Kg19!RCaJ4'> ป้อนข้อความจนกระทั่งถึงขอบขวา, แล้วป้อนต่อไปอีก. ท่านจะเห็นการแสดงผลของ + บรรทัดต่อเนื่องกัน. ->> ,Tc0*i10;Xh1A(B ,T`0>Wh1ME:0"i1M$GRAMM!(9!CP07Qh1'0"i1M$GRA09Qi19>M04U10!Q1:$GRA!0Gi1R'"M'K09i1R(M(B. - ,T:CC07Q1407Uh105h1M`09Wh1M'0!Q190!g1(PKRBd;(B. +>> ใช้ปุ่ม เพื่อลบข้อความออกจนกระทั่งข้อความนั้นพอดีกับความกว้างของหน้าจอ. + บรรทัดที่ต่อเนื่องกันก็จะหายไป. -0,T7h1R9JRARC6E:0MQ1!"CP(B Newline ,TMM!d04i1`0*h19`04U1BG0!Q1:05Q1G0MQ1!IC0MWh19f(B. ,T!RCE:0MQ1!"CP(B Newline -,TCPK0Gh1R'JM':CC07Q14(P`0;g19!RCCGAJM':CC07Q1409Qi19`0"i1R`0;g19:CC07Q14`04U1BG(B. 0,T6i1R> ,T`$0EWh1M9`$M0Cl1`+M0Cl1d;0BQ1'5SaK09h1'`0CTh1A05i19"M':CC07Q14(B, ,Ta0Ei1G!40;Xh1A(B . - ,T:CC07Q140;Q1(0(X10:Q19(P06Y1!`0*Wh1MA`0"i1R0!Q1::CC07Q140!h1M9K09i1R(B. +>> เคลื่อนเคอร์เซอร์ไปยังตำแหน่งเริ่มต้นของบรรทัด, แล้วกดปุ่ม . + บรรทัดปัจจุบันจะถูกเชื่อมเข้ากับบรรทัดก่อนหน้า. ->> ,T!40;Xh1A(B ,T`0>Wh1M07Uh1(Pa7C!0MQ1!"CP(B Newline ,T`0"i1Rd;cK0Ah1(B. +>> กดปุ่ม เพื่อที่จะแทรกอักขระ Newline เข้าไปใหม่. -,T$GC(Sd0Gi10Gh1R$S0JQh1'0Jh1G9cK0-h1"M'0MU1aA!0Jl1(PJRARC67Sc0Ki1;CPAGE> ,TEM'7S04Y1`04Uk1BG09Ui1(B--0,T;i1M9$S0JQh1'(B C-u 8 * ,T`0>Wh1M07Uh1(P0;i1M9JRB0MQ1!"CP(B ********. +>> ลองทำดูเดี๋ยวนี้--ป้อนคำสั่ง C-u 8 * เพื่อที่จะป้อนสายอักขระ ********. -0,T7h1R9d04i1`0CU1B90CYi106V1'0GT108U1!RC`0:Wi1M'05i19c9!RC0;i1M9:R'0JTh1':R'M0Bh1R'c90MU1aA!0Jl1aEP!RCa0!i1d"(B -0,T"i1M0ER405h1R'f(B. 0,T7h1R9JRARC607Uh1(PE:07U1EP$SK0CW1M07U1EP:CC07Q14c97S9M'`04U1BG0!Q19(B. 0,T5h1Md;09Ui1`0;g19(B -,T!RCJ0CX1;!RCE:04i1GB0GT108U105h1R'f(B: +ท่านได้เรียนรู้ถึงวิธีการเบื้องต้นในการป้อนบางสิ่งบางอย่างในอีแมกส์และการแก้ไข +ข้อผิดพลาดต่างๆ. ท่านสามารถที่จะลบทีละคำหรือทีละบรรทัดในทำนองเดียวกัน. ต่อไปนี้เป็น +การสรุปการลบด้วยวิธีต่างๆ: - ,TE:05Q1G0MQ1!IC07Uh1M0BYh1K09i1R5SaK09h1'`$M0Cl1`+M0Cl1(B - C-d ,TE:05Q1G0MQ1!IC07Uh1M0BYh106Q14d;K0EQ1'5SaK09h1'`$M0Cl1`+M0Cl1(B + ลบตัวอักษรที่อยู่หน้าตำแหน่งเคอร์เซอร์ + C-d ลบตัวอักษรที่อยู่ถัดไปหลังตำแหน่งเคอร์เซอร์ - M- 0,T&h1R$S07Uh1M0BYh1K09i1R5SaK09h1'`$M0Cl1`+M0Cl1(B - M-d 0,T&h1R$S07Uh1M0BYh106Q14d;K0EQ1'5SaK09h1'`$M0Cl1`+M0Cl1(B + M- ฆ่าคำที่อยู่หน้าตำแหน่งเคอร์เซอร์ + M-d ฆ่าคำที่อยู่ถัดไปหลังตำแหน่งเคอร์เซอร์ - C-k 0,T&h1R05Q1G0MQ1!IC05Qi1'a05h15SaK09h1'`$M0Cl1`+M0Cl1d;(906V1'07i1RB:CC07Q14(B - M-k 0,T&h1R05Q1G0MQ1!IC05Qi1'a05h15SaK09h1'`$M0Cl1`+M0Cl1d;(906V1'07i1RB"M';CPbB$(B + C-k ฆ่าตัวอักษรตั้งแต่ตำแหน่งเคอร์เซอร์ไปจนถึงท้ายบรรทัด + M-k ฆ่าตัวอักษรตั้งแต่ตำแหน่งเคอร์เซอร์ไปจนถึงท้ายของประโยค -,T$GC(P0JQ1'`!5d04i10Gh1R$S0JQh1'(B ,TaEP(B C-d, 0,T!Q1:(B M- ,TaEP(B M-d ,T`0;g19$S0JQh1'(B -,Tc97S9M'`04U1BG0!Q1907Uh1`0CTh1A(R!$S0JQh1'(B C-f ,TaEP(B M-f (,Ta0Ai10Gh1R0;Xh1A(B ,T(Pd0Ah1c0*h105Q1G0MQ1!IC(B -0,T!g15RA(B, ,Ta05h1d0Ah1d04i1`0;g19`0CWh1M'JS0$Q1-(B). ,T$S0JQh1'(B C-k ,TaEP(B M-k 0,T!g1`0*h19`04U1BG0!Q1:(B C-e ,TaEP(B M-e 0,T7Uh1(B -,T7S'R9c90EQ1!I3P`04U1BG0!Q19a05h1$9EPCP04Q1:(B, 0,T$W1MCP04Q1:07Uh1`0;g19:CC07Q140!Q1:;CPbB$(B. +ควรจะสังเกตได้ว่าคำสั่ง และ C-d, กับ M- และ M-d เป็นคำสั่ง +ในทำนองเดียวกันที่เริ่มจากคำสั่ง C-f และ M-f (แม้ว่าปุ่ม จะไม่ใช่ตัวอักษร +ก็ตาม, แต่ไม่ได้เป็นเรื่องสำคัญ). คำสั่ง C-k และ M-k ก็เช่นเดียวกับ C-e และ M-e ที่ +ทำงานในลักษณะเดียวกันแต่คนละระดับ, คือระดับที่เป็นบรรทัดกับประโยค. -,T`0AWh1M07h1R9E:05Q1G0MQ1!ICd;AR!!0Gh1RK09Vh1'05Q1Gc9$0CQi1'K09Vh1'f(B, 0,TMU1aA!0Jl1(P0:Q1907V1!0"i1M$GRA07Uh106Y1!E:d;d0Gi1(B -,T`0>Wh1M0Gh1R07h1R9(PJRARC6`0CU1B!!0EQ1:ARd04i10MU1!(B. ,T!RC`0CU1B!!0EQ1:AR"M'0"i1M$GRA07Uh106Y1!0&h1Rd;09Qi19`0CU1B!0Gh1R(B -",T!RC`0CU1B!0$W19(B (yanking)". 0,T7h1R9JRARC6`0CU1B!0$W190"i1M$GRA07Uh106Y1!0&h1Rd;!0EQ1:ARd04i1b4Bc0Ki1(B -,T;CR!/c907Uh107Uh106Y1!0&h1Rd;(B, ,TK0CW1M;CR!/c907Uh1c4f(B ,T"M'0"i1M$GRA0!g1d04i1(B. 0,T7h1R9JRARC6`0CU1B!0$W190"i1M$GRA(B -0,T!Uh1$0CQi1'0!g1d04i1`0>Wh1M07Uh1(P7SJS`9R0"i1M$GRA(B. ,T$S0JQh1'07Uh1c0*i1c9!RC`0CU1B!0$W190$W1M(B C-y. +เมื่อท่านลบตัวอักษรไปมากกว่าหนึ่งตัวในครั้งหนึ่งๆ, อีแมกส์จะบันทึกข้อความที่ถูกลบไปไว้ +เพื่อว่าท่านจะสามารถเรียกกลับมาได้อีก. การเรียกกลับมาของข้อความที่ถูกฆ่าไปนั้นเรียกว่า +"การเรียกคืน (yanking)". ท่านสามารถเรียกคืนข้อความที่ถูกฆ่าไปกลับมาได้โดยให้ +ปรากฏในที่ที่ถูกฆ่าไป, หรือปรากฏในที่ใดๆ ของข้อความก็ได้. ท่านสามารถเรียกคืนข้อความ +กี่ครั้งก็ได้เพื่อที่จะทำสำเนาข้อความ. คำสั่งที่ใช้ในการเรียกคืนคือ C-y. -0,TJTh1'07Uh1$GC0JQ1'`!50MQ19K09Vh1'0$W1M0"i1Ma5!05h1R'CPK0Gh1R'(B ",T!RC0&h1R(B (killing)" 0,T!Q1:(B ",T!RCE:(B -(deleting)". 0,TJTh1'07Uh106Y1!(B "0,T&h1R(B (killed)" ,Td;09Qi19(B, ,TJRARC607Uh1(P`0CU1B!0$W19(B (yank) ,TARd04i1(B, -,Ta05h10JTh1'07Uh106Y1!(B ",TE:(B (deleted)" ,Td;09Qi19(B, ,Td0Ah1JRARC6(P`0CU1B!0$W19ARd04i1(B. ,Tb4B07Qh1Gd;(B, ,T$S0JQh1'07Uh1JRARC6(B -,TE:0"i1M$GRAd04i107U1EPAR!f(B ,T(P`0!g1:0"i1M$GRA09Qi19d0Gi1(B, ,T"3P07Uh1$S0JQh1'07Uh1E:d04i107U1EP05Q1G0MQ1!IC(B, ,TK0CW1M:CC07Q14(B -,T`;0Eh1RaEP`0Gi19GCC$(B, ,T(Pd0Ah1`0!g1:0"i1M$GRA07Uh106Y1!E:d;(B. +สิ่งที่ควรสังเกตอันหนึ่งคือข้อแตกต่างระหว่าง "การฆ่า (killing)" กับ "การลบ +(deleting)". สิ่งที่ถูก "ฆ่า (killed)" ไปนั้น, สามารถที่จะเรียกคืน (yank) มาได้, +แต่สิ่งที่ถูก "ลบ (deleted)" ไปนั้น, ไม่สามารถจะเรียกคืนมาได้. โดยทั่วไป, คำสั่งที่สามารถ +ลบข้อความได้ทีละมากๆ จะเก็บข้อความนั้นไว้, ขณะที่คำสั่งที่ลบได้ทีละตัวอักษร, หรือบรรทัด +เปล่าและเว้นวรรค, จะไม่เก็บข้อความที่ถูกลบไป. ->> ,T`$0EWh1M9`$M0Cl1`+M0Cl1d;0BQ1'0(X14`0CTh1A05i19"M':CC07Q1407Uh1d0Ah1c0*h1:CC07Q14`;0Eh1R(B. - ,Ta0Ei1G0;i1M9$S0JQh1'(B C-k ,T`0>Wh1M07Uh1(P0&h1R0"i1M$GRA07Uh1M0BYh1:9:CC07Q1409Qi19(B. ->> 0,T;i1M9$S0JQh1'(B C-k 0,TMU1!$0CQi1'K09Vh1'(B. 0,T7h1R9(P`0Kg190Gh1R0MQ1!"CP(B Newline 0,T7Uh1M0BYh107i1RB:CC07Q1409Qi19(P06Y1!(B - 0,T&h1Rd;(B. +>> เคลื่อนเคอร์เซอร์ไปยังจุดเริ่มต้นของบรรทัดที่ไม่ใช่บรรทัดเปล่า. + แล้วป้อนคำสั่ง C-k เพื่อที่จะฆ่าข้อความที่อยู่บนบรรทัดนั้น. +>> ป้อนคำสั่ง C-k อีกครั้งหนึ่ง. ท่านจะเห็นว่าอักขระ Newline ที่อยู่ท้ายบรรทัดนั้นจะถูก + ฆ่าไป. -,T(P0JQ1'`!5d04i10Gh1R$S0JQh1'(B C-k ,T$S0JQh1'aC!(P0&h1R`09Wi1M$GRA"M':CC07Q14(B, ,TaEP$S0JQh1'(B C-k ,T$S0JQh1'(B -0,T7Uh1JM'(P0&h1R:CC07Q1409Qi19(B, ,TaEP(P"0BQ1::CC07Q140MWh19f(B 0,T7Uh1`K0EW1M07Qi1'KA40"Vi19(B. ,T$S0JQh1'(B C-k 0,T(Q14!RC0!Q1:(B -0,T5Q1G`E"MR0Cl10!T1G`A905l1c90EQ1!I3P07Uh1a5!05h1R'MM!d;(B: ,T$S0JQh1'09Ui1(P0&h1RKERBf(B ,T:CC07Q14aEP`09Wi1MKR"M'(B -0,T"i1M$GRA04i1GB(B. 0,T9Uh1d0Ah1`K0AW1M9!RC7S0+i1Sa::;C!05T1(B. ,T$S0JQh1'(B C-u 2 C-k ,T(P0&h1R07Qi1'JM':CC07Q14(B -,T>0Ci1MA07Qi1'0MQ1!"CP(B Newline ,T"M':CC07Q1409Qi19f(B 0,T4i1GB(B; 0,T+Vh1'05h1R'(R!!RC7S$S0JQh1'(B C-k ,TJM'$0CQi1'(B. +จะสังเกตได้ว่าคำสั่ง C-k คำสั่งแรกจะฆ่าเนื้อความของบรรทัด, และคำสั่ง C-k คำสั่ง +ที่สองจะฆ่าบรรทัดนั้น, และจะขยับบรรทัดอื่นๆ ที่เหลือทั้งหมดขึ้น. คำสั่ง C-k จัดการกับ +ตัวเลขอาร์กิวเมนต์ในลักษณะที่แตกต่างออกไป: คำสั่งนี้จะฆ่าหลายๆ บรรทัดและเนื้อหาของ +ข้อความด้วย. นี่ไม่เหมือนการทำซ้ำแบบปรกติ. คำสั่ง C-u 2 C-k จะฆ่าทั้งสองบรรทัด +พร้อมทั้งอักขระ Newline ของบรรทัดนั้นๆ ด้วย; ซึ่งต่างจากการทำคำสั่ง C-k สองครั้ง. -,Tc0*i1$S0JQh1'(B C-y ,Tc9!RC07Uh1(P`0CU1B!0$W190"i1M$GRA07Uh106Y1!0&h1Rd;K0EQ1'0JX14(B. 0,T"i1M$GRA07Uh106Y1!`0CU1B!0$W1909Qi19(P(B -,T;CR!/07Uh15SaK09h1'`$M0Cl1`+M0Cl10;Q1(0(X10:Q19(B. +ใช้คำสั่ง C-y ในการที่จะเรียกคืนข้อความที่ถูกฆ่าไปหลังสุด. ข้อความที่ถูกเรียกคืนนั้นจะ +ปรากฏที่ตำแหน่งเคอร์เซอร์ปัจจุบัน. ->> ,TEM'c0*i1$S0JQh1'(B C-y ,T`0>Wh1M07Uh1(P`0CU1B!0$W190"i1M$GRA!0EQ1:AR(B. +>> ลองใช้คำสั่ง C-y เพื่อที่จะเรียกคืนข้อความกลับมา. -,T$S0JQh1'(B C-y 0,T!g1`K0AW1M9!RC`0CU1B!0$W190JTh1'"M'07Uh1c$C:R'$9d04i1`MRd;(R!07h1R9(B. 0,T7h1R9(P0JQ1'`!5d04i10Gh1R(B -0,T6i1R07h1R9c0*i1$S0JQh1'(B C-k 0,T5T1405h1M0!Q19KERBf(B ,T$0CQi1'(B, 0,T"i1M$GRA07Uh106Y1!0&h1Rd;07Qi1'KA4(P06Y1!`0!g1:d0Gi104i1GB0!Q19(B, -,T)P09Qi19!RCc0*i1$S0JQh1'(B C-y ,T`0>U1B'$0CQi1'`04U1BG0!g1(P`0CU1B!0$W190"i1M$GRA!0EQ1:ARd04i107Qi1'KA4(B. +คำสั่ง C-y ก็เหมือนการเรียกคืนสิ่งของที่ใครบางคนได้เอาไปจากท่าน. ท่านจะสังเกตได้ว่า +ถ้าท่านใช้คำสั่ง C-k ติดต่อกันหลายๆ ครั้ง, ข้อความที่ถูกฆ่าไปทั้งหมดจะถูกเก็บไว้ด้วยกัน, +ฉะนั้นการใช้คำสั่ง C-y เพียงครั้งเดียวก็จะเรียกคืนข้อความกลับมาได้ทั้งหมด. ->> ,TEM'c0*i1$S0JQh1'(B C-k ,TKERBf(B ,T$0CQi1'04Y1(B. +>> ลองใช้คำสั่ง C-k หลายๆ ครั้งดู. -,T`0>Wh1M07Uh1(P`0CU1B!0$W190"i1M$GRA07Uh106Y1!0&h1Rd;(B: +เพื่อที่จะเรียกคืนข้อความที่ถูกฆ่าไป: ->> ,TEM'c0*i1$S0JQh1'(B C-y. ,Ta0Ei1G`$0EWh1M9`$M0Cl1`+M0Cl1E'd;0JQ1!JM'JRA:CC07Q14(B, ,Ta0Ei1Gc0*i1$S0JQh1'(B C-y - 0,TMU1!$0CQi1'(B. 0,T7h1R9(P`0"i1Rc(0GT108U1!RC07Uh1(PJS`9R0"i1M$GRA(B. +>> ลองใช้คำสั่ง C-y. แล้วเคลื่อนเคอร์เซอร์ลงไปสักสองสามบรรทัด, แล้วใช้คำสั่ง C-y + อีกครั้ง. ท่านจะเข้าใจวิธีการที่จะสำเนาข้อความ. -0,T7h1R9(P7SM0Bh1R'dC06i1R07h1R905i1M'!RC(P`0CU1B!0$W190"i1M$GRA:R'M0Bh1R'(B, ,Ta0Ei1G0&h1R:R'M0Bh1R'MM!d;(B? -,T$S0JQh1'(B C-y ,T(P`0CU1B!0$W190"i1M$GRA07Uh106Y1!0&h1R0Eh1R0JX14(B. ,Ta05h10"i1M$GRA0!h1M9K09i1R09Qi190BQ1'$'`K0EW1MM0BYh1(B. 0,T7h1R9(B -,TJRARC6(P`0CU1B!0$W19ARd04i10MU1!b4Bc0*i1$S0JQh1'(B M-y. ,TK0EQ1'(R!07Uh107h1R9d04i1`0CU1B!0$W190"i1M$GRA0Eh1R0JX14a0Ei1G(B, -,Tc0*i1$S0JQh1'(B M-y ,T`0>Wh1M07Uh1(P`0CU1B!0$W190"i1M$GRA0!h1M9K09i1R09Qi19ARa7907Uh1(B. ,T!RCc0*i1$S0JQh1'(B M-y ,Ta05h1EP$0CQi1'(B -,T(P`0CU1B!0$W190"i1M$GRA07Uh106Y1!0&h1Rd;c9ES04Q1:07Uh10Bi1M9!0EQ1:0"Vi19d;(B. ,T`0AWh1M07h1R9d04i10"i1M$GRA07Uh105i1M'!RC!0EQ1:0$W19AR(B, -0,T7h1R90!g1d0Ah1(S`0;g1907Uh1(P05i1M'7SMPdC0!Q1:0"i1M$GRA09Qi190MU1!(B. ,T`0>U1B';0Eh1MBM0BYh1M0Bh1R'09Qi19(B, ,Ta0Ei1G7S!RCa0!i1d"(B -0,T"i1M$GRA0MWh1905h1Md;(B. +ท่านจะทำอย่างไรถ้าท่านต้องการจะเรียกคืนข้อความบางอย่าง, แล้วฆ่าบางอย่างออกไป? +คำสั่ง C-y จะเรียกคืนข้อความที่ถูกฆ่าล่าสุด. แต่ข้อความก่อนหน้านั้นยังคงเหลืออยู่. ท่าน +สามารถจะเรียกคืนมาได้อีกโดยใช้คำสั่ง M-y. หลังจากที่ท่านได้เรียกคืนข้อความล่าสุดแล้ว, +ใช้คำสั่ง M-y เพื่อที่จะเรียกคืนข้อความก่อนหน้านั้นมาแทนที่. การใช้คำสั่ง M-y แต่ละครั้ง +จะเรียกคืนข้อความที่ถูกฆ่าไปในลำดับที่ย้อนกลับขึ้นไป. เมื่อท่านได้ข้อความที่ต้องการกลับคืนมา, +ท่านก็ไม่จำเป็นที่จะต้องทำอะไรกับข้อความนั้นอีก. เพียงปล่อยอยู่อย่างนั้น, แล้วทำการแก้ไข +ข้อความอื่นต่อไป. -0,T6i1R07h1R9c0*i1$S0JQh1'(B M-y 0,T4i1GB(S9G9$0CQi1'07Uh1AR!>M(B, 0,T7h1R9(P0Bi1M9!0EQ1:AR0BQ1'0(X14`0CTh1A05i190MU1!$0CQi1'(B -(0,T"i1M$GRA07Uh106Y1!0&h1Rd;0Eh1R0JX14(B). +ถ้าท่านใช้คำสั่ง M-y ด้วยจำนวนครั้งที่มากพอ, ท่านจะย้อนกลับมายังจุดเริ่มต้นอีกครั้ง +(ข้อความที่ถูกฆ่าไปล่าสุด). ->> 0,T&h1RK09Vh1':CC07Q14(B, ,T`$0EWh1M9`$M0Cl1`+M0Cl1d;(B, 0,T&h1R0MU1!:CC07Q14(B. - ,Ta0Ei1Gc0*i1$S0JQh1'(B C-y ,T`0>Wh1M07Uh1(P`0CU1B!0$W19:CC07Q1407Uh106Y1!0&h1Rd;c9$0CQi1'07Uh1JM'(B. - ,Ta0Ei1Gc0*i1$S0JQh1'(B M-y 0,T+Vh1'(P`0CV1B!0$W19:CC07Q1407Uh106Y1!0&h1Rd;c9$0CQi1'aC!ARa7907Uh1(B. - ,Tc0*i1$S0JQh1'(B M-y 0,TMU1!(B, ,Ta0Ei1G04Y10Gh1R(P`0!T14MPdC0"Vi19(B. ,TEM'7Sd;`0CWh1MBf(B ,T(9!0Gh1R:CC07Q1407Uh106Y1!0&h1Rd;(B - ,Tc9$0CQi1'07Uh1JM'(P!0EQ1:0$W19AR(B, ,Ta0Ei1G7Sd;0MU1!0JQ1!CPBP(B. - 0,T6i1R07h1R905i1M'!RC(B, 0,T7h1R9MR((PEM'!S0!Q1:05Q1G`E"MR0Cl10!T1G`A905l107Qi1'07Uh1`0;g19(S9G9:G!aEPE:c0Ki10!Q1:(B - ,T$S0JQh1'(B M-y 0,T4Y1(B. +>> ฆ่าหนึ่งบรรทัด, เคลื่อนเคอร์เซอร์ไป, ฆ่าอีกบรรทัด. + แล้วใช้คำสั่ง C-y เพื่อที่จะเรียกคืนบรรทัดที่ถูกฆ่าไปในครั้งที่สอง. + แล้วใช้คำสั่ง M-y ซึ่งจะเรึยกคืนบรรทัดที่ถูกฆ่าไปในครั้งแรกมาแทนที่. + ใช้คำสั่ง M-y อีก, แล้วดูว่าจะเกิดอะไรขึ้น. ลองทำไปเรื่อยๆ จนกว่าบรรทัดที่ถูกฆ่าไป + ในครั้งที่สองจะกลับคืนมา, แล้วทำไปอีกสักระยะ. + ถ้าท่านต้องการ, ท่านอาจจะลองกำกับตัวเลขอาร์กิวเมนต์ทั้งที่เป็นจำนวนบวกและลบให้กับ + คำสั่ง M-y ดู. -* ,T!RC7S0Bi1M9(B (undo) +* การทำย้อน (undo) ------------------- -0,T6i1R07h1R9d04i1a0!i1d"0"i1M$GRAd;(B, ,TaEP0$T140Gh1Rd04i17S0ER4d;(B, 0,T7h1R9JRARC67S0Bi1M90JTh1'07Uh1d04i1(B -,T`;0EUh1B9a;E'd;a0Ei1G04i1GB$S0JQh1'!RC7S0Bi1M9(B, C-x u. +ถ้าท่านได้แก้ไขข้อความไป, และคิดว่าได้ทำผิดพลาดไป, ท่านสามารถทำย้อนสิ่งที่ได้ +เปลี่ยนแปลงไปแล้วด้วยคำสั่งการทำย้อน, C-x u. -,Tb4B;C!05T1(B, ,T$S0JQh1'(B C-x u ,T7S0Bi1M9$S0JQh1'07Uh1d04i17Sd;a0Ei1GK09Vh1'$S0JQh1'(B; 0,T6i1R07h1R97S0Bi1M90+i1S05T1405h1M0!Q19(B, -,T!RC7S0Bi1M9a05h1EP$0CQi1'(P0Bi1M9$S0JQh1'd;07U1EP$S0JQh1'(B. +โดยปรกติ, คำสั่ง C-x u ทำย้อนคำสั่งที่ได้ทำไปแล้วหนึ่งคำสั่ง; ถ้าท่านทำย้อนซ้ำติดต่อกัน, +การทำย้อนแต่ละครั้งจะย้อนคำสั่งไปทีละคำสั่ง. -,Ta05h10AU10"i1MB!`0Gi19M0BYh1JM';CP!RC(B: ,T$S0JQh1'07Uh1d0Ah1`;0EUh1B9a;E'0"i1M$GRA(Pd0Ah109Q1:CGAM0BYh104i1GB(B (0,T9Uh1CGA06V1'(B -,T$S0JQh1'!RC`$0EWh1M9`$M0Cl1`+M0Cl1aEP!RC`$0EWh1M90Ai1G9(B), ,TaEP!RCa7C!05Q1G0MQ1!IC0!g1(P06Y1!0(Q14!RCb4BCGA(B -,T`0;g19!0EXh1A07Uh1d0Ah1`0!T19(B 20 0,T5Q1G0MQ1!IC05h1M!0EXh1A(B. (0,T7Qi1'09Ui1`0>Wh1ME4(S9G9$0CQi1'"M'$S0JQh1'(B C-x u ,Tc9!RC7S(B -0,TBi1M9!RCa7C!05Q1G0MQ1!IC(B.) +แต่มีข้อยกเว้นอยู่สองประการ: คำสั่งที่ไม่เปลี่ยนแปลงข้อความจะไม่นับรวมอยู่ด้วย (นี่รวมถึง +คำสั่งการเคลื่อนเคอร์เซอร์และการเคลื่อนม้วน), และการแทรกตัวอักษรก็จะถูกจัดการโดยรวม +เป็นกลุ่มที่ไม่เกิน 20 ตัวอักษรต่อกลุ่ม. (ทั้งนี้เพื่อลดจำนวนครั้งของคำสั่ง C-x u ในการทำ +ย้อนการแทรกตัวอักษร.) ->> 0,T&h1R:CC07Q1409Ui104i1GB$S0JQh1'(B C-k, ,Ta0Ei1G0;i1M9$S0JQh1'(B C-x u. ,T:CC07Q1407Uh106Y1!0&h1Rd;(P;CR!/!0EQ1:0$W19AR(B. +>> ฆ่าบรรทัดนี้ด้วยคำสั่ง C-k, แล้วป้อนคำสั่ง C-x u. บรรทัดที่ถูกฆ่าไปจะปรากฏกลับคืนมา. -,T$S0JQh1'(B C-_ ,T`0;g190MU1!$S0JQh1'K09Vh1'JSK0CQ1:!RC7S0Bi1M9(B; ,T$S0JQh1'09Ui17S'R9`K0AW1M90!Q1:$S0JQh1'(B C-x u, -,Ta05h10Gh1RJP4G!!0Gh1Rc9!RC0;i1M9KERBf(B ,T$0CQi1'05T1405h1M0!Q19(B. 0,T"i1M`0JU1B"M'$S0JQh1'(B C-_ 0,T9Ui10$W1Mc9:R'(B -,Ta0;i190>T1A0>l1(B, ,TMR((Pd0Ah17CR:0Gh1R(P0;i1M9$S0JQh1'd04i1M0Bh1R'dC(B. 0,T9Qh190$W1M`K05X107Uh17Sc0Ki1`CR05i1M'`50CU1BA$S0JQh1'(B -C-x u ,Tc0Ki10MU1!05h1R'KR!(B. ,Tc9`$0CWh1M';ERB7R':R'*09T14(B,0,T7h1R9MR((P0;i1M9$S0JQh1'(B C-_ ,Td04i1b4B!RC!4(B -0,TMQ1!"CP(B / ,Tc9"3P07Uh1!40;Xh1A(B CONTROL. +คำสั่ง C-_ เป็นอีกคำสั่งหนึ่งสำหรับการทำย้อน; คำสั่งนี้ทำงานเหมือนกับคำสั่ง C-x u, +แต่ว่าสะดวกกว่าในการป้อนหลายๆ ครั้งติดต่อกัน. ข้อเสียของคำสั่ง C-_ นี้คือในบาง +แป้นพิมพ์, อาจจะไม่ทราบว่าจะป้อนคำสั่งได้อย่างไร. นั่นคือเหตุที่ทำให้เราต้องเตรียมคำสั่ง +C-x u ให้อีกต่างหาก. ในเครื่องปลายทางบางชนิด,ท่านอาจจะป้อนคำสั่ง C-_ ได้โดยการกด +อักขระ / ในขณะที่กดปุ่ม CONTROL. -0,T5Q1G`E"MR0Cl10!T1G`A905l1JSK0CQ1:$S0JQh1'(B C-_ ,TaEP(B C-x u ,T(P`0;g19!RC0+i1S(S9G9$0CQi1'"M'$S0JQh1'(B. +ตัวเลขอาร์กิวเมนต์สำหรับคำสั่ง C-_ และ C-x u จะเป็นการซ้ำจำนวนครั้งของคำสั่ง. -* ,Ta0?i1A0"i1M0AY1E(B (file) +* แฟ้มข้อมูล (file) ---------------- -,T`0>Wh1M07Uh1(P`0!g1:0"i1M$GRA07Uh1d04i1a0!i1d"d;09Qi19(B, 0,T7h1R9(P05i1M'`0!g1:0"i1M$GRA09Qi19d0Gi1c9a0?i1A0"i1M0AY1E(B. ,Td0Ah1`0*h1909Qi19(B -0,T"i1M$GRA0!g1(PKRBd;`0AWh1M07h1R9`0ET1!c0*i10MU1aA!0Jl1(B. ,T!RC07Uh1(P`0!g1:0"i1M$GRA09Qi19E'c9a0?i1A0"i1M0AY1E(B, 0,T7h1R9(B -,T(P05i1M'(B "0,T$i19KR(B (find)" ,Ta0?i1A0"i1M0AY1E0!h1M907Uh1(P`0"i1Rd;c90"i1M$GRA09Qi19d04i1(B. (0,T9Uh1`0CU1B!0Gh1R(B ",T!RC(B -,T`0BW1M9(B (visiting)" ,Ta0?i1A0"i1M0AY1E(B.) +เพื่อที่จะเก็บข้อความที่ได้แก้ไขไปนั้น, ท่านจะต้องเก็บข้อความนั้นไว้ในแฟ้มข้อมูล. ไม่เช่นนั้น +ข้อความก็จะหายไปเมื่อท่านเลิกใช้อีแมกส์. การที่จะเก็บข้อความนั้นลงในแฟ้มข้อมูล, ท่าน +จะต้อง "ค้นหา (find)" แฟ้มข้อมูลก่อนที่จะเข้าไปในข้อความนั้นได้. (นี่เรียกว่า "การ +เยือน (visiting)" แฟ้มข้อมูล.) -,T!RC0$i19KRa0?i1A0"i1M0AY1EKARB06V1'!RC07Uh107h1R9d04i1`0Kg19`09Wi1MKR"M'a0?i1A0"i1M0AY1E@RBc90MU1aA!0Jl1(B. ,Tc9KERBf(B -,T7R'(B, 0,T4Y1`K0AW1M90Gh1R07h1R9!S0EQ1'a0!i1d"0"i1M0AY1Ec9a0?i1A0"i1M0AY1EM0BYh1(B. ,TM0Bh1R'dC0!g15RA(B, ,T!RCa0!i1d"@RBc90MU1(B -,TaA!0Jl109Qi19(Pd0Ah1$'M0BYh1(9!0Gh1R07h1R9(P(B "0,T(Q14`0!g1:(B (save)" ,Ta0?i1A0"i1M0AY1E09Qi19(B. 0,T9Uh1`0;g19!RC0*h1GBc0Ki107h1R9(B -,TJRARC6K0EU1!`0EUh1B'!RC7Sc0Ki1a0?i1A0"i1M0AY1E06Y1!a0!i1d"d0Gi1$0CVh1'f(B ,T!ER'f(B 0,T6i1R07h1R9d0Ah1d04i105i1M'!RC(B. ,Ta0Ai10Gh1R(B -0,T7h1R9(P7S!RC0(Q14`0!g1:d;a0Ei1G0!g15RA(B, 0,TMU1aA!0Jl10!g10BQ1'$'`K0EW1Ma0?i1A0"i1M0AY1E05i19)0:Q1:d0Gi1b4B`0!g1:d0Gi1c90*Wh1M(B -,TcK0Ah1(B, ,T`0ER4(B. +การค้นหาแฟ้มข้อมูลหมายถึงการที่ท่านได้เห็นเนื้อหาของแฟ้มข้อมูลภายในอีแมกส์. ในหลายๆ +ทาง, ดูเหมือนว่าท่านกำลังแก้ไขข้อมูลในแฟ้มข้อมูลอยู่. อย่างไรก็ตาม, การแก้ไขภายในอี +แมกส์นั้นจะไม่คงอยู่จนกว่าท่านจะ "จัดเก็บ (save)" แฟ้มข้อมูลนั้น. นี่เป็นการช่วยให้ท่าน +สามารถหลีกเลี่ยงการทำให้แฟ้มข้อมูลถูกแก้ไขไว้ครึ่งๆ กลางๆ ถ้าท่านไม่ได้ต้องการ. แม้ว่า +ท่านจะทำการจัดเก็บไปแล้วก็ตาม, อีแมกส์ก็ยังคงเหลือแฟ้มข้อมูลต้นฉบับไว้โดยเก็บไว้ในชื่อ +ใหม่, เผื่อไว้ในกรณีที่ท่านแก้ไขผิดพลาด. -0,T6i1R07h1R90JQ1'`!504Y10Jh1G90Eh1R'"M'K09i1R(M"M'0MU1aA!0Jl1(B, 0,T7h1R9(P`0Kg19:CC07Q1407Uh1`0CTh1A05i19aEP0JTi190JX1404i1GB(B -,T`0Ji19;CP(B. ,T:CC07Q1409Qi19MR((P`0CTh1A05i1904i1GB(B "--:-- TUTORIAL" ,TK0CW1MMPdC7S9M'09Qi19(B. 0,TJh1G909Ui1(B -,T"M'K09i1R(M(B, ,Tb4B;C!05T1a0Ei1G(B, ,T(PaJ4'0*Wh1Ma0?i1A0"i1M0AY1E07Uh107h1R9!S0EQ1'`0BW1M9M0BYh1(B. ,T"3P09Ui107h1R9!S0EQ1'(B -,T`0BW1M9a0?i1A0"i1M0AY1E07Uh10*Wh1M0Gh1R(B "TUTORIAL.th" 0,T+Vh1'`0;g19JS`9R"M'0$Yh10AW1M!RCc0*i10MU1aA!0Jl1(B. ,T`0AWh1M07h1R9d04i1(B -,T`0BW1M9a0?i1A0"i1M0AY1E04i1GB0MU1aA!0Jl1(B, 0,T*Wh1M"M'a0?i1A0"i1M0AY1E09Qi19(P;CR!/c907Uh107Uh1d04i1!0Eh1RGd0Gi1a0Ei1G(B. +ถ้าท่านสังเกตดูส่วนล่างของหน้าจอของอีแมกส์, ท่านจะเห็นบรรทัดที่เริ่มต้นและสิ้นสุดด้วย +เส้นประ. บรรทัดนั้นอาจจะเริ่มต้นด้วย "--:-- TUTORIAL" หรืออะไรทำนองนั้น. ส่วนนี้ +ของหน้าจอ, โดยปรกติแล้ว, จะแสดงชื่อแฟ้มข้อมูลที่ท่านกำลังเยือนอยู่. ขณะนี้ท่านกำลัง +เยือนแฟ้มข้อมูลที่ชื่อว่า "TUTORIAL.th" ซึ่งเป็นสำเนาของคู่มือการใช้อีแมกส์. เมื่อท่านได้ +เยือนแฟ้มข้อมูลด้วยอีแมกส์, ชื่อของแฟ้มข้อมูลนั้นจะปรากฏในที่ที่ได้กล่าวไว้แล้ว. -0,TEQ1!I3P0>T1`HI0"i1MK09Vh1'"M'$S0JQh1'`0BW1M9a0?i1A0"i1M0AY1E0$W1M(B 0,T7h1R9(P05i1M':M!0*Wh1M"M'a0?i1A0"i1M0AY1E07Uh1(P(B -,T`0BW1M9(B. ,T`CR`0CU1B!0EQ1!I3P`0*h1909Ui10Gh1R(B "0,TMh1R9MR0Cl10!T1G`A905l1(R!`$0CWh1M';ERB7R'(B" (,Tc9!C03U109Ui1(B, ,TMR0Cl1(B -0,T!T1G`A905l10!g10$W1M0*Wh1M"M'a0?i1A0"i1M0AY1E(B). ,TK0EQ1'(R!07Uh107h1R90;i1M9$S0JQh1'(B +ลักษณะพิเศษข้อหนึ่งของคำสั่งเยือนแฟ้มข้อมูลคือ ท่านจะต้องบอกชื่อของแฟ้มข้อมูลที่จะ +เยือน. เราเรียกลักษณะเช่นนี้ว่า "อ่านอาร์กิวเมนต์จากเครื่องปลายทาง" (ในกรณีนี้, อาร์ +กิวเมนต์ก็คือชื่อของแฟ้มข้อมูล). หลังจากที่ท่านป้อนคำสั่ง C-x C-f Find a file -0,TMU1aA!0Jl1(P6RA0*Wh1Ma0?i1A0"i1M0AY1E(B. 0,T*Wh1Ma0?i1A0"i1M0AY1E07Uh107h1R90;i1M9`0"i1Rd;(P;CR!/07Uh1:CC07Q140Eh1R'"M'K09i1R(M(B. -,T:CC07Q140Eh1R'"M'K09i1R(M`0CU1B!0Gh1R0AT109T10:Q1?`?M0Cl1(B (minibuffer) ,T`0AWh1M06Y1!c0*i1'R9c90EQ1!I3P09Ui1(B. -0,T7h1R9JRARC6c0*i1$S0JQh1'07Uh1c0*i1c9!RCa0!i1d";C!05T1"M'0MU1aA!0Jl1a0!i1d"0*Wh1M"M'a0?i1A0"i1M0AY1E(B. +อีแมกส์จะถามชื่อแฟ้มข้อมูล. ชื่อแฟ้มข้อมูลที่ท่านป้อนเข้าไปจะปรากฏที่บรรทัดล่างของหน้าจอ. +บรรทัดล่างของหน้าจอเรียกว่ามินิบัฟเฟอร์ (minibuffer) เมื่อถูกใช้งานในลักษณะนี้. +ท่านสามารถใช้คำสั่งที่ใช้ในการแก้ไขปรกติของอีแมกส์แก้ไขชื่อของแฟ้มข้อมูล. -,T"3P07Uh107h1R9!S0EQ1'0;i1M90*Wh1Ma0?i1A0"i1M0AY1E(B (,TK0CW1M0"i1M0AY1Ec4f(B ,Tc90AT109T10:Q1?`?M0Cl109Ui1(B), 0,T7h1R9JRARC6(B -,TB!`0ET1!$S0JQh1'04i1GB!RCc0*i1$S0JQh1'(B C-g. +ขณะที่ท่านกำลังป้อนชื่อแฟ้มข้อมูล (หรือข้อมูลใดๆ ในมินิบัฟเฟอร์นี้), ท่านสามารถ +ยกเลิกคำสั่งด้วยการใช้คำสั่ง C-g. ->> 0,T;i1M9$S0JQh1'(B C-x C-f, ,Ta0Ei1G0;i1M9$S0JQh1'(B C-g. 0,T9Uh1`0;g19!RCB!`0ET1!0AT109T10:Q1?`?M0Cl1(B, ,TaEP(B - ,TB!`0ET1!$S0JQh1'(B C-x C-f 0,T7Uh1!S0EQ1'c0*i10AT109T10:Q1?`?M0Cl1M0BYh1(B. ,T08l10$W1M07h1R9(Pd0Ah1d04i1`0BW1M9(B - ,Ta0?i1A0"i1M0AY1Ec4f(B. +>> ป้อนคำสั่ง C-x C-f, แล้วป้อนคำสั่ง C-g. นี่เป็นการยกเลิกมินิบัฟเฟอร์, และ + ยกเลิกคำสั่ง C-x C-f ที่กำลังใช้มินิบัฟเฟอร์อยู่. ผลลัพธ์คือท่านจะไม่ได้เยือน + แฟ้มข้อมูลใดๆ. -,T`0AWh1M07h1R9d04i10;i1M90*Wh1Ma0?i1A0"i1M0AY1E`J0Cg1(a0Ei1G(B, ,T!40;Xh1A(B ,T`0>Wh1M07Uh1(P0JTi190JX14$S0JQh1'(B. ,Ta0Ei1G$S0JQh1'(B -C-x C-f 0,T!g1(P7S'R9(B, ,TaEP(P`0BW1M9a0?i1A0"i1M0AY1E07Uh107h1R9d04i1`0EW1M!d0Gi1(B. 0,TAT109T10:Q1?`?M0Cl1(P(B -,TKRBd;`0AWh1M`J0Cg1(0JTi19$S0JQh1'(B C-x C-f. +เมื่อท่านได้ป้อนชื่อแฟ้มข้อมูลเสร็จแล้ว, กดปุ่ม เพื่อที่จะสิ้นสุดคำสั่ง. แล้วคำสั่ง +C-x C-f ก็จะทำงาน, และจะเยือนแฟ้มข้อมูลที่ท่านได้เลือกไว้. มินิบัฟเฟอร์จะ +หายไปเมื่อเสร็จสิ้นคำสั่ง C-x C-f. -,TK0EQ1'(R!09Qi19d0Ah19R9`09Wi1MKR"M'a0?i1A0"i1M0AY1E0!g1(P;CR!/:9K09i1R(M(B, ,TaEP07h1R90!g1(PJRARC6a0!i1d"(B -,T`09Wi1MKRd04i1(B. ,T`0AWh1M07h1R905i1M'!RC(Pa0!i1d"0"i1M$GRAM0Bh1R'6RGC(B, 0,T!g1c0Ki1c0*i1$S0JQh1'(B +หลังจากนั้นไม่นานเนื้อหาของแฟ้มข้อมูลก็จะปรากฏบนหน้าจอ, และท่านก็จะสามารถแก้ไข +เนื้อหาได้. เมื่อท่านต้องการจะแก้ไขข้อความอย่างถาวร, ก็ให้ใช้คำสั่ง C-x C-s Save the file -,T$S0JQh1'09Ui1(P7SJS`9R0"i1M$GRA07Uh1M0BYh1c90MU1aA!0Jl1`0"i1Rd;`0!g1:d0Gi1c9a0?i1A0"i1M0AY1E(B. ,Tc9!RC!CP7S`0*h1909Ui1c9(B -,T$0CQi1'aC!0JX14(B, 0,TMU1aA!0Jl1(P`;0EUh1B90*Wh1Ma0?i1A0"i1M0AY1E05i19)0:Q1:`0>Wh1M0Gh1R(Pd04i1$'d0Gi1(B. 0,T*Wh1McK0Ah109Qi1905Qi1'0"Vi19b4B(B -,T!RC`05T1A(B "~" ,T`0"i1Rd;07i1RB0*Wh1Ma0?i1A0"i1M0AY1E05i19)0:Q1:(B. +คำสั่งนี้จะทำสำเนาข้อความที่อยู่ในอีแมกส์เข้าไปเก็บไว้ในแฟ้มข้อมูล. ในการกระทำเช่นนี้ใน +ครั้งแรกสุด, อีแมกส์จะเปลี่ยนชื่อแฟ้มข้อมูลต้นฉบับเพื่อว่าจะได้คงไว้. ชื่อใหม่นั้นตั้งขึ้นโดย +การเติม "~" เข้าไปท้ายชื่อแฟ้มข้อมูลต้นฉบับ. -,T`0AWh1M7S!RC0(Q14`0!g1:`0CU1B:0Ci1MBa0Ei1G(B, 0,TMU1aA!0Jl1(P0>T1A0>l10*Wh1Ma0?i1A0"i1M0AY1E09Qi19(B. 0,T7h1R9$GC(P0(Q14`0!g1:0"i1M0AY1E(B -0,T:h1MBf(B, ,T`0>Wh1M0Gh1R07h1R9(Pd04i1d0Ah105i1M'`0JU1B'R9d;AR!09Q1!KR!CP::`0!T140"Q140"i1M'(B. +เมื่อทำการจัดเก็บเรียบร้อยแล้ว, อีแมกส์จะพิมพ์ชื่อแฟ้มข้อมูลนั้น. ท่านควรจะจัดเก็บข้อมูล +บ่อยๆ, เพื่อว่าท่านจะได้ไม่ต้องเสียงานไปมากนักหากระบบเกิดขัดข้อง. ->> 0,T;i1M9$S0JQh1'(B C-x C-s, ,T`0>Wh1M0(Q14`0!g1:JS`9R0$Yh10AW1M!RCc0*i1"M'07h1R9(B. - ,T(P;CR!/(B "Write ...TUTORIAL.th" 0,T7Uh1:CC07Q140Eh1R'0JX14"M'K09i1R(M(B. +>> ป้อนคำสั่ง C-x C-s, เพื่อจัดเก็บสำเนาคู่มือการใช้ของท่าน. + จะปรากฏ "Write ...TUTORIAL.th" ที่บรรทัดล่างสุดของหน้าจอ. -0,T7h1R9JRARC6(P`0BW1M9a0?i1A0"i1M0AY1E07Uh10AU1M0BYh1a0Ei1G(B, ,T`0>Wh1M07Uh1(P04Y1K0CW1Ma0!i1d"(B. 0,T7h1R9JRARC6(P`0BW1M9(B -,Ta0?i1A0"i1M0AY1E07Uh10BQ1'd0Ah1;CR!/0!g1d04i1(B. 0,T9Uh1`0;g19!RCJ0Ci1R'a0?i1A0"i1M0AY1EcK0Ah1"M'0MU1aA!0Jl1(B: ,T`0BW1M9a0?i1A0"i1M0AY1E(B, -0,T+Vh1'(P`0CTh1A05i1904i1GBK09i1R(M0Gh1R'`;0Eh1R(B, ,Ta0Ei1G7S!RCa7C!0"i1M$GRA`0>Wh1M07Uh1(PJ0Ci1R'`0;g19a0?i1A0"i1M0AY1E05h1Md;(B. -,T`0AWh1M07h1R90JQh1'c0Ki1(B "0,T(Q14`0!g1:(B (save)" ,Ta0?i1A0"i1M0AY1E(B, 0,TMU1aA!0Jl10(V1'(PJ0Ci1R'a0?i1A0"i1M0AY1E04i1GB0"i1M$GRA07Uh1(B -0,T7h1R9d04i10;i1M9`0"i1Rd;(B. ,T(R!09Ui1d;(B, 0,T7h1R9JRARC6(P05Q140JT19c(EM'a0!i1d"a0?i1A0"i1M0AY1E07Uh10AU1M0BYh1a0Ei1Gd04i1(B. +ท่านสามารถจะเยือนแฟ้มข้อมูลที่มีอยู่แล้ว, เพื่อที่จะดูหรือแก้ไข. ท่านสามารถจะเยือน +แฟ้มข้อมูลที่ยังไม่ปรากฏก็ได้. นี่เป็นการสร้างแฟ้มข้อมูลใหม่ของอีแมกส์: เยือนแฟ้มข้อมูล, +ซึ่งจะเริ่มต้นด้วยหน้าจอว่างเปล่า, แล้วทำการแทรกข้อความเพื่อที่จะสร้างเป็นแฟ้มข้อมูลต่อไป. +เมื่อท่านสั่งให้ "จัดเก็บ (save)" แฟ้มข้อมูล, อีแมกส์จึงจะสร้างแฟ้มข้อมูลด้วยข้อความที่ +ท่านได้ป้อนเข้าไป. จากนี้ไป, ท่านสามารถจะตัดสินใจลองแก้ไขแฟ้มข้อมูลที่มีอยู่แล้วได้. -* 0,T:Q1?`?M0Cl1(B (buffer) +* บัฟเฟอร์ (buffer) ----------------- -0,T6i1R07h1R9`0BW1M90MU1!a0?i1A0"i1M0AY1Eb4Bc0*i1$S0JQh1'(B C-x C-f, ,Ta0?i1A0"i1M0AY1EaC!(P0BQ1'$'M0BYh1c90MU1aA!0Jl1(B. 0,T7h1R9(B -,TJRARC6(PJ0EQ1:!0EQ1:d;d04i10MU1!b4Bc0*i1$S0JQh1'(B C-x C-f. 0,TGT108U109Ui1(P7Sc0Ki107h1R9JRARC6`0BW1M9a0?i1A0"i1M0AY1E(B -,T@RBc90MU1aA!0Jl1d04i1(S9G9K09Vh1'(B. +ถ้าท่านเยือนอีกแฟ้มข้อมูลโดยใช้คำสั่ง C-x C-f, แฟ้มข้อมูลแรกจะยังคงอยู่ในอีแมกส์. ท่าน +สามารถจะสลับกลับไปได้อีกโดยใช้คำสั่ง C-x C-f. วิธีนี้จะทำให้ท่านสามารถเยือนแฟ้มข้อมูล +ภายในอีแมกส์ได้จำนวนหนึ่ง. ->> ,TJ0Ci1R'a0?i1A0"i1M0AY1EaEPc0Ki10*Wh1M0Gh1R(B "foo" ,Tb4B!RC0;i1M9$S0JQh1'(B C-x C-f foo . - ,Ta0Ei1G0;i1M90"i1M$GRA(B, ,Ta0!i1d"(B, ,TaEP0(Q14`0!g1:(B "foo" ,Tb4B!RC0;i1M9$S0JQh1'(B C-x C-s. - 0,TJX1407i1RB(B, 0,T;i1M9$S0JQh1'(B C-x C-f TUTORIAL ,T`0>Wh1M(Pd04i10Bi1M9!0EQ1:AR07Uh10"i1M$GRA(B - ,T"M'0$Yh10AW1M!RCc0*i1(B. +>> สร้างแฟ้มข้อมูลและให้ชื่อว่า "foo" โดยการป้อนคำสั่ง C-x C-f foo . + แล้วป้อนข้อความ, แก้ไข, และจัดเก็บ "foo" โดยการป้อนคำสั่ง C-x C-s. + สุดท้าย, ป้อนคำสั่ง C-x C-f TUTORIAL เพื่อจะได้ย้อนกลับมาที่ข้อความ + ของคู่มือการใช้. -0,TMU1aA!0Jl1`0!g1:0"i1M$GRA"M'a05h1EPa0?i1A0"i1M0AY1E@RBc90JTh1'f(B (object) ,TK09Vh1'(B, 0,T+Vh1'`0CU1B!0Gh1R(B "0,T:Q1?`?M0Cl1(B -(buffer)". ,T!RC`0BW1M9a0?i1A0"i1M0AY1E`0;g19!RCJ0Ci1R'0:Q1?`?M0Cl1cK0Ah1@RBc90MU1aA!0Jl1(B. ,Tc9!RC07Uh1(P04Y1(B -,TCRB!RC"M'0:Q1?`?M0Cl107Uh10AU1M0BYh1c90MU1aA!0Jl109Qi19(B, ,Tc0Ki10;i1M9$S0JQh1'(B: +อีแมกส์เก็บข้อความของแต่ละแฟ้มข้อมูลภายในสิ่งๆ (object) หนึ่ง, ซึ่งเรียกว่า "บัฟเฟอร์ +(buffer)". การเยือนแฟ้มข้อมูลเป็นการสร้างบัฟเฟอร์ใหม่ภายในอีแมกส์. ในการที่จะดู +รายการของบัฟเฟอร์ที่มีอยู่ในอีแมกส์นั้น, ให้ป้อนคำสั่ง: C-x C-b List buffers ->> ,TEM'0;i1M9$S0JQh1'(B C-x C-b 0,T4Y1(B. +>> ลองป้อนคำสั่ง C-x C-b ดู. -0,T4Y10Gh1Ra05h1EP0:Q1?`?M0Cl10AU10*Wh1M0Gh1RMPdC(B, ,TaEP:R'0MQ190!g1`0;g190*Wh1M"M'a0?i1A0"i1M0AY1E07Uh10AU1`09Wi1MKR09Qi19f(B ,TM0BYh1(B. ,T:R'(B -0,T:Q1?`?M0Cl1d0Ah1d04i1`0!Uh1BG0"i1M'0!Q1:a0?i1A0"i1M0AY1E(B. 0,T5Q1GM0Bh1R'`0*h19(B, 0,T:Q1?`?M0Cl107Uh10AU10*Wh1M0Gh1R(B "*Buffer List*" -,Td0Ah10AU1a0?i1A0"i1M0AY1Ec4f(B 0,T7Qi1'0JTi19(B. 0,T9Uh1`0;g190:Q1?`?M0Cl10+Vh1':CC0(X1`09Wi1MKR"M'CRB!RC"M'0:Q1?`?M0Cl107Uh106Y1!J0Ci1R'(B -0,T4i1GB$S0JQh1'(B C-x C-b. 0,T"i1M$GRAc4f(B 0,T7Uh107h1R9`0Kg19:9K09i1R(M"M'0MU1aA!0Jl1(P;CR!/M0BYh1`0;g190Jh1G9K09Vh1'(B -,T"M'0:Q1?`?M0Cl1c40:Q1?`?M0Cl1K09Vh1'`JAM(B. +ดูว่าแต่ละบัฟเฟอร์มีชื่อว่าอะไร, และบางอันก็เป็นชื่อของแฟ้มข้อมูลที่มีเนื้อหานั้นๆ อยู่. บาง +บัฟเฟอร์ไม่ได้เกี่ยวข้องกับแฟ้มข้อมูล. ตัวอย่างเช่น, บัฟเฟอร์ที่มีชื่อว่า "*Buffer List*" +ไม่มีแฟ้มข้อมูลใดๆ ทั้งสิ้น. นี่เป็นบัฟเฟอร์ซึ่งบรรจุเนื้อหาของรายการของบัฟเฟอร์ที่ถูกสร้าง +ด้วยคำสั่ง C-x C-b. ข้อความใดๆ ที่ท่านเห็นบนหน้าจอของอีแมกส์จะปรากฏอยู่เป็นส่วนหนึ่ง +ของบัฟเฟอร์ใดบัฟเฟอร์หนึ่งเสมอ. ->> ,TEM'c0*i1$S0JQh1'(B C-x 1 ,T`0>Wh1M07Uh1(P!S0(Q14CRB!RC"M'0:Q1?`?M0Cl1(B. +>> ลองใช้คำสั่ง C-x 1 เพื่อที่จะกำจัดรายการของบัฟเฟอร์. -0,T6i1R07h1R9a0!i1d"0"i1M$GRAc9a0?i1A0"i1M0AY1EK09Vh1'(B, ,Ta0Ei1G`0BW1M90MU1!a0?i1A0"i1M0AY1EK09Vh1'(B, 0,TMU1aA!0Jl10BQ1'd0Ah1d04i10(Q14`0!g1:(B -0,T"i1M$GRA"M'a0?i1A0"i1M0AY1EaC!(B. 0,T"i1M$GRA07Uh106Y1!a0!i1d"d;(P0BQ1'$'M0BYh1c90MU1aA!0Jl1(B, ,Tc90:Q1?`?M0Cl1JSK0CQ1:(B -,Ta0?i1A0"i1M0AY1E09Qi19(B. ,T!RCJ0Ci1R'K0CW1M!RCa0!i1d""M'0:Q1?`?M0Cl1JSK0CQ1:a0?i1A0"i1M0AY1E07Uh1JM'd0Ah1d04i10AU1Wh1M07Uh1(Pd04i1c0*i1$S0JQh1'(B C-x C-s ,Tc9!RC0(Q14`0!g1:(B. -0,T4Q1'09Qi19`CR0(V1'`50CU1BA$S0JQh1'(B +ถ้าท่านแก้ไขข้อความในแฟ้มข้อมูลหนึ่ง, แล้วเยือนอีกแฟ้มข้อมูลหนึ่ง, อีแมกส์ยังไม่ได้จัดเก็บ +ข้อความของแฟ้มข้อมูลแรก. ข้อความที่ถูกแก้ไขไปจะยังคงอยู่ในอีแมกส์, ในบัฟเฟอร์สำหรับ +แฟ้มข้อมูลนั้น. การสร้างหรือการแก้ไขของบัฟเฟอร์สำหรับแฟ้มข้อมูลที่สองไม่ได้มีผลต่อ +บัฟเฟอร์สำหรับแฟ้มข้อมูลที่หนึ่ง. นี่เป็นสิ่งที่มีประโยชน์มาก, แต่ก็หมายความว่าจะต้องมี +วิธีการที่ดีในการจัดเก็บบัฟเฟอร์ของแฟ้มข้อมูลแรก. นี่ไม่ได้หมายความว่าจะต้องสลับกลับไป +ยังแฟ้มข้อมูลแรกด้วยคำสั่ง C-x C-f ก่อน, เพื่อที่จะได้ใช้คำสั่ง C-x C-s ในการจัดเก็บ. +ดังนั้นเราจึงเตรียมคำสั่ง C-x s Save some buffers -,T$S0JQh1'(B C-x s ,T(P6RA07h1R9`0!Uh1BG0!Q1:0:Q1?`?M0Cl107Uh1d04i10CQ1:!RCa0!i1d"a05h10BQ1'd0Ah1d04i10CQ1:!RC0(Q14`0!g1:(B. 0,TMU1(B -,TaA!0Jl1(P6RA07h1R9(B, ,TJSK0CQ1:a05h1EP0:Q1?`?M0Cl104Q1'!0Eh1RG(B, 0,TGh1R(P0(Q14`0!g1:K0CW1Md0Ah1(B. +คำสั่ง C-x s จะถามท่านเกี่ยวกับบัฟเฟอร์ที่ได้รับการแก้ไขแต่ยังไม่ได้รับการจัดเก็บ. อี +แมกส์จะถามท่าน, สำหรับแต่ละบัฟเฟอร์ดังกล่าว, ว่าจะจัดเก็บหรือไม่. ->> ,Ta7C!0"i1M$GRA0JQ1!K09Vh1':CC07Q14(B, ,Ta0Ei1G0;i1M9$S0JQh1'(B C-x s. - 0,TMU1aA!0Jl1(P6RA07h1R90Gh1R(P0(Q14`0!g1:0:Q1?`?M0Cl10*Wh1M(B TUTORIAL ,TdKA(B. - ,T5M:0Gh1Rc0*h1b4B!RC0;i1M9(B "y". +>> แทรกข้อความสักหนึ่งบรรทัด, แล้วป้อนคำสั่ง C-x s. + อีแมกส์จะถามท่านว่าจะจัดเก็บบัฟเฟอร์ชื่อ TUTORIAL ไหม. + ตอบว่าใช่โดยการป้อน "y". -* ,T!RC`0>Th1A0*X14$S0JQh1'(B +* การเพิ่มชุดคำสั่ง -------------- -0,TAU1$S0JQh1'"M'0MU1aA!0Jl1M0BYh10MU1!AR!ARB(9`0!T19!0Gh1R07Uh1(PJRARC6!S0!Q1:d04i104i1GB0MQ1!"CP;CPJA0!Q1:0MQ1!"CP(B -,T$M9b7CE(B (control character) ,TaEPM0@T10MQ1!"CP(B (meta character). 0,TMU1aA!0Jl1c0*i1!RC(B -,T;CPJA0!Q1:$S0JQh1'`J0CT1A(B (eXtend command). ,T!RC`J0CT1A09Ui1`0;g19d;d04i1JM'0EQ1!I3P(B: +มีคำสั่งของอีแมกส์อยู่อีกมากมายจนเกินกว่าที่จะสามารถกำกับได้ด้วยอักขระประสมกับอักขระ +คอนโทรล (control character) และอภิอักขระ (meta character). อีแมกส์ใช้การ +ประสมกับคำสั่งเสริม (eXtend command). การเสริมนี้เป็นไปได้สองลักษณะ: - C-x ,T!RC`J0CT1A0MQ1!"CP(B (Character eXtend). ,T5RA04i1GBK09Vh1'05Q1G0MQ1!IC(B. - M-x ,T!RC`J0CT1A04i1GB0*Wh1M$S0JQh1'(B (Named command eXtend). ,T5RA04i1GB0*Wh1M`05g1A(B. + C-x การเสริมอักขระ (Character eXtend). ตามด้วยหนึ่งตัวอักษร. + M-x การเสริมด้วยชื่อคำสั่ง (Named command eXtend). ตามด้วยชื่อเต็ม. -,T$S0JQh1'`K0Eh1R09Ui1b4B07Qh1Gd;a0Ei1G(P0AU1;CPbB*09l1(B, ,Ta05h10AQ1!(P0AU1bM!RJc0*i109i1MB!0Gh1R$S0JQh1'05h1R'f(B 0,T7Uh107h1R9d04i1(B -,T`0CU1B90CYi1d;a0Ei1G(B. 0,T7h1R9d04i1>:d;a0Ei1GJM'$S0JQh1'(B: ,T$S0JQh1'JSK0CQ1:!RC0(Q14!RC0!Q1:a0?i1A0"i1M0AY1E(B C-x C-f -,TJSK0CQ1:!RC`0BW1M9(B (Find) ,TaEP(B C-x C-s ,TJSK0CQ1:!RC0(Q14`0!g1:(B (Save). 0,TMU1!05Q1GM0Bh1R'K09Vh1'0!g1(B -0,T$W1M$S0JQh1'07Uh1c0*i1c9!RC`0ET1!c0*i10MU1aA!0Jl1(B--,T$S0JQh1'(B C-x C-c. (,Td0Ah105i1M'`0;g190Kh1G'0Gh1R0"i1M0AY1E07Uh107h1R9d04i1(B -,Ta0!i1d"d;(P0JY1-KRB(B; ,T$S0JQh1'(B C-x C-c ,T(P`J9Mc0Ki10(Q14`0!g1:a0?i1A0"i1M0AY1E07Uh106Y1!a0!i1d"d;0!h1M907Uh1(P0JTi190JX14(B -0,TMU1aA!0Jl1(B.) +คำสั่งเหล่านี้โดยทั่วไปแล้วจะมีประโยชน์, แต่มักจะมีโอกาสใช้น้อยกว่าคำสั่งต่างๆ ที่ท่านได้ +เรียนรู้ไปแล้ว. ท่านได้พบไปแล้วสองคำสั่ง: คำสั่งสำหรับการจัดการกับแฟ้มข้อมูล C-x C-f +สำหรับการเยือน (Find) และ C-x C-s สำหรับการจัดเก็บ (Save). อีกตัวอย่างหนึ่งก็ +คือคำสั่งที่ใช้ในการเลิกใช้อีแมกส์--คำสั่ง C-x C-c. (ไม่ต้องเป็นห่วงว่าข้อมูลที่ท่านได้ +แก้ไขไปจะสูญหาย; คำสั่ง C-x C-c จะเสนอให้จัดเก็บแฟ้มข้อมูลที่ถูกแก้ไขไปก่อนที่จะสิ้นสุด +อีแมกส์.) -,T$S0JQh1'(B C-z ,T`0;g19$S0JQh1'07Uh1c0*i1c9!RCMM!(R!0MU1aA!0Jl1`0;g19!RC0*Qh1G$CRG(B *temporarily*--,T)P09Qi19(B -0,T7h1R9JRARC6!0EQ1:d;0JYh10MU1aA!0Jl1d04i10MU1!K0EQ1'(R!09Qi19(B. +คำสั่ง C-z เป็นคำสั่งที่ใช้ในการออกจากอีแมกส์เป็นการชั่วคราว *temporarily*--ฉะนั้น +ท่านสามารถกลับไปสู่อีแมกส์ได้อีกหลังจากนั้น. -,TJSK0CQ1:CP::07Uh1M09X1-R5c0Ki1c0*i1$S0JQh1'(B, C-z "suspends" 0,TMU1aA!0Jl1(B; 0,T9Qh190$W1M!RC!0EQ1:d;0BQ1'`*E0El1(B -(shell) ,Tb4Bd0Ah1d04i17SERB0MU1aA!0Jl1(B. ,Tc9`*E0El107Qh1Gd;(B, 0,T7h1R9JRARC60CU10+Y1A(B (resume) 0,TMU1aA!0Jl1(B -,Td04i104i1GB$S0JQh1'(B `fg' ,TK0CW1M04i1GB$S0JQh1'(B `%emacs'. +สำหรับระบบที่อนุญาตให้ใช้คำสั่ง, C-z "suspends" อีแมกส์; นั่นคือการกลับไปยังเชลล์ +(shell) โดยไม่ได้ทำลายอีแมกส์. ในเชลล์ทั่วไป, ท่านสามารถรีซูม (resume) อีแมกส์ +ได้ด้วยคำสั่ง `fg' หรือด้วยคำสั่ง `%emacs'. -,TJSK0CQ1:CP::07Uh1d0Ah10AU10?Q1'0!l10*Q19(B "suspend", ,T$S0JQh1'(B C-z ,T(PJ0Ci1R'0+Q1:`*E0El1(B (subshell) -,T@RBc05i10MU1aA!0Jl1`0>Wh1Mc0Ki107h1R90AU1bM!RJ4S`09T19'R9b;Ca!CA0MWh190!h1M9a0Ei1G0$h1MB!0EQ1:AR0BQ1'0MU1aA!0Jl10MU1!$0CQi1'(B; -0,T+Vh1'd0Ah1c0*h1!RC(B ",TMM!(R!(B (exit)" 0,TMU1aA!0Jl1(0CT1'(B. ,Tc9!C03U109Ui1(B, ,T$S0JQh1'`*E0El1(B `exit' ,T`0;g19$S0JQh1'(B -,T;C!05T107Uh1c0*i1c9!RC!0EQ1:d;0BQ1'0MU1aA!0Jl1(R!0+Q1:`*E0El1(B. +สำหรับระบบที่ไม่มีฟังก์ชัน "suspend", คำสั่ง C-z จะสร้างซับเชลล์ (subshell) +ภายใต้อีแมกส์เพื่อให้ท่านมีโอกาสดำเนินงานโปรแกรมอื่นก่อนแล้วค่อยกลับมายังอีแมกส์อีกครั้ง; +ซึ่งไม่ใช่การ "ออกจาก (exit)" อีแมกส์จริง. ในกรณีนี้, คำสั่งเชลล์ `exit' เป็นคำสั่ง +ปรกติที่ใช้ในการกลับไปยังอีแมกส์จากซับเชลล์. -,Tc0*i1$S0JQh1'(B C-x C-c 0,T!g105h1M`0AWh1M07h1R905i1M'!RC(P`0ET1!c0*i10MU1aA!0Jl1(0CT1'f(B. 0,TGT108U109Ui1`0;g190GT108U107Uh106Y1!05i1M'c9(B -,T!RC07Uh1(P`0ET1!c0*i10MU1aA!0Jl1(B, ,Td0Ah10Gh1R0MU1aA!0Jl109Qi19(P06Y1!`0CU1B!c0*i1(R!b;Ca!CA0(Q14!RC`AE0El1(B (mail -handling programs) ,TK0CW1Mb;Ca!CAMCC6;CPbB*09l1(B (utility programs) 0,T5h1R'f(B, -,T`09Wh1M'(R!0Gh1Rb;Ca!CA`K0Eh1R09Ui1d0Ah10AU10GT108U1!RC0(Q14!RC0!Q1:0MU1aA!0Jl1d04i1b4B5C'(B. ,Tc9J@R>!RC7S'R9(B -,T;C!05T1(B, 0,T6i1R07h1R9d0Ah1d04i105i1M'!RC(P`0ET1!c0*i10MU1aA!0Jl1(0CT1'f(B, 0,T7h1R90!g1$GC(P(B suspend ,Tb4B!RCc0*i1(B -,T$S0JQh1'(B C-z ,Ta79!RC`0ET1!c0*i1d;`EB(B. +ใช้คำสั่ง C-x C-c ก็ต่อเมื่อท่านต้องการจะเลิกใช้อีแมกส์จริงๆ. วิธีนี้เป็นวิธีที่ถูกต้องใน +การที่จะเลิกใช้อีแมกส์, ไม่ว่าอีแมกส์นั้นจะถูกเรียกใช้จากโปรแกรมจัดการเมลล์ (mail +handling programs) หรือโปรแกรมอรรถประโยชน์ (utility programs) ต่างๆ, +เนื่องจากว่าโปรแกรมเหล่านี้ไม่มีวิธีการจัดการกับอีแมกส์ได้โดยตรง. ในสภาพการทำงาน +ปรกติ, ถ้าท่านไม่ได้ต้องการจะเลิกใช้อีแมกส์จริงๆ, ท่านก็ควรจะ suspend โดยการใช้ +คำสั่ง C-z แทนการเลิกใช้ไปเลย. -0,TBQ1'0AU1$S0JQh1'07Uh1M0BYh1c90*X14$S0JQh1'(B C-x 0,TMU1!AR!(B. 0,T5h1Md;09Ui1`0;g19CRB!RC$S0JQh1'07Uh107h1R9d04i1`0CU1B90CYi1d;a0Ei1G(B: +ยังมีคำสั่งที่อยู่ในชุดคำสั่ง C-x อีกมาก. ต่อไปนี้เป็นรายการคำสั่งที่ท่านได้เรียนรู้ไปแล้ว: - C-x C-f ,T`0BW1M9a0?i1A0"i1M0AY1E(B (Find file). - C-x C-s 0,T(Q14`0!g1:a0?i1A0"i1M0AY1E(B (Save file). - C-x C-b ,T7SCRB!RC0:Q1?`?M0Cl1(B (List buffers). - C-x C-c ,T`0ET1!c0*i10MU1aA!0Jl1(B (Quit Emacs). - C-x 1 ,TE:K09i1R(M07Qi1'KA4b4B$'M0BYh1d0Gi1K09Vh1'K09i1R(M(B + C-x C-f เยือนแฟ้มข้อมูล (Find file). + C-x C-s จัดเก็บแฟ้มข้อมูล (Save file). + C-x C-b ทำรายการบัฟเฟอร์ (List buffers). + C-x C-c เลิกใช้อีแมกส์ (Quit Emacs). + C-x 1 ลบหน้าจอทั้งหมดโดยคงอยู่ไว้หนึ่งหน้าจอ (Delete all but one window). - C-x u ,T7S0Bi1M9(B (Undo). + C-x u ทำย้อน (Undo). -,T$S0JQh1'07Uh10AU10*Wh1M$S0JQh1'`J0CT1A09Ui1`0;g19$S0JQh1'07Uh1c0*i1d0Ah10$h1MB0:h1MB09Q1!(B, ,TK0CW1M`0;g19$S0JQh1'07Uh1c0*i1`)>RPc9:R'bKA4(B -,T`07h1R09Qi19(B. 0,T5Q1GM0Bh1R'K09Vh1'"M'$S0JQh1'09Ui10$W1M$S0JQh1'`;0EUh1B9a79(B-,TJRB0MQ1!"CP(B (replace-string), -0,T+Vh1'`0;g19!RC`;0EUh1B9a79JRB0MQ1!"CPK09Vh1'04i1GB0MU1!JRB0MQ1!"CPK09Vh1'07Qi1'KA4(B. ,T`0AWh1M07h1R90;i1M9$S0JQh1'(B M-x, -0,TMU1aA!0Jl1aJ4'(B M-x 0,T7Uh1:CC07Q140Eh1R'0JX14"M'K09i1R(M(B, ,Tc907Uh109Ui107h1R9(P05i1M'0>T1A0>l10*Wh1M"M'$S0JQh1'(B; ,Tc9!C03U109Ui1(B -0,T$W1M(B "replace-string". 0,T7h1R9MR((P0>T1A0>l1(B "repl s" ,Ta0Ei1G0MU1aA!0Jl1(P`05T1A0*Wh1M$S0JQh1'c0Ki1(B -,T`05g1A`M'd04i1(B. 0,TJTi190JX14$S0JQh1'04i1GB!RC!40;Xh1A(B . +คำสั่งที่มีชื่อคำสั่งเสริมนี้เป็นคำสั่งที่ใช้ไม่ค่อยบ่อยนัก, หรือเป็นคำสั่งที่ใช้เฉพาะในบางโหมด +เท่านั้น. ตัวอย่างหนึ่งของคำสั่งนี้คือคำสั่งเปลี่ยนแทน-สายอักขระ (replace-string), +ซึ่งเป็นการเปลี่ยนแทนสายอักขระหนึ่งด้วยอีกสายอักขระหนึ่งทั้งหมด. เมื่อท่านป้อนคำสั่ง M-x, +อีแมกส์แสดง M-x ที่บรรทัดล่างสุดของหน้าจอ, ในที่นี้ท่านจะต้องพิมพ์ชื่อของคำสั่ง; ในกรณีนี้ +คือ "replace-string". ท่านอาจจะพิมพ์ "repl s" แล้วอีแมกส์จะเติมชื่อคำสั่งให้ +เต็มเองได้. สิ้นสุดคำสั่งด้วยการกดปุ่ม . -,T$S0JQh1'`;0EUh1B9a79(B-,TJRB0MQ1!"CP(B (replace-string) 0,T5i1M'!RCJM'MR0Cl10!T1G`A905l1(B--,TJRB0MQ1!"CP(B -0,T7Uh1(P06Y1!`;0EUh1B9a79(B, ,TaEPJRB0MQ1!"CP07Uh1(Pc0*i1`;0EUh1B9a79(B. 0,T7h1R9(P05i1M'0JTi190JX14!RC0;i1M9a05h1EPMR0Cl1(B -0,T!T1G`A905l104i1GB!RC!40;Xh1A(B . +คำสั่งเปลี่ยนแทน-สายอักขระ (replace-string) ต้องการสองอาร์กิวเมนต์--สายอักขระ +ที่จะถูกเปลี่ยนแทน, และสายอักขระที่จะใช้เปลี่ยนแทน. ท่านจะต้องสิ้นสุดการป้อนแต่ละอาร์ +กิวเมนต์ด้วยการกดปุ่ม . ->> ,T`$0EWh1M9`$M0Cl1`+M0Cl1d;0BQ1':CC07Q14`;0Eh1R07Uh1M0BYh1c05i1:CC07Q1409Ui1d;JM':CC07Q14(B. - ,Ta0Ei1G0;i1M9$S0JQh1'(B M-x repl schangedaltered. +>> เคลื่อนเคอร์เซอร์ไปยังบรรทัดเปล่าที่อยู่ใต้บรรทัดนี้ไปสองบรรทัด. + แล้วป้อนคำสั่ง M-x repl schangedaltered. - 0,TJQ1'`!504Y1!RC`;0EUh1B9a;E'"M':CC07Q1409Ui1(B: 0,T7h1R9d04i1`;0EUh1B9a79$S0Gh1R(B c-h-a-n-g-e-d - 0,T4i1GB$S0Gh1R(B "altered" ,Tc907X1!07Uh107Uh1;CR!/05Qi1'a05h15SaK09h1'07Uh1`$M0Cl1`+M0Cl1M0BYh10;Q1(0(X10:Q19(B. + สังเกตดูการเปลี่ยนแปลงของบรรทัดนี้: ท่านได้เปลี่ยนแทนคำว่า c-h-a-n-g-e-d + ด้วยคำว่า "altered" ในทุกที่ที่ปรากฏตั้งแต่ตำแหน่งที่เคอร์เซอร์อยู่ปัจจุบัน. -* 0,T(Q14`0!g1:0MQ15b90AQ105T1(B (auto save) +* จัดเก็บอัตโนมัติ (auto save) ------------------------- -,T`0AWh1M07h1R9d04i1a0!i1d"a0?i1A0"i1M0AY1Ea0Ei1G(B, ,Ta05h107h1R90BQ1'd0Ah1d04i10(Q14`0!g1:(B, ,Ta0?i1A0"i1M0AY1E`K0Eh1R09Qi19MR(0JY1-KRBd04i106i1R(B -,T`$0CWh1M'$MA0>T1G`5M0Cl1"M'07h1R9`0!T140"Q140"i1M'(B. ,T`0>Wh1M0;i1M'0!Q19`K05X1!RC03l1`0*h1909Ui1(B, 0,TMU1aA!0Jl17S!RC`0"U1B9(B -0,T"i1M$GRAJSK0CQ1:a05h1EPa0?i1A0"i1M0AY1E07Uh107h1R9!S0EQ1'7S!RCa0!i1d"M0BYh1E'c9a0?i1A0"i1M0AY1E(B "0,T(Q14`0!g1:0MQ15b90AQ105T1(B -(auto save)". 0,T*Wh1M"M'a0?i1A0"i1M0AY1E0(Q14`0!g1:0MQ15b90AQ105T1(B (auto save file) ,T(P06Y1!05Qi1'cK0Ah1c0Ki1(B -0,TAU10MQ1!"CP(B "#" ,TM0BYh107Qi1'0"i1R'K09i1RaEP0"i1R'K0EQ1'0*Wh1Ma0?i1A0"i1M0AY1E05i19)0:Q1:(B; 0,T5Q1GM0Bh1R'`0*h19(B, 0,T6i1R0*Wh1M"M'(B -,Ta0?i1A0"i1M0AY1E09Qi19`0;g19(B "hello.c", 0,T*Wh1M"M'a0?i1A0"i1M0AY1E0(Q14`0!g1:0MQ15b90AQ105T1(P`0;g19(B "#hello.c#". -,T`0AWh1M07h1R97S!RC0(Q14`0!g1:a0?i1A0"i1M0AY1E04i1GB0GT108U1!RC;C!05T1a0Ei1G(B, 0,TMU1aA!0Jl1(PE:a0?i1A0"i1M0AY1E0(Q14`0!g1:0MQ15b90AQ105T1(B -0,T9Qi19`0JU1B(B. +เมื่อท่านได้แก้ไขแฟ้มข้อมูลแล้ว, แต่ท่านยังไม่ได้จัดเก็บ, แฟ้มข้อมูลเหล่านั้นอาจสูญหายได้ถ้า +เครื่องคอมพิวเตอร์ของท่านเกิดขัดข้อง. เพื่อป้องกันเหตุการณ์เช่นนี้, อีแมกส์ทำการเขียน +ข้อความสำหรับแต่ละแฟ้มข้อมูลที่ท่านกำลังทำการแก้ไขอยู่ลงในแฟ้มข้อมูล "จัดเก็บอัตโนมัติ +(auto save)". ชื่อของแฟ้มข้อมูลจัดเก็บอัตโนมัติ (auto save file) จะถูกตั้งใหม่ให้ +มีอักขระ "#" อยู่ทั้งข้างหน้าและข้างหลังชื่อแฟ้มข้อมูลต้นฉบับ; ตัวอย่างเช่น, ถ้าชื่อของ +แฟ้มข้อมูลนั้นเป็น "hello.c", ชื่อของแฟ้มข้อมูลจัดเก็บอัตโนมัติจะเป็น "#hello.c#". +เมื่อท่านทำการจัดเก็บแฟ้มข้อมูลด้วยวิธีการปรกติแล้ว, อีแมกส์จะลบแฟ้มข้อมูลจัดเก็บอัตโนมัติ +นั้นเสีย. -0,T6i1R`$0CWh1M'$MA0>T1G`5M0Cl1`0!T140"Q140"i1M'(B, 0,T7h1R9JRARC60!Yi1(B (recover) ,T(R!a0?i1A0"i1M0AY1E0(Q14`0!g1:(B -0,TMQ15b90AQ105T109Qi19d04i104i1GB!RC`0BW1M9a0?i1A0"i1M0AY1Ea::;C!05T1(B (,Ta0?i1A0"i1M0AY1E07Uh107h1R9!S0EQ1'a0!i1d"M0BYh1(B, ,Td0Ah1c0*h1(B -,Ta0?i1A0"i1M0AY1E0(Q14`0!g1:0MQ15b90AQ105T1(B), ,Ta0Ei1G0>T1A0>l1$S0JQh1'(B M-x recover file. ,T`0AWh1M0AU1!RC(B -,T6RA`0>Wh1M!RC0BW190BQ19(B, 0,T>T1A0>l1$S0Gh1R(B yes ,T`0>Wh1M4S`09T19!RC05h1MaEP7S!RC0!Yi10"i1M0AY1E07Uh106Y1!(B -0,T(Q14`0!g1:0MQ15b90AQ105T109Qi19(B. +ถ้าเครื่องคอมพิวเตอร์เกิดขัดข้อง, ท่านสามารถกู้ (recover) จากแฟ้มข้อมูลจัดเก็บ +อัตโนมัตินั้นได้ด้วยการเยือนแฟ้มข้อมูลแบบปรกติ (แฟ้มข้อมูลที่ท่านกำลังแก้ไขอยู่, ไม่ใช่ +แฟ้มข้อมูลจัดเก็บอัตโนมัติ), แล้วพิมพ์คำสั่ง M-x recover file. เมื่อมีการ +ถามเพื่อการยืนยัน, พิมพ์คำว่า yes เพื่อดำเนินการต่อและทำการกู้ข้อมูลที่ถูก +จัดเก็บอัตโนมัตินั้น. -* ,T:0CT1`G3JP07i1M9(B (echo area) +* บริเวณสะท้อน (echo area) ------------------------ -0,TMU1aA!0Jl10Mh1R9$S0JQh1';CPJA(B (multicharacter command) ,T"3P07Uh107h1R9!S0EQ1'0>T1A0>l1`0"i1Rd;0*i1Rf(B, -0,TMU1aA!0Jl1(PaJ4'$S0JQh1'05h1R'f(B 0,T7Uh107h1R9d04i10>T1A0>l1`0"i1Rd;5C'0Jh1G90Eh1R'"M'K09i1R(M5C':0CT1`G307Uh1`0CU1B!0Gh1R(B -",T:0CT1`G3JP07i1M9(B (echo area)". ,T:0CT1`G3JP07i1M90$W1M:CC07Q140Eh1R'0JX14"M'K09i1R(M(B. +อีแมกส์อ่านคำสั่งประสม (multicharacter command) ขณะที่ท่านกำลังพิมพ์เข้าไปช้าๆ, +อีแมกส์จะแสดงคำสั่งต่างๆ ที่ท่านได้พิมพ์เข้าไปตรงส่วนล่างของหน้าจอตรงบริเวณที่เรียกว่า +"บริเวณสะท้อน (echo area)". บริเวณสะท้อนคือบรรทัดล่างสุดของหน้าจอ. -* ,T:CC07Q14aJ4'bKA4(B (mode line) +* บรรทัดแสดงโหมด (mode line) --------------------------- -,T:CC07Q1407Uh1M0BYh1`K09W1M:0CT1`G3JP07i1M909Qi19`0CU1B!0Gh1R(B "mode line". ,T:CC07Q14aJ4'bKA4(PaJ4'(B -0,T"i1M$GRA:R'M0Bh1R'c90EQ1!I3P(B: +บรรทัดที่อยู่เหนือบริเวณสะท้อนนั้นเรียกว่า "mode line". บรรทัดแสดงโหมดจะแสดง +ข้อความบางอย่างในลักษณะ: --:** TUTORIAL (Fundamental)--L670--58%---------------- -,T:CC07Q1409Ui1c0Ki10"i1M0AY1E07Uh1`0;g19;CPbB*09l1`0!Uh1BG0!Q1:J6R9@R>"M'0MU1aA!0Jl1aEP0"i1M$GRA07Uh107h1R9!S0EQ1'7S!RC(B -,Ta0!i1d"M0BYh1(B. +บรรทัดนี้ให้ข้อมูลที่เป็นประโยชน์เกี่ยวกับสถานภาพของอีแมกส์และข้อความที่ท่านกำลังทำการ +แก้ไขอยู่. -0,T7h1R97CR:a0Ei1G0Gh1R0*Wh1Ma0?i1A0"i1M0AY1E0AU1$GRAKARBM0Bh1R'dC(B--0,T$W1Ma0?i1A0"i1M0AY1E07Uh107h1R9d04i1`0BW1M9M0BYh1(B. -NN%-- -0,T:h1':M!5SaK09h1'0;Q1(0(X10:Q19c90"i1M$GRA"M'07h1R9(B; 0,T9Qh19KARB$GRA0Gh1R0AU10"i1M$GRA(B NN ,T`;M0Cl1`+905l107Uh1M0BYh1(B -,T`K09W1M5SaK09h1'0JY1'0JX14"M'K09i1R(M(B. 0,T6i1R5SaK09h1'0JY1'0JX14"M'a0?i1A0"i1M0AY1EM0BYh1:9K09i1R(M(B, ,T(P;CR!/(B ---Top-- ,Ta7907Uh1(P`0;g19(B --00%--. 0,T6i1R5SaK09h1'0Eh1R'0JX14"M'0"i1M$GRAM0BYh1:9K09i1R(M(B, ,T(P;CR!/(B ---Bot--. 0,T6i1R07h1R9!S0EQ1'`0BW1M9a0?i1A0"i1M0AY1E07Uh1`0Eg1!AR!(90"i1M$GRA07Qi1'KA4M0BYh1:9K09i1R(M(B, ,T:CC07Q14(B -,TaJ4'bKA4(PaJ4'0Gh1R(B --All--. +ท่านทราบแล้วว่าชื่อแฟ้มข้อมูลมีความหมายอย่างไร--คือแฟ้มข้อมูลที่ท่านได้เยือนอยู่. -NN%-- +บ่งบอกตำแหน่งปัจจุบันในข้อความของท่าน; นั่นหมายความว่ามีข้อความ NN เปอร์เซนต์ที่อยู่ +เหนือตำแหน่งสูงสุดของหน้าจอ. ถ้าตำแหน่งสูงสุดของแฟ้มข้อมูลอยู่บนหน้าจอ, จะปรากฏ +--Top-- แทนที่จะเป็น --00%--. ถ้าตำแหน่งล่างสุดของข้อความอยู่บนหน้าจอ, จะปรากฏ +--Bot--. ถ้าท่านกำลังเยือนแฟ้มข้อมูลที่เล็กมากจนข้อความทั้งหมดอยู่บนหน้าจอ, บรรทัด +แสดงโหมดจะแสดงว่า --All--. -,T`$0CWh1M'KARB4M!0(Q19:0CT1`G305i19f(B ,T"M':CC07Q14aJ4'bKA4KARB$GRA0Gh1R07h1R9d04i17S!RC(B -,T`;0EUh1B9a;E'`09Wi1MKRc90"i1M$GRAa0Ei1G(B. ,TKR!07h1R9`0>Th1'`0BW1M9K0CW1M0(Q14`0!g1:a0?i1A0"i1M0AY1E(B, 0,TJh1G907Uh1(B -,Td04i1!0Eh1RG06V1'09Qi19(Pd0Ah10AU1`$0CWh1M'KARB4M!0(Q19;CR!/(B, ,T(P0AU1a05h1`0Ji19;CP(B (dashes). +เครื่องหมายดอกจันบริเวณต้นๆ ของบรรทัดแสดงโหมดหมายความว่าท่านได้ทำการ +เปลี่ยนแปลงเนื้อหาในข้อความแล้ว. หากท่านเพิ่งเยือนหรือจัดเก็บแฟ้มข้อมูล, ส่วนที่ +ได้กล่าวถึงนั้นจะไม่มีเครื่องหมายดอกจันปรากฏ, จะมีแต่เส้นประ (dashes). -0,TJh1G907Uh1M0BYh1CPK0Gh1R'G'`0Eg1:@RBc9:CC07Q14aJ4'bKA4(P:M!07h1R90Gh1R07h1R9!S0EQ1'M0BYh1c9bKA4!RCa0!i1d"(B -(editing mode) ,TMPdC(B. ,TbKA4b4B;0CT1BRB(B (default mode) 0,T$W1M(B Fundamental 0,T7Uh1(B -0,T7h1R9!S0EQ1'c0*i1M0BYh1c9"3P09Ui1(B. 0,T9Uh10$W1M05Q1GM0Bh1R'"M'(B ",TbKA4K0EQ1!(B (major mode)". +ส่วนที่อยู่ระหว่างวงเล็บภายในบรรทัดแสดงโหมดจะบอกท่านว่าท่านกำลังอยู่ในโหมดการแก้ไข +(editing mode) อะไร. โหมดโดยปริยาย (default mode) คือ Fundamental ที่ +ท่านกำลังใช้อยู่ในขณะนี้. นี่คือตัวอย่างของ "โหมดหลัก (major mode)". -0,TMU1aA!0Jl10AU1bKA4K0EQ1!M0BYh1KERBbKA4(B. 0,T:i1R'c0*i1JSK0CQ1:!RCa0!i1d"c9@RIRaEP(B/,TK0CW1M0"i1M$GRA*09T1405h1R'f(B, -,T`0*h19(B Lisp mode, Text mode, ,T`0;g1905i19(B. 0,T7h1R9(PM0BYh1c9bKA4K0EQ1!c4bKA4K0EQ1!K09Vh1'c9`GER(B -,T`04U1BG(B, ,TaEP0*Wh1M"M'bKA4K0EQ1!09Qi19(P;CR!/M0BYh107Uh1:CC07Q14aJ4'bKA4(B, 0,T7Uh107Uh10AU1(B "Fundamental" -,T;CR!/M0BYh1c9"3P09Ui1(B. +อีแมกส์มีโหมดหลักอยู่หลายโหมด. บ้างใช้สำหรับการแก้ไขในภาษาและ/หรือข้อความชนิดต่างๆ, +เช่น Lisp mode, Text mode, เป็นต้น. ท่านจะอยู่ในโหมดหลักใดโหมดหลักหนึ่งในเวลา +เดียว, และชื่อของโหมดหลักนั้นจะปรากฏอยู่ที่บรรทัดแสดงโหมด, ที่ที่มี "Fundamental" +ปรากฏอยู่ในขณะนี้. -,Ta05h1EPbKA4K0EQ1!(P7Sc0Ki1$S0JQh1'c0Ki1> M-x thai-text-mode -,Td0Ah105i1M'0!Q1'GE(B, ,T$S0JQh1'07Uh107h1R9!S0EQ1'0HV1!IRM0BYh109Ui1d0Ah1d04i1c0Ki1Wh1M0Mh1R9CRBEP`0MU1B4"M'bKA4K0EQ1!0;Q1(0(X10:Q1907Uh107h1R9M0BYh1(B. +ใช้คำสั่ง C-h m เพื่ออ่านรายละเอียดของโหมดหลักปัจจุบันที่ท่านอยู่. ->> ,Tc0*i1$S0JQh1'(B C-u C-v ,TK09Vh1'$0CQi1'K0CW1MAR!!0Gh1R09Qi19`0>Wh1M07Uh1(P"0BQ1::CC07Q1409Ui10"Vi19d;0BQ1'0Jh1G9:9"M'K09i1R(M(B. ->> 0,T;i1M9$S0JQh1'(B C-h m, ,T`0>Wh1M04Y10Gh1R(B Text mode 0,T5h1R'(R!(B Fundamental mode ,TM0Bh1R'dC(B. ->> 0,T;i1M9$S0JQh1'(B C-x 1 ,T`0>Wh1M"0(Q14`M!JRC0*Ui1a('MM!(R!K09i1R(M(B. +>> ใช้คำสั่ง C-u C-v หนึ่งครั้งหรือมากกว่านั้นเพื่อที่จะขยับบรรทัดนี้ขึ้นไปยังส่วนบนของหน้าจอ. +>> ป้อนคำสั่ง C-h m, เพื่อดูว่า Text mode ต่างจาก Fundamental mode อย่างไร. +>> ป้อนคำสั่ง C-x 1 เพื่อขจัดเอกสารชี้แจงออกจากหน้าจอ. -0,T7Uh1`0CU1B!0Gh1RbKA4K0EQ1!09Qi190!g1`>CRP0Gh1R0AU1bKA40Bh1MB(B (minor mode) 0,TMU1!(B. ,TbKA40Bh1MBd0Ah1d04i1`0;g19(B -0,T5Q1G`0EW1M!c9bKA4K0EQ1!(B, ,T`09Wh1M'(R!0Gh1R0AU1!RC`;0EUh1B9d;`0>U1B'`0Eg1!09i1MB`07h1R09Qi19(B. ,Ta05h1EPbKA40Bh1MBJRARC6(B -,T(P`0;T14K0CW1M0;T14d04i1@RBc905Q1G`M'(B, 0,T$W1Ma05h1EPbKA40Bh1MB(P7S'R9b4B0MT1JCP(R!0!Q19(B, ,TaEP(B -,T`0;g190MT1JCP(R!bKA4K0EQ1!04i1GB(B. ,T)P09Qi1907h1R9JRARC6d0Ah1c0*i1bKA40Bh1MB`EB(B, ,TK0CW1MK09Vh1'bKA40Bh1MB(B, ,TK0CW1M(B -,TbKA40Bh1MBKERBf(B ,TbKA4RPJSK0CQ1:c0*i1a0!i1d"0"i1M$GRA07Uh1`0;g19@RIR0MQ1'!DI(B, 0,T$W1M(B -,TbKA40(Q14:CC07Q140MQ15b90AQ105T1(B (Auto Fill). ,T`0AWh1MbKA409Ui17S'R9(B, 0,TMU1aA!0Jl1(Pa0:h1':CC07Q14CPK0Gh1R'(B -,T$S0MQ15b90AQ105T1(B, 0,T7Q1907U107Uh107h1R9a7C!0"i1M$GRAaEP7Sc0Ki1:CC07Q1409Qi19BRG`0!T19d;(B. +โหมดย่อยที่มีประโยชน์มาก, โดยเฉพาะสำหรับใช้แก้ไขข้อความที่เป็นภาษาอังกฤษ, คือ +โหมดจัดบรรทัดอัตโนมัติ (Auto Fill). เมื่อโหมดนี้ทำงาน, อีแมกส์จะแบ่งบรรทัดระหว่าง +คำอัตโนมัติ, ทันทีที่ท่านแทรกข้อความและทำให้บรรทัดนั้นยาวเกินไป. -0,T7h1R9JRARC6`0;T14bKA40(Q14:CC07Q140MQ15b90AQ105T1d04i1b4B!RCc0*i1$S0JQh1'(B M-x auto fill -mode. ,T`0AWh1MbKA409Ui17S'R9M0BYh1(B, 0,T7h1R9JRARC60;T14bKA409Ui1d04i1b4B!RCc0*i1$S0JQh1'(B M-x -auto fill mode. 0,T6i1RbKA409Ui10;T14M0BYh1(B, ,T$S0JQh1'09Ui1(P`0;T14bKA4c0Ki17S'R9(B, ,TaEP06i1R(B -,TbKA409Ui1`0;T14M0BYh1(B, ,T$S0JQh1'09Ui10!g1(P0;T14bKA4(B. 0,T$W1M0>Y14d04i10Gh1R$S0JQh1'09Ui1(B "toggles the mode". +ท่านสามารถเปิดโหมดจัดบรรทัดอัตโนมัติได้โดยการใช้คำสั่ง M-x auto fill +mode. เมื่อโหมดนี้ทำงานอยู่, ท่านสามารถปิดโหมดนี้ได้โดยการใช้คำสั่ง M-x +auto fill mode. ถ้าโหมดนี้ปิดอยู่, คำสั่งนี้จะเปิดโหมดให้ทำงาน, และถ้า +โหมดนี้เปิดอยู่, คำสั่งนี้ก็จะปิดโหมด. คือพูดได้ว่าคำสั่งนี้ "toggles the mode". ->> 0,T;i1M9$S0JQh1'(B M-x auto fill mode 0,T4Y1(B. ,Ta0Ei1G0;i1M9(B "asdf " 0,T+i1Sf(B 0,T!Q19d;(9(B - 0,T7h1R9`0Kg190Gh1R:CC07Q1409Qi1906Y1!a0:h1'MM!`0;g19JM':CC07Q14(B. 0,T7h1R905i1M'c0Jh1`0Gi19GCC$`>CRP0Gh1R!RC0(Q14(B - ,T:CC07Q140MQ15b90AQ105T1(Pa0:h1':CC07Q145C'`0Gi19GCC$`07h1R09Qi19(B. +>> ป้อนคำสั่ง M-x auto fill mode ดู. แล้วป้อน "asdf " ซ้ำๆ กันไปจน + ท่านเห็นว่าบรรทัดนั้นถูกแบ่งออกเป็นสองบรรทัด. ท่านต้องใส่เว้นวรรคเพราะว่าการจัด + บรรทัดอัตโนมัติจะแบ่งบรรทัดตรงเว้นวรรคเท่านั้น. -,T"M:`0> 0,T;i1M9$S0JQh1'(B C-x f ,T>0Ci1MA04i1GBMR0Cl10!T1G`A905l1(B 20. (C-u 2 0 C-x f). - ,Ta0Ei1G0;i1M90"i1M$GRAaEP(P`0Kg190Gh1R0MU1aA!0Jl10(Q14:CC07Q1407Uh10AU1"9R4(B 20 0,T5Q1G0MQ1!IC(B. ,Ta0Ei1G05Qi1'"M:(B - ,T`0> ป้อนคำสั่ง C-x f พร้อมด้วยอาร์กิวเมนต์ 20. (C-u 2 0 C-x f). + แล้วป้อนข้อความและจะเห็นว่าอีแมกส์จัดบรรทัดที่มีขนาด 20 ตัวอักษร. แล้วตั้งขอบ + เผื่อเป็น 70 โดยใช้คำสั่ง C-x f อีกครั้ง. -0,T6i1R07h1R97S!RC`;0EUh1B9a;E'5C'!ER'0Bh1MK09i1R(B, ,TbKA40(Q14:CC07Q140MQ15b90AQ105T1(Pd0Ah10(Q14:CC07Q14cK0Ah1(B -(re-fill) ,Tc0Ki107h1R9(B. 0,T6i1R(P0(Q14:CC07Q14cK0Ah1c0Ki10!Q1:0Bh1MK09i1R09Qi19(B, ,Tc0Ki10;i1M9$S0JQh1'(B M-q (META-q) -,Tb4BGR'5SaK09h1'`$M0Cl1`+M0Cl1d0Gi1@RBc90Bh1MK09i1R09Qi19(B. +ถ้าท่านทำการเปลี่ยนแปลงตรงกลางย่อหน้า, โหมดจัดบรรทัดอัตโนมัติจะไม่จัดบรรทัดใหม่ +(re-fill) ให้ท่าน. ถ้าจะจัดบรรทัดใหม่ให้กับย่อหน้านั้น, ให้ป้อนคำสั่ง M-q (META-q) +โดยวางตำแหน่งเคอร์เซอร์ไว้ภายในย่อหน้านั้น. ->> ,T`$0EWh1M9`$M0Cl1`+M0Cl1`0"i1Rd;0BQ1'0Bh1MK09i1R0"i1R':9(B, ,Ta0Ei1G0;i1M9$S0JQh1'(B M-q. +>> เคลื่อนเคอร์เซอร์เข้าไปยังย่อหน้าข้างบน, แล้วป้อนคำสั่ง M-q. -* ,T!RC0JW1:0$i19(B (searching) +* การสืบค้น (searching) --------------------- -0,TMU1aA!0Jl1JRARC60JW1:0$i19JRB0MQ1!"CP(B (,T!0EXh1A"M'05Q1G0MQ1!ICK0CW1M$S07Uh1M0BYh105h1M`09Wh1M'0!Q19(B) ,Td0Ah10Gh1R(Pd;(B -0,T"i1R'K09i1RK0CW1M0Bi1M9!0EQ1:(B, 0,T7Qh1G07Qi1'0"i1M$GRA(B. ,T!RC0JW1:0$i19JRB0MQ1!"CP0$W1M$S0JQh1'c9!RC`$0EWh1M95SaK09h1'(B -,T"M'`$M0Cl1`+M0Cl1(B; ,T`$M0Cl1`+M0Cl1(P`$0EWh1M9d;M0BYh107Uh15SaK09h1'06Q14d;07Uh10AU1JRB0MQ1!"CP09Qi19M0BYh1(B. +อีแมกส์สามารถสืบค้นสายอักขระ (กลุ่มของตัวอักษรหรือคำที่อยู่ต่อเนื่องกัน) ไม่ว่าจะไป +ข้างหน้าหรือย้อนกลับ, ทั่วทั้งข้อความ. การสืบค้นสายอักขระคือคำสั่งในการเคลื่อนตำแหน่ง +ของเคอร์เซอร์; เคอร์เซอร์จะเคลื่อนไปอยู่ที่ตำแหน่งถัดไปที่มีสายอักขระนั้นอยู่. -,T$S0JQh1'0JW1:0$i19c90MU1aA!0Jl105h1R'(R!$S0JQh1'0JW1:0$i19c9b;Ca!CA:CC3R08T1!C03l1(B (editor) 0,TJh1G9cK0-h1(B, ,Tc9(B -0,TEQ1!I3P07Uh1`0;g19(B "incremental". 0,T9Uh1KARB$GRA0Gh1R!RC0JW1:0$i19`0CTh1A05Qi1'a05h107Uh107h1R9d04i10;i1M90MQ1!"CP07Uh1(B -0,T5i1M'!RC0JW1:0$i19(B. +คำสั่งสืบค้นในอีแมกส์ต่างจากคำสั่งสืบค้นในโปรแกรมบรรณาธิกรณ์ (editor) ส่วนใหญ่, ใน +ลักษณะที่เป็น "incremental". นี่หมายความว่าการสืบค้นเริ่มตั้งแต่ที่ท่านได้ป้อนอักขระที่ +ต้องการสืบค้น. -,T$S0JQh1'07Uh1c0*i1`0>Wh1Mc0Ki17S!RC0JW1:0$i19d;0"i1R'K09i1R0$W1M(B C-s, ,TaEP7S!RC0JW1:0$i190Bi1M9d;0"i1R'K0EQ1'0$W1M(B -C-r. ,Ta05h1$MB0!h1M9(B! ,TM0Bh1R`0>Th1'EM'(B. +คำสั่งที่ใช้เพื่อให้ทำการสืบค้นไปข้างหน้าคือ C-s, และทำการสืบค้นย้อนไปข้างหลังคือ +C-r. แต่คอยก่อน! อย่าเพิ่งลอง. -,T`0AWh1M07h1R90;i1M9$S0JQh1'(B C-s 0,T7h1R9(P0JQ1'`!5`0Kg190Gh1R0AU1$S0Gh1R(B "I-search" ,T;CR!/07Uh1:0CT1`G3JP07i1M9(B -(echo area). 0,T9Uh1aJ4'0Gh1R0MU1aA!0Jl1d04i1M0BYh1c9!RC0$i19a::(B incremental ,TaEP!S0EQ1'CM(B -0,TJTh1'07Uh107h1R9(P0>T1A0>l1`0>Wh1M0JW1:0$i19(B. ,T!40;Xh1A(B ,T`0>Wh1M0JTi190JX14$S0JQh1'0JW1:0$i19(B. +เมื่อท่านป้อนคำสั่ง C-s ท่านจะสังเกตเห็นว่ามีคำว่า "I-search" ปรากฏที่บริเวณสะท้อน +(echo area). นี่แสดงว่าอีแมกส์ได้อยู่ในการค้นแบบ incremental และกำลังรอ +สิ่งที่ท่านจะพิมพ์เพื่อสืบค้น. กดปุ่ม เพื่อสิ้นสุดคำสั่งสืบค้น. ->> 0,T;i1M9$S0JQh1'(B C-s ,T`0>Wh1M`0CTh1A!RC0JW1:0$i19(B. 0,T>T1A0>l10MQ1!IC07U1EP05Q1G0*i1Rf(B, 0,T>T1A0>l1$S0Gh1R(B 'cursor', - ,TK0BX14K0EQ1'(R!07Uh107h1R90>T1A0>l107U1EP05Q1G0MQ1!IC(B, ,Ta0Ei1G04Y10Gh1R0AU1MPdC`0!T140"Vi190!Q1:`$M0Cl1`+M0Cl1(B. - ,T"3P09Ui107h1R9d04i10JW1:0$i19$S0Gh1R(B "cursor" ,Td;K09Vh1'K9a0Ei1G(B. ->> 0,T;i1M9$S0JQh1'(B C-s 0,TMU1!$0CQi1'(B, ,T`0>Wh1M0JW1:0$i195SaK09h1'06Q14d;"M'$S0Gh1R(B "cursor". ->> ,T!40;Xh1A(B 0,TJQ1!0JUh1$0CQi1'(B, ,Ta0Ei1G04Y10Gh1R`$M0Cl1`+M0Cl1`$0EWh1M907Uh1M0Bh1R'dC(B. ->> ,T!40;Xh1A(B ,T`0>Wh1M0JTi190JX14$S0JQh1'0JW1:0$i19(B. +>> ป้อนคำสั่ง C-s เพื่อเริ่มการสืบค้น. พิมพ์อักษรทีละตัวช้าๆ, พิมพ์คำว่า 'cursor', + หยุดหลังจากที่ท่านพิมพ์ทีละตัวอักษร, แล้วดูว่ามีอะไรเกิดขึ้นกับเคอร์เซอร์. + ขณะนี้ท่านได้สืบค้นคำว่า "cursor" ไปหนึ่งหนแล้ว. +>> ป้อนคำสั่ง C-s อีกครั้ง, เพื่อสืบค้นตำแหน่งถัดไปของคำว่า "cursor". +>> กดปุ่ม สักสี่ครั้ง, แล้วดูว่าเคอร์เซอร์เคลื่อนที่อย่างไร. +>> กดปุ่ม เพื่อสิ้นสุดคำสั่งสืบค้น. -0,T7h1R9`0Kg19K0CW1Md0Ah10Gh1R0AU1MPdC`0!T140"Vi19(B? ,Tc9!RC0JW1:0$i19a::(B incremental, 0,TMU1aA!0Jl1>BRBRA(B -,T`$0EWh1M9d;5RAJRB0MQ1!"CP07Uh107h1R9d04i10>T1A0>l1E'd;c9a05h1EP$0CQi1'(B. 0,T6i1R(P`$0EWh1M9d;0BQ1'5SaK09h1'(B -0,T6Q14d;"M'$S(B, 0,T!g17Sd04i1b4B!RC0;i1M9$S0JQh1'(B C-s 0,TMU1!$0CQi1'(B. 0,T6i1Rd0Ah10AU1$S09Qi190MU1!a0Ei1G(B, 0,TMU1aA!0Jl1(P0Ci1M'(B -,T:M!(B (beep) 0,T7h1R90Gh1R!RC0JW1:0$i19$0CQi1'09Qi19(B ",T>ER4(B (failing)", ,T$S0JQh1'(B C-g 0,T!g1JRARC6c0*i1c9(B -,T!RC0JTi190JX14!RC0JW1:0$i19d04i1(B. +ท่านเห็นหรือไม่ว่ามีอะไรเกิดขึ้น? ในการสืบค้นแบบ incremental, อีแมกส์พยายาม +เคลื่อนไปตามสายอักขระที่ท่านได้พิมพ์ลงไปในแต่ละครั้ง. ถ้าจะเคลื่อนไปยังตำแหน่ง +ถัดไปของคำ, ก็ทำได้โดยการป้อนคำสั่ง C-s อีกครั้ง. ถ้าไม่มีคำนั้นอีกแล้ว, อีแมกส์จะร้อง +บอก (beep) ท่านว่าการสืบค้นครั้งนั้น "พลาด (failing)", คำสั่ง C-g ก็สามารถใช้ใน +การสิ้นสุดการสืบค้นได้. -0,T"i1M0JQ1'`!5(B: ,Tc9:R'CP::(B, ,T!RC0;i1M9$S0JQh1'(B C-s ,T(P7Sc0Ki1CP::"M'07h1R9*P0'Q1!aEP07h1R9(Pd0Ah1`0Kg19(B -0,T"i1M$GRAMPdC:90MU1aA!0Jl1(B. 0,TEQ1!I3P09Ui1aJ4'0Gh1R(B "feature" ,T"M'CP::;0/T10:Q105T1!RC(B, 0,T7Uh1`0CU1B!0Gh1R(B -"flow control" 0,T9Qi19(B, ,Td04i10"Q14"GR'!RC7S'R9"M'$S0JQh1'(B C-s ,TaEPd0Ah1BMAc0Ki1!0EQ1:0JYh10MU1aA!0Jl1(B -0,TMU1!(B. ,T!RC07Uh1(Pa0!i1d"!RCK0BX14*P0'Q1!09Qi19(B, ,Tc0Ki10;i1M9$S0JQh1'(B C-q. 0,THV1!IR0GT108U1!RC0(Q14!RC0!Q1:(B "feature" -0,T9Ui1d04i107Uh1:707Uh10Gh1R04i1GB(B "Spontaneous Entry to Incremental Search" ,Tc90$Yh10AW1M"M'0MU1aA!0Jl1(B. +ข้อสังเกต: ในบางระบบ, การป้อนคำสั่ง C-s จะทำให้ระบบของท่านชะงักและท่านจะไม่เห็น +ข้อความอะไรบนอีแมกส์. ลักษณะนี้แสดงว่า "feature" ของระบบปฏิบัติการ, ที่เรียกว่า +"flow control" นั้น, ได้ขัดขวางการทำงานของคำสั่ง C-s และไม่ยอมให้กลับสู่อีแมกส์ +อีก. การที่จะแก้ไขการหยุดชะงักนั้น, ให้ป้อนคำสั่ง C-q. ศึกษาวิธีการจัดการกับ "feature" +นี้ได้ที่บทที่ว่าด้วย "Spontaneous Entry to Incremental Search" ในคู่มือของอีแมกส์. -0,T6i1R07h1R9M0BYh1CPK0Gh1R'!RC0JW1:0$i19a::(B incremental ,TM0BYh1(B, ,Ta0Ei1G07h1R9!40;Xh1A(B , 0,T7h1R9(P(B -0,TJQ1'`!5`0Kg190Gh1R05Q1G0MQ1!IC0JX1407i1RB07Uh107h1R90;i1M9`0"i1Rd;09Qi1906Y1!E:MM!(B, ,TaEP(P0Bi1M9!0EQ1:d;0BQ1'5SaK09h1'(B -0,T!h1M9K09i1R"M'!RC0JW1:0$i19(B. 0,T5Q1GM0Bh1R'`0*h19(B, ,TJA0AX105T10Gh1R07h1R9d04i10;i1M905Q1G0MQ1!IC(B "c", ,T`0>Wh1M07Uh1(P0JW1:0$i19(B -,T5SaK09h1'07Uh1;CR!/05Q1G0MQ1!IC(B "c" 0,T9Qi19(B. ,T5M909Ui106i1R07h1R90>T1A0>l105Q1G0MQ1!IC(B "u", ,T`$M0Cl1`+M0Cl10!g1(P(B -,T`$0EWh1M9d;M0BYh107Uh15SaK09h1'07Uh1;CR!/JRB0MQ1!"CP(B "cu" ,TaC!0JX14(B. ,T5M909Ui1c0Ki1!40;Xh1A(B . -0,T5Q1G0MQ1!IC(B "u" ,T(P06Y1!E:MM!(R!JRB0MQ1!"CP07Uh17S!RC0JW1:0$i19M0BYh1(B, ,TaEP`$M0Cl1`+M0Cl10!g1(P`$0EWh1M9(B -,T!0EQ1:d;0BQ1'5SaK09h1'07Uh1;CR!/05Q1G0MQ1!IC(B "c" ,TaC!0JX14(B. +ถ้าท่านอยู่ระหว่างการสืบค้นแบบ incremental อยู่, แล้วท่านกดปุ่ม , ท่านจะ +สังเกตเห็นว่าตัวอักษรสุดท้ายที่ท่านป้อนเข้าไปนั้นถูกลบออก, และจะย้อนกลับไปยังตำแหน่ง +ก่อนหน้าของการสืบค้น. ตัวอย่างเช่น, สมมุติว่าท่านได้ป้อนตัวอักษร "c", เพื่อที่จะสืบค้น +ตำแหน่งที่ปรากฏตัวอักษร "c" นั้น. ตอนนี้ถ้าท่านพิมพ์ตัวอักษร "u", เคอร์เซอร์ก็จะ +เคลื่อนไปอยู่ที่ตำแหน่งที่ปรากฏสายอักขระ "cu" แรกสุด. ตอนนี้ให้กดปุ่ม . +ตัวอักษร "u" จะถูกลบออกจากสายอักขระที่ทำการสืบค้นอยู่, และเคอร์เซอร์ก็จะเคลื่อน +กลับไปยังตำแหน่งที่ปรากฏตัวอักษร "c" แรกสุด. -0,T6i1R07h1R9M0BYh1CPK0Gh1R'!RC0JW1:0$i19(B, ,Ta0Ei1G0;i1M9$S0JQh1';CPJA"M'(B CONTROL ,TK0CW1M(B META (,T9M!(R!(B -0,T"i1MB!`0Gi19:R';CP!RC(B--,T$S0JQh1'0>T1`HI07Uh1c0*i1JSK0CQ1:!RC0JW1:0$i19(B, ,Td04i1a0!h1(B C-s ,TaEP(B C-r), ,T!RC0JW1:(B -0,T$i19(P0JTi190JX14E'(B. +ถ้าท่านอยู่ระหว่างการสืบค้น, แล้วป้อนคำสั่งประสมของ CONTROL หรือ META (นอกจาก +ข้อยกเว้นบางประการ--คำสั่งพิเศษที่ใช้สำหรับการสืบค้น, ได้แก่ C-s และ C-r), การสืบ +ค้นจะสิ้นสุดลง. -,T$S0JQh1'(B C-s ,T`0CTh1A!RC0JW1:0$i1904i1GB!RCAM'KRJRB0MQ1!"CP05Qi1'a05h15SaK09h1'0;Q1(0(X10:Q19"M'`$M0Cl1`+M0Cl1(B. -0,T6i1R07h1R905i1M'!RC0JW1:0$i19JRB0MQ1!"CP07Uh1M0BYh10!h1M9K09i1Rc90"i1M$GRA09Qi19(B, ,Tc0Ki10;i1M9$S0JQh1'(B C-r ,Ta79(B. -,T$S0JQh1'(B C-s ,T(P7S'R9`K0AW1M90!Q1:$S0JQh1'(B C-r 0,T7X1!M0Bh1R'(B, ,TB!`0Gi1907T1H7R'"M'!RC0JW1:0$i19(B -,T`07h1R09Qi19(B, 0,T7Uh15C'0"i1RA0!Q19(B. +คำสั่ง C-s เริ่มการสืบค้นด้วยการมองหาสายอักขระตั้งแต่ตำแหน่งปัจจุบันของเคอร์เซอร์. +ถ้าท่านต้องการสืบค้นสายอักขระที่อยู่ก่อนหน้าในข้อความนั้น, ให้ป้อนคำสั่ง C-r แทน. +คำสั่ง C-s จะทำงานเหมือนกับคำสั่ง C-r ทุกอย่าง, ยกเว้นทิศทางของการสืบค้น +เท่านั้น, ที่ตรงข้ามกัน. -* 0,TGT19b40Gl1a::KERB0GT19b40Gl1(B (multiple windows) +* วินโดว์แบบหลายวินโดว์ (multiple windows) -------------------------------------- -0,TEQ1!I3P07Uh109h1RJ9c(0MQ19K09Vh1'"M'0MU1aA!0Jl10!g10$W1M(B, 0,T7h1R9JRARC6aJ4'> ,T`$0EWh1M9`$M0Cl1`+M0Cl1AR07Uh1:CC07Q1409Ui1(B, ,Ta0Ei1G0;i1M9$S0JQh1'(B C-u 0 C-l. +>> เคลื่อนเคอร์เซอร์มาที่บรรทัดนี้, แล้วป้อนคำสั่ง C-u 0 C-l. ->> 0,T5h1Md;(B, 0,T;i1M9$S0JQh1'(B C-x 2 0,T+Vh1'(Pa0:h1'K09i1R(MMM!`0;g19JM'0GT19b40Gl1(B. - 0,T7Qi1'JM'0GT19b40Gl1aJ4'0$Yh10AW1M!RCc0*i109Ui1(B. ,T`$M0Cl1`+M0Cl1;CR!/M0BYh1c90GT19b40Gl1:9(B. +>> ต่อไป, ป้อนคำสั่ง C-x 2 ซึ่งจะแบ่งหน้าจอออกเป็นสองวินโดว์. + ทั้งสองวินโดว์แสดงคู่มือการใช้นี้. เคอร์เซอร์ปรากฏอยู่ในวินโดว์บน. ->> 0,T;i1M9$S0JQh1'(B C-M-v ,T`0>Wh1M`$0EWh1M90Ai1G90GT19b40Gl10"i1R'0Eh1R'(B. - (0,T6i1R07h1R9d0Ah10AU10;Xh1A(B META, 0,T;i1M9$S0JQh1'(B ESC C-v ,Ta79(B.) +>> ป้อนคำสั่ง C-M-v เพื่อเคลื่อนม้วนวินโดว์ข้างล่าง. + (ถ้าท่านไม่มีปุ่ม META, ป้อนคำสั่ง ESC C-v แทน.) ->> 0,T;i1M9$S0JQh1'(B C-x o ("o" ,TKARB06V1'(B "other") ,T`0>Wh1M`$0EWh1M9`$M0Cl1`+M0Cl1AR0BQ1'0GT19b40Gl10Eh1R'(B. ->> ,Tc0*i1$S0JQh1'(B C-v ,TaEP(B M-v ,Tc90GT19b40Gl10Eh1R'`0>Wh1M07Uh1(P`$0EWh1M90Ai1G9(B. - 0,TMh1R9$Sa9P9S09Ui104i1GB0GT19b40Gl1:9(B. +>> ป้อนคำสั่ง C-x o ("o" หมายถึง "other") เพื่อเคลื่อนเคอร์เซอร์มายังวินโดว์ล่าง. +>> ใช้คำสั่ง C-v และ M-v ในวินโดว์ล่างเพื่อที่จะเคลื่อนม้วน. + อ่านคำแนะนำนี้ด้วยวินโดว์บน. ->> 0,T;i1M9$S0JQh1'(B C-x o 0,TMU1!$0CQi1'`0>Wh1M07Uh1(P`$0EWh1M9`$M0Cl1`+M0Cl1!0EQ1:d;0GT19b40Gl1:9(B. - ,T`$M0Cl1`+M0Cl1c90GT19b40Gl1:9(P;CR!/5C'07Uh107Uh1`$B;CR!/(B. +>> ป้อนคำสั่ง C-x o อีกครั้งเพื่อที่จะเคลื่อนเคอร์เซอร์กลับไปวินโดว์บน. + เคอร์เซอร์ในวินโดว์บนจะปรากฏตรงที่ที่เคยปรากฏ. -0,T7h1R9JRARC6c0*i1$S0JQh1'(B C-x o ,T`0>Wh1MJ0EQ1:d;ARCPK0Gh1R'0GT19b40Gl1(B. ,Ta05h1EP0GT19b40Gl10AU15SaK09h1'"M'(B -,T`$M0Cl1`+M0Cl1"M'05Q1G`M'(B, ,Ta05h1(P0AU1`0>U1B'0GT19b40Gl1`04U1BG`07h1R09Qi1907Uh1aJ4'05Q1G`$M0Cl1`+M0Cl1(B. 0,T7X1!$S0JQh1'0!g1(P(B -0,TAU1Wh1M!RC0Mi1R'0MT1'(B. 0,T7h1R9JRARC6c0Ki1`$M0Cl1`+M0Cl1;CR!/:90GT19b40Gl107Uh107h1R9!S0EQ1'a0!i1d"M0BYh15EM4`GER(B, -,Ta0Ei1G`$0EWh1M95SaK09h1'"M'0MU1!0GT19b40Gl1K09Vh1'04i1GB$S0JQh1'(B C-M-v. +คำสั่ง C-M-v มีประโยชน์มากเมื่อท่านกำลังแก้ไขข้อความบนวินโดว์หนึ่ง, และดูอีกวินโดว์หนึ่ง +เพื่อการอ้างอิง. ท่านสามารถให้เคอร์เซอร์ปรากฏบนวินโดว์ที่ท่านกำลังแก้ไขอยู่ตลอดเวลา, +แล้วเคลื่อนตำแหน่งของอีกวินโดว์หนึ่งด้วยคำสั่ง C-M-v. -,T$S0JQh1'(B C-M-v ,T`0;g1905Q1GM0Bh1R'K09Vh1'"M'$S0JQh1';CPJA(B CONTROL-META. 0,T6i1R07h1R90AU10;Xh1A(B META, -0,T7h1R9JRARC60;i1M9$S0JQh1'(B C-M-v ,Tb4B!RC!40;Xh1A(B CONTROL ,TaEP(B META ,T"3P07Uh1!40;Xh1A0MQ1!"CP(B -v. ,Td0Ah10Gh1R(P!40;Xh1A(B CONTROL ,TK0CW1M(B META 0,T!h1M90!g1d0Ah10AU10;Q1-KRMPdC(B, ,T`>CRP0Gh1R07Qi1'JM'0;Xh1A`0;g190;Xh1A(B -,T"BRB"M'0;Xh1A0MQ1!"CP07Uh107h1R9(P!4(B. +คำสั่ง C-M-v เป็นตัวอย่างหนึ่งของคำสั่งประสม CONTROL-META. ถ้าท่านมีปุ่ม META, +ท่านสามารถป้อนคำสั่ง C-M-v โดยการกดปุ่ม CONTROL และ META ขณะที่กดปุ่มอักขระ +v. ไม่ว่าจะกดปุ่ม CONTROL หรือ META ก่อนก็ไม่มีปัญหาอะไร, เพราะว่าทั้งสองปุ่มเป็นปุ่ม +ขยายของปุ่มอักขระที่ท่านจะกด. -0,T6i1R07h1R9d0Ah10AU10;Xh1A(B META, ,TaEP07h1R9c0*i10;Xh1A(B ESC ,Ta79(B, ,TES04Q1:"M'!RC!40;Xh1A(P0AU1CRP0Gh1R$S0JQh1'(B CONTROL-ESC v ,T(Pd0Ah1(B -,T7S'R9(B. 0,T7Qi1'09Ui1`>CRP0Gh1R0;Xh1A(B ESC ,T`0;g190MQ1!"CP05Q1GK09Vh1'(B, ,Td0Ah1c0*h10;Xh1A"BRB(B. +ถ้าท่านไม่มีปุ่ม META, และท่านใช้ปุ่ม ESC แทน, ลำดับของการกดปุ่มจะมีผลต่อการทำงาน: +ท่านต้องกดปุ่ม ESC แล้วตามด้วยคำสั่ง CONTROL-v, เพราะว่าคำสั่ง CONTROL-ESC v จะไม่ +ทำงาน. ทั้งนี้เพราะว่าปุ่ม ESC เป็นอักขระตัวหนึ่ง, ไม่ใช่ปุ่มขยาย. ->> 0,T;i1M9$S0JQh1'(B C-x 1 (,Tc90GT19b40Gl1:9(B) ,T`0>Wh1M!S0(Q140GT19b40Gl10Eh1R'(B. +>> ป้อนคำสั่ง C-x 1 (ในวินโดว์บน) เพื่อกำจัดวินโดว์ล่าง. -(0,T6i1R07h1R90;i1M9$S0JQh1'(B C-x 1 ,Tc90GT19b40Gl10Eh1R'(B, 0,TGT19b40Gl1:90!g1(PKRBd;(B. 0,T7h1R9JRARC6(S(B -,T$S0JQh1'09Ui1d04i1b4B0$T140Gh1R(B ",T`K0EW1Md0Gi1`0>U1B'K09Vh1'0GT19b40Gl1(B--0,TGT19b40Gl107Uh1M0BYh1c9"3P09Ui1(B.") +(ถ้าท่านป้อนคำสั่ง C-x 1 ในวินโดว์ล่าง, วินโดว์บนก็จะหายไป. ท่านสามารถจำ +คำสั่งนี้ได้โดยคิดว่า "เหลือไว้เพียงหนึ่งวินโดว์--วินโดว์ที่อยู่ในขณะนี้.") -0,T7h1R9d0Ah1(S`0;g1905i1M'aJ4'Wh1M0$i19KRa0?i1A0"i1M0AY1Ec90GT19b40Gl1K09Vh1'(B, 0,TMU1!0GT19b40Gl1K09Vh1'(Pd0Ah1`;0EUh1B9a;E'(B. 0,T7h1R9JRARC60$i19KR(B -,Ta0?i1A0"i1M0AY1Ec9a05h1EP0GT19b40Gl1d04i10MT1JCP05h1M0!Q19(B. +ท่านไม่จำเป็นต้องแสดงผลของบัฟเฟอร์เดียวกันบนทั้งสองวินโดว์. ถ้าท่านใช้คำสั่ง C-x C-f +เพื่อค้นหาแฟ้มข้อมูลในวินโดว์หนึ่ง, อีกวินโดว์หนึ่งจะไม่เปลี่ยนแปลง. ท่านสามารถค้นหา +แฟ้มข้อมูลในแต่ละวินโดว์ได้อิสระต่อกัน. -0,T5h1Md;`0;g190MU1!0GT108U1K09Vh1'"M'!RCc0*i1JM'0GT19b40Gl1JSK0CQ1:aJ4'> 0,T;i1M9$S0JQh1'(B C-x 4 C-f ,Ta0Ei1G5RA04i1GB0*Wh1Ma0?i1A0"i1M0AY1E(B. 0,TJTi190JX14$S0JQh1'04i1GB!RC!40;Xh1A(B - . ,T(P`0Kg190Gh1R0AU1a0?i1A0"i1M0AY1E07Uh105i1M'!RC;CR!/M0BYh1c90GT19b40Gl10Eh1R'(B. ,T`$M0Cl1`+M0Cl10!g1(Pd;(B - ,T;CR!/07Uh10GT19b40Gl109Qi1904i1GB(B. +>> ป้อนคำสั่ง C-x 4 C-f แล้วตามด้วยชื่อแฟ้มข้อมูล. สิ้นสุดคำสั่งด้วยการกดปุ่ม + . จะเห็นว่ามีแฟ้มข้อมูลที่ต้องการปรากฏอยู่ในวินโดว์ล่าง. เคอร์เซอร์ก็จะไป + ปรากฏที่วินโดว์นั้นด้วย. ->> 0,T;i1M9$S0JQh1'(B C-x o ,T`0>Wh1M!0EQ1:d;0BQ1'0GT19b40Gl1:9(B, ,Ta0Ei1G0;i1M9$S0JQh1'(B C-x 1 ,T`0>Wh1M!S0(Q140GT19b40Gl10Eh1R'(B. +>> ป้อนคำสั่ง C-x o เพื่อกลับไปยังวินโดว์บน, แล้วป้อนคำสั่ง C-x 1 เพื่อกำจัดวินโดว์ล่าง. -* ,TCP04Q1:"M'!RCa0!i1d"a::`0CU1B!0+i1S(B (recursive editing levels) +* ระดับของการแก้ไขแบบเรียกซ้ำ (recursive editing levels) ------------------------------------------------------- -,T:R'$0CQi1'07h1R9MR((P`0"i1Rd;M0BYh1c9(B ",TCP04Q1:"M'!RCa0!i1d"a::!RC`0CU1B!0+i1S(B (recursive editing -level)". ,TJ@R>04Q1'!0Eh1RG`0*h1909Ui1aJ4'04i1GBG'`0Eg1:0!i1RA0;Y1c9:CC07Q14aJ4'bKA4(B, 0,TEi1MACM:G'`0Eg1:07Uh1(B -,TaJ4'0*Wh1M"M'bKA4K0EQ1!(B. 0,T5Q1GM0Bh1R'`0*h19(B, 0,T7h1R9MR((P`0Kg19(B [(Fundamental)] ,Ta7907Uh1(P`0;g19(B +บางครั้งท่านอาจจะเข้าไปอยู่ใน "ระดับของการแก้ไขแบบการเรียกซ้ำ (recursive editing +level)". สภาพดังกล่าวเช่นนี้แสดงด้วยวงเล็บก้ามปูในบรรทัดแสดงโหมด, ล้อมรอบวงเล็บที่ +แสดงชื่อของโหมดหลัก. ตัวอย่างเช่น, ท่านอาจจะเห็น [(Fundamental)] แทนที่จะเป็น (Fundamental). -,Tc9!RC07Uh1(PMM!(R!CP04Q1:"M'!RCa0!i1d"a::`0CU1B!0+i1S(B, ,T!40;Xh1A(B ESC ESC ESC. 0,T9Uh1`0;g19(B -,T$S0JQh1'07Uh1c0*i1d04i107Qh1Gd;c9!RCMM!(R!CP04Q1:c4f(B ,T"M'!RC;CPAGET1`HI0MWh19f(B, ,TCGA07Qi1'!RCMM!(R!0AT109T10:Q1?`?M0Cl1(B (minibuffer). +ในการที่จะออกจากระดับของการแก้ไขแบบเรียกซ้ำ, กดปุ่ม ESC ESC ESC. นี่เป็น +คำสั่งที่ใช้ได้ทั่วไปในการออกจากระดับใดๆ ของการประมวลผล. ท่านสามารถใช้คำสั่งนี้ใน +การกำจัดวินโดว์พิเศษอื่นๆ, รวมทั้งการออกจากมินิบัฟเฟอร์ (minibuffer). ->> 0,T;i1M9$S0JQh1'(B M-x ,T`0>Wh1M`0"i1Rd;c90AT109T10:Q1?`?M0Cl1(B; ,T!40;Xh1A(B ESC ESC ESC ,T`0>Wh1MMM!(R!(B - 0,TAT109T10:Q1?`?M0Cl109Qi19(B. +>> ป้อนคำสั่ง M-x เพื่อเข้าไปในมินิบัฟเฟอร์; กดปุ่ม ESC ESC ESC เพื่อออกจาก + มินิบัฟเฟอร์นั้น. -0,T7h1R9d0Ah1JRARC6c0*i1$S0JQh1'(B C-g ,T`0>Wh1MMM!(R!CP04Q1:"M'!RCa0!i1d"a::`0CU1B!0+i1S(B. -,T`>CRP0Gh1R$S0JQh1'(B C-g ,Tc0*i1`0>Wh1MB!`0ET1!$S0JQh1'aEPMR0Cl10!T1G`A905l1@RBc9CP04Q1:"M'!RCa0!i1d"a::(B -,T`0CU1B!0+i1S(B. +ท่านไม่สามารถใช้คำสั่ง C-g เพื่อออกจากระดับของการแก้ไขแบบเรียกซ้ำ. +เพราะว่าคำสั่ง C-g ใช้เพื่อยกเลิกคำสั่งและอาร์กิวเมนต์ภายในระดับของการแก้ไขแบบ +เรียกซ้ำ. -* ,T!RC`0CU1B!04Y10"i1M$GRA0*h1GB`K0EW1M`0>Th1A`05T1A(B (getting more help) +* การเรียกดูข้อความช่วยเหลือเพิ่มเติม (getting more help) ------------------------------------------------- -,Tc90$Yh10AW1M09Ui1`CR>BRBRA07Uh1(Pc0Ki10"i1M0AY1E07Uh1`0>U1B'>MJSK0CQ1:!RC`0CTh1Ac0*i10MU1aA!0Jl1(B. 0,TBQ1'$'0AU10"i1M0AY1E0MU1!AR!c9(B -0,TMU1aA!0Jl10+Vh1'`CRd0Ah1JRARC607Uh1(P9SARM08T1:RBd0Gi1c907Uh109Ui1d04i107Qi1'KA4(B. ,TM0Bh1R'dC0!g15RA(B, 0,T7h1R9MR(05i1M'!RC(B -,T`0CU1B90CYi1`0!Uh1BG0!Q1:0MU1aA!0Jl1`0>Th1A`05T1A`>CRP0MU1aA!0Jl10BQ1'0AU10$X13JA0:Q105T10MU1!AR!ARB(B. 0,TMU1aA!0Jl1d04i1`50CU1BA$S0JQh1'(B -,TJSK0CQ1:`0CU1B!04Y1`09Wi1MKR`0!Uh1BG0!Q1:$S0JQh1'"M'0MU1aA!0Jl1(B. ,T$S0JQh1'(B "0,T*h1GB`K0EW1M(B (help)" 0,T7Qi1'KA4`0CTh1A04i1GB(B -0,TMQ1!"CP(B CONTROL-h, 0,T+Vh1'`0CU1B!0Gh1R(B "0,TMQ1!"CP0*h1GB`K0EW1M(B (the Help character)". +ในคู่มือนี้เราพยายามที่จะให้ข้อมูลที่เพียงพอสำหรับการเริ่มใช้อีแมกส์. ยังคงมีข้อมูลอีกมากใน +อีแมกส์ซึ่งเราไม่สามารถที่จะนำมาอธิบายไว้ในที่นี้ได้ทั้งหมด. อย่างไรก็ตาม, ท่านอาจต้องการ +เรียนรู้เกี่ยวกับอีแมกส์เพิ่มเติมเพราะอีแมกส์ยังมีคุณสมบัติอีกมากมาย. อีแมกส์ได้เตรียมคำสั่ง +สำหรับเรียกดูเนื้อหาเกี่ยวกับคำสั่งของอีแมกส์. คำสั่ง "ช่วยเหลือ (help)" ทั้งหมดเริ่มด้วย +อักขระ CONTROL-h, ซึ่งเรียกว่า "อักขระช่วยเหลือ (the Help character)". -,Tc9!RC07Uh1(Pc0*i10$X13JA0:Q105T10*h1GB`K0EW1M(B, 0,T;i1M90MQ1!"CP(B C-h, ,Ta0Ei1G5RA04i1GB0MU1!K09Vh1'0MQ1!"CP`0>Wh1M:M!0Gh1R(B -0,T7h1R905i1M'!RC$S0*h1GB`K0EW1MMPdC(B. 0,T6i1R07h1R9d0Ah17CR:0Gh1R(P7SMPdC05h1Md;(B, 0,T;i1M9$S0JQh1'(B C-h ? ,Ta0Ei1G(B -0,TMU1aA!0Jl1(P:M!07h1R90Gh1R0AU1$S0*h1GBMPdC07Uh10MU1aA!0Jl1JRARC6(Pc0Ki1d04i1(B. 0,T6i1R07h1R90;i1M9$S0JQh1'(B C-h ,Ta0Ei1G(B -0,T5i1M'!RCB!`0ET1!07h1R9(B, 0,T!g1JRARC6B!`0ET1!d04i1b4Bc0*i1$S0JQh1'(B C-g. +ในการที่จะใช้คุณสมบัติช่วยเหลือ, ป้อนอักขระ C-h, แล้วตามด้วยอีกหนึ่งอักขระเพื่อบอกว่า +ท่านต้องการคำช่วยเหลืออะไร. ถ้าท่านไม่ทราบว่าจะทำอะไรต่อไป, ป้อนคำสั่ง C-h ? แล้ว +อีแมกส์จะบอกท่านว่ามีคำช่วยอะไรที่อีแมกส์สามารถจะให้ได้. ถ้าท่านป้อนคำสั่ง C-h แล้ว +ต้องการยกเลิกท่าน, ก็สามารถยกเลิกได้โดยใช้คำสั่ง C-g. -(,Tc9:R'CP::09Qi19(B, ,T$GRAKARB"M'0MQ1!"CP(B C-h ,Td04i106Y1!`;0EUh1B9d;(B. 0,T+Vh1'b4B$GRA`0;g19(0CT1'a0Ei1Gd0Ah1(B -,T$GC(P7S`0*h1909Ui1(B, 0,T7Qi1'09Ui107h1R9MR((P0*Ui1a('05h1M0RPK09i1R(B, 0,T6i1R(B -,T$S0JQh1'(B C-h ,Td0Ah1d04i1aJ4'0"i1M$GRA`0!Uh1BG0!Q1:$S0*h1GB`K0EW1M07Uh10Jh1G90Eh1R'"M'K09i1R(M09Qi19(B, ,Tc0Ki1EM'!40;Xh1A(B F1 -,TK0CW1M(B M-x help ,Ta79(B.) +(ในบางระบบนั้น, ความหมายของอักขระ C-h ได้ถูกเปลี่ยนไป. ซึ่งโดยความเป็นจริงแล้วไม่ +ควรจะทำเช่นนี้, ทั้งนี้ท่านอาจจะชี้แจงต่อผู้ดูแลระบบได้. สำหรับการแก้ปัญหาเฉพาะหน้า, ถ้า +คำสั่ง C-h ไม่ได้แสดงข้อความเกี่ยวกับคำช่วยเหลือที่ส่วนล่างของหน้าจอนั้น, ให้ลองกดปุ่ม F1 +หรือ M-x help แทน.) -0,T$X13JA0:Q105T1`0:Wi1M'05i19"M'$S0JQh1'0*h1GB`K0EW1M0$W1M$S0JQh1'(B C-h c. ,TEM'0;i1M9$S0JQh1'(B C-h, 0,TMQ1!"CP(B c, ,Ta0Ei1G(B -,T5RA04i1GB0MQ1!"CPK0CW1MJRB0MQ1!"CP(B; ,Ta0Ei1G0MU1aA!0Jl1(PaJ4'$SM08T1:RB"M'$S0JQh1'09Qi19b4B0JQ1'`";(B. +คุณสมบัติเบื้องต้นของคำสั่งช่วยเหลือคือคำสั่ง C-h c. ลองป้อนคำสั่ง C-h, อักขระ c, แล้ว +ตามด้วยอักขระหรือสายอักขระ; แล้วอีแมกส์จะแสดงคำอธิบายของคำสั่งนั้นโดยสังเขป. ->> 0,T;i1M9$S0JQh1'(B C-h c CONTROL-p. - 0,T"i1M$GRA07Uh1;CR!/(P`0;g1904Q1'05h1Md;09Ui1(B +>> ป้อนคำสั่ง C-h c CONTROL-p. + ข้อความที่ปรากฏจะเป็นดังต่อไปนี้ C-p runs the command previous-line -0,T9Uh1`0;g19!RC:M!(B "0,T*Wh1M0?Q1'0!l10*Q19"M'$S0JQh1'(B" 0,T9Qi19(B. 0,T*Wh1M"M'0?Q1'0!l10*Q19c0*i1`0>Wh1M!RC;0CQ1:aEPa05h1'`05T1A0MU1aA!0Jl1(B. -,Ta05h1`09Wh1M'(R!0*Wh1M"M'0?Q1'0!l10*Q1909Qi1905Qi1'`0>Wh1M0*Ui1:M!0Gh1R$S0JQh1'09Qi197S'R9M0Bh1R'dC(B, 0,T+Vh1'MR(`0;g1905Q1G0*h1GB:M!(B -,T$SM08T1:RBb4B0JQ1'`";d04i1(B--,TMR(`0>U1B'>M07Uh1(P`05W1M9c0Ki107h1R909V1!06V1'$S0JQh1'07Uh105i1M'!RCd04i1(B. +นี่เป็นการบอก "ชื่อฟังก์ชันของคำสั่ง" นั้น. ชื่อของฟังก์ชันใช้เพื่อการปรับและแต่งเติมอีแมกส์. +แต่เนื่องจากชื่อของฟังก์ชันนั้นตั้งเพื่อชี้บอกว่าคำสั่งนั้นทำงานอย่างไร, ซึ่งอาจเป็นตัวช่วยบอก +คำอธิบายโดยสังเขปได้--อาจเพียงพอที่จะเตือนให้ท่านนึกถึงคำสั่งที่ต้องการได้. -,T$S0JQh1'07Uh1;CP!M:04i1GBKERB0MQ1!"CP(B ,T`0*h19$S0JQh1'(B C-x C-s ,TaEP(B (0,T6i1R07h1R9d0Ah10AU10;Xh1A(B META ,TK0CW1M(B -EDIT ,TK0CW1M(B ALT) ,T$S0JQh1'(B v ,TJRARC6c0*i15RAK0EQ1'$S0JQh1'(B C-h c. +คำสั่งที่ประกอบด้วยหลายอักขระ เช่นคำสั่ง C-x C-s และ (ถ้าท่านไม่มีปุ่ม META หรือ +EDIT หรือ ALT) คำสั่ง v สามารถใช้ตามหลังคำสั่ง C-h c. -,T!RC07Uh1(P`0CU1B!04Y10"i1M0AY1E`0>Th1A`0!Uh1BG0!Q1:$S0JQh1'(B, ,Tc0Ki1c0*i1$S0JQh1'(B C-h k ,Ta79$S0JQh1'(B C-h c. +การที่จะเรียกดูข้อมูลเพิ่มเกี่ยวกับคำสั่ง, ให้ใช้คำสั่ง C-h k แทนคำสั่ง C-h c. ->> 0,T;i1M9$S0JQh1'(B C-h k CONTROL-p. +>> ป้อนคำสั่ง C-h k CONTROL-p. -0,T9Uh1`0;g19!RCaJ4'0Ci1MA0!Q1:0*Wh1M"M'$S0JQh1'09Qi19(B, ,Tc90GT19b40Gl1K09Vh1'"M'0MU1aA!0Jl1(B. -,T`0AWh1M07h1R90Mh1R9`J0Cg1(a0Ei1G(B, 0,T;i1M9$S0JQh1'(B C-x 1 ,T`0>Wh1M!S0(Q140"i1M$GRA"M'$S0*h1GB`K0EW1M(B. 0,T7h1R9d0Ah1(B -,T(S`0;g1907Uh1(P05i1M'7S07Q1907U1(B. 0,T7h1R9MR(7S!RCa0!i1d""3P07Uh104Y10"i1M$GRA$S0*h1GB`K0EW1M09Qi19M0BYh1(B, ,Ta0Ei1G(B -0,T$h1MB0;i1M9$S0JQh1'(B C-x 1. +นี่เป็นการแสดงผลคำอธิบายของฟังก์ชัน, พร้อมกับชื่อของคำสั่งนั้น, ในวินโดว์หนึ่งของอีแมกส์. +เมื่อท่านอ่านเสร็จแล้ว, ป้อนคำสั่ง C-x 1 เพื่อกำจัดข้อความของคำช่วยเหลือ. ท่านไม่ +จำเป็นที่จะต้องทำทันที. ท่านอาจทำการแก้ไขขณะที่ดูข้อความคำช่วยเหลือนั้นอยู่, แล้ว +ค่อยป้อนคำสั่ง C-x 1. -0,T5h1Md;09Ui1`0;g1905Q1G`0EW1M!07Uh1`0;g19;CPbB*09l1(B: +ต่อไปนี้เป็นตัวเลือกที่เป็นประโยชน์: - C-h f ,TM08T1:RB0?Q1'0!l10*Q19(B. 0,T>T1A0>l10*Wh1M0?Q1'0!l10*Q1907Uh105i1M'!RC7CR:5RAE'd;(B. + C-h f อธิบายฟังก์ชัน. พิมพ์ชื่อฟังก์ชันที่ต้องการทราบตามลงไป. ->> ,TEM'0;i1M9$S0JQh1'(B C-h f previous-line. - 0,T9Uh1`0;g19!RC07Uh1(P7Sc0Ki10MU1aA!0Jl10>T1A0>l10"i1M0AY1E07Qi1'KA407Uh10AU1`0!Uh1BG0!Q1:0?Q1'0!l10*Q19"M'$S0JQh1'(B C-p. +>> ลองป้อนคำสั่ง C-h f previous-line. + นี่เป็นการที่จะทำให้อีแมกส์พิมพ์ข้อมูลทั้งหมดที่มีเกี่ยวกับฟังก์ชันของคำสั่ง C-p. - C-h a ,T$S0JQh1'$GRA07Uh1`KARPJA(B (Command Apropos). 0,T;i1M9$SK0EQ1!(B (keyword) - ,Ta0Ei1G0MU1aA!0Jl1(PaJ4'CRB!RC"M'$S0JQh1'07Qi1'KA407Uh10AU1$SK0EQ1!;CP!M:M0BYh1(B. - ,T$S0JQh1'`K0Eh1R09Ui1(P`0CU1B!c0*i1d04i104i1GB$S0JQh1'(B META-x. - ,TJSK0CQ1::R'$S0JQh1'(B, ,T$S0JQh1'$GRA07Uh1`KARPJA(B (Command Apropos) ,T(P(B - ,TaJ4'CRB!RC"M'$S0JQh1'07Uh1;CP!M:04i1GBK09Vh1'K0CW1MJM'JRB0MQ1!"CP07Uh1c0*i1`0CU1B!(B - ,T$S0JQh1'`04U1BG0!Q1904i1GB(B. + C-h a คำสั่งความที่เหมาะสม (Command Apropos). ป้อนคำหลัก (keyword) + แล้วอีแมกส์จะแสดงรายการของคำสั่งทั้งหมดที่มีคำหลักประกอบอยู่. + คำสั่งเหล่านี้จะเรียกใช้ได้ด้วยคำสั่ง META-x. + สำหรับบางคำสั่ง, คำสั่งความที่เหมาะสม (Command Apropos) จะ + แสดงรายการของคำสั่งที่ประกอบด้วยหนึ่งหรือสองสายอักขระที่ใช้เรียก + คำสั่งเดียวกันด้วย. ->> 0,T;i1M9$S0JQh1'(B C-h a file. +>> ป้อนคำสั่ง C-h a file. -0,T9Uh1`0;g19!RCaJ4'CRB!RC"M'$S0JQh1';CP!M:"M'(B M-x 0,T!Q1:(B "file" ,Tc90*Wh1M"M'$S0JQh1'(B -0,T7Qi1'KA4c90MU1!K09i1R(M(B. 0,T7h1R9(P`0Kg19$S0JQh1';CP!M:0MQ1!"CP(B (character-command) ,T`0*h19(B C-x -C-f ,TaJ4'M0BYh10!Q1:0*Wh1M"M'$S0JQh1'09Qi19f(B ,T`0*h19(B find-file. +นี่เป็นการแสดงรายการของคำสั่งประกอบของ M-x กับ "file" ในชื่อของคำสั่ง +ทั้งหมดในอีกหน้าจอ. ท่านจะเห็นคำสั่งประกอบอักขระ (character-command) เช่น C-x +C-f แสดงอยู่กับชื่อของคำสั่งนั้นๆ เช่น find-file. ->> 0,T;i1M9$S0JQh1'(B C-M-v ,T`0>Wh1M`$0EWh1M90Ai1G90GT19b40Gl1$S0*h1GB`K0EW1M(B (help window). ,TEM'7S04Y10JQ1!(B - ,TJM'JRA$0CQi1'(B. +>> ป้อนคำสั่ง C-M-v เพื่อเคลื่อนม้วนวินโดว์คำช่วยเหลือ (help window). ลองทำดูสัก + สองสามครั้ง. ->> 0,T;i1M9$S0JQh1'(B C-x 1 ,T`0>Wh1M!S0(Q140GT19b40Gl1$S0*h1GB`K0EW1M(B. +>> ป้อนคำสั่ง C-x 1 เพื่อกำจัดวินโดว์คำช่วยเหลือ. -* ,TJ0CX1;(B +* สรุป ----- -0,TJTh1'$GC(Sd0Gi10$W1M(B, ,T$S0JQh1'(B C-x C-c ,Tc0*i1JSK0CQ1:MM!(R!0MU1aA!0Jl1M0Bh1R'6RGC(B. 0,T6i1R05i1M'!RCMM!d;0BQ1'(B -,T`*E0El10*Qh1G$CRG(B, ,TaEPJRARC6!0EQ1:AR0BQ1'0MU1aA!0Jl1d04i10MU1!09Qi19(B, ,Tc0Ki1c0*i1$S0JQh1'(B C-z. +สิ่งควรจำไว้คือ, คำสั่ง C-x C-c ใช้สำหรับออกจากอีแมกส์อย่างถาวร. ถ้าต้องการออกไปยัง +เชลล์ชั่วคราว, และสามารถกลับมายังอีแมกส์ได้อีกนั้น, ให้ใช้คำสั่ง C-z. -0,T$Yh10AW1M!RCc0*i109Ui10AU1`(59Rc0Ki10Th1'`0CTh1Ac0*i107Qi1'KERBJRARC6`0"i1Rc(d04i1(B, 0,T4Q1'09Qi1906i1R07h1R9>::R'0JTh1'07Uh1d0Ah1(B -0,T*Q14`(9(B, ,Td0Ah105i1M'09Qh1'5SK09T105Q1G`M'(B - ,TJM:6RAARd04i1`EB(B! +คู่มือการใช้นี้มีเจตนาให้ผู้ที่เพิ่งเริ่มใช้ทั้งหลายสามารถเข้าใจได้, ดังนั้นถ้าท่านพบบางสิ่งที่ไม่ +ชัดเจน, ไม่ต้องนั่งตำหนิตัวเอง - สอบถามมาได้เลย! -* ,T!RC7SJS`9R(B (copying) +* การทำสำเนา (copying) ---------------------- -0,T$Yh10AW1M09Ui1d04i10CQ1:!RC0>Q129RAR`0;g19CPBP`GER9R9(B, ,T`0CTh1A05Qi1'a05h105i19)0:Q1:07Uh1`0"U1B9b4B(B Stuart Cracraft. +คู่มือนี้ได้รับการพัฒนามาเป็นระยะเวลานาน, เริ่มตั้งแต่ต้นฉบับที่เขียนโดย Stuart Cracraft. -0,T$Yh10AW1M`GM0Cl10*Q1909Ui1(B, ,T`0*h19`04U1BG0!Q1:(B GNU Emacs, ,Td04i10CQ1:!RCJ'G90JT1708Tl1(B, ,TaEP<9G!d0Gi1c9`0'Wh1M9d"c9(B -,T!RC`0Ch104i1GB(B: +คู่มือเวอร์ชันนี้, เช่นเดียวกับ GNU Emacs, ได้รับการสงวนสิทธิ์, และผนวกไว้ในเงื่อนไขใน +การเผยแพร่ด้วย: -,TJ'G90ET1"0JT1708Tl1(B ,T>(B.,TH(B. 2528, 2529 ,Tb4B?0CU1+M?05l1aG0Cl1?RG09l1`40*Q19(B (Free Software Foundation) +สงวนลิขสิทธิ์ พ.ศ. 2528, 2529 โดยฟรีซอฟต์แวร์ฟาวน์เดชัน (Free Software Foundation) - 0,T7X1!07h1R90AU10JT1708Tl1c9!RC7SJS`9RK0CW1M`0Ch1`M!JRC09Ui1(B, ,Tc907X1!0JWh1M(B, ,Tb4B05i1M'a9:0"i1M$GRAaJ4'(B - 0,TJT1708Tl1aEP!RCM09X1-R509Ui1d;>0Ci1MA04i1GB(B. 0,T7Qi1'09Ui1`0>Wh1M0*Ui1c0Ki1`0Kg190Gh1R00Ch1d04i1M09X1-R5c0Ki100Ch105h1Md;d04i1b4BMR0HQ1B0"i1M$GRAc9`M!JRC09Ui1(B. + ทุกท่านมีสิทธิ์ในการทำสำเนาหรือเผยแพร่เอกสารนี้, ในทุกสื่อ, โดยต้องแนบข้อความแสดง + สิทธิ์และการอนุญาตนี้ไปพร้อมด้วย. ทั้งนี้เพื่อชี้ให้เห็นว่าผู้เผยแพร่ได้อนุญาตให้ผู้ที่ได้รับ + สามารถทำการเผยแพร่ต่อไปได้โดยอาศัยข้อความในเอกสารนี้. - ,T!RCM09X1-R509Qi19d04i1CGA06V1'0JT1708Tl1c9!RC`0Ch1`GM0Cl10*Q1907Uh1;0CQ1:;0CX1'a0Ei1G(B, ,TK0CW1M0Jh1G9K09Vh1'"M'(B - ,T`M!JRC09Ui1(B, ,T@RBc05i1`0'Wh1M9d"0"i1R':9(B, ,T5EM4(90JT1708Tl1c9!RC:M!0Gh1Rc$C`0;g1900Ch1JS`9R"M'(B GNU Emacs ,Td;0BQ1'`0>Wh1M9f(B ,T"M'07h1R904i1GB(B. -0,T*h1GB0!Q197SERBCP::KG'+M?05l1aG0Cl1(B (",TaJ4'$GRA`0;g19`0(i1R0"i1RG`0(i1R"M'(B") 0,T4i1GB!RCc0*i1(B, -,T!RC`0"U1B9(B, ,TaEP!RC`0;g19`0(i1R"M'0Ch1GA0!Q19"M'+M?05l1aG0Cl1`J0CU1(B (free software). +เงื่อนไขของการทำสำเนาอีแมกส์จะซับซ้อนมากกว่านี้, แต่มีเจตนารมณ์ที่เหมือนกัน. กรุณา +อ่านแฟ้มข้อมูล COPYING แล้วเผยแพร่สำเนาของ GNU Emacs ไปยังเพื่อนๆ ของท่านด้วย. +ช่วยกันทำลายระบบหวงซอฟต์แวร์ ("แสดงความเป็นเจ้าข้าวเจ้าของ") ด้วยการใช้, +การเขียน, และการเป็นเจ้าของร่วมกันของซอฟต์แวร์เสรี (free software). -* 0,T5i19)0:Q1:0Gh1R04i1GB`0CWh1M'!RC7SJS`9R(B +* ต้นฉบับว่าด้วยเรื่องการทำสำเนา -------------------------- -0,T5h1Md;09Ui1`0;g19`M!JRC0Gh1R04i1GB`0CWh1M'!RC7SJS`9R07Uh1`0;g1905i19)0:Q1:(B. ,T`M!JRC09Ui1;CR!/M0BYh1c90$Yh10AW1M!RCc0*i1(B -0,TMU1aA!0Jl1)0:Q1:@RIR0MQ1'!DI(B, 0,T+Vh1'`0;g1905i19)0:Q1:"M'`M!JRCa;E)0:Q1:09Ui104i1GB(B. +ต่อไปนี้เป็นเอกสารว่าด้วยเรื่องการทำสำเนาที่เป็นต้นฉบับ. เอกสารนี้ปรากฏอยู่ในคู่มือการใช้ +อีแมกส์ฉบับภาษาอังกฤษ, ซึ่งเป็นต้นฉบับของเอกสารแปลฉบับนี้ด้วย. This tutorial descends from a long line of Emacs tutorials starting with the one written by Stuart Cracraft for the original Emacs. @@ -983,24 +983,24 @@ GNU Emacs to your friends. Help stamp out software obstructionism ("ownership") by using, writing, and sharing free software! -* ,T$S0Jh1'07i1RB(B +* คำส่งท้าย --------- -0,T$Yh10AW1M)0:Q1:09Ui1d04i1a;E(R!05i19)0:Q1:07Uh1`0;g19@RIR0MQ1'!DI(B, 0,T+Vh1'(P;CR!/M0BYh1c90MU1aA!0Jl1`GM0Cl10*Q19(B 20.4. -0,T(B ,TG'0Hl1(B -,TJRB0JX1GCC3(B, ,Td04i10MT1'0$Yh10AW1M"M'0MU1aA!0Jl1`GM0Cl10*Q19`0!h1R(B, ,TaEP"3P09Ui10MU1aA!0Jl1`GM0Cl10*Q19(B 20.4 0,T!g1d04i1(B -,T`;0EUh1B9a;E'd;AR!a0Ei1G(B. ,T9M!(R!09Ui1(B, 0,TWh1M07Uh1(P`0"U1B9c0Ki1d04i1$GRA07Uh10*Q14`(9(B. ,TK0GQ1'`0;g19M0Bh1R'0BTh1'0Gh1R0$Yh10AW1M)0:Q1:09Ui1(P`0;g19;CPbB*09l1(B -,TaEP(Pd04i10CQ1:!RCa0!i1d"c0Ki104U10BTh1'f(B 0,T"Vi190MU1!05h1Mf(B ,Td;(B. ,T"M"M:0$X13(B 0,T$X1307Q1H09U10Bl1(B ,T`(0CT1->C(B 0,T7Uh1c0Ki1$GRA(B -0,T*h1GB`K0EW1M5CG(JM:05i19)0:Q1:(B. +คู่มือฉบับนี้ได้แปลจากต้นฉบับที่เป็นภาษาอังกฤษ, ซึ่งจะปรากฏอยู่ในอีแมกส์เวอร์ชัน 20.4. +ผู้แปลได้ทำการแปลขึ้นมาใหม่เนื่องจากฉบับเก่าที่เป็นภาษาไทย, ซึ่งแปลโดย ดร.มานพ วงศ์ +สายสุวรรณ, ได้อิงคู่มือของอีแมกส์เวอร์ชันเก่า, และขณะนี้อีแมกส์เวอร์ชัน 20.4 ก็ได้ +เปลี่ยนแปลงไปมากแล้ว. นอกจากนี้, ผู้แปลยังได้นำเครื่องหมายวรรคตอนมาใช้ในที่นี้ด้วย, +ทั้งนี้ก็เพื่อที่จะเขียนให้ได้ความที่ชัดเจน. หวังเป็นอย่างยิ่งว่าคู่มือฉบับนี้จะเป็นประโยชน์ +และจะได้รับการแก้ไขให้ดียิ่งๆ ขึ้นอีกต่อๆ ไป. ขอขอบคุณ คุณทัศนีย์ เจริญพร ที่ให้ความ +ช่วยเหลือตรวจสอบต้นฉบับ. -22 ,TA!CR$A(B 2542 -0,TGT10CQ1*(B ,THC`0ET1H0Ei1SGR03T1*(B +22 มกราคม 2542 +วิรัช ศรเลิศล้ำวาณิช virach@nectec.or.th Translate - January 1999 by Virach Sornlertlamvanich ;;; Local Variables: ;;; sentence-end-double-space: nil -;;; coding: iso-2022-7bit +;;; coding: utf-8 ;;; End: diff --git a/leim/ChangeLog b/leim/ChangeLog index 47f22ecfb53..a9b9bfd1bc4 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,45 @@ +2013-05-25 Eli Zaretskii + + * Makefile.in (leim-list.el, check-declare): Replace + reveal-filename with unmsys--file-name. + +2013-05-16 Eli Zaretskii + + * Makefile.in (leim-list.el, check-declare): Use reveal-filename. + +2013-04-01 Paul Eggert + + 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 + + * Makefile.in ($(srcdir)/ja-dic/ja-dic.el): Use batch-skkdic-convert. + +2013-03-18 Eli Zaretskii + + * makefile.w32-in ($(srcdir)/ja-dic/ja-dic.el): New target. + +2013-03-18 Paul Eggert + + 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 * 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 - - * Version 24.3 released. - 2013-02-08 Stefan Monnier * quail/latin-ltx.el: Add greek superscripts. diff --git a/leim/Makefile.in b/leim/Makefile.in index 56f28b8e891..5edf1665af7 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -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)"))' diff --git a/leim/SKK-DIC/README b/leim/SKK-DIC/README index 43b5a66c360..fa51a57fe16 100644 --- a/leim/SKK-DIC/README +++ b/leim/SKK-DIC/README @@ -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. diff --git a/leim/SKK-DIC/SKK-JISYO.L b/leim/SKK-DIC/SKK-JISYO.L index 4b587f02e47..f02c5658f2a 100644 --- a/leim/SKK-DIC/SKK-JISYO.L +++ b/leim/SKK-DIC/SKK-JISYO.L @@ -1,8 +1,6 @@ -;; -*- text; coding: euc-jp -*- -;; SKK-JISYO.L.unannotated was generated automatically by unannotation.awk at Tue Jan 26 00:31:27 2010 ;; -*- mode: fundamental; coding: euc-jp -*- ;; Large size dictionary for SKK system -;; Copyright (C) 1988-1995, 1997, 1999-2008 +;; Copyright (C) 1988-1995, 1997, 1999-2010 ;; ;; Masahiko Sato ;; Hironobu Takahashi , @@ -15,9 +13,9 @@ ;; SKK Development Team ;; ;; Maintainer: SKK Development Team -;; Version: $Id: SKK-JISYO.L,v 1.946 2010/01/23 00:10:04 czkmt Exp $ +;; Version: $Id: SKK-JISYO.L,v 1.1124 2013/03/16 00:10:02 czkmt Exp $ ;; Keywords: japanese -;; Last Modified: $Date: 2010/01/23 00:10:04 $ +;; Last Modified: $Date: 2013/03/16 00:10:02 $ ;; ;; This dictionary is free software; you can redistribute it and/or ;; modify it under the terms of the GNU General Public License as @@ -30,9 +28,11 @@ ;; General Public License for more details. ;; ;; You should have received a copy of the GNU General Public License -;; along with this dictionary. If not, see . +;; along with Daredevil SKK, see the file COPYING. If not, write to +;; the Free Software Foundation Inc., 59 Temple Place - Suite 330, +;; Boston, MA 02111-1307, USA. ;; -;; ACKNOWLEDGMENT +;; ACKNOWLEDGEMENT ;; ;; μϡSKK Ԥκƣɧ 1 ǺΤ ;; ŵ̿꺴ƣ漼 () γãȤȤ scratch @@ -78,10 +78,10 @@ 뤬k // 뤬i // 뤬g // -s //ب/ -k //ب/ -i //ب/ -g //ب/ +s //ب;ְפε(̾Ѵ)/ +k //ب;ְפε(̾Ѵ)/ +i //ب;ְפε(̾Ѵ)/ +g //ب;ְפε(̾Ѵ)/ b // s /// t /꿶/俶/ @@ -98,12 +98,12 @@ ꤭r /// ꤭n /// ꤭c /// -ꤤr // +ꤤr /;-/ ꤢt /// ꤢi /// t // s // -n // +n /;-(礦)/ k // k // 餤k /Ф/ @@ -115,15 +115,15 @@ 餤k /Фž/ 餤r /Ф/ 餤s /Ф/ -w /// -u /// -t /// -o /// +w //;(jeer) ͤμԤФ/ +u //;(jeer) ͤμԤФ/ +t //;(jeer) ͤμԤФ/ +o //;(jeer) ͤμԤФ/ k /// -i /// +i //;(jeer) ͤμԤФ/ h /// -e /// -c /// +e //;(jeer) ͤμԤФ/ +c //;(jeer) ͤμԤФ/ ᤭r // ᤭t /Ω/ k /// @@ -168,20 +168,20 @@ 錄m // 錄h // 錄g // -錄t ////// +錄t //;(ϰϡ) ֤ˤ/;=ˤ (̾Ѵ) (NB:λ)/// 錄s // -錄r ////// -錄n ////// -錄c ////// +錄r //;(ϰϡ) ֤ˤ/;=ˤ (̾Ѵ) (NB:λ)/// +錄n //;(ϰϡ) ֤ˤ/;=ˤ (̾Ѵ) (NB:λ)/// +錄c //;(ϰϡ) ֤ˤ/;=ˤ (̾Ѵ) (NB:λ)/// 碌ɤr // -鷺w /// -鷺u /// -鷺t /// -鷺o /// -鷺i /// -鷺e /// -鷺c /// -鷺k ///// +鷺w /;() Ѥ路/;() ¤򴵤/ +鷺u /;() ¤򴵤/;() פѤ/ +鷺t /;() ¤򴵤/;() פѤ/ +鷺o /;() ¤򴵤/;() פѤ/ +鷺i /;() ¤򴵤/;() פѤ/ +鷺e /;() ¤򴵤/;() פѤ/ +鷺c /;() ¤򴵤/;() פѤ/ +鷺k //;NB:֤kפƱ/;Ϥ/; Ϥ/ 魯t /˺/ 魯줵t /˺/ 魯줵r /˺/ @@ -199,7 +199,7 @@ 路m /ѯ/ 路h /ѯ/ 路g /ѯ/ -虜i //// +虜i //;(:Ȥ)/;/ 虜t // 櫓s /̵/ 櫓k /̵/ @@ -234,8 +234,8 @@ 來c /ͯ/Ͱ/ 來k // 來s /ͯ/ -來t /ʨΩ/ͯΩ/ͰΩ/ -來c /ʨΩ/ͯΩ/ͰΩ/ +來t /ʨΩ;boil/ͯΩ;pour out/ͰΩ;=ͯΩ/ +來c /ʨΩ;boil/ͯΩ;pour out/ͰΩ;=ͯΩ/ 來m /Ƹ/ 來t /ʨ/ 來r /ʨ/ @@ -246,7 +246,7 @@ 來n /ʨ/ 來c /ʨ/ 來k /ʨ/ͯ/ -來g /ͯ/ʨ/ +來g /ͯ;(rush) ͯ夬/ʨ;Ϥʨ夬/ 狼狼s /㡹/ 狼䤹s /ʬ/Ƚ// 狼䤹k /ʬ/Ƚ// @@ -273,30 +273,30 @@ 狼n // 狼c // 狼y // -狼t /Ƚ/ʬ////// +狼t /Ƚ;(Ƚ) 㤤Ƚ/ʬ;(§:k)/;() Ȥ//;櫓Ϳ/;ֲפΰλ/;(ƻ)/ 狼s /// -狼r //Ƚ//ʬ//// -狼n //Ƚ/ʬ/// +狼r /;(ͤ) ̤/Ƚ;(Ƚ) 㤤Ƚ/;() Ȥ/ʬ;(§:k)/;(ƻ)/;(åѥȤ狼)/;ֲפΰλ/ +狼n /;() Ȥ/Ƚ;(Ƚ) 㤤Ƚ/ʬ;(§:k)/;(ƻ)/;ֲפΰλ/ 狼k /// 狼i /// 狼g /// -狼c //Ƚ/ʬ/// +狼c /;() Ȥ/Ƚ;(Ƚ) 㤤Ƚ/ʬ;(§:k)/;(ƻ)/;ֲפΰλ/ t // s // r /// n // -k /ʬ/ͯ/ʨ/Ͱ// -i /ͯ/ʨ/Ͱ/ +k /ʬ/ͯ;(spring) ͯ/ʨ;(boil) ʨ/Ͱ;ͯ// +i /ͯ;(spring) ͯ/ʨ;(boil) ʨ/Ͱ;ͯ/ g // c // -b /// +b /;պ᤹/;ΤӼ/ z // j // r /Ͽ軣/ -s /Ͽ/ +s /Ͽ;Ͽ/ n // s /ϫ/ -s /ϫ/Ϯ/ϸ/ +s /ϫ;Ȥϫ/Ϯ;Ϯ/ϸ;ϸ/ 餯k /Ϣĺ/ 餯i /Ϣĺ/ 餯s /Ϣ/ @@ -307,7 +307,7 @@ 줤n // 뤤s // t // -s /ۡ//Χ/ +s /ۡ//Χ;=ۡ/ 褦s /Ѳ/ 褦s // 礳i /ιԻ/ @@ -319,7 +319,7 @@ 礦Ҥk /ξ/ 礦礦s /λ/ 礦s /λ/ -礦s /// +礦s //;ʾ/ 夦r /ή/ 㤯s /ά/ ޤr // @@ -350,7 +350,7 @@ 餯n // 餯d // 餦s /ϫ/ -d /ɤ/ +d /ɤ;/ t // ꤭t // ꤭r // @@ -370,11 +370,11 @@ g // c // k // -d // +d /;/ Ӥn /ͦ/ Ӥm /ͦ/ -n ///// -b ///// +n /;(:ˤƤ)/;(:Τ꤬)/;(:夲Ƥ)/;(ʡ)Ĥӿ夲ޤ (:ˤäƹԤ)/ +b /;(:ˤƤ)/;(:Τ꤬)/;(:夲Ƥ)/;(ʡ)֤Ĥӿ夲ޤ (:ˤäƹԤ)/ s // m // 뤪s // @@ -457,8 +457,8 @@ ߤm /ɤ߿/ ߤs /ɤ߲/ ߤt /ɤ߼/ -ߤn /ɤ߹/ɹ/Ӥ߹/ -ߤm /ɤ߹/ɹ/Ӥ߹/ +ߤn /ɤ߹/ɹ/Ӥ߹;Τ/ +ߤm /ɤ߹/ɹ/Ӥ߹;Τ/ ߤb /ɤ/ɤ߳/ ߤs /ɤ߲/߲/ ߤt /ɤ// @@ -466,11 +466,11 @@ ߤn /ɤ// ߤk /ɤʹ/ ߤc /ɤ// -ߤt //// -ߤr //// -ߤn //// -ߤc //// -ߤe /// +ߤt //;=ᴤ/;ɡפΰλ/ +ߤr //;=ᴤ/;ɡפΰλ/ +ߤn //;=ᴤ/;ɡפΰλ/ +ߤc //;=ᴤ/;ɡפΰλ/ +ߤe //;ɡפΰλ/ ߤs /ɤ/ ߤk /ɤ߽/ ߤe /ɤ/ @@ -490,7 +490,7 @@ ߤk /ɤ˰/ ߤg /ɤ߾/ s // -d /ɤ/ +d /ɤ;/ ޤr // դs /빹/ k /빹/ @@ -519,8 +519,8 @@ r /// k // ɤs // -n /// -m /// +n //;=/ +m //;=/ Ȥr // Ƥɤr /ͽ/ r // @@ -535,18 +535,18 @@ äƤt /äΩ/ äk /ó/ t // -t /Ω/Ω/ -c /Ω/ +t /Ω/Ω;ȤӤΩ/ +c /Ω;ȤӤΩ/ 褽褽s /;;/ -褽u // -褽w //// -褽u //// -褽t //// -褽o //// -褽i //// -褽h // -褽e //// -褽c //// +褽u /;פε(̾Ѵ)/ +褽w ///;פε(̾Ѵ)/ +褽u ///;פε(̾Ѵ)/ +褽t //;פε(̾Ѵ)// +褽o ///;פε(̾Ѵ)/ +褽i //;פε(̾Ѵ)// +褽h /;פε(̾Ѵ)/ +褽e ///;פε(̾Ѵ)/ +褽c ///;פε(̾Ѵ)/ 褽ɤr /ͽ/ 褽s /ͽ/ 褽w // @@ -624,7 +624,7 @@ 褳c // 褳k // 褳t // -褳s //// +褳s ///;-٤/ 褯֤s /߿/ 褯֤k /߿/ 褯֤i /߿/ @@ -633,14 +633,14 @@ 褯r /ĥ/ 褯n /ĥ/ 褯c /ĥ/ -褯s // +褯s /;bath/ 褯b // 褮k /;̵/ 褮t // 褮r // 褮n /;// 褮c // -褫r // +褫r /;/ 褦礦k // 褦u // 褦k // @@ -659,38 +659,38 @@ 褦s /Ѱ/ 褦n /ư/ 褦d /ư/ -褦t /Ƥ// -褦s //// -褦n //// -褦h // +褦t /Ƥ/;-ȤƻѤ򸫤ʤ/ +褦s //;ʸ// +褦n ///;͡פε(̾Ѵ)/ +褦h /;-/ 褦d // 褤m /줤/ 褤Ĥs /줤/ 褤Ĥr /줤/ 褤är /ĥ/ 褤r /줤/ -褤m /줤/줤// +褤m /줤;/줤// 褤s // 褢k // 褢b /ͷ/ 褢k // z /ڵ/ -w /// -u /// -t //////////Dz/// -s ////////// -r /////Dz//// +w //;ֿפε(̾Ѵ)/ +u //;ֿפε(̾Ѵ)/ +t ////;() ϳ˰/;ꤹ NB:֤rס֤rפƱ/;(¸) ˰ͤ/;() ʸ˵//;ֿפε(̾Ѵ)/Dz;Dz/;Dz// +s ///;(褤)Ԥ//;//;(ﵯ褤)ֲ¤ (:äꤷƤ)/;ֿפε(̾Ѵ)/;פΰλ/ +r //;(¸) ˰ͤ/;() ʸ˵/;() ϳ˰/Dz;Dz/;Dz/;ꤹ NB:֤rס֤rפƱ// p // -o /// -n ////////////Dz///// -m ///// -k //////ǽ////// +o //;ֿפε(̾Ѵ)/ +n ///;²ΤӤ/;η(=ɤ)//;פΰλ/;ɡפε//;(¸) ˰ͤ/;() ʸ˵/;() ϳ˰/Dz;Dz/;Dz/;ꤹ NB:֤rס֤rפƱ//;(夲ƸƤӴ󤻤)/ +m //;²ΤӤ/;η(=ɤ)/;ɡפε/ +k //;(褤)Ԥ/;(put aside)ʬʬ NB:֤kפƱ/;(avoid)֤򤱤 NB:֤kפƱ/;NB:֤kפƱ/ǽ;-/;-ä/;פΰλ//;(ﵯ褤)ֲ¤ (:äꤷƤ)/;ֿפε(̾Ѵ)/ j /ڵ/ -i //////// -g //////// -e /// -c ///////Dz//// -b /// +i ///;(Τޤ),ֹŷ/;(褤)Ԥ/;(ﵯ褤)ֲ¤ (:äꤷƤ)/;ֿפε(̾Ѵ)/;פΰλ/ +g /;(褤)Ԥ///;(Τޤ),ֹŷ/;(ﵯ褤)ֲ¤ (:äꤷƤ)/;ֿפε(̾Ѵ)/;פΰλ/ +e //;ֿפε(̾Ѵ)/ +c //;ֿפε(̾Ѵ)//;(¸) ˰ͤ/;() ʸ˵/;() ϳ˰/Dz;Dz/;Dz/;ꤹ NB:֤rס֤rפƱ// +b //;(夲ƸƤӴ󤻤)/ a // 狼s /ʨ/ 廊k /廊/ @@ -711,23 +711,23 @@ 뤮s /ɤ뤮̵/ 뤮k /ɤ뤮̵/ 뤮i /ɤ뤮̵/ -뤬s // +뤬s /;-/ y // -s ///İ// -r // +s //;Ϥ/İ;// +r /;(-)/ n /// m /// k // i /// g /// -b /// +b /;[ʸ]/;[ʸ]/ s /ɤ/ ꤫s /ɤ/ ꤪs /ɤ굯/ ꤪt /ɤ/ ꤪk /ɤ굯/ ꤦk /ɤư/ -s /ͳ/ͳͳ// +s /ͳ/ͳͳ/;ͳ/ z /̴/ y /̴/ t /̴/ @@ -740,7 +740,7 @@ n /̴/ ߤk /ݰ/ ߤi /ݰ/ -ߤr /ݺ/ +ߤr /ݺ;?/ ӤŤi /ػ/ Ӥs /غ/ Ӥr // @@ -748,13 +748,13 @@ Ȥm // Ǥg /觤Dz/ Ǥg /觤Ǿ/ -t // -r // +t /;־פε(̾Ѵ)/ +r /;־פε(̾Ѵ)/ t // r // n /// c // -椿k /˭// +椿k /˭/;/ 椺錄s // 椺ꤦk // 椺ꤢw // @@ -764,10 +764,10 @@ 椺ꤢi // 椺ꤢe // 椺ꤢc // -椺t /// -椺r /// -椺n /// -椺c /// +椺t //;־פε(̾Ѵ)/ +椺r //;־פε(̾Ѵ)/ +椺n //;־פε(̾Ѵ)/ +椺c //;־פε(̾Ѵ)/ 椹t // 椹r // 椹n // @@ -776,12 +776,12 @@ 椹r /ɿ/ 椹n /ɿ/ 椹c /ɿ/ -椹t /// -椹r /// -椹n /// +椹t //;§/ +椹r //;§/ +椹n //;§/ 椹i // 椹g // -椹c /// +椹c //;§/ 椶m // 椵t /ɤ/ɿ/ 椵r /ɤ/ɿ/ @@ -799,7 +799,7 @@ 椭Ȥk /Ԥ/ 椭Ȥi /Ԥ/ 椭m /Ԥ/ -椭k /Ԥ/Ԥ/ +椭k /Ԥ;-/Ԥ;-Ź/ 椭i /Ԥ/ 椭w /Ԥ/ 椭u /Ԥ/ @@ -844,7 +844,7 @@ 椬m // 椬k // 椬i // -椫s // +椫s /;(ƻ)/ 椨s /̵/ 椨k /̵/ 椨i /̵/ @@ -871,24 +871,24 @@ 椢g // w // u // -t ////// -s /// -r ///// +t ///;/;/;ɡפε(̾Ѵ)/ +s //;ɡפε(̾Ѵ)/ +r //;/;/;ɡפε(̾Ѵ)/ o // -n ///// -k ////// +n //;/;/;ɡפε(̾Ѵ)/ +k //;()/;(:ŪϤعԤ) ƻ/;(:ޤä󤯤عԤ) /;ֱפΰλ/ i // h // g // e // d // -c ////// +c ///;/;/;ɡפε(̾Ѵ)/ 󤴤Ȥs /߻̵/ 󤴤Ȥk /߻̵/ 󤴤Ȥi /߻̵/ 餫k // s // -r //// +r /;(:ʤƤޤʤʤ䤫)/;(:ʤ)/;-餰/ n // k // i // @@ -919,7 +919,7 @@ ꤳs // ꤳn /// ꤳm /// -꤭r /// +꤭r /;ڤʤ// ꤫s /// ꤪe /꽪/꽪/ ꤢw /// @@ -929,7 +929,7 @@ ꤢi /// ꤢe // ꤢc /// -r /ߤ/ +r /ߤ;/ z /ߤ/ n /ߤ/ m /ߤ/ @@ -962,17 +962,17 @@ ޤs // ޤr // ޤk // -s /// +s //;(:Ĵ)/ ֤r // ֤ꤹt /ˤ/ ֤ˤm // ֤k // -t /// -r /// -n /// +t //;Ԥ/ +r //;Ԥ/ +n //;Ԥ/ k // i // -c /// +c //;Ԥ/ r ////ĥ/ i // ˤg /鲼/ @@ -985,21 +985,21 @@ n // c // Ȥr /ۤ/ -w /// -u /// -t /// -o /// -i /// +w //;=ۤ/ +u //;=ۤ/ +t //;=ۤ/ +o //;=ۤ/ +i //;=ۤ/ h /// -e /// -c /// +e //;=ۤ/ +c //;=ۤ/ Ĥk /Ȭ/ Ĥr /Ȭ/ s // r // äƤk /ä/ äk // -t /Ȭ// +t /Ȭ/;-(ä)/ 䤻ۤt /餻/ 䤻ۤr /餻/ 䤻ۤn /餻/ @@ -1016,29 +1016,29 @@ 䤹n /¾/ 䤹c /¾/ 䤹g /¾/ -䤹u //// -䤹s //// +䤹u //;(easy) פ/;(cheap) / +䤹s //;(easy) פ/;(cheap) / 䤹r // 䤹p // 䤹n /// -䤹m ///// -䤹k //// -䤹i //// -䤹g //// +䤹m ///;(easy) פ/;(cheap) / +䤹k //;(easy) פ/;(cheap) / +䤹i //;(easy) פ/;(cheap) / +䤹g //;(easy) פ/;(cheap) / 䤸t // 䤸r // 䤸n // 䤸c // -䤷w /// -䤷u /// -䤷t /// -䤷o /// -䤷i /// +䤷w //;/ +䤷u //;/ +䤷t //;/ +䤷o //;/ +䤷i //;/ 䤷h // -䤷e /// -䤷c /// -䤵i /ͥ/פ/ -䤵s /ͥ// +䤷e //;/ +䤷c //;/ +䤵i /ͥ;/פ;/ +䤵s /ͥ;(gentle)ͥ/;(easy)פ/ 䤱Τt /Ƥ/ 䤱Τr /Ƥ/ 䤱Τn /Ƥ/ @@ -1066,7 +1066,7 @@ 䤯c /Ω/ 䤯t /Ω/ 䤯ɤr /«/ -䤯s ///ٯ// +䤯s /;(translate) ʩ/;(promise) Ʋ/ٯ;(hold) ٯ/;פε/ 䤯n // 䤭s //Ƥ/ 䤭Ϥw /Ƥʧ/ @@ -1078,7 +1078,7 @@ 䤭Ϥc /Ƥʧ/ 䤭ʤs /Ƥ// 䤭ʤs /Ƥľ/ľ/ -䤭Ĥs /Ƥ/ +䤭Ĥs /Ƥ;ФƤ-/ 䤭k /Ƥ/Ƥ// 䤭i /Ƥ// 䤭t /Ƥ/ @@ -1097,14 +1097,14 @@ 䤫s // 䤦u // 䤦k // -t ////Ȭ/ -s /// -r ///// -n //////// -m //////// -k ///// -i ///// -c //// +t /;(do)Ż򸯤, ()ͤ򸯤/;(play)إꥢ٤/;(kill)򻦤/Ȭ;-ä/ +s //;餻/ +r /;(do)Ż򸯤, ()ͤ򸯤/;(play)إꥢ٤/;(kill)򻦤/;ˤ/ +n ///;(do)Ż򸯤, ()ͤ򸯤/;(play)إꥢ٤/;(kill)򻦤/;ߤ/;(:Фä)/ +m //;Ż򼭤//;ߤ/;(:Фä)//;ּפε/ +k //;() 䤭ʤ/;ޤ/;־ơפε(̾Ѵ)/ +i //;() 䤭ʤ/;־ơפε(̾Ѵ)/;ޤ/ +c /;(do)Ż򸯤, ()ͤ򸯤/;(play)إꥢ٤/;(kill)򻦤/ s /ʸ̵/ ɤꤦt /ݶ/ ɤꤦc /ݶ/ @@ -1132,7 +1132,7 @@ ꤢw // ꤢg /// s // -餤äѤs /㤤/ +餤äѤs /㤤;Ĥ-/ 餤n /㤤»/ 餤k /㤤/ w // @@ -1177,7 +1177,7 @@ Τߤk /ʪ/ Τߤi /ʪ/ Τߤg /ʪ/ -Τs /ʪ/ʪ/ +Τs /ʪ;-/ʪ;-ʴ/ Τr /ʪ/ Τr /ʪ­/ Τk /ʪ/ @@ -1214,7 +1214,7 @@ Τr /ʪ/ Τi /ʪ/ Τe /ʪ/ -s /ʪ/ +s /ʪ;ܤʪ/ k // ɤäƤz /ä/ ɤäƤy /ä/ @@ -1248,20 +1248,20 @@ Ȥk // Ȥi // Ȥr // -z // -t /أ/// -r /أ// -n ///أ///// +z /;?/ +t /أ/;=أ/;base.ּθ-ˤ/ +r /أ/;=أ/ +n ///أ/;=أ//;ϤϰϡֿƤ-/; -/ m // k // -h // -d ///// -c /أ// +h /;ϤϰϡֿƤ-/ +d /;-Ť/;-//;ϤϰϡֿƤ-/ +c /أ/;=أ/ ƤϤs //Ʊ/ Ƥs // Ƥs /;/ -Ƥn /Ϯ/// -Ƥb /Ϯ/// +Ƥn /Ϯ/;=Ϯ/;=Ϯ/ +Ƥb /Ϯ/;=Ϯ/;=Ϯ/ Ĥ줳n // Ĥ줳m // Ĥ줢w // @@ -1272,8 +1272,8 @@ Ĥ줢e // Ĥ줢c // r // -är /// -äm /// +är //;פε(̾Ѵ)/ +äm /;(most)/;(reasonable)֤- (³)-⡢⤢/ äƤޤt /äƲ/ äƤޤr /äƲ/ äƤޤn /äƲ/ @@ -1341,7 +1341,7 @@ c // k // e // -t /Ѥ/ +t /Ѥ;/ s /// k // i // @@ -1352,7 +1352,7 @@ i /// g // c // -w // +w /;-/ i // s // e // @@ -1364,7 +1364,7 @@ ⤿줢e /ߤ/ ⤿줢c /ߤ/ ⤿s // -⤿r /// +⤿r //;ߤ/ ⤿g /ڬ/ ⤸ޤi /ʸְ/ ⤸k /ʸ/ @@ -1374,14 +1374,14 @@ ⤸r // ⤸n // ⤸c // -⤷m /㤷/ -⤷k /㤷/ +⤷m /㤷;/ +⤷k /㤷;/ ⤰ꤳn // ⤰ꤳm // -⤰t //ߪ/߫/ -⤰r //ߪ/߫/ -⤰n //ߪ/߫/ -⤰c //ߪ/߫/ +⤰t //ߪ;1/߫;2/ +⤰r //ߪ;1/߫;2/ +⤰n //ߪ;1/߫;2/ +⤰c //ߪ;1/߫;2/ ⤯n // ⤯m // ⤯s /// @@ -1407,8 +1407,8 @@ ⤨r /dz/ ⤨n /dz/ ⤨c /dz/ -⤨t /dzΩ/˨Ω/ -⤨c /dzΩ/˨Ω/ +⤨t /dzΩ/˨Ω;˨Ω/ +⤨c /dzΩ/˨Ω;˨Ω/ ⤨t /dz/ ⤨r /dz/ ⤨n /dz/ @@ -1446,10 +1446,10 @@ ⤦n /// ⤦m /// ⤦n // -⤦t /// -⤦r //// -⤦n /// -⤦c /// +⤦t /;-// +⤦r /;-ޤ/;-// +⤦n /;-// +⤦c /;-// ⤦k // ⤦r /// ⤦s // @@ -1458,14 +1458,14 @@ ⤦s // ⤦k /// ⤦d // -y /dz/˨// -t /////ϳ// +y /dz/˨/;˨פΰλ(̾Ѵ)/ +t ////;(ݻ) Τݤʤ NB:֤tפƱ/ϳ;(:)/;(:ƾĤ)/ s //dz// -r //ϳ/// -n ///ϳ// +r //ϳ;(:)/;(:ƾĤ)/;-/ +n ///ϳ;(:)/;(:ƾĤ)/ m // -e /dz/˨// -c ////ϳ// +e /dz/˨;(sprout) ꤬˨/;˨פΰλ(̾Ѵ)/ +c //;(ݻ) Τݤʤ NB:֤tפƱ//ϳ;(:)/;(:ƾĤ)/ ܤs /̵/ ܤk /̵/ ܤi /̵/ @@ -1516,23 +1516,23 @@ Ǥi /ܽ/ Ǥg /ܽ/ t /ܽ/ -Ťs /// +Ťs /;첾̾/;첾̾,פΰλ/ m /ܵ/ k /// -ät /¿/å/ -än /¿/ +ät /¿;(ƻ)/å/ +än /¿;(ƻ)/ s // t /Ω/ c /Ω/ -᤺s /// +᤺s //;פΰλ/ ᤸɤr // ᤸs // ᤷϤt // ᤷϤc // -ᤷt /// -ᤷr /// -ᤷn /// -ᤷc /// +ᤷt /;/;[ʸ]ƤӴ󤻤/ +ᤷr /;/;[ʸ]ƤӴ󤻤/ +ᤷn /;/;[ʸ]ƤӴ󤻤/ +ᤷc /;/;[ʸ]ƤӴ󤻤/ ᤷĤw // ᤷĤu // ᤷĤt // @@ -1551,11 +1551,11 @@ ᤶk // ᤶi // ᤶg // -ᤶs /ܻ/ܻ/ +ᤶs /ܻ/ܻ;᥶/ ᤶm /ܳ// ᤰɤr /ܹ/ ᤰᤰt // -ᤰꤢw ////갩/ +ᤰꤢw /;-碌///갩/ ᤰꤢu ///갩/ ᤰꤢt ///갩/ ᤰꤢo ///갩/ @@ -1563,11 +1563,11 @@ ᤰꤢe ///갩/ ᤰꤢc ///갩/ ᤰt ////// -ᤰs // +ᤰs /;[ʸ]-񤤽ФǤġ/ ᤰr ////// -ᤰn //ت//////˨/ -ᤰm //˨/ت/ -ᤰk // +ᤰn //ت;ַáפε(̾Ѵ)//////˨;() =ꤰ/ +ᤰm //˨;() =ꤰ/ت;ַáפε(̾Ѵ)/ +ᤰk /;[ʸ]-񤤽ФǤġ/ ᤰc ////// ᤯줢g // ᤯k // @@ -1586,7 +1586,7 @@ ᤫn /Ѥ/ ᤫm /Ѥ/ ᤫs /ܱ/ -ᤫs // +ᤫs /;Ѥ/ ᤪs /ܲ/ ᤦr /ܰ/ ᤤ勞k /dz/ @@ -1594,12 +1594,12 @@ ᤤ夦r /µ/ ᤤt // ᤤc // -ᤤz /̿// +ᤤz /̿;(order) ĥ̿/;(inscript) Τä/ ᤤt // -ᤤs // +ᤤs /;ʤԤ٤(=¿ƻˤʤ)/ ᤤr // ᤤn // -ᤤj /̿// +ᤤj /̿;(order)/;(inscript) Τä/ ᤤc // ᤢs /ո/ ᤢs /ܿ/ @@ -1624,11 +1624,11 @@ ʤg // s /// Ȥk /̵/ -Ťt /ʰ/ +Ťt /ʰ;첾̾/ Ťs // Ťr /ʰ/ -Ťn /ʰ/ -Ťc /ʰ/ +Ťn /ʰ;첾̾/ +Ťc /ʰ;첾̾/ Ĥߤw /Ӥ߹/ Ĥߤu /Ӥ߹/ Ĥߤt /Ӥ߹/ @@ -1667,8 +1667,8 @@ हӤʤs /ľ/ हӤk // हӤi // -हn /// -हb /// +हn //;(Ǥ)ֿŤ֡/ +हb //;(Ǥ)ֿŤ֡/ षt /ۤ/ षr /ۤ/ षn /ۤ/ @@ -1679,8 +1679,8 @@ षr /Կ/ षs // षդj // -षn //// -षm //// +षn ///;šפΰλ/ +षm ///;šפΰλ/ षr // षi // षs // @@ -1688,11 +1688,11 @@ षk // षi // षg // -षt // +षt /;ӱ-/ षs /̵/ -षr /ǫ// -षn // -षc // +षr /ǫ;(rather) -/;ӱ-/ +षn /;ӱ-/ +षc /;ӱ-/ वܤn /Ť/ वܤm /Ť/ वܤ꤯w /Ť꿩/Ť/ @@ -1708,11 +1708,11 @@ वc // वs /व/ ऴt /// -ऴs /// -ऴk /// -ऴi /// -ऴg /// -ळu /// +ऴs //;NB:֤ҤiפƱ/ +ऴk //;NB:֤ҤiפƱ/ +ऴi //;NB:֤ҤiפƱ/ +ऴg //;NB:֤ҤiפƱ/ +ळu //;/ ऱʤs /ľ/ यw /// यu /// @@ -1721,7 +1721,7 @@ यo /// यn // यm // -यi /// +यi /;(:ͤؤȳ)/;(:򴫤)/ यe /// यc /// भʤt /ľ/ @@ -1761,12 +1761,12 @@ फu /// फt /// फo /// -फi //// +फi //;// फh //// -फe ///// +फe //;(Ԥ)/// फc /// t /ϻ/ -s //// +s //;˰/;=/ r /// k /// i /// @@ -1811,7 +1811,7 @@ ߤk // ߤi // ߤߤr // -ߤߤr //// +ߤߤr /;-ʤ/;-/;⼪ʤ/ ߤߤr // ߤߤs // ߤߤk // @@ -1868,27 +1868,27 @@ ߤϤm //ѻ/ ߤϤi // ߤϤr // -ߤt /ĥ/// -ߤr /ĥ/// -ߤn /ĥ// -ߤc /ĥ// +ߤt /ĥ;-ä/;-Ƥ̴/;ܤդ̯/ +ߤr /ĥ;-/;-餷/;ܤդ̯/ +ߤn /ĥ;-/;ܤդ̯/ +ߤc /ĥ;-/;ܤդ̯/ ߤΤޤr /Ȥβ/ ߤΤs // ߤΤs /ƨ/ -ߤt //̭/ -ߤr //̭/ -ߤn //̭/ +ߤt //̭;(esp.ʪ) 椬̭/ +ߤr //̭;(esp.ʪ) 椬̭/ +ߤn //̭;(esp.ʪ) 椬̭/ ߤg /ƨ/ -ߤc //̭/ +ߤc //̭;(esp.ʪ) 椬̭/ ߤͤt // ߤk /ȴ/ ߤi /ȴ/ ߤˤk /Ȥ/ ߤˤi /Ȥ/ -ߤˤs ///Ѱ/ -ߤˤk ///Ѱ/ -ߤˤi ///Ѱ/ -ߤˤg ///Ѱ/ +ߤˤs /;(ugly) /;(hard to see) ɽ/Ѱ; ⽹/ +ߤˤk /;(ugly) /;(hard to see) ɽ/Ѱ; ⽹/ +ߤˤi /;(ugly) /;(hard to see) ɽ/Ѱ; ⽹/ +ߤˤg /;(ugly) /;(hard to see) ɽ/Ѱ; ⽹/ ߤˤt /˹/ ߤˤk /˹/ ߤˤc /˹/ @@ -1908,7 +1908,7 @@ ߤʤz /Ʊ/ ߤʤj /Ʊ/ ߤʤs /ľ/ -ߤs //// +ߤs ///;-/ ߤr /// ߤg // ߤȤ᤬s /ǧ/ @@ -1925,12 +1925,12 @@ ߤȤk // ߤȤm // ߤȤs // -ߤȤs /Ʃ// -ߤt /Ǽ// -ߤr /Ǽ///Ƣ/ -ߤn /Ǽ// +ߤȤs /Ʃ/;֤̾ߤȤ-/ +ߤt /Ǽ;ǴǼ/;/ +ߤr /Ǽ;ǴǼ/;-/;/Ƣ;⸫/ +ߤn /Ǽ;ǴǼ/;/ ߤm /ǧ/ -ߤc /Ǽ// +ߤc /Ǽ;ǴǼ/;/ ߤƤt /Ƽ/ ߤƤr /Ƽ/ ߤƤn /Ƽ/ @@ -1983,10 +1983,10 @@ ߤĤe // ߤĤc // ߤĤs // -ߤĤr /դ/ +ߤĤr /դ;/ ߤs /̩/ ߤn /̩/ -ߤm ///Ż// +ߤm /;-/;-/Ż;ƻ,=ͤ/;=ͤ/ ߤk // ߤi // ߤg // @@ -1995,7 +1995,7 @@ ߤ¤n /ȶ/ ߤk /ƻ/ ߤk /ƻ/ -ߤt // +ߤt /;(̴ȴ˾)-/ ߤӤs /Ƴ/ ߤk /Ƴ/ ߤi /Ƴ/ @@ -2013,8 +2013,8 @@ ߤb // ߤ줦t // ߤm // -ߤs ////Ь/ -ߤr ///////Ь/ +ߤs ///; 夤/Ь;פε/ +ߤr //;-/;-,-/;-/;-/;夤/Ь;פε/ ߤt /Ω/ ߤs /// ߤj /»/ @@ -2039,7 +2039,7 @@ ߤc // ߤr // ߤr /ϳ/ -ߤߤs ///塹// +ߤߤs ///塹;=𡹤// ߤޤr // ߤs // ߤk /廵/ @@ -2049,7 +2049,7 @@ ߤs // ߤr /ί/ ߤk // -ߤm /并// +ߤm /并;ο并/;./ ߤs /彭/ ߤk /彭/ ߤi /彭/ @@ -2067,12 +2067,12 @@ ߤr // ߤs // ߤs /Ʃ/ -ߤt ///ߥ/ +ߤt ///ߥ;[]-ä/ ߤr /ߥ/ ߤn /ߥ/ ߤk /Ʃ/ ߤg // -ߤe /// +ߤe //;/ ߤc /ߥ/ ߤr // ߤi /ư/ @@ -2084,10 +2084,10 @@ ߤk /û/ȶ/ ߤi /û/ȶ/ ߤg /û/ȶ/ -ߤm /// -ߤk /û/ -ߤꤪk /Τ/ -ߤꤪi /Τ/ +ߤm //;ֻפε/ +ߤk /û;§(ߤi)/ +ߤꤪk /Τ;-/ +ߤꤪi /Τ;-/ ߤt // ߤr // ߤn // @@ -2128,8 +2128,8 @@ ߤi /᤭ȴ/ ߤt /᤭Ω/ ߤg /᤭/ -ߤk /// -ߤi /// +ߤk //;()-/ +ߤi //;()-/ ߤs // ߤt // ߤr // @@ -2174,10 +2174,10 @@ ߤr // ߤk // ߤs // -ߤt //̥/ -ߤr //̥// -ߤn //̥/ -ߤc //̥/ +ߤt /;(gaze) פ鷺/̥;(charm,˼Ȥ) ڤ̥/ +ߤr /;(gaze) פ鷺/̥;(charm,˼Ȥ) ڤ̥/;(income) ꤬ʤ/ +ߤn /;(gaze) פ鷺/̥;(charm,˼Ȥ) ڤ̥/ +ߤc /;(gaze) פ鷺/̥;(charm,˼Ȥ) ڤ̥/ ߤs // ߤt // ߤr // @@ -2196,27 +2196,27 @@ ߤg // ߤe // ߤc // -z /////// -y /////// -w //////// -u /////// -t //////////// -s //̥////// -r /////// -p /////// -o /////// -n //////// -m /////// -k /////// -j //////// -i /////// -h /////// -g /////// -e /////// -d /////// -c ///////// -b /////// -a /////// +z //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +y //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +w ///;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +u //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +t /;(:ƴդˤ)/;(:դɤ)//;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;() ΤĤз礯//;/;ִѡפε/ +s //̥;(attract)/;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +r //;(:ߤ錄)/;(:äȤߤ)/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +p //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +o //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +n //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(nurse) Ǥ//;(diagnose) ԤǤ/;ִѡפε/ +m //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +k //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +j ///;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +i //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +h //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +g //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +e //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +d //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +c ///;/;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +b //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ +a //;(:ߤ錄) Dz-/;(:äȤߤ) TV-/;(diagnose) ԤǤ/;(nurse) Ǥ/;ִѡפε/ ޤޤs // ޤޤn // ޤޤk // @@ -2231,14 +2231,14 @@ ޤꤳn // ޤꤳm // ޤ路r // -ޤt ////// -ޤs ///// -ޤr ////// -ޤn ////// -ޤc ////// +ޤt ///;(괬)ֲȤμ/;ֲפε/;NB:֤ᤰrפƱ/ +ޤs ////;ֲפε/ +ޤr //;(괬)ֲȤμ//;NB:֤ᤰrפƱ/;ֲפε/ +ޤn //;(괬)ֲȤμ//;NB:֤ᤰrפƱ/;ֲפε/ +ޤc //;(괬)ֲȤμ//;NB:֤ᤰrפƱ/;ֲפε/ ޤy // ޤn /ž/ -ޤm /// +ޤm /;-/;-/ ޤb /ž/ ޤs /// ޤn /// @@ -2255,14 +2255,14 @@ ޤ뤫r // ޤ뤦s /ݼ/ ޤ뤢i // -ޤs ///Ԥ// -ޤm ///Ԥ// -ޤk ///Ԥ// -ޤi ///Ԥ// +ޤs ///Ԥ;ֱߡפε(̾Ѵ)/;/ +ޤm ///Ԥ;ֱߡפε(̾Ѵ)/;/ +ޤk ///Ԥ;ֱߡפε(̾Ѵ)/;/ +ޤi ///Ԥ;ֱߡפε(̾Ѵ)/;/ ޤ褤n /¤/ ޤ褤m /¤/ ޤw // -ޤu /// +ޤu //;˷ǺܤƤޤ/ ޤt // ޤo // ޤk // @@ -2279,11 +2279,11 @@ ޤk /̵֤/ ޤi /̵֤/ ޤg /̵֤/ -ޤt //// -ޤr //// -ޤn //// -ޤc //// -ޤy // +ޤt /;(:̤褦ޤ)/;(:դ̤褦ޤ)/;(:Τޤ)/ +ޤr /;(:̤褦ޤ)/;(:դ̤褦ޤ)/;(:Τޤ)/ +ޤn /;(:̤褦ޤ)/;(:դ̤褦ޤ)/;(:Τޤ)/ +ޤc /;(:̤褦ޤ)/;(:դ̤褦ޤ)/;(:Τޤ)/ +ޤy /;¤䤫/ ޤk // ޤr // ޤe // @@ -2332,37 +2332,37 @@ ޤˤe /֤˹/ ޤˤc /֤˹/ ޤʤs /㺹/ܺ/ -ޤn //// -ޤb //// +ޤn //;ֳءפε/;ֳءפΰλ/ +ޤb //;ֳءפε/;ֳءפΰλ/ ޤɤn // ޤɤm // ޤɤk // ޤɤk // -ޤw //ؤ/ -ޤu //ؤ/ -ޤt //ؤ/ +ޤw //ؤ; ȴ/ +ޤu //ؤ; ȴ/ +ޤt //ؤ; ȴ/ ޤr /ּ/ -ޤo //ؤ/ +ޤo //ؤ; ȴ/ ޤk // -ޤi //ؤ/ +ޤi //ؤ; ȴ/ ޤh // -ޤe //ؤ/ -ޤc //ؤ/ +ޤe //ؤ; ȴ/ +ޤc //ؤ; ȴ/ ޤȤk /Ż/ ޤȤi /Ż/ ޤȤ᤬i /ޤȤ/ ޤȤϤr /Ū/ ޤȤk /Ż/ ޤȤi /Ż/ -ޤw /Ż// -ޤu /Ż// -ޤt /Ż// -ޤo /Ż// -ޤm /Ż// -ޤi /Ż// +ޤw /Ż/;/ +ޤu /Ż/;/ +ޤt /Ż/;/ +ޤo /Ż/;/ +ޤm /Ż/;λ/ +ޤi /Ż/;/ ޤh /Ż/ -ޤe /Ż// -ޤc /Ż// +ޤe /Ż/;/ +ޤc /Ż/;/ ޤs /̣/ ޤk /̣/ ޤi /̣/ @@ -2371,11 +2371,11 @@ ޤĤޤk // ޤĤr // ޤw /Ż/ -ޤt ////Ż/ -ޤr ////Ż/ -ޤn ////Ż/ +ޤt //;() NB:֤ƤޤrפƱ/;(worship) Ĥ㫤/Ż;Ż˥/ +ޤr //;(worship) Ĥ㫤/;() NB:֤ƤޤrפƱ/Ż;Ż˥/ +ޤn //;(worship) Ĥ㫤/;() NB:֤ƤޤrפƱ/Ż;Ż˥/ ޤh /Ż/ -ޤc ////Ż/ +ޤc //;(worship) Ĥ㫤/;() NB:֤ƤޤrפƱ/Ż;Ż˥/ ޤäפt // ޤäu // ޤär /ʿ/ @@ -2418,7 +2418,7 @@ ޤe /Ԥ/ ޤn /Ԥ/ ޤk /Ԥ/Լ/ -ޤs /Թ/Ԥ/ +ޤs /Թ/Ԥ;/ ޤn /Ԥ/ ޤm /Ԥ/ ޤw /Ԥ/Թ/ @@ -2431,7 +2431,7 @@ ޤs // ޤn // ޤd // -ޤs /̤/ +ޤs /̤;/ ޤk // ޤi // ޤs /٤/ @@ -2445,7 +2445,7 @@ ޤi // ޤh // ޤg // -ޤäs // +ޤäs /;-/ ޤn // ޤm // ޤk /򤼽// @@ -2476,8 +2476,8 @@ ޤh /// ޤe /// ޤc // -ޤs /// -ޤt // +ޤs /;ŷ˺ߤ餬/;ߤ/ +ޤt /;/ ޤꤢw // ޤꤢu // ޤꤢt // @@ -2489,15 +2489,15 @@ ޤr /Ϯ/ ޤn /Ϯ/ ޤc /Ϯ/ -ޤt //ͥ/ +ޤt /;(:٤Ǿ)/ͥ;(:ǽǤ)/ ޤs // -ޤr //ͥ/ -ޤn ///ͥ/ -ޤc //ͥ/ +ޤr /;(:٤Ǿ)/ͥ;(:ǽǤ)/ +ޤn //;(:٤Ǿ)/ͥ;(:ǽǤ)/ +ޤc /;(:٤Ǿ)/ͥ;(:ǽǤ)/ ޤk /¹/ -ޤu /ʶ/ -ޤs /// -ޤn //// +ޤu /ʶ;-(ʤ) ()/ +ޤs /;-䤫// +ޤn //;-/;-/ ޤb /ʤ/ ޤĤk /餱³/ ޤs /餱/ @@ -2519,10 +2519,10 @@ ޤr /ʶ/ ޤr /ų/ ޤs /// -ޤʤs /ľ/ľ/ +ޤʤs /ľ;-(New Deal)/ľ;ޥ-/ ޤk /// ޤi /// -ޤs // +ޤs /;/ ޤr // ޤe /ź/ ޤn // @@ -2535,18 +2535,18 @@ ޤ꤭r /ʤ/ ޤ꤭n /ʤ/ ޤ꤭c /ʤ/ -ޤޤs /ҡ/Ҳ//ʡ/ -ޤw /ʶ// -ޤu /ʶ// -ޤt //ʶ//۾/׾/׿/ +ޤޤs /ҡ/Ҳ//ʡ;ҡ/ +ޤw /ʶ/;/ +ޤu /ʶ/;/ +ޤt //ʶ/;/۾/׾/׿;׾פΰλ/ ޤs // -ޤr //ּ/۾/׾/׿/ -ޤo /ʶ// -ޤn //۾/׾/׿/ +ޤr //ּ/۾/׾/׿;׾פΰλ/ +ޤo /ʶ/;/ +ޤn //۾/׾/׿;׾פΰλ/ ޤi /ʶ// ޤh /ʶ/ -ޤe /ʶ// -ޤc /ʶ///۾/׾/׿/ +ޤe /ʶ/;/ +ޤc /ʶ/;//۾/׾/׿;׾פΰλ/ ޤޤw /ְ/ ޤޤu /ְ/ ޤޤt /ְ/ @@ -2580,7 +2580,7 @@ ޤn /Ǥ/ ޤc /Ǥ/ ޤt // -ޤs /Ǥ// +ޤs /Ǥ;(:ʤΤ) ֻŻǤ/;(:Ϥȴƹˤ) Ѥ/ ޤr // ޤn // ޤc // @@ -2630,28 +2630,28 @@ ޤr /񤤹/ ޤc // ޤg /񤤾// -ޤt //// -ޤr //// -ޤn //// -ޤc //// +ޤt //;/;ܤ˷ؤ/ +ޤr //;ܤ˷ؤ/;/ +ޤn //;ܤ˷ؤ/;/ +ޤc //;ܤ˷ؤ/;/ ޤs // ޤi /ֹ/ -z ///// +z //;-/// w // u // -t //// -s ////// +t ///;Ԥ롣ֲ-סֽϤ-/ +s //;(brush) ŷह//// r // o // n // -k ///////// -j //// -i //////// +k ///;Ф黵,Ũ򻵤/;(:Ĥ)򼬤/;(:Фޤ)Ť/;µ/;-/;ִפε(̾Ѵ)/ +j /;(:Ϥ礦)/;(:Ωޤ)/;(:勞)/ +i ///;Ф黵,Ũ򻵤/;(:Ĥ)򼬤//;(:Фޤ)Ť/;ִפε(̾Ѵ)/ h // g //۾/ e // d /̤/ -c //// +c ///;ؤ/ ݤk /ݤ/ ݤt /ݥ/ ݤr /ݥ/ @@ -2670,7 +2670,7 @@ ܤc /ܥ/ ܤw // ܤt // -ܤs // +ܤs /;ʤ/ ܤn // ܤm // ܤh // @@ -2686,14 +2686,14 @@ s /// r ///Ħ/ m //˫/ -k //// +k /;(:ֻҤΤ褦ˤܤäȤ) NB:֤ۤkפƱ/;(:˵)/;ԥȤ/ ۤm // ۤߤ礦z /̾Ʊ/ ۤߤ礦j /̾Ʊ/ ۤr /ܹ/ ۤɤr // ۤm // -ۤb // +ۤb /;?/ ۤŤi /ܻ/ ۤ󤹤r /ܳ/ ۤm /ܷ/ܶ/ @@ -2716,17 +2716,17 @@ ۤ줳m // ۤk /ȴ/ ۤi /ȴ/ -ۤs //Ħ/ +ۤs /;Фʪ/Ħ;ںफʩĦФ/ ۤꤹn // ۤꤹm // ۤꤵg /겼/ -ۤꤳn /Ħ///Ħ/ -ۤꤳm /Ħ///Ħ/ +ۤꤳn /Ħ;carve.̾-/;dig.ְͤ-//Ħ/ +ۤꤳm /Ħ;carve.̾-/;dig.ְͤ-//Ħ/ ۤ꤯s // ꤫ۤs // ۤꤪk /굯/ ۤꤢt // -ۤꤢg /Ħ// +ۤꤢg /Ħ;(ʩ|)-// ۤ᤿e /˫// ۤ᤿t /Ω/ ۤ᤽s //˫/˫/ @@ -2737,7 +2737,7 @@ ۤޤ줿i // ۤޤ줿g // ۤޤ줪k // -ۤr /// +ۤr //;/ ۤۤt /ĥ/ ۤۤr /ĥ/ ۤۤn /ĥ/ @@ -2749,7 +2749,7 @@ ۤr // ۤn // ۤc // -ۤΤe /м/ +ۤΤe /м;-/ ۤΤs /м/ ۤΤm /м/ ۤΤk /м/ @@ -2760,7 +2760,7 @@ ۤΤi /м/ ۤΤg /м/ ۤm /м/ -ۤk /м/¦/ +ۤk /м/¦;-(=м)/ ۤͤ䤹m // ۤͤt /ĥ/ ۤͤr /ĥ/ @@ -2789,8 +2789,8 @@ ۤɤg // ۤɤs // ۤn // -ۤk // -ۤi // +ۤk /;NB:֤kפƱ/ +ۤi /;NB:֤kפƱ/ ۤȤd // ۤȤФt // ۤȤФr // @@ -2837,10 +2837,10 @@ ۤޤs /// ۤޤn /// ۤޤd /// -ۤs // -ۤk // -ۤi /ߤ// -ۤg // +ۤs /;§(s)/ +ۤk /;§(s)/ +ۤi /ߤ;/;§(s)/ +ۤg /;§(s)/ ۤr /ݸ/ ۤn /þ/ ۤb /þ/ @@ -2855,7 +2855,7 @@ ۤc // ۤs // ۤr // -ۤr /ϯ/ۭ/ +ۤr /ϯ/ۭ;ϯפΰλ/ ۤn /¾/ ۤt /ĥ/ ۤr /ĥ/ @@ -2884,25 +2884,25 @@ ۤäƤi /ä/ ۤt // ۤs // -ۤz ///// +ۤz /;ޤ󤺤/;緯/;ɴФ/;䤺/ ۤw // -ۤt //// +ۤt /;(:Υ)/;(:⤯ꤲ)// ۤs /// -ۤr /// -ۤn //// +ۤr /;(:Υ)/;(:⤯ꤲ)/ +ۤn /;(:Υ)/;(:⤯ꤲ)// ۤm // ۤk /// ۤj //// ۤh // ۤg // -ۤc /// -t ///Ħ/ -s ////// -r //Ħ////// -n //Ħ/ -m /˫///// -e ////Ӭ/ -c //Ħ/ +ۤc /;(:Υ)/;(:⤯ꤲ)/ +t /;(dig) 򷡤//Ħ;(carve) ʩĦ/ +s ///;= (NB:ִפϲˡ)/// +r /;(dig) 򷡤/Ħ;(carve) ʩĦ/;˹///// +n /;(dig) 򷡤/Ħ;(carve) ʩĦ/ +m /˫;(:Ԥɾ)/;(:夲)/;(:˫򤢤Ƥ)/;˫פΰλ/;פε/ +e /;:Ĥ/;:礭Ф/;:ޤǤۤ/Ӭ; 㤨/ +c /;(dig) 򷡤/Ħ;(carve) ʩĦ/ ٤󤸤t /ۤΩ/ ٤z // ٤s // @@ -2931,15 +2931,15 @@ ؤs /Ѳ/ ؤz // ؤt // -ؤs ///// -ؤn /// +ؤs /;///;ѡפε/ +ؤn //;ѡפε/ ؤj // -ؤd /// +ؤd //;ѡפε/ ؤ꤯t //½/ ؤ꤯r //½/ ؤ꤯n //½/ ؤ꤯c //½/ -ؤs // +ؤs /;/ ؤᤰt /н/в// ؤᤰr /н/в// ؤᤰn /н/в// @@ -2971,23 +2971,23 @@ ؤr //ؤ/ ؤn //ؤ/ ؤc //ؤ/ -ؤn // -ؤm // +ؤn /;NB:֤mפƱ/ +ؤm /;NB:֤mפƱ/ ؤn /ʿ/ ؤg /о/ -z //// -y //// -t ///// -s ////// -r ///// -n ///// -m //// -k //// -j //// -i /// -g /// -d //// -c ///// +z /;Ф,Ф/;ַСפε/;Ф/ +y /;Ф,Ф/;Ф/;ַСפε/ +t //;Ф,Ф/;ַСפε/;Ф/ +s /;礤-礤//;Ф,Ф/;Ф/;ַСפε/ +r //;Ф,Ф/;Ф/;ַСפε/ +n /;Ф,Ф/;ַСפε//;Ф/ +m /;Ф,Ф/;Ф/;ַСפε/ +k /;Ф,Ф/;Ф/;ַСפε/ +j /;Ф,Ф/;Ф/;ַСפε/ +i /;()/;/ +g /;()/;/ +d /;Ф,Ф/;Ф/;ַСפε/ +c //;Ф,Ф/;Ф/;ַСפε/ ֤ʤt /Ǥ/֤/ ֤ʤr /֤/Ǥ/ ֤ʤn /֤/Ǥ/ @@ -2997,7 +2997,7 @@ ֤󤫤s /ʬ/ ֤s /ʬ/ ֤i // -֤꤫s /֤/ +֤꤫s /֤;Ǯ-/ ֤餵g /֤鲼/ ֤Ҥr /ʼ/ ֤t /ĥ/ @@ -3011,7 +3011,7 @@ ֤n // ֤c // ֤Ĥr /֤/ -֤äȤs /֤/Ǥ/ +֤äȤs /֤/Ǥ;/ ֤än /Ǥ/ ֤äb /Ǥ/ ֤ät /֤ä/֤ä/Ǥü/ @@ -3023,14 +3023,14 @@ ֤än /Ǥù/֤ù/ ֤äm /Ǥù/֤ù/ ֤äk /Ǥó/֤ó/ -֤s /֤/Ǥ/֥/ +֤s /֤/Ǥ;NB:֤sפƱ/֥/ ֤s /Ǥ/֥/֤/ -֤n /Ǥ/ -֤m /Ǥ/ -֤r /֥/ -֤r /֥/ +֤n /Ǥ;NB:֤mפƱ/ +֤m /Ǥ;NB:֤mפƱ/ +֤r /֥;-/ +֤r /֥;-/ ֤m /Ǥ/ -֤g /Ǥ/ +֤g /Ǥ;NB:֤gפƱ/ ֤g /Ե̣/ ֤s // ֤k // @@ -3040,8 +3040,8 @@ ֤k /ָ/ʬ// ֤i /ʬ//ָ/ ֤g /ʬ//ָ/ -t ///// -s /// +t //;NB:֤tפƱ/// +s //;(Ϣ)/ r // n // k //// @@ -3057,7 +3057,7 @@ դ󤾤꤫n /Ƨȿ/ դ󤾤꤫c /Ƨȿ/ դt /Ƨȿ/ -դr /Ƨȿ/ +դr /Ƨȿ;-,-֤/ դn /Ƨȿ/ դc /Ƨȿ/ դ󤸤t /դ/ @@ -3068,7 +3068,7 @@ դr /Ƨ/ դn /Ƨ/ դc /Ƨ/ -դs /ʱ/ +դs /ʱ;ʱ/ դ錄r // դk /ʬ/ դg /Ϥ/ @@ -3109,18 +3109,18 @@ դ뤤s /ʳ/ դ뤤t /뤤// դ뤤k /ʳ/ -դw //ʳ//// -դu /ʳ///////// -դt /ʳ///// -դs ///// -դo /ʳ///// -դm ///// -դk ///// -դi ////ʳ////// +դw //ʳ;Ϥʳ/;(generic) 򿶤/;(ȯ) Ϥ,Ӥ/;(screen) ʴ/ +դu /ʳ;Ϥʳ/;(generic) 򿶤/;(ȯ) Ϥ,Ӥ//;(screen) ʴ////;ֵפε/ +դt /ʳ;Ϥʳ/;(generic) 򿶤/;(ȯ) Ϥ,Ӥ//;(screen) ʴ/ +դs ////;ֵפε/ +դo /ʳ;Ϥʳ/;(generic) 򿶤/;(ȯ) Ϥ,Ӥ//;(screen) ʴ/ +դm ////;ֵפε/ +դk ////;ֵפε/ +դi ////ʳ;Ϥʳ/;(generic) 򿶤//;ֵפε/;(ȯ) Ϥ,Ӥ/;(screen) ʴ/ դh ////ʳ// -դg ///// -դe ///ʳ//// -դc /ʳ///// +դg ////;ֵפε/ +դe ///ʳ;Ϥʳ/;(generic) 򿶤/;(ȯ) Ϥ,Ӥ/;(screen) ʴ/ +դc /ʳ;Ϥʳ/;(generic) 򿶤/;(ȯ) Ϥ,Ӥ//;(screen) ʴ/ դb // դk /ʬ/ դn /ߤ/ @@ -3141,7 +3141,7 @@ դϤi /ʧ/ դϤe /ʧ/ դϤc /ʧ/ -դΤs /ߤ/ +դΤs /ߤ;-ƤƲ/ դk /ȴ/ȴ/ դi /ȴ/ȴ/ դg /ƨ/ @@ -3171,18 +3171,18 @@ դꤷr /ߤ/ դꤷn /ߤ/ դꤷc /ߤ/ -դꤵz // -դꤵy // -դꤵt // -դꤵs // -դꤵr // -դꤵn // -դꤵm // -դꤵk // -դꤵc // -դꤵk // -դꤳn //ߤ// -դꤳm ///ߤ/ߤ/ +դꤵz /;-нʤ/ +դꤵy /;-нʤ/ +դꤵt /;-нʤ/ +դꤵs /;-нʤ/ +դꤵr /;-нʤ/ +դꤵn /;-нʤ/ +դꤵm /;-нʤ/ +դꤵk /;-нʤ/ +դꤵc /;-нʤ/ +դꤵk /;-нʤ/ +դꤳn //ߤ;뤫㤬-// +դꤳm ///ߤ;뤫㤬-/ߤ;-/ դ꤭t // դ꤭r // դ꤭n // @@ -3196,7 +3196,7 @@ դ꤫r /// դ꤫n /// դ꤫c /// -դ꤫k /ߤ// +դ꤫k /ߤ;-/;-/ դ꤫e // դꤪs // դꤪt // @@ -3207,12 +3207,12 @@ դr // դ椭Ȥk /Թ/ դ椬r /߸/ -դs /// +դs /;/;/ դk /Ը/ դߤk /Ƨʬ/ դߤϤs /Ƨ߳/ -դߤk /Ƨȴ/Ƨߴ/ -դߤi /Ƨȴ/Ƨߴ/ +դߤk /Ƨȴ;-/Ƨߴ;ţ-/ +դߤi /Ƨȴ;-/Ƨߴ;ţ-/ դߤˤt /Ƨ/ դߤˤr /Ƨ/ դߤˤn /Ƨ/ @@ -3245,10 +3245,10 @@ դߤr /Ƨ/ դߤn /Ƨ/ դߤc /Ƨ/ -դߤr /Ƨ߹/ -դe /Ƨ/ -դk /// -դi /// +դߤr /Ƨ߹;ֱ-餹/ +դe /Ƨ;/ +դk //;㤯/ +դi //;㤯/ դФi /ʧ/ դk /ȴ/ դʤi // @@ -3294,10 +3294,10 @@ դȤr // դb // դk /Գ/ -դt //б/ +դt //б;פΰλ/ դi /·/ -դi /// -դg /// +դi //;(դʤ)/ +դg //;(դʤ)/ դm /ز/ʰ/ դb // դޤs // @@ -3318,8 +3318,8 @@ դu // դt // դo // -դi ///ݵ/ -դg //ݵ/ +դi ///ݵ;ݵ/ +դg //ݵ;ݵ/ դc // դk // դn /Ϸ/ @@ -3335,7 +3335,7 @@ դ֤s /ʡ/ դĤg /ʣ/ դy //ı/ -դs ////ʤ/ +դs /;Ӥ/;/;Ϥ/ʤ;NB:֤ĤsפƱ/ դr //ı/ դn // դm // @@ -3383,11 +3383,11 @@ դm /᤭/ դn /᤭/ դm /᤭/ -դs /᤭// +դs /᤭;(blow out)Ϲ᤭ä/;(wipe out)񤭤򿡤ä/ դm // դs /᤭/ -դk /᤭/ -դe //᤭// +դk /᤭;©-/ +դe /;βοؤ/᤭/;ؤ/ դr /᤭// դr /᤭/ դg /᤭/ @@ -3404,11 +3404,11 @@ դg // դi // դr // -դs ////߬/ -դm //߬/ -դk //߬/ -դi //߬/ -դg //߬/ +դs //; (NB:֤sפƱ)/;򹹤/߬;/ +դm //߬;/ +դk //߬;/ +դi //߬;/ +դg //߬;/ դk /ū/ դn // դm // @@ -3422,16 +3422,16 @@ դd // դr // դƤd /԰/ -y /// -t /// -s /////Ҷ// -r ///////// -n /Ƨ////// -m /Ƨ//// -k ///ʮ/Ϸ//// -i ///ʮ// -e /// -c /// +y //;(ΤμȤä)ֺ򿣤䤹/ +t //;ߤ/ +s ///;˲餹/;=դ/Ҷ// +r ///;ߤ/;椬˷Ф/; ˡ뺤/;ֿפε/;ַСפε/;/ +n /Ƨ/;Ƨ/;(Ƨ) ɹ//;ߤ/;() ߹Ԥ/ +m /Ƨ/;(Ƨ) ɹ/;() ߹Ԥ/;Ƨ/ +k /;ū᤯/;򿡤/ʮ;(burst)Фʮ/Ϸ;Ϸ/;뤬/;/;-(⹹|Ϸ)/ +i /;ū᤯/;򿡤/ʮ;(burst)Фʮ/;/ +e //;(procreate)(ǭ|⻺)/ +c //;ߤ/ Ӥܤs /˳/ Ӥܤk /˳/ Ӥܤi /˳/ @@ -3441,7 +3441,7 @@ Ӥk // Ӥi // Ӥg // -Ӥk // +Ӥk /;,ٳ,ҳ/ Ӥ礦m // Ӥ礦t // Ӥ礦c // @@ -3459,7 +3459,7 @@ Ҥk // Ҥk // Ҥi // -Ҥs /// +Ҥs /;λ// Ҥ錄r // Ҥr // Ҥɤr // @@ -3472,12 +3472,12 @@ Ҥw /// Ҥu /// Ҥt /// -Ҥs //ע///// +Ҥs //ע;ֹפε(̾Ѵ)//;μ-/// Ҥo /// -Ҥm ///ע/// -Ҥk ////ע/// -Ҥi //////ע/ -Ҥg ///Ÿ/ע/ڲ///// +Ҥm ///ע;ֹפε(̾Ѵ)/;μ-// +Ҥk ///;μ-/ע;ֹפε(̾Ѵ)/// +Ҥi ///;μ-///ע;ֹפε(̾Ѵ)/ +Ҥg //;(enlarge)/Ÿ;(ޤȤƤäΤҤ) ʹŸ/ע;ֹפε(̾Ѵ)/ڲ;ֳȡפε/;μ-///;?/ Ҥe /// Ҥc /// Ҥs /ʿ/ @@ -3485,14 +3485,14 @@ Ҥ뤹g // Ҥ뤵r /벼/ Ҥ뤵g /벼/ -Ҥ뤬t /// -Ҥ뤬s /// -Ҥ뤬r /// -Ҥ뤬n /// -Ҥ뤬c /// +Ҥ뤬t //;ݡפε(̾Ѵ)/ +Ҥ뤬s //;ݡפε(̾Ѵ)/ +Ҥ뤬r //;ݡפε(̾Ѵ)/ +Ҥ뤬n //;ݡפε(̾Ѵ)/ +Ҥ뤬c //;ݡפε(̾Ѵ)/ Ҥn // Ҥm // -Ҥs // +Ҥs /;NB:֤ۤsפƱ/ Ҥk // Ҥi // Ҥj /ʿ/ @@ -3503,9 +3503,9 @@ Ҥ餭ʤc /ľ/ Ҥ餢r /ʿ/ Ҥt /ʿ/ -Ҥk //// -Ҥi //// -Ҥb /ʿ/ +Ҥk //;Ϥ/;ؤ򷼤/ +Ҥi //;Ϥ/;ؤ򷼤/ +Ҥb /ʿ;-٤ä/ Ҥs /Ҽ/ Ҥk /Ҽ/ Ҥi /Ҽ/ @@ -3529,7 +3529,7 @@ Ҥ礦s /ɽ/ Ҥ礦k /ȴ/ Ҥ礦m /ɽ/ -Ҥ礦s /ɽ/ɾ/ +Ҥ礦s /ɽ;(manifest) ɰդɽ/ɾ;(criticise) ʤɾ/ Ҥi // Ҥ䤫s /Ǹ/ Ҥy // @@ -3542,10 +3542,10 @@ Ҥk /ɳ// Ҥi //ɳ/ ҤޤĤs // -Ҥs ///// -Ҥn /// -Ҥd /// -Ҥk /п/ +Ҥs ////;()/ +Ҥn //;()/ +Ҥd //;()/ +Ҥk /п;-,-/ ҤӤr /桳/Ҥӳ/ ҤӤ錄t // ҤӤ錄r // @@ -3565,11 +3565,11 @@ ҤͤĤs /DZ/ Ҥͤs /DZ/ Ҥͤޤs /DZ/ -Ҥt /DZ/Dz//// -Ҥr /DZ/Dz//// -Ҥn /DZ/Dz//// +Ҥt /DZ/Dz/;(age) 纬Ĥ/;DZ// +Ҥr /DZ/Dz/;(age) 纬Ĥ/;DZ// +Ҥn /DZ/Dz/;(age) 纬Ĥ/;DZ// Ҥk /DZ/ -Ҥc /DZ/Dz//// +Ҥc /DZ/Dz/;(age) 纬Ĥ/;DZ// Ҥˤt // Ҥˤr // Ҥˤn // @@ -3620,7 +3620,7 @@ ҤȤm // ҤȤɤr // ҤȤȤr // -ҤȤȤr // +ҤȤȤr /;֤̾ҤȤȤ-/ ҤȤŤi /դ/ ҤȤŤi /ͻ/ ҤȤĤk /³/ @@ -3633,14 +3633,14 @@ ҤȤe /·/ ҤȤk /͹/ ҤȤr // -ҤȤg /// +ҤȤg /;/;/ ҤȤi /ڼ/ ҤȤs /õ// ҤȤs /ͻ/ ҤȤm /͹/ͺ/ ҤȤs // ҤȤr // -ҤȤi /Ͷ/Ϳ/ +ҤȤi /Ͷ/Ϳ;-/ ҤȤi /ͷ/ ҤȤk /ʹ/ ҤȤr // @@ -3664,9 +3664,9 @@ ҤȤi /­/ ҤȤt // ҤȤr // -Ҥt ///С///1/ +Ҥt //;ְפ/С;ְפΰλ/;ְפε//1/ Ҥs //// -Ҥr //// +Ҥr /;(:ʤ)/;(:Ĥ)/;ȡפε/ Ҥm // Ҥt // Ҥr // @@ -3685,7 +3685,7 @@ Ҥät /ĥ/ĥ/ Ҥär /ĥ/ĥ/ Ҥän /ĥ/ĥ/ -Ҥäg // +Ҥäg /;ӥä-/ Ҥäc /ĥ/ĥ/ ҤäȤe // Ҥäk // @@ -3702,7 +3702,7 @@ Ҥäi /ڼ/ Ҥäe /ڼ/ Ҥäc /ڼ/ -Ҥäg ///ò/ +Ҥäg /;NB:֤gפƱ//ò/ Ҥäk /äȴ/ Ҥäi /äȴ/ ҤäŤr // @@ -3735,7 +3735,7 @@ Ҥäs // Ҥäk /ó// Ҥäi // -Ҥäe // +Ҥäe /;ؤ-/ Ҥs /ɮ/ɬ/ Ҥs // Ҥk // @@ -3763,10 +3763,10 @@ Ҥn // Ҥc // Ҥy /̩// -Ҥn //ߪ/߫// -Ҥm ///ߪ/߫/ -Ҥk /̩/// -Ҥm /й// +Ҥn //ߪ;פε1/߫;פε2/;/ +Ҥm //;/ߪ;פε1/߫;פε2/ +Ҥk /̩//;פε(̾Ѵ)/ +Ҥm /й;йˤ/;ͤդˤ/ Ҥn // Ҥm // Ҥ礦n // @@ -3776,8 +3776,8 @@ Ҥk // Ҥi // Ҥm // -Ҥi /// -Ҥg /// +Ҥi //; =Ǥ/ +Ҥg //; =Ǥ/ Ҥޤk // Ҥޤi // Ҥޤk // @@ -3786,9 +3786,9 @@ Ҥs /// Ҥr /פ/ Ҥr // -Ҥs /// -Ҥi /// -Ҥg ///// +Ҥs //;/ +Ҥi /;(trade) ̷Ƚ/;/ +Ҥg /;(trade) ̷Ƚ/;/;(crush) ȢǤ/;󤲤/ Ҥs /о/ Ҥr // Ҥg // @@ -3819,7 +3819,7 @@ Ҥk /ȴ/ Ҥi /ȴ/ Ҥg /भƨ/ -Ҥʤs /ľ/ +Ҥʤs /ľ;٤-/ Ҥr /Ƥ/ ҤȤs // Ҥt /// @@ -3840,9 +3840,9 @@ Ҥr // Ҥn // Ҥc // -Ҥi /// +Ҥi /;-()// Ҥs ///Ƥ/ -Ҥs /// +Ҥs /;-// Ҥt /Ω/Ω/ Ҥc /Ω/Ω/ Ҥޤs /// @@ -3854,7 +3854,7 @@ Ҥr // Ҥn // Ҥc // -Ҥr // +Ҥr /;/ Ҥt // Ҥr // Ҥn // @@ -3878,12 +3878,12 @@ Ҥs // Ҥe ///// Ҥs // -Ҥs /// +Ҥs //;/ Ҥr // -Ҥk //椭/ -Ҥs // +Ҥk //椭;cause/ +Ҥs /;ʸ-/ Ҥk /// -Ҥr // +Ҥr /;֤-/ Ҥs // Ҥw // Ҥu // @@ -3920,16 +3920,16 @@ Ҥb /ͷ/ Ҥg /// y // -t /// -s //// -r /// +t //;/ +s ///;-ä/ +r //;/ p // -n ///// -m /// -k ///////////̥/׼/ -i /////׼///////̥/ +n /;-ͤ,-ͤӤ/;ʤ/;-/;/ +m //;פε(̾Ѵ)/ +k //;ԥΤƤ/;ҡƦԤ/;य/;/;भ/;֤Ȥ/;ˤ򸣤/;Ф/;(attract)椫/̥;椯/׼;ơפε(̾Ѵ)/ +i //;ԥΤƤ/;ҡƦԤ/;Ф/׼;ơפε(̾Ѵ)/;य/;/;भ/;֤Ȥ/;ˤ򸣤/;(attract)椫/̥;椯/ e // -c // +c /;/ Ѥw /ʧ/ Ѥu /ʧ/ Ѥt /ʧ/ @@ -3970,7 +3970,7 @@ Фi /Ф黵// Фs /Х/ Фk // -Фi /ʧ/// +Фi /ʧ/;㱤/;ʧפε(̾Ѵ)/ Фs // Фk // Фi // @@ -3993,13 +3993,13 @@ Фc // Фn // Фm // -Фs // +Фs /;/ Фb /ϼ/ ФФs /ϼϼ/ХХ/ -Фs /ϼ/Х/ -Фk /ϼ/Х/ -Фi /ϼ/Х/ -Фg /ϼ/Х/ +Фs /ϼ;ƻ[ik(sg)]/Х/ +Фk /ϼ;ƻ[ik(sg)]/Х/ +Фi /ϼ;ƻ[ik(sg)]/Х/ +Фg /ϼ;ƻ[ik(sg)]/Х/ Фs /ϼ/ Фk /ϼ/ Фi /ϼ/ @@ -4007,12 +4007,12 @@ Фt /ϼ/ Фs /̥/ Фr //ϼ/ -Фg /ϼ/ +Фg /ϼ;ϼ/ Фs /ܶ/ Фk /ܶ/ Фi /ܶ/ Фg /ܶ/ -Фs /// +Фs /;double.̣ܤϡ/;롣ֱʤ椹/ Фk /ʬ/ Фt // t /ĥ/Ž/ @@ -4034,10 +4034,10 @@ Ϥ󤽤k /ȿ§/ Ϥ󤴤s /Ⱦ/ Ϥm // -Ϥ󤫤s /ȾĽ/ -Ϥ󤫤k /ȾĽ/ -Ϥ󤫤i /ȾĽ/ -Ϥ󤫤g /ȾĽ/ +Ϥ󤫤s /ȾĽ;̳ƻ/ +Ϥ󤫤k /ȾĽ;̳ƻ/ +Ϥ󤫤i /ȾĽ;̳ƻ/ +Ϥ󤫤g /ȾĽ;̳ƻ/ Ϥ󤨤s /ȿ/ Ϥz /Ƚ/ Ϥs /ȿ/ @@ -4051,11 +4051,11 @@ Ϥ줢g // Ϥ䤹m /յ/ Ϥm // -Ϥk //// +Ϥk ///;ڡפε(̾Ѵ)/ Ϥ錄s /ĥ/ Ϥᤰr /ĥ/ Ϥޤs /ĥ/ -ϤĤr /Žդ/ +ϤĤr /Žդ;/ Ϥm /ĥ/ Ϥk /Ž/ĥ/ Ϥi /ĥ/Ž/ @@ -4063,8 +4063,8 @@ Ϥꤿs /ĥ/Ф/ Ϥꤵs /˻/ Ϥꤵk /ĥ/ -Ϥꤳn /ĥ/Ž/Ϥ/ -Ϥꤳm /ĥ/Ž/Ϥ/ +Ϥꤳn /ĥ/Ž;paste.ֲ-/Ϥ/ +Ϥꤳm /ĥ/Ž;paste.ֲ-/Ϥ/ Ϥ꤭t /ĥ/ Ϥ꤭r /ĥ/ Ϥ꤭n /ĥ/ @@ -4104,16 +4104,16 @@ Ϥ餤m /ʧ/ʧ/ Ϥ餤m /㱤/ Ϥ餤s /ʢ/ -Ϥw /ʧ///// -Ϥu /ʧ///// -Ϥt /ʧ///// -Ϥo /ʧ///// +Ϥw /ʧ/;ʧפε(̾Ѵ)/;㱤/;ݤ/;㱤/ +Ϥu /ʧ/;㱤/;ݤ/;㱤/;ʧפε(̾Ѵ)/ +Ϥt /ʧ/;ʧפε(̾Ѵ)/;㱤/;ݤ/;㱤/ +Ϥo /ʧ/;ʧפε(̾Ѵ)/;㱤/;ݤ/;㱤/ Ϥn // Ϥm // -Ϥi /ʧ///// -Ϥh //ʧ/// -Ϥe /ʧ///// -Ϥc /ʧ///// +Ϥi /ʧ/;㱤/;ʧפε(̾Ѵ)/;ݤ/;㱤/ +Ϥh //ʧ//;ʧפε(̾Ѵ)/ +Ϥe /ʧ/;ʧפε(̾Ѵ)/;㱤/;ݤ/;㱤/ +Ϥc /ʧ/;㱤/;ݤ/;㱤/;ʧפε(̾Ѵ)/ Ϥu // Ϥs // Ϥk // @@ -4131,15 +4131,15 @@ Ϥ䤪k /ᵯ/ Ϥ䤦t // Ϥ䤤Τt /ᤤԾ/ -Ϥt /ή/// -Ϥs /®///// -Ϥr /ή/// -Ϥn /ή/// +Ϥt /ή/;/;/ +Ϥs /®;(quick)­®ס®Ż/;(early)īᤤסᤤ//;(Τ褦®)/;(ưȿϤ䤤)/ +Ϥr /ή/;/;/ +Ϥn /ή/;/;/ Ϥm //®/ -Ϥk //®/// -Ϥi //®/// -Ϥg //®/// -Ϥc /ή/// +Ϥk /;(early)īᤤסᤤ/®;(quick)­®ס®Ż/;(Τ褦®)/;(ưȿϤ䤤)/ +Ϥi /;(early)īᤤסᤤ/®;(quick)­®ס®Ż/;(Τ褦®)/;(ưȿϤ䤤)/ +Ϥg /;(early)īᤤסᤤ/®;(quick)­®ס®Ż/;(Τ褦®)/;(ưȿϤ䤤)/ +Ϥc /ή/;/;/ Ϥt /ϥ/ Ϥr /ϥ/ Ϥn /ϥ/ @@ -4201,14 +4201,14 @@ ϤФr // ϤФn // ϤФc // -Ϥn /// -Ϥm /// +Ϥn //; ˤ/ +Ϥm //; ˤ/ Ϥͤޤt /ķͲ/ Ϥͤޤr /ķͲ/ Ϥͤޤn /ķͲ/ Ϥͤޤc /ķͲ/ Ϥͤk /ͽ/ -Ϥͤär /ķͤ/ +Ϥͤär /ķͤ;-̼/ Ϥͤt /ķ/ Ϥͤs /ķ// Ϥͤr /ķ/ @@ -4251,7 +4251,7 @@ Ϥʤr // Ϥy /// Ϥt // -Ϥs //Υ// +Ϥs //Υ;(separate) ֤Υ/;(release) / Ϥr /Υ// Ϥc // Ϥm // @@ -4259,11 +4259,11 @@ ϤƤs /̤Ƥ̵/ ϤƤk /̤Ƥ̵/ ϤƤi /̤Ƥ̵/ -Ϥs /̤/ +Ϥs /̤;/ Ϥs // Ϥr // -Ϥn ///׼/ -Ϥm ///׼/ +Ϥn /;첾̾/;첾̾/׼;ơפε(̾Ѵ)/ +Ϥm /;첾̾/;첾̾/׼;ơפε(̾Ѵ)/ Ϥk /// ϤĤr // ϤĤr // @@ -4273,8 +4273,8 @@ Ϥäs /ȯ/ Ϥäs /ȯ/ Ϥäs /ȯ/ -Ϥs /ȯ// -Ϥp /դ/ +Ϥs /ȯ/;ȯפε/ +Ϥp /դ;/ Ϥr /Ϥ/ Ϥe /ȭ/ Ϥw /ȭ/ @@ -4308,11 +4308,11 @@ Ϥj /ڤ/ Ϥs // Ϥm // -Ϥs //Ѥ/ +Ϥs //Ѥ;/ Ϥs // Ϥr // -Ϥn ///׼/ -Ϥm ////׼/ +Ϥn ///׼;ơפε(̾Ѵ)/ +Ϥm ////׼;ơפε(̾Ѵ)/ Ϥk // Ϥफi /и/ Ϥꤢg /üھ/ @@ -4325,7 +4325,7 @@ Ϥr /Ѥ/ Ϥn /Ѥ/ Ϥc /Ѥ/ -Ϥm ///// +Ϥm /;(,̤и)ֽƤSKK/;()SKKϤסɱϤ/// Ϥk // Ϥi // Ϥr /ü/ @@ -4361,17 +4361,17 @@ Ϥn /ü/ Ϥk /Ȥ/ Ϥc /ü/ -Ϥt //ü//// -Ϥr ///// -Ϥn ///// -Ϥc ///// +Ϥt //ü;-()/;(ޤǤϤ)/;פΰλ/;(ˤ)/ +Ϥr //;(ˤ)/;(ޤǤϤ)/;פΰλ/ +Ϥn //;(ˤ)/;(ޤǤϤ)/;פΰλ/ +Ϥc //;(ˤ)/;(ޤǤϤ)/;פΰλ/ Ϥr // Ϥߤn /߹/ Ϥߤm /߹/ Ϥߤt /߷/ Ϥߤc /߷/ -Ϥn ////// -Ϥm ////// +Ϥn //;ⶴ/;/;ڤ뤳/;ڤ뤳/ +Ϥm //;ⶴ/;ڤ뤳/;ڤ뤳/;/ Ϥe // ϤӤs /ӽ/ ϤӤn /ӹ/ @@ -4386,18 +4386,18 @@ Ϥޤi /ޤ/ Ϥޤe /ޤ/ Ϥޤc /ޤ/ -Ϥs // +Ϥs /;/ Ϥt // Ϥc // Ϥg /Ť/ Ϥs //// -Ϥn //ү/ -Ϥm //ү/ -Ϥn /// -Ϥm /// +Ϥn //ү;/ +Ϥm //ү;/ +Ϥn //;ְפΰλ/ +Ϥm //;ְפΰλ/ Ϥr // Ϥs // -Ϥs // +Ϥs /;/ Ϥt // Ϥr // Ϥn // @@ -4408,21 +4408,21 @@ Ϥr //ü/ Ϥs /Ǥ/ Ϥe // -Ϥr /Ǥ/ +Ϥr /Ǥ;μ-餹/ Ϥs /ݤ/Ǥ/Ϥ/ -Ϥi /ݤ/ +Ϥi /ݤ;?/ Ϥt /Ǥ/ Ϥs /˴/ Ϥm /ݤ/ Ϥ줪t // Ϥ줪c // -Ϥs /// -Ϥk /// -Ϥi /// -Ϥg /// +Ϥs //;/ +Ϥk //;/ +Ϥi //;/ +Ϥg //;/ Ϥs // Ϥr // -Ϥi // +Ϥi /;-()/ Ϥꤷr /פ/ Ϥ꤫n /פ/ Ϥꤦr /̤/ @@ -4438,10 +4438,10 @@ Ϥr /Ľ/ Ϥn /Ľ/ Ϥc /Ľ/ -Ϥt //¬////Ԧ/// -Ϥr //¬//////Ԧ/ -Ϥn //¬//////Ԧ/ -Ϥc //¬//////Ԧ/ +Ϥt /;²ޤ/¬;Υ¬/;֤פ,פ餦/;Ѱ˻/;ŻŤ/Ԧ;ֿޡפε/;νŤ̤// +Ϥr /;²ޤ/¬;Υ¬/;֤פ,פ餦/;νŤ̤/;Ѱ˻/;ŻŤ//Ԧ;ֿޡפε/ +Ϥn /;²ޤ/¬;Υ¬/;֤פ,פ餦/;νŤ̤/;Ѱ˻/;ŻŤ//Ԧ;ֿޡפε/ +Ϥc /;²ޤ/¬;Υ¬/;֤פ,פ餦/;νŤ̤/;Ѱ˻/;ŻŤ//Ԧ;ֿޡפε/ Ϥt // Ϥr // Ϥn // @@ -4496,28 +4496,28 @@ Ϥm /礤/ Ϥg /礤/ Ϥt /// -Ϥs ///// +Ϥs /;(ӽ) 񹳤Ӥ/;(ѻ) ٤Ѥ/;(Ҵ) ʩҤ,ФҤ/;() ۤ/ Ϥr /// Ϥn /// Ϥc /// Ϥd /İ/ -z ///// -y ////// -w ////ҵ/ +z ////;ѡפΰλ/ +y //;ɤ䤹(=˫᤽䤹)/;ɤ䤹//;ֱɡפε(̾Ѵ)/ +w ///;/ҵ/ u //ҵ/ -t //Ž/ĥ//ҵ/ +t //Ž;(paste) ҤŽ/ĥ;ԥĥ//ҵ/ s /// -r /Ž/ĥ///ı/// +r /Ž;(paste) ҤŽ롣(饷|åƥ|URL)-/ĥ;ԥĥ롣(|ƥ|)-//;ۤ/ı;/;/; (NB:֤դrפƱ/ o //ҵ/ -n /ķ////Ž/ĥ/ +n /ķ;(ư)/;(¾ư) ťͤ/;-/;()-ͤ/Ž;(paste) ҤŽ/ĥ;ԥĥ/ m ///Ŷ/ -k //////////// -j ////// -i /////ҵ//////// -g //// -e ///////ҵ/ -d ////// -c //ҵ/Ž/ĥ/ +k ///;߸ˤ/;/;ܥ/;ݤ/;פΰλ/;֥饷Ǻ/;Ф//;ӡפε(̾Ѵ)/ +j /;(:ޤ갭)/;(:Ȥν̤)///;ѡפΰλ/ +i //;///ҵ/;ܥ/;ݤ/;פΰλ/;֥饷Ǻ/;Ф//;ꤰ(=)/ +g ///;ꤰ(=)/ +e //;(contrast)ͼۤ˱Ǥ/;(glory)ֱɤ NB:֤eפƱ/;ֱɡפε(̾Ѵ)/;ֱǡפΰλ//ҵ/ +d /////;ѡפΰλ/ +c //ҵ/Ž;(paste) ҤŽ/ĥ;ԥĥ/ b // Τt // Τr // @@ -4527,16 +4527,16 @@ Τk /߽/ Τi /߽/ Τg /߽/ -Τw //// -Τu //// -Τt //// -Τs /// -Τo //// -Τk /// -Τi ///// -Τg /// -Τe //// -Τc //// +Τw ///;ּפΰλ/ +Τu ///;ּפΰλ/ +Τt ///;ּפΰλ/ +Τs //;NB:֤ˤiפƱ/ +Τo ///;ּפΰλ/ +Τk //;NB:֤ˤiפƱ/ +Τi //;NB:֤ˤiפƱ//;ּפΰλ/ +Τg //;NB:֤ˤiפƱ/ +Τe ///;ּפΰλ/ +Τc ///;ּפΰλ/ Τޤs // Τk // ΤĤs // @@ -4557,7 +4557,7 @@ Τꤳs // Τꤳn // Τꤳm // -Τꤳe //Ķ/ +Τꤳe //Ķ;/ Τ꤯n /// Τ꤯m /// Τ꤭t // @@ -4602,17 +4602,17 @@ Τߤn /߹//ݤ߹/ Τߤm /߹//ݤ߹/ Τߤb // -Τߤs /߲/ +Τߤs /߲;-/ Τߤk // Τߤi // -Τߤk //˰/ +Τߤk /;(īޤ)-/˰;-/ Τܤm //Ф/ Τܤg /վ夻/ -Τt ////ƭ/ -Τs //վ/嵤/ -Τr ////ƭ/ -Τn ////ƭ/ -Τc ////ƭ/ +Τt /;(climb)Ф/;(ascend)//ƭ/ +Τs /;˾夻/վ;(Ϥ|)վ夻/嵤;վ夻/ +Τr /;(climb)Ф//;(ascend)/ƭ/ +Τn /;(climb)Ф//;(ascend)/ƭ/ +Τc /;(climb)Ф//;(ascend)/ƭ/ Τ٤Ĥޤs /Τ٤̵/ Τ֤s // Τ֤k // @@ -4638,25 +4638,25 @@ ΤΤr // ΤΤn // ΤΤc // -Τs // +Τs /;§(ΤΤr)/ Τm // -Τäk /ð/ -Τät /ü/§/ -Τär /ü/§/ˡ/ -Τän /ü/§/ -Τäc /ü/§/ +Τäk /ð;-(ʤʤ)/ +Τät /ü;(take over)Ҥü/§;(conform)§/ +Τär /ü;(take over)Ҥü/§;(conform)§/ˡ/ +Τän /ü;(take over)Ҥü/§;(conform)§/ +Τäc /ü;(take over)Ҥü/§;(conform)§/ Τe /ź/ Τn // Τ줸n // Τޤk /۩/ -Τw //۩/ -Τu //۩/ -Τt //۩/ -Τo //۩/ -Τi //۩/ +Τw /;(:ԤϤ餻)/۩;(:˽Ф)/ +Τu /;(:ԤϤ餻)/۩;(:˽Ф)/ +Τt /;(:ԤϤ餻)/۩;(:˽Ф)/ +Τo /;(:ԤϤ餻)/۩;(:˽Ф)/ +Τi /;(:ԤϤ餻)/۩;(:˽Ф)/ Τh //۩/ -Τe //۩/ -Τc //۩/ +Τe /;(:ԤϤ餻)/۩;(:˽Ф)/ +Τc /;(:ԤϤ餻)/۩;(:˽Ф)/ Τޤt /Τ/ Τޤr /Τ/ Τޤn /Τ/ @@ -4682,10 +4682,10 @@ Τn // Τm // Τs /// -Τn /˾// -Τm /˾// -Τk ///// -Τi ///// +Τn /˾/;(Ф) (|)פ/ +Τm /˾/;(Ф) (|)פ/ +Τk ///;/;/ +Τi ///;/;/ Τg /// Τk // Τi // @@ -4693,34 +4693,34 @@ Τs // Τ鷺k /Ĥ/ Τꤹn /Ĥ꾯/ -Τt //// -Τs //// -Τr //// -Τn //// -Τc //// +Τt //;ֻġפε// +Τs //;() ⻺䤹/;ֻġפε/ +Τr ///;ֻġפε/ +Τn ///;ֻġפε/ +Τc ///;ֻġפε/ Τt /Τȿ/Ĥȿ/ Τr /Ĥȿ/Τȿ/ Τn /Ĥȿ/Τȿ/ Τc /Ĥȿ/Τȿ/ Τm // -Τs /ƨ// -Τr /ƨ//// +Τs /ƨ/;ƨפΰλ/ +Τr /ƨ/;:ƤΤ/;:äƤΤ/;ƨפΰλ/ Τs /ǽ̵/ -t ///Ы/ -s /////Ы/ -r ////Ы/ -n ////ݻ///Ы/ -m ////ݻ/ -k ///// -i // -g /ƨ// -c ///Ы/ -b ///// +t //;˺ܤ/Ы;־פε(̾Ѵ)/ +s /;(ʪŪ)˺ܤ, (ʪ)ʸܤ//;ߤ򿭤/;/Ы;־פε(̾Ѵ)/ +r //;|˺ܤ/;뤫ȿ뤫/Ы;־פε(̾Ѵ)/ +n /;:ΤΤ/;:ޤˤΤ߲//ݻ;ְפε//;˺ܤ/Ы;־פε(̾Ѵ)/ +m /;:ΤΤ/;:ޤˤΤ߲//ݻ;ְפε/ +k /;Ωयסֲऱ NB:֤ꤾkפƱ/;(put aside)ּ/// +i /;Ωयסֲऱ NB:֤ꤾkפƱ/ +g /ƨ/;ƨפΰλ/ +c //;˺ܤ/Ы;־פε(̾Ѵ)/ +b //;ոҤ٤/;(Ū)ͽ꤬Ӥ/;Ҥ٤/ ͤФi /ǯʧ/ ͤr // ͤs /ǰ/ ͤr /ǰ/ -ͤz /ǰ// +ͤz /ǰ/;Ҥͤ/ ͤj /ǰ/ ͤz /꺮/ ͤʤs /ľ/ @@ -4740,19 +4740,19 @@ ͤi // ͤe // ͤc // -ͤ⤳r // +ͤ⤳r /;֤ͤ󤴤פθŤ/ ͤޤs /ˤ/ ͤk /ˤ/ ͤꤳn /̲/ ͤꤳm /̲/ -ͤt /̲// +ͤt /̲/;(:ۤ)/ ͤs /̲/ -ͤr /̲// -ͤn /̲// +ͤr /̲/;(:ۤ)/ +ͤn /̲/;(:ۤ)/ ͤk /̲/ ͤi /̲/ ͤg /̲/ -ͤc /̲// +ͤc /̲/;(:ۤ)/ ͤߤr // ͤޤs // ͤk /// @@ -4760,11 +4760,11 @@ ֤ͤk // ֤ͤi // ֤ͤg // -ͤt //̲/ -ͤr //̲/ -ͤn //̲/ +ͤt /;(lick) Ӥ/̲;sleep/ +ͤr /;(lick) Ӥ/̲;sleep/ +ͤn /;(lick) Ӥ/̲;sleep/ ͤm /Ƨ/ -ͤc //̲/ +ͤc /;(lick) Ӥ/̲;sleep/ ͤk /Ͱ/ ͤi /Ͱ/ ͤe // @@ -4804,7 +4804,7 @@ ͤä夦s /Ǯ/ ͤäd /Ǯ/ ͤs /Ǯ/ -ͤk // +ͤk /;/ ͤe // ͤt // ͤr // @@ -4827,7 +4827,7 @@ ͤr /स/ ͤn /स/ ͤc /स/ -ͤg /स/ +ͤg /स;Ӥ-/ ͤt /DZ// ͤr /DZ// ͤn /DZ// @@ -4845,13 +4845,13 @@ ͤm // ͤs // ͤr // -ͤw /ϫ// -ͤu /ϫ// -ͤt /ϫ// -ͤo /ϫ// -ͤi /ϫ// -ͤe /ϫ// -ͤc /ϫ// +ͤw /ϫ/;ʪǾʼϫ뤳/ +ͤu /ϫ/;ʪǾʼϫ뤳/ +ͤt /ϫ/;ʪǾʼϫ뤳/ +ͤo /ϫ/;ʪǾʼϫ뤳/ +ͤi /ϫ/;ʪǾʼϫ뤳/ +ͤe /ϫ/;ʪǾʼϫ뤳/ +ͤc /ϫ/;ʪǾʼϫ뤳/ ͤt // ͤr // ͤn // @@ -4870,14 +4870,14 @@ ͤk /ꤤ/ ͤc /ꤤ/ ͤg /ꤤ/ -ͤw /// -ͤu /// -ͤt /// -ͤo /// -ͤi /// +ͤw //;(:äˤʤΤ)/ +ͤu //;(:äˤʤΤ)/ +ͤt //;(:äˤʤΤ)/ +ͤo //;(:äˤʤΤ)/ +ͤi //;(:äˤʤΤ)/ ͤh // -ͤe /// -ͤc /// +ͤe //;(:äˤʤΤ)/ +ͤc //;(:äˤʤΤ)/ ͤk // ͤk // ͤs // @@ -4892,27 +4892,27 @@ ͤr /;// ͤk // ͤg /;/ -z //DZ/// -y /// -w /// -u /// -t ////ϣ//Ǵ/ -s /// -r ///ϣ//Ǵ// -p /// -o /// -n ////ϣ//Ǵ/ -m //// -k //// -j /DZ//// -i /// -h /// -g /// -e /// -d /// -c ///ϣ//Ǵ// -b /// -a /// +z //DZ//;ֿפε(̾Ѵ)/ +y //;ֿפε(̾Ѵ)/ +w //;ֿפε(̾Ѵ)/ +u //;ֿפε(̾Ѵ)/ +t //;Ƥ/;ֿפε(̾Ѵ)/ϣ;Ŵϣ/;/Ǵ;NB:֤ͤrפƱ/ +s //;ֿפε(̾Ѵ)/ +r //;Ƥ/ϣ;Ŵϣ/;/Ǵ;NB:֤ͤrפƱ/;ֿפε(̾Ѵ)/ +p //;ֿפε(̾Ѵ)/ +o //;ֿפε(̾Ѵ)/ +n //;ֿפε(̾Ѵ)/;Ƥ/ϣ;Ŵϣ/;/Ǵ;NB:֤ͤrפƱ/ +m ///;ֿפε(̾Ѵ)/ +k ///;ֿפε(̾Ѵ)/ +j /DZ///;ֿפε(̾Ѵ)/ +i //;ֿפε(̾Ѵ)/ +h //;ֿפε(̾Ѵ)/ +g //;ֿפε(̾Ѵ)/ +e //;ֿפε(̾Ѵ)/ +d //;ֿפε(̾Ѵ)/ +c //;Ƥ/ϣ;Ŵϣ/;/Ǵ;NB:֤ͤrפƱ/;ֿפε(̾Ѵ)/ +b //;ֿפε(̾Ѵ)/ +a //;ֿפε(̾Ѵ)/ ̤s /// ̤n // ̤m /// @@ -4920,17 +4920,17 @@ ̤i /// ̤g /// ̤k /ɤʬ/ -̤ʤs /ɤľ/ +̤ʤs /ɤľ;ɤ-/ ̤Ĥs /ɤ/ ̤k /ɤ/ ̤ꤳn /ɤ/ ̤ꤳm /ɤ/ ̤꤫m /ɤ/ ̤꤫e /ɤ// -̤t // -̤r // -̤n // -̤c // +̤t /;NB:֤rפƱ/ +̤r /;NB:֤rפƱ/ +̤n /;NB:֤rפƱ/ +̤c /;NB:֤rפƱ/ ̤Τr // ̤Τr // ̤ߤz /߸/ @@ -4950,8 +4950,8 @@ ̤ߤi /߿/ ̤ߤk /ʹ/ ̤ߤi /ʹ/ -̤n ///ݹ/ -̤m ///ݹ/ +̤n ///ݹ;פε(̾Ѵ)/ +̤m ///ݹ;פε(̾Ѵ)/ ̤z /ȴ/ ̤y /ȴ/ ̤t /ȴ/ @@ -4988,7 +4988,7 @@ ̤r /ȴ/ ̤n /ȴ/ ̤m /ȴ/ -̤Ϥt /ȴ/ +̤Ϥt /ȴ;ʪ-/ ̤Ȥs /Ӥ/ ̤t /ȴ/ ̤r /ȴ/ @@ -5026,8 +5026,8 @@ ̤n /ť߿/ ̤m /ť߿/ ̤Фk /Ư/ -̤k // -̤i // +̤k /;­-/ +̤i /;­-/ ̤r /ť߿/ ̤t /˥/˥/ ̤r /˥/˥/ @@ -5046,8 +5046,8 @@ r //Ǩ/ o /˥/ n // -k /ȴ//æ/ٶ/ -i /ȴ/æ/˥//ٶ/ +k /ȴ/;NB:֤ĤkפƱ/æ/ٶ;ȴפε(̾Ѵ)/ +i /ȴ/æ/˥/;NB:֤ĤkפƱ/ٶ;ȴפε(̾Ѵ)/ g /æ/ e /˥/ c /˥// @@ -5078,8 +5078,8 @@ ˤߤi /ˤ߹/ ˤߤe /ˤ߹/ ˤߤc /ˤ߹/ -ˤn /// -ˤm /// +ˤn //; (:äƤߤĤ)/ +ˤm //; (:äƤߤĤ)/ ˤt // ˤr // ˤn // @@ -5106,13 +5106,13 @@ ˤϤm /ѻ/ ˤk /ȴ/ ˤi /ȴ/ -ˤw /ô/ٿ/ -ˤu /ô/ٿ/ -ˤt /ô/ٿ/ -ˤo /ô/ٿ/ -ˤi /ô/ٿ/ -ˤe /ô/ٿ/ -ˤc /ô/ٿ/ +ˤw /ô/ٿ;ôפε/ +ˤu /ô/ٿ;ôפε/ +ˤt /ô/ٿ;ôפε/ +ˤo /ô/ٿ;ôפε/ +ˤi /ô/ٿ;ôפε/ +ˤe /ô/ٿ;ôפε/ +ˤc /ô/ٿ;ôפε/ ˤȤr // ˤk // ˤŤr /¤/ @@ -5158,7 +5158,7 @@ ˤn // ˤc // ˤg /ž/ -ˤy /// +ˤy //;NB:֤ʤyפƱ/ ˤn /ѹ/ ˤm /ѹ/ ˤޤt /ƨ/ @@ -5210,13 +5210,13 @@ ˤn // ˤc // ˤt // -ˤs //// +ˤs //;(hard) ͤ NB:֤iפƱ/;/ ˤr // ˤn // ˤm // -ˤk //// -ˤi //// -ˤg //// +ˤk //;(hard) ͤ NB:֤iפƱ/;/ +ˤi //;(hard) ͤ NB:֤iפƱ/;/ +ˤg //;(hard) ͤ NB:֤iפƱ/;/ ˤw // ˤu // ˤt // @@ -5234,7 +5234,7 @@ ˤr // ˤn // ˤc // -ˤr // +ˤr /;-/ ˤi // ˤ꤭t // ˤ꤭r // @@ -5245,7 +5245,7 @@ ˤߤФn // ˤߤФc // ˤˤs /졹/ -ˤs //ƨ/ +ˤs //ƨ;§(g)/ ˤr // ˤp // ˤm // @@ -5262,15 +5262,15 @@ ˤt /βΩ/ ˤt /Ω/ ˤc /Ω/ -ˤy // -ˤw /// -ˤu /// -ˤt /// +ˤy /;䤫/ +ˤw //;() / +ˤu //;() / +ˤt //;() / ˤr /ٲ/ -ˤo /// -ˤi /// -ˤe /// -ˤc /// +ˤo //;() / +ˤi /;褤/;ʽ/ +ˤe //;() / +ˤc //;() / ˤt /Ѥ/ ˤr /Ѥ/ ˤn /Ѥ/ @@ -5311,7 +5311,7 @@ j /// i /// h /// -g /ƨ//// +g /ƨ/;ƨפΰλ/// e /// d /// c /// @@ -5373,29 +5373,29 @@ ʤӤe /¤Ӵ/ ʤk // ʤ餤e // -ʤw ///// -ʤu //// -ʤt //// +ʤw ///;imitate.ͤ臘/; ⽬/ +ʤu //;imitate.ͤ臘/; ⽬/ +ʤt //;imitate.ͤ臘/; ⽬/ ʤs // -ʤo //// -ʤn ///// -ʤi //// +ʤo //;imitate.ͤ臘/; ⽬/ +ʤn //;()Ź֡/;¡פε/;(ɤŨ)ФּԤʤ/ +ʤi //;imitate.ͤ臘/; ⽬/ ʤh // -ʤe //// -ʤc //// -ʤb ///// +ʤe //;imitate.ͤ臘/; ⽬/ +ʤc //;imitate.ͤ臘/; ⽬/ +ʤb //;()Ź֡/;(ɤŨ)ФּԤʤ/;¡פε/ ʤs /̾/ ʤߤk /Ǻ¿/ -ʤn /Ǻ/ؽ/ -ʤm /Ǻ/ؽ/ +ʤn /Ǻ/ؽ;/ +ʤm /Ǻ/ؽ;/ ʤk // ʤޤs /Ӥ// ʤt /Ӥ/ ʤr /Ӥ/ ʤn /Ӥ/ ʤc /Ӥ/ -ʤĤs /Ӥ// -ʤk //Ӥ/ +ʤĤs /Ӥ;ǭߥ륯-/;ɻ-/ +ʤk /;ɻ-/Ӥ;̪-/ ʤ᤺t // ʤ᤺r // ʤ᤺n // @@ -5422,9 +5422,9 @@ ʤߤc /Ω/ ʤߤt // ʤߤc // -ʤߤt /¤ߵ/ -ʤߤr /¤ߵ/ -ʤs // +ʤߤt /¤ߵ;-붯뤿/ +ʤߤr /¤ߵ;-붯뤿/ +ʤs /;/ ʤޤ䤵s // ʤޤk // ʤޤs // @@ -5452,27 +5452,27 @@ ʤޤk /// ʤޤi /// ʤޤg /// -ʤޤr // +ʤޤr /;̾(-)/ ʤޤk // ʤޤk /̾/ ʤޤk /̾/ ʤޤk // -ʤt //// +ʤt /;ȯ¤/;Ӥߤ/;¡פΰλ/ ʤs // -ʤr //// -ʤn ///// +ʤr /;Ӥߤ/;ȯ¤/;¡פΰλ/ +ʤn /;Ӥߤ/;ȯ¤/;¡פΰλ// ʤm // ʤk /// ʤd // -ʤc //// +ʤc /;Ӥߤ/;ȯ¤/;¡פΰλ/ ʤs //ľ/ -ʤt /¤/ -ʤ֤ꤴs /ˤ껦/ +ʤt /¤;/ +ʤ֤ꤴs /ˤ껦;-/ ʤ֤ꤳs /ˤ껦/ -ʤt /// -ʤr /// -ʤn /// -ʤc /// +ʤt //; =ˤ/ +ʤr //; =ˤ/ +ʤn //; =ˤ/ +ʤc //; =ˤ/ ʤk // ʤi // ʤΤz /̾/ @@ -5484,11 +5484,11 @@ ʤΤm /̾/ ʤΤk /̾/ ʤΤc /̾/ -ʤt /̾/̾/̾/ -ʤr /̾/̾/̾/ -ʤn /̾/̾/̾/ -ʤm // -ʤc /̾/̾/̾/ +ʤt /̾/̾;/̾;=̾/ +ʤr /̾/̾;=̾/̾;/ +ʤn /̾/̾;=̾/̾;/ +ʤm /;[ʸ]/ +ʤc /̾/̾;=̾/̾;/ ʤˤҤt // ʤˤϤƤk /ٮ/ ʤˤϤƤi /ٮ/ @@ -5520,15 +5520,15 @@ ʤǤn /ǻ/ ʤǤc /ǻ/ ʤǤg /Ǿ/ -ʤŤt /̾դ/ +ʤŤt /̾դ;/ ʤn /ť/ ʤm /ť/ ʤk /̾/ ʤĤ䤹m /Ƶ/ ʤĤk /Ƹ/ ʤĤޤr /ƺ/ -ʤĤs /// -ʤk /// +ʤĤs //;ֲפε(̾Ѵ)/ +ʤk //;ֲפε(̾Ѵ)/ ʤäȤk /Ǽĺ/ ʤäȤi /Ǽĺ/ ʤäȤt /Ǽ/ @@ -5543,24 +5543,24 @@ ʤi /̾/ ʤg /̾/ ʤt /̾Ω/ -ʤr /// +ʤr //;(롣)/ ʤm /ͨ/ -ʤu ///// -ʤh ///// -ʤe //// +ʤu ///;ֽפά/;ֽפΰλ/ +ʤh ///;ֽפά/;ֽפΰλ/ +ʤe ///;ֽפά/ ʤk // ʤk // ʤm // ʤn // -ʤu ///// -ʤh ///// +ʤu ///;ֽפά/;ֽפΰλ/ +ʤh ///;ֽפά/;ֽפΰλ/ ʤn /ť/ ʤm /ť/ -ʤk // -ʤt // -ʤr // -ʤn // -ʤc // +ʤk /;NB:֤kס֤kפƱ/ +ʤt /;NB:֤rס֤rפƱ/ +ʤr /;NB:֤rס֤rפƱ/ +ʤn /;NB:֤rס֤rפƱ/ +ʤc /;NB:֤rס֤rפƱ/ ʤߤ֤s /߿/ ʤߤ֤k /߿/ ʤߤ֤i /߿/ @@ -5594,7 +5594,7 @@ ʤr // ʤk // ʤꤪs /̾/ -ʤk /¤/ +ʤk /¤;/ ʤy // ʤr /̾/ ʤn // @@ -5607,7 +5607,7 @@ ʤr /ꤲ/ ʤk /ꤲ/ ʤs /ꤲ/ -ʤt /ꤲ/ +ʤt /ꤲ;֥ƥӤ뤫ꤲΤƤ/ ʤn /ꤲ// ʤm /ꤲ// ʤs /ò/ @@ -5615,8 +5615,8 @@ ʤk /ꤲ/ ʤt /ꤲ/ ʤr /ꤲ/ -ʤt //ڳ/ -ʤc //ڳ/ +ʤt //ڳ;Ƥ/ +ʤc //ڳ;Ƥ/ ʤr /ꤲ/ ʤw /ꤲ/ ʤu /ꤲ/ @@ -5626,10 +5626,10 @@ ʤg /ꤲ/ ʤe /ꤲ/ ʤc /ꤲ/ -ʤk /ò/÷// -ʤi /ò/÷// +ʤk /ò/÷;ò (:ί©Ф)/; (:ͤޤ)/ +ʤi /ò/÷;ò (:ί©Ф)/; (:ͤޤ)/ ʤe /Ĺ/ -ʤr /㤱/ +ʤr /㤱;/ ʤk // ʤꤿs // ʤꤳs /껦/ @@ -5652,10 +5652,10 @@ ʤᤢc /֤/ ʤn // ʤm // -ʤt ////ڳ/ -ʤr ///ڳ// -ʤn ///ڳ// -ʤc ///ڳ// +ʤt ///;ֲפε/ڳ/ +ʤr ///ڳ/;ֲפε/ +ʤn ///ڳ/;ֲפε/ +ʤc ///ڳ/;ֲפε/ ʤk /㤯/ ʤϤw /央ʧ/ ʤϤu /央ʧ/ @@ -5685,10 +5685,10 @@ ʤt /㤭Ǩ/ ʤn /㤭/ ʤm /㤭/ -ʤt /Ĥ/㤭/ -ʤr /Ĥ/㤭/ -ʤn /Ĥ/㤭/ -ʤc /Ĥ/㤭/ +ʤt /Ĥ;ɴ夬-/㤭/ +ʤr /Ĥ;ɴ夬-/㤭/ +ʤn /Ĥ;ɴ夬-/㤭/ +ʤc /Ĥ;ɴ夬-/㤭/ ʤn /㤭/ ʤb /㤭/ ʤs /㤭/ @@ -5716,7 +5716,7 @@ ʤ줢k /ή/ ʤ줢i /ή/ ʤh /¸/ -ʤe /¸/ +ʤe /¸;-/ ʤt /Ĺ/ ʤc /Ĺ/ ʤt /įḯ/ @@ -5747,8 +5747,8 @@ ʤk /Ĺ/ ʤt /Ĺ/ ʤs /ή/Ĺ// -ʤr /ή/Ĺ///¸/ -ʤm /į/Ĺ// +ʤr /ή/Ĺ;-餯,-館//;(ư) ʹ/¸;(ʤe?)/ +ʤm /į/Ĺ/;Τ򤦤 NB:֤mפƱ/ ʤk /Ĺ// ʤi /Ĺ// ʤg /Ĺ// @@ -5767,37 +5767,37 @@ ʤm // ʤt // ʤs /没/ -ʤt // -ʤr /// +ʤt /;Ļ,ƻ,Ĺ/ +ʤr //;-/ ʤn // ʤb /Ⱦ/ ʤs // ʤt /ľ/ -ʤt /ľ// -ʤs /ľ/// -ʤr /ľ// -ʤn /ľ// -ʤc /ľ// -ʤt /̾/ +ʤt /ľ;ξ㤬ľ/;/ +ʤs /ľ;ξľ/;¤򼣤/;NB:֤sפƱ/ +ʤr /ľ;ξ㤬ľ/;/ +ʤn /ľ;ξ㤬ľ/;/ +ʤc /ľ;ξ㤬ľ/;/ +ʤt /̾;/ ʤz /ä/ ʤr // z // w // u // -t /////// -s /̵//////˴/ -r ////////// +t ////;¤//;ְ١פε(̾Ѵ)/ +s /̵/; (ֺפΰդ)/;Ӥ٤ (ֹԤפΰդ)/;Ҥ/;/;ְ١פε(̾Ѵ)/˴;(dead)⺣˴/ +r ////;¤/;줿//;Ϥ/;ʹִطˤĤƸΡ֤ʤ/;ְ١פε(̾Ѵ)/ o // -n ////// -m ////̵// -k ///˴//̵//ӭ/޸/// -i /̵///˴////ӭ/޸//// +n ///;¤//;ְ١פε(̾Ѵ)/ +m //;(:ڥȤʤ)/;(:˾褻̣򸫤)/̵;()-ߤ(=Τˤ)/;¡פε/ +k ///˴;(ʤ)˴/;(:꤫)ֺۤ򼺤/̵/;ФƵ㤯Ĥ/ӭ;㤹/޸;ޤή/;ĻĤ/;٤ǵ㤯/ +i /̵///˴;(dead)⺣˴//;䤰/;ФƵ㤯Ĥ/ӭ;㤹/޸;ޤή/;ĻĤ/;٤ǵ㤯/;央ݤ/ h // -g ////̵/ -e //// -d //̾/ -c /////// -b // +g //;䤰/;央ݤ/̵/ +e //;// +d //̾;-/ +c ////;¤//;ְ١פε(̾Ѵ)/ +b /;-٤/ ɤŤr /ɤ/ ɤm /ɤ/ ɤ󤯤s /߽/ @@ -5811,7 +5811,7 @@ ɤk /ť/ ɤi /ť/ ɤg /ť/ -ɤm //ư/ +ɤm /;ɤ᤯/ư/ ɤt // ɤr /// ɤn // @@ -5850,7 +5850,7 @@ ɤs /Ǿ/ ɤr // ɤs // -ɤs /// +ɤs //;(Ϣ) 餱̤,Ω̤,̤/ ɤr // ɤm // ɤk // @@ -5870,14 +5870,14 @@ ɤk /ư/ ɤg /ƹ/ ɤz /ư/Ʊ/ -ɤr // +ɤr /;֤̾ɤ-/ ɤj /ư/Ʊ/ ɤi /ٹ/ t //Ͽ/ s // r //Ͽ// -n ///Ͽ/ -m //α/ +n /;-//Ͽ/ +m //α;α,α,α/ k ///ͻ/ i // c //Ͽ/ @@ -5891,7 +5891,7 @@ Ȥn // Ȥc // Ȥs /ȥ/ -Ȥk /Ƣ//ȥ/ +Ȥk /Ƣ/; Ƣ/ȥ;[]/ Ȥi /ȥ/ Ȥg /ȥ/ Ȥ魯r /˺/ @@ -5933,7 +5933,7 @@ ȤΤs /ƨ/ Ȥk // Ȥg /ƨ/ -Ȥʤs /ľ/Ͽľ/ľ/ +Ȥʤs /ľ/Ͽľ;Τ-/ľ;̿-/ Ȥs /// ȤĤs /// ȤĤw /// @@ -5944,8 +5944,8 @@ ȤĤe /// ȤĤc /// ȤĤs // -Ȥk ///// -Ȥi //꼡///輡/ +Ȥk ////;᤯/ +Ȥi //꼡/;᤯//輡/ Ȥg /꼡/輡/ Ȥe // Ȥr /껶/ @@ -5953,14 +5953,14 @@ Ȥꤿt /Ω/Ω/ Ȥꤽe /·/ Ȥꤽn /»/ -Ȥꤹt // -Ȥꤹr // -Ȥꤹn // -Ȥꤹc // +Ȥꤹt /;(µ)-/ +Ȥꤹr /;(µ)-/ +Ȥꤹn /;(µ)-/ +Ȥꤹc /;(µ)-/ Ȥꤹm // Ȥꤷb /Ĵ/Ĵ/ Ȥꤷt /// -Ȥꤷr //// +Ȥꤷr ///;/ Ȥꤷn /// Ȥꤷc /// Ȥꤷt // @@ -6055,10 +6055,10 @@ Ȥn /ȥ/ Ȥc /ȥ/ Ȥ餬r /״/ -Ȥw ///ª/ +Ȥw /;콬˼/;/ª/ Ȥk /Ƣ// Ȥh //ª// -Ȥe /ª/// +Ȥe /ª;ưª/;ȿͤᤨ// ȤФk /Ư/ Ȥw /ȼ/ Ȥu /ȼ/ @@ -6072,11 +6072,11 @@ Ȥ⤰i // Ȥ⤫g // Ȥ⤨g // -Ȥt //// -Ȥs //// -Ȥr //// -Ȥn //ȼ///// -Ȥc //// +Ȥt ///;פε(̾Ѵ)/ +Ȥs ///;פε(̾Ѵ)/ +Ȥr ///;פε(̾Ѵ)/ +Ȥn //ȼ/;-///;פε(̾Ѵ)/ +Ȥc ///;פε(̾Ѵ)/ Ȥᤪk /α/ Ȥᤪi /α/ Ȥw /Ĥ/ˬ/ @@ -6086,7 +6086,7 @@ Ȥi /Ĥ/ˬ/ Ȥe /Ĥ/ˬ/ Ȥc /Ĥ/ˬ/ -Ȥn // +Ȥn /;-(ޤ)/ Ȥޤꤳn /ޤ/ Ȥޤꤳm /ޤ/ Ȥޤw // @@ -6100,7 +6100,7 @@ Ȥr ////α/ Ȥn ////α/ Ȥc ////α/ -Ȥܤi /˳/ +Ȥܤi /˳;/ Ȥs /˳// Ȥk /// Ȥۤk // @@ -6180,16 +6180,16 @@ Ȥʤꤢi /ٹ/٤/ Ȥʤꤢe /ٹ/٤/ Ȥʤꤢc /ٹ/٤/ -Ȥr /// +Ȥr //;١פΰλ/ Ȥh /// -Ȥe //// -Ȥɤk /// -Ȥɤi /// +Ȥe //;(call) ̾Τ NB:֤eפƱ/;־Ρפΰλ/ +Ȥɤk //;ֹפΰλ/ +Ȥɤi //;ֹפΰλ/ Ȥɤt // -Ȥɤt /// -Ȥɤr /// -Ȥɤn /// -Ȥɤc /// +Ȥɤt //;ڡפε(̾Ѵ)/ +Ȥɤr //;ڡפε(̾Ѵ)/ +Ȥɤn //;ڡפε(̾Ѵ)/ +Ȥɤc //;ڡפε(̾Ѵ)/ Ȥɤz /Ϥ/ Ȥɤy /Ϥ/ Ȥɤt /Ϥ/Ͻ/ @@ -6199,18 +6199,18 @@ Ȥɤm /Ϥ/ Ȥɤk /Ϥ/ Ȥɤc /Ϥ/Ͻ/ -Ȥm /α//// -Ȥk /// -Ȥi /// -ȤȤΤr // -ȤȤw //Ĵ// -ȤȤu //Ĵ// -ȤȤt //Ĵ// -ȤȤo //Ĵ// -ȤȤi //Ĵ// +Ȥm /α///;αפΰλ/ +Ȥk //;ϡפε/ +Ȥi //;ϡפε/ +ȤȤΤr /;§(ȤȤe)/ +ȤȤw //Ĵ;|̤Ĵ// +ȤȤu //Ĵ;|̤Ĵ// +ȤȤt //Ĵ;|̤Ĵ// +ȤȤo //Ĵ;|̤Ĵ// +ȤȤi //Ĵ;|̤Ĵ// ȤȤh ///Ĵ/ -ȤȤe //Ĵ// -ȤȤc //Ĵ// +ȤȤe //Ĵ;Ĵ// +ȤȤc //Ĵ;|̤Ĵ// Ȥm // Ȥi // Ȥg // @@ -6249,7 +6249,7 @@ Ȥäc /ó/ Ȥäk /ó/ Ȥäe // -Ȥk // +Ȥk /;/ Ȥe /// Ȥr // Ȥt /Ĥ/ @@ -6271,7 +6271,7 @@ Ȥs /ǯ/ Ȥi /ǯϷ/ Ȥk /ǯ/ -Ȥs /// +Ȥs //;§(z)/ ȤƤk // Ȥs /궹/ Ȥu /궹/ @@ -6294,14 +6294,14 @@ Ȥ٤n // ȤФi /ʧ/ Ȥ礦k /ħ/ -Ȥs /// -Ȥn /// +Ȥs //;ʧ-/ +Ȥn /;-/;-()/ Ȥj // Ȥd // -Ȥr /ڤ/ +Ȥr /ڤ;/ Ȥm // Ȥr /// -Ȥۤs /Ϥ/ +Ȥۤs /Ϥ;-ޤ/ Ȥs /⤭/ ȤϤt // ȤϤs // @@ -6319,7 +6319,7 @@ Ȥm // Ȥc // Ȥk /̤ȴ/ -Ȥꤹi /̤/ +Ȥꤹi /̤;?/ Ȥꤹg /̤/ Ȥꤳs /̤/ Ȥ꤬k /̤/ @@ -6332,12 +6332,12 @@ Ȥk // Ȥe // Ȥr // -Ȥk /// +Ȥk //;/ Ȥi // Ȥg // Ȥz // Ȥt //Ʃ/Ű/ -Ȥs ///Ű/Ʃ/ +Ȥs ///Ű;ʬΤŰ (NB:֤ƤsפƱ)/Ʃ;Ʃ/ Ȥr //Ʃ/Ű/ Ȥn ///Ʃ/Ű/ Ȥm // @@ -6348,48 +6348,48 @@ Ȥs /Ͽ/ Ȥu // Ȥs /º// -Ȥn /º// +Ȥn /º;(respect) ʩˡº/;(value) ¤򵮤/ Ȥk /º// Ȥi /º// Ȥg /º// -Ȥb /º// +Ȥb /º;(respect) ʩˡº/;(value) ¤򵮤/ Ȥn // Ȥg // ȤĤr // Ȥs // Ȥs // Ȥz // -Ȥt // -Ȥs /// -Ȥr // +Ȥt /;֤̾Ȥ-äơ/ +Ȥs /;֤̾Ȥ-// +Ȥr /;֤̾Ȥ-/ Ȥn // Ȥj // Ȥʤs /䤤ľ/ľ/ -Ȥm /䤤// +Ȥm /䤤;䤤ͤ᤿// Ȥs /䤤/ Ȥs /䤤/ -Ȥk /䤤// -Ȥs //䤤/ +Ȥk /䤤/;̾졦Բ/ +Ȥs //䤤;/ Ȥw /䤤// -z //// -w //ˬ/ -u ///ˬ/ -t ////Ͽ///æ////// -s // -r ///////Ͽ////æ// +z ///;ġפΰλ/ +w //ˬ;Ĺˬ/ +u ///ˬ;Ĺˬ/ +t //;Ƥ-/;̿-/Ͽ;DVD-/;(steal)-/;ͤ-/æ/;ޤ-/;ʬ-/;ش-/;(harvest)ڤ-/;(ˤȤ)/ +s /;/ +r //;̿-/;Ƥ-/;ʬ-/;ͤ-/;ޤ-,-/Ͽ;DVD-/;ش-/;(steal)-/;(harvest)ڤ-/æ; ˹Ҥ-/;(ˤȤ)/ p // -o //ˬ/ -n ///ķ////////Ͽ//////æ/ -m ////α//// -k ////ͻ////// -j //// -i //////ˬ/////// +o //ˬ;Ĺˬ/ +n /;fly//ķ;jump/;take wing/;[]-ʤ/;̿-/;Ƥ-/;ʬ-/;ͤ-/;ޤ-/Ͽ;DVD-/;ش-/;(steal)-/;(harvest)ڤ-/;(ˤȤ)/;١פε(̾Ѵ)/æ; ˹Ҥ-/ +m //;ɤޤ//α;α/;(park)֤/;١פε(̾Ѵ)/;αפΰλ/ +k /;|/;(preach)⤯/;Ϥ/ͻ;Ǯͻ//;ȱय NB:֤kפƱ/;ŴФ/;Сפΰλ/;ֲפΰλ/ +j ///;ġפΰλ/ +i //;|̩/;(preach)⤯/;򸦤/;ֲפΰλ/ˬ;Ĺˬ/;Ϥ/;ȱय NB:֤kפƱ/;ŴФ/;Сפΰλ/;Ƥᤰ (ָפ)/;⸦/ h // -g ///// -e //ˬ/ +g //;򸦤/;Ƥᤰ (ָפ)/;⸦/ +e //ˬ;Ĺˬ/ d /// -c ///////Ͽ/////æ/ -b //ķ// +c //;̿-/;Ƥ-/;ʬ-/;ͤ-/;ޤ-/Ͽ;DVD-/;ش-/;(steal)-/;(harvest)ڤ-/;(ˤȤ)/æ; ˹Ҥ-/ +b /;fly/ķ;jump/;take wing/ Ǥr // Ǥ󤲤k /Ÿȴ/ Ǥ󤲤r /Ÿ/ @@ -6513,7 +6513,7 @@ Ǥb // Ǥa // Ǥg /в/ -Ǥr /гݤ/ +Ǥr /гݤ;/ Ǥs //ǥ/ Ǥm /ǥ/ Ǥk /г/ǥ/ @@ -6602,9 +6602,9 @@ Ƥޤn /ּ/ Ƥޤc /ּ/ Ƥۤk // -Ƥr /꿶// +Ƥr /꿶/;/ ƤӤs /깭/ -ƤӤk /깭/ +ƤӤk /깭;-䤹/ ƤӤi /깭/ ƤӤe /깵/ Ƥk // @@ -6616,7 +6616,7 @@ ƤФk // ƤФi // ƤФg // -ƤФs //Υ/ +ƤФs //Υ;NB:ˤϤʤɽ/ ƤϤm // Ƥ̤s // Ƥ̤k // @@ -6678,7 +6678,7 @@ Ƥi /궯/ Ƥg /궯/ Ƥh // -Ƥe /// +Ƥe /;/;ֱ׵/ Ƥt // Ƥr // Ƥn // @@ -6692,7 +6692,7 @@ Ƥr // Ƥs /긷/ ƤȤn /Ŭ/ -Ƥs /Ŭ/Ũ/ +Ƥs /Ŭ;Ŭ/Ũ;Ũ/ Ƥn /Ū/ Ƥd /Ū/ Ƥs // @@ -6700,14 +6700,14 @@ Ƥi // Ƥg // Ƥr // -Ƥk //// +Ƥk ///;ݤ,ݤ/ Ƥr // Ƥt // Ƥs /겡/ Ƥi // Ƥc // -Ƥt // -Ƥk // +Ƥt /;-(ɥ,ˤʤ)/ +Ƥk /;κۤ褯/ Ƥs // Ƥk // Ƥi // @@ -6716,12 +6716,12 @@ Ƥs // Ƥk // Ƥ礦s // -Ƥs ///// +Ƥs /;(show) 趷褹/;Ȥ򤹤/;(correct) Ƥ/;?/ Ƥr // -Ƥs // -Ƥk /// -Ƥi /// -Ƥg // +Ƥs /;Ӥʡ/ +Ƥk /;Ӥʡ// +Ƥi /;/;Ӥʡ/ +Ƥg /;Ӥʡ/ Ƥr // Ƥs // Ƥk // @@ -6825,7 +6825,7 @@ Ĥꤢt /// Ĥꤢo /// Ĥꤢi /// -Ĥꤢg //ߤ// +Ĥꤢg /;夲/ߤ;פߤ夲// Ĥꤢe /// Ĥꤢc /// Ĥ褴s /̱/ @@ -6878,7 +6878,7 @@ Ĥg // Ĥc // Ĥߤs /Ѥ// -Ĥߤr // +Ĥߤr /;?/ Ĥߤ֤s /ῼ/ Ĥߤ֤k /ῼ/ Ĥߤ֤i /ῼ/ @@ -6918,12 +6918,12 @@ Ĥޤt /Ω/ Ĥޤc /Ω/ Ĥt // -Ĥs /// +Ĥs //;𤷤 (:ɳǰ)/ Ĥr // Ĥn //Ŧ/ٴ// Ĥm /Ŧ/ٴ// -Ĥn /// -Ĥm /// +Ĥn /;ߤ鲤/;NB:֤mפƱ/ +Ĥm /;ߤ鲤/;NB:֤mפƱ/ Ĥ֤s // Ĥ֤n // Ĥ֤d // @@ -6941,11 +6941,11 @@ Ĥ֤i /٤/ Ĥ֤e /٤/ Ĥ֤c /٤/ -Ĥt // +Ĥt /;ܤԤ/ Ĥs // -Ĥr //// -Ĥn // -Ĥc // +Ĥr //;ܤԤ/;ߤƷ/ +Ĥn /;ܤԤ/ +Ĥc /;ܤԤ/ Ĥe ///ʾ/ ĤФ᤬s // Ĥs // @@ -6965,11 +6965,11 @@ Ĥʤm /Ҥ/ Ĥʤe /Ѥ/ Ĥʤt // -Ĥʤr // -Ĥʤn // -Ĥʤc // -Ĥi //// -Ĥg //// +Ĥʤr /;§(Ĥg)/ +Ĥʤn /;§(Ĥg)/ +Ĥʤc /;§(Ĥg)/ +Ĥi ///;ַѡפε/ +Ĥg //;(Ĥ?)/;ַѡפε/ Ĥw // Ĥu // Ĥt // @@ -6980,15 +6980,15 @@ Ĥc // ĤȤᤢg /Ф/ Ĥn // -Ĥm //̳//// +Ĥm /;(exert) ڤؤ/̳;(act) ܤ̳/;(work for) Ҥ˶Ф/;ؤ (:̵򤹤)// ĤŤꤢw /֤/ -ĤŤy // +ĤŤy /;ͤϸʤ-䤫ˤ/ Ĥt // Ĥr // Ĥn // Ĥm // -Ĥk /³// -Ĥi /³// +Ĥk /³/;/ +Ĥi /³/;/ Ĥc // ĤĤߤn /߹/ ĤĤߤm /߹/ @@ -6999,15 +6999,15 @@ ĤĤߤ֤k /߿/ ĤĤߤ֤i /߿/ ĤĤߤ֤g /߿/ -ĤĤn //// -ĤĤm //// +ĤĤn /;(be prudent)ָդ򿵤/;(respect)ֶߤƿ夲/;ֿפε(̾Ѵ)/ +ĤĤm /;(be prudent)ָդ򿵤/;(respect)ֶߤƿ夲/;ֿפε(̾Ѵ)/ ĤĤs /̵/ ĤĤk /̵/ ĤĤi /̵/ ĤĤg /̵/ -Ĥs /// -Ĥn ////// -Ĥm ////// +Ĥs /;§(ĤĤm)/;§(ĤĤm)/ +Ĥn //;NB:֤ĤĤmפƱ/;Ӥ-/;[ʸ]٤/;/ +Ĥm //;NB:֤ĤĤmפƱ/;Ӥ-/;[ʸ]٤/;/ Ĥk /// Ĥi /// Ĥäs /ͤ/ @@ -7033,7 +7033,7 @@ Ĥäs /ͤ/ Ĥäk /ͤó/ Ĥäh /// -Ĥäe /// +Ĥäe //;٤/ Ĥr //ڹ/ Ĥw // Ĥu // @@ -7042,28 +7042,28 @@ Ĥi // Ĥe // Ĥc // -Ĥw //ѣ/ -Ĥu //ѣ/ -Ĥt //ѣ/ -Ĥo //ѣ/ -Ĥi //ѣ/ -Ĥe //ѣ/ -Ĥc //ѣ/ +Ĥw //ѣ;פε(̾Ѵ)/ +Ĥu //ѣ;פε(̾Ѵ)/ +Ĥt //ѣ;פε(̾Ѵ)/ +Ĥo //ѣ;פε(̾Ѵ)/ +Ĥi //ѣ;פε(̾Ѵ)/ +Ĥe //ѣ;פε(̾Ѵ)/ +Ĥc //ѣ;פε(̾Ѵ)/ Ĥs // Ĥk // Ĥi // Ĥg // Ĥk /ʹ/ Ĥi /ʹ/ -Ĥw //ѣ/ -Ĥu //ѣ/ -Ĥt //ѣ/ -Ĥo //ѣ/ -Ĥi //ѣ/ -Ĥh //ѣ/ -Ĥe //ѣ/ -Ĥc //ѣ/ -Ĥr // +Ĥw //ѣ;פε(̾Ѵ)/ +Ĥu //ѣ;פε(̾Ѵ)/ +Ĥt //ѣ;פε(̾Ѵ)/ +Ĥo //ѣ;פε(̾Ѵ)/ +Ĥi //ѣ;פε(̾Ѵ)/ +Ĥh //ѣ;פε(̾Ѵ)/ +Ĥe //ѣ;פε(̾Ѵ)/ +Ĥc //ѣ;פε(̾Ѵ)/ +Ĥr /;֤̾Ĥr/ ĤĤޤw // Ĥs /Թ/ Ĥk /Թ/ @@ -7081,7 +7081,7 @@ Ĥͤi /դ/ Ĥͤe /դ/ Ĥͤc /դ/ -ĤäѤs /դ/ +ĤäѤs /դ;ƥ-/ Ĥs /դ/ Ĥs /դ­/ Ĥn /դ/Ҥ/ @@ -7103,8 +7103,8 @@ Ĥi // Ĥe // Ĥc // -Ĥn /// -Ĥm /// +Ĥn //; (:)/ +Ĥm //; (:)/ Ĥw // Ĥu // Ĥt // @@ -7130,13 +7130,13 @@ Ĥr // Ĥn // Ĥc // -Ĥt ///¤// -Ĥs ///// -Ĥr ///¤// -Ĥn ////¤// -Ĥc ///¤// +Ĥt //;innovate/¤;fabricate/;ֺפΰλ/ +Ĥs //;ֿԡפε(̾Ѵ)/; (Ǥ) ŨӤ/;ӡפΰλ/ +Ĥr //;innovate/¤;fabricate/;ֺפΰλ/ +Ĥn ///;innovate/¤;fabricate/;ֺפΰλ/ +Ĥc //;innovate/¤;fabricate/;ֺפΰλ/ Ĥk /ʬ/ -Ĥs /Ѥ­/­/ +Ĥs /Ѥ­;ơפѤ­/­;() ­/ Ĥn /Ĥ// Ĥm /Ĥ// Ĥn // @@ -7153,7 +7153,7 @@ Ĥޤc /դŻ/ ĤФi /ʧ/ ĤϤs /ͤ/ -ĤϤm /// +ĤϤm //;?/ Ĥt /Ԥ/ Ĥk /ͤȴ/ ĤȤs /ͤ/ @@ -7200,14 +7200,14 @@ Ĥs /ͤ/ Ĥw /ͤ/դ/չ/ Ĥu /դ/չ/ -Ĥt /դ/ͤ/չ/ +Ĥt /դ;-ä/ͤ;-/չ/ Ĥo /դ/չ/ Ĥk // Ĥi /դ/չ/ Ĥg /ͤ/ Ĥe /դ/չ/ Ĥc /դ/չ/ -Ĥm // +Ĥm /;[ʸ]/ Ĥw // Ĥu // Ĥt // @@ -7277,17 +7277,17 @@ Ĥc /Ȥ/ Ĥw /Ȥ/ Ĥe /Ȥ/ -Ĥw /// -Ĥu /// -Ĥt /// +Ĥw //;(||ͷ)򸯤/ +Ĥu //;(||ͷ)򸯤/ +Ĥt //;(||ͷ)򸯤/ Ĥr // -Ĥo /// -Ĥn //«//ڼ/ -Ĥm ///ª//ڼ/ -Ĥi /// +Ĥo //;(||ͷ)򸯤/ +Ĥn //«;-ͤ NB:֤nפƱ/;Ϥ/ڼ;ڼ/ +Ĥm ///ª;-ޤ/;Ϥ/ڼ;ڼ/ +Ĥi //;(||ͷ)򸯤/ Ĥh ////// -Ĥe /////// -Ĥc /// +Ĥe //;(serve) ʤ˻Ť/;(hinder) ٤/; ٤/; ٤/;(||ͷ)򸯤/ +Ĥc //;(||ͷ)򸯤/ Ĥۤs // Ĥw /̤/ Ĥu /̤/ @@ -7298,7 +7298,7 @@ Ĥc /̤/ Ĥz // Ĥj // -Ĥs /// +Ĥs //;/ ĤƤޤt /դƲ/ ĤƤޤr /դƲ/ ĤƤޤn /դƲ/ @@ -7308,19 +7308,19 @@ Ĥn /٤/ Ĥc /٤/ Ĥy // -Ĥt //ĥ/ -Ĥn /// -Ĥe //// +Ĥt /;§(i)/ĥ/ +Ĥn /;-// +Ĥe /;˾٤/;⻺񤨤/; ٤/ Ĥd // Ĥb // -t ////ڻ/ -r /Ϣ///ڻ/ -n //Ŧ////ڻ/ -m ///Ŧ/ -k ///////////Ƶ//////// -i /////////////Ƶ///////ܦ// -g ///////ܦ// -c ///ڻ/ +t /;/;ߤ뤹//ڻ;­ڻ/ +r /Ϣ/;/;ߤ뤹/ڻ;­ڻ/ +n //Ŧ;֤Ŧ,ɡŦޤ//;/;ߤ뤹/ڻ;­ڻ/ +m ///Ŧ;֤Ŧ,ɡŦޤ/ +k //////;ϰ̤˽/;Ф/;Ǥ/;԰դפ/;᤯/Ƶ;Ƶ/;Ƥ/;פ/;ۤ/;=/;Ҥ/;ֿԡפε(̾Ѵ)/;פε/ +i ////;Ѥ/;᤯//;ϰ̤˽/;=/;Ф/;ַѡפε/;Ǥ/;԰դפ/Ƶ;Ƶ/;Ƥ/;ۤ/;פε/;ӡ/;ڤݤܤ/;ܤ̤/ܦ;(Ĥڤ)/;?/ +g /;Ѥ/;ӡ///;ڤݤܤ/;ܤ̤/ܦ;(Ĥڤ)/;ַѡפε/ +c /;/;ߤ뤹/ڻ;­ڻ/ s // g /²/ s // @@ -7336,7 +7336,7 @@ 礯Ĥt /ľܹ/ 礯Ĥk /ľܹ/ 礯Ĥc /ľܹ/ -礯n /ľ/ +礯n /ľ;-/ 礯d /ľ/ 礦हb /ij/ 礦ɤs // @@ -7353,7 +7353,7 @@ 礦g /Ĵ/ 礦s /Ģ/ 礦z /Ĺ/ -礦s /ħ/ī/Ĥ// +礦s /ħ;ħ/ī;ī/Ĥ;Ĥ/;/ 礦j /Ĺ/ 夦r /ʸ/ 夦r // @@ -7370,13 +7370,13 @@ 夦֤g /տ/ 夦k /ս/ 夦s // -夦s ////// +夦s /;annotate/;=/;(punish) 𰭤Ϥ/;(ascent) ŷ˲/;ⲭ/ m // k // 㤯Фi /ʧ/ 㤯s // 㤯m // -㤫s /㲽/ +㤫s /㲽;(ƻ)/ 㤦k // 㤤s /㿧/ 㤤p /㿧/ @@ -7435,20 +7435,20 @@ 䤴s /ƻ/ m // n // -m // +m /;̾(m)/ u // -t /// -r /// -n /// -c /// -w /// -u /// -t /// -o /// -i /// +t //;(promise) ֽȷ/ +r //;(promise) ֽȷ/ +n //;(promise) ֽȷ/ +c //;(promise) ֽȷ/ +w //;/ +u //;/ +t //;/ +o //;/ +i //;/ h /// -e /// -c /// +e //;/ +c //;/ t /ϻ/ c /ϻ/ ޤs /Ǥ/ @@ -7479,19 +7479,19 @@ i // e // c // -w /// -u /// -t /// -s //// -o /// +w //; (:ӵäƤ)/ +u //; (:ӵäƤ)/ +t //; (:ӵäƤ)/ +s //;NB:֤sפƱ// +o //; (:ӵäƤ)/ k /// -i //// +i ///; (:ӵäƤ)/ h /// g /// -e /// +e //; (:ӵäƤ)/ d // -c /// -n // +c //; (:ӵäƤ)/ +n /;/ k // s // t // @@ -7534,11 +7534,11 @@ ޤn /٤/ ޤm /٤/ ޤt /٤Ƥ/ -t /// +t //;ۡפε(̾Ѵ)/ s // -r //ί// -n /// -c /// +r //ί/;ۡפε(̾Ѵ)/ +n //;ۡפε(̾Ѵ)/ +c //;ۡפε(̾Ѵ)/ t // r // n // @@ -7548,14 +7548,14 @@ n // c // s /æ/ -k // +k /;/ äԤs /ù/ äԤk /ù/ äԤi /ù/ äԤg /ù/ k /Фȴ/ i /Фȴ/ -äѤs /Ф/ +äѤs /Ф;ƻ-/ t /Ф/ r /Ф/ n /Ф/ @@ -7573,7 +7573,7 @@ i /Ф/ e /Ф/ c /Ф/ -s // +s /;/ s // t // r // @@ -7599,7 +7599,7 @@ e // c // s // -r // +r /;(Ϣ) ݤ-,-/ ᤤɤr /̾/ ֤u /ʬ/ k // @@ -7611,9 +7611,9 @@ i // s // t /Ω// -s /// +s //;ĤĤ/ r // -m /ί/߱/ +m /ί/߱;λ/ k /// i // c /Ω/ @@ -7621,16 +7621,16 @@ 󤸤n /ñ/ 󤤤t /ñ̻/ z /ò/÷/ -n /ñ// +n /ñ/;ñפε(̾Ѵ)/ j /ò/÷/ r // m // -r //٦/ +r //٦;ֵפε(̾Ѵ)/ r // 襤s /襤̵/ 襤k /襤̵/ 襤i /襤̵/ -w // +w /;-(̭)/ n // m // k // @@ -7647,15 +7647,15 @@ 餷n /Ԥ/ 餷m /Ԥ/ 餤ޤs /⹲/ -z /­/ +z /­;/ s //Ƣ/ s /̵/ k /̵/ i /̵/ -t /// -r /// -n /// -c /// +t //;letter/ +r //;letter/ +n //;letter/ +c //;letter/ 椿w /Ƣ/ 椿u /Ƣ/ 椿t /Ƣ/ @@ -7685,7 +7685,7 @@ ᤳn /ί/ ᤳm /ί/ s // -n /// +n //;ְ١פε(̾Ѵ)/ d // s // k // @@ -7704,17 +7704,17 @@ ޤr /// ޤt // ޤr // -w /// -u /// -t /ί/߱//// +w /;(grant) ַϤ򤦡// +u //;(grant) ַϤ򤦡/ +t /ί/߱;λ//;(grant) ַϤ򤦡/;ʤ/ s // -r /ί//߱/ -o /// -n //ί//߱/ -i /// +r /ί/;ʤ/߱;λ/ +o //;(grant) ַϤ򤦡/ +n /;sometimes.-ε٤ߡ/ί/;ʤ/߱;λ/ +i //;(grant) ַϤ򤦡/ h /// -e /// -c ///ί/߱/ +e //;(grant) ַϤ򤦡/ +c //;(grant) ַϤ򤦡/ί/߱;λ/ ٤Ϥm /ٻ/ ٤Τs /ٻ/ ٤Ĥk /³/ @@ -7735,8 +7735,8 @@ ٤i // ٤w /ٹ/ ٤k /˰/ -t // -r // +t /;/ +r /;/ ֤k // դs //º/ դm //º/ @@ -7752,38 +7752,38 @@ Ӥn /ٽ/ s /ι/ Фs // -Фn /궴// -Фm /궴// +Фn /궴/;ֶ׵/ +Фm /궴/;ֶ׵/ Фt // Фr // Фn // Фc // n /«/ Ϥr /٦/ -Τs // +Τs /;/ Τߤn /߹/ Τߤm /߹/ -s ///// -n /// -m /// +s //;(:ޤ)/;(:Ф)/;ֳڡפε(̾Ѵ)/ +n //;(Ƥˤ) Ȥ/ +m //;(Ƥˤ) Ȥ/ ͤk /Ｌ// ͤr // ͤs // ͤk // ˤޤr /ë/ -ʤk /ê/ -ʤi /ê/ +ʤk /ê;-/ +ʤi /ê;-/ ʤs /Ź/ ʤs /ê/ ʤg /ê/ ɤk /é/ ɤi /é/ -t /é// +t /é/;?/ r /é/ n /é/ c /é/ h /// -e //// +e /;(ꡦ)㤨С/;()ιȤ/; (:ܶڤ)/ Ǥu // Ƥᤰt /Ωƽ/ Ƥᤰr /Ωƽ/ @@ -7794,11 +7794,11 @@ Ƥޤn // Ƥޤc // Ƥs /// -Ƥʤs /Ωľ/ľ/Ωľ/ľ/ +Ƥʤs /Ωľ;-/ľ;ӥ-/Ωľ/ľ/ ƤȤs /Ω/ ƤĤk /Ω³/ -Ƥk ///// -Ƥi /// +Ƥk /;ηդ/;Ƥ˽ͤ//;=ͤ/ +Ƥi /;Ƥ˽ͤ// Ƥt /Ω/ Ƥr /Ω/ Ƥn /Ω/ @@ -7806,13 +7806,13 @@ Ƥn /Ωƹ/ƹ/ Ƥm /Ωƹ/ƹ/ Ƥm // -Ƥt /Ω/Ĥ/ -Ƥr /Ω/Ĥ/ -Ƥn /Ω/Ĥ/ -Ƥc /Ω/Ĥ/ +Ƥt /Ω/Ĥ;Ҥ-/ +Ƥr /Ω/Ĥ;Ҥ-/ +Ƥn /Ω/Ĥ;Ҥ-/ +Ƥc /Ω/Ĥ;Ҥ-/ Ƥk /Ľ/ Ƥk /ΩƳ/ -Ƥe /Ω///Ω/ +Ƥe /Ω;Ωؤ/;Ȥؤ//Ω/ Ťh /ڸ// Ťr /ĺ/ n ///ˬ/ @@ -7823,7 +7823,7 @@ äg /º// äb /º// äs /ã/ -s /ã// +s /ã/;λ/ t /Ω/Ω/ r /Ω/Ω/ n /Ω/Ω/ @@ -7873,7 +7873,7 @@ m /Ω/Ω/ i /Ω/ n /Ω/ -m /Ω/Ω/ +m /Ω/Ω;=Ω/ k /Ωʹ/ t /Ǥ/ۤ/٣/ r /Ǥ/ۤ/٣/ @@ -7881,7 +7881,7 @@ k /Ωʹ/ i /Ωʹ/ c /Ǥ/ۤ/٣/ -r /Ω/Ω/ +r /Ω/Ω;[]stand dead/ t /Ω/ r /Ω/ n /Ω/ @@ -7900,7 +7900,7 @@ k /Ω/ i /Ω/ r /Ω/ -r /Ω夲/ +r /Ω夲;/ w /Ω/Ω/Ω/Ω/ u /Ω/Ω/Ω/Ω/ t /Ω/Ω/Ω/Ω/ @@ -7919,8 +7919,8 @@ c /ɺ/ n /ñ/ t /ľ/ -s //â//// -r /// +s //â;â/;(䤤) դ/;(Ƥ) /;(˲Ʒľ)/ +r //;/ c /ľ/ ߤn /߹/ ߤm /߹/ @@ -7935,7 +7935,7 @@ s /á/ ʤs /áľ/ Ĥs /á/ -k /á/á/ +k /á/á;/ s /á/ s /á/ s /á/ @@ -7954,26 +7954,26 @@ n /á/ c /á/ g /á/ -w //Ʈ/٥/// -u //Ʈ//٥// -t //Ʈ/٥/// -o //Ʈ//٥// -i //Ʈ/٥/// -h /٥// -e //Ʈ/٥/// -c //Ʈ//٥// +w /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/٥;פε(̾Ѵ)/;Ʈפε/;Ʈפά/ +u /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/;Ʈפά/٥;פε(̾Ѵ)/;Ʈפε/ +t /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/٥;פε(̾Ѵ)/;Ʈפε/;Ʈפά/ +o /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/;Ʈפά/٥;פε(̾Ѵ)/;Ʈפε/ +i /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/٥;פε(̾Ѵ)/;Ʈפε/;Ʈפά/ +h /٥;פε(̾Ѵ)/;Ʈפε/ +e /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/٥;פε(̾Ѵ)/;Ʈפά/;Ʈפε/ +c /;(:Ũݤ)/Ʈ;(:Ԥ礤褦)/;Ʈפά/٥;פε(̾Ѵ)/;Ʈפε/ t /ù/ r /ù/ n /ù/ c /ù/ t // r // -n ////// -m ///// -k /á// -i /á// +n ///;־פε(̾Ѵ)/;־פε2/;־פε3/ +m //;־פε(̾Ѵ)/;־פε2/;־פε3/ +k /á/;(knock)ָͤʤ/ +i /á/;(knock)ָͤʤ/ h //ù/ -e ///ù// +e ///ù;-// c // r // ͤt /Ҥ/ @@ -7987,9 +7987,9 @@ r // n // c // -w //ڸ/ -e //ڸ/ -n //ˬ// +w //ڸ;λ/ +e //ڸ;λ/ +n /;generic/ˬ;visit.ָιˬͤ/;inquire. ƻ֤ͤ/ w // u // t // @@ -7999,8 +7999,8 @@ c // r /ȿ/ k /맳/ -r // -k ///// +r /;/ +k //;(:򺹤٤)/;(:Τ٤Ƥ)/;(:ź)/ 礦u /¿/ 礦t /¿/ 礦i /¿/ @@ -8010,8 +8010,8 @@ 礦i /¿/ 礦g /¿/ 礦r /¿/ -n // -m /// +n /;(like)Ϥ/ +m /;(like)Ϥ/;(warn)ۤ/ ᤢw /Τ/ ᤢu /Τ/ ᤢt /Τ/ @@ -8021,7 +8021,7 @@ ᤢc /Τ/ s /­/ w /­/ -k /// +k //;-/ ꤿt /ԤΩ/ ꤿc /ԤΩ/ ꤯w /Ԥ궸/ @@ -8030,19 +8030,19 @@ ꤯o /Ԥ궸/ ꤯i /Ԥ궸/ ꤯c /Ԥ궸/ -ʤs /// -ʤn /// -ʤd /// +ʤs //;/ +ʤn /;// +ʤd //;/ s /ԡ// ɤr /ݲ/ -t //Ӭ/ +t //Ӭ;ʤ/ s // -r //Ӭ/ -n //Ӭ/ +r //Ӭ;ʤ/ +n //Ӭ;ʤ/ k // i // -c //Ӭ/ -b //// +c //Ӭ;ʤ/ +b /;[ʸ]-/;Ԥ/;Ԥ/ s /귫/ ꤳn /귫/ ꤳm /귫/ @@ -8053,12 +8053,12 @@ i // h /// c /귫/ -e //// +e ///;/ n // m // s // h /// -s /// +s /;/;/ r // n // m // @@ -8068,12 +8068,12 @@ c /// k /ʲ/ʲ/ m // -n /椭/// -m /椭/// +n /椭;椭ߤ//;򷰤/ +m /椭;椭ߤ//;򷰤/ s /椭/ -w /椭/ -g /椭/ -s //// +w /椭;䣤ȥ參-碌/ +g /椭;դä-/ +s //;ֹ̡פΰλ/;̻ (NB:֤䡦פȤƻȤǽϳ̵)/ i /ߤ/ w // u // @@ -8089,7 +8089,7 @@ 򤯤c // 餵s /õ/ t // -r ///ж/ +r //;/ж;/ n // c // Τm /˾/ @@ -8098,16 +8098,16 @@ n // c // m // -r // +r /;(-餹)/ g // t // s // -r /// +r //;餫/ n /// m // k // i // -g // +g /;-(Τ줿)/ c // b // s /ݤ/ݤ/ @@ -8117,11 +8117,11 @@ n /ݤ/ m /ݤ/ y /վ/ -t // +t /;֤ޤ/ s // -r ////н/ -n // -c // +r //;֤ޤ/;(ݤƻ) Ϥͤ/н;(Ѥݤ)/ +n /;֤ޤ/ +c /;֤ޤ/ ޤs /䤨̵/ ޤk /䤨̵/ ޤi /䤨̵/ @@ -8144,7 +8144,7 @@ r /䤨/ n /䤨/ c /䤨/ -z /䤨/ +z /䤨;/ n /̯/ e /Ŀ/ ؤs // @@ -8161,23 +8161,23 @@ s /б/ r // t // -s ////// +s ///;(obey)ְդΤ/;Сפε// r /ʿ/ -s /¾̵/ -k /¾̵/ -i /¾̵/ +s /¾̵;ƻ/ +k /¾̵;ƻ/ +i /¾̵;ƻ/ y // -t /Ω//////ȯ//٣//////// -s /­/ï// -r //­/Ա/ +t /Ω///;©(䤨)/;֤Ф/;ۤۤ/ȯ;ѥȯ/;/٣;٣ڤ/;(erect)ʪ֤/;Ƥ/;Ĥ/;ǡפε/;ȯפε/;ַСפε/;?/ +s /­/ï;-/;ãפΰλ/ +r //­/Ա;ֿפε/ n /¾/­/ -m //ί////߱/ -k //ʲ/Ĺ/// -i //ʲ// +m /;(ͭʪ) /ί/;(rectify) ʤ򶺤///߱;ίפΰλ/ +k /;Ӥ椯/ʲ;Ϥʲ/Ĺ;ݤĹ/;򷰤/;Ĺ/ +i /;Ӥ椯/ʲ;Ϥʲ/;򷰤/ h /¾/// -e //// -c /Ω///////ȯ//٣////­/ -b //// +e ///;(ͤ) ˴ʤ/ +c /Ω//;֤Ф//;ǡפε/;©(䤨)/;ۤۤ/ȯ;ѥȯ/;/٣;٣ڤ//;ȯפε/;ַСפε/­/ +b //;[ʸ](йԻ)/;[ʸ](йԻ)/ 󤸤g /¸/ z /¸/ j /¸/ @@ -8234,13 +8234,13 @@ k /ʬ/ʬ/ k /ȴ/ i /ȴ/ -ʤs /ľ/ +ʤs /ľ;ʬο-/ s // ᤳn // ᤳm // ᤢg // -k /// -i /// +k //;revolt/ +i //;revolt/ ܤt /ܹ/ ܤr /ܹ/ ܤn /ܹ/ @@ -8256,7 +8256,7 @@ ʤk // w /// h //// -e //// +e /;(offer) ʪ/;(prepare) Ͽ̤/;/ Ȥk // Ȥޤr // Ȥk // @@ -8267,26 +8267,26 @@ äk /Ǥõ̵/ äi /Ǥõ̵/ Ƥg /ƾ/ -t /// +t //;ְפΰλ/ r /­/ -c /// -r /̡/ +c //;ְפΰλ/ +r /̡;-/ ꤿt /Ω/Ω/ ꤿc /Ω/Ω/ Фt // Фr // Фn // Фc // -Τs /// +Τs //; =/ n // m // -i ///// -g ///// +i //;(=g)ֱ̾-(cf.㿫)/;(=g)֥󥹤-/;/ +g //;/;(=g)֥󥹤-/;(=g)ֱ̾-(cf.㿫)/ t /ȿΩ/ -t ////// -r //////// -n ////// -c ////// +t /;:Ф/;:Ωơ/;:Ԥ䤤/;:𤲸٤// +r /;:Ф/;:Ωơ/;ƻ//;:Ԥ䤤/;:𤲸٤// +n /;:Ф/;:Ωơ/;:Ԥ䤤/;:𤲸٤// +c /;:Ф/;:Ωơ/;:Ԥ䤤/;:𤲸٤// e // k /ȴ/ w /»// @@ -8311,7 +8311,7 @@ i // e // c // -s /¨/§/¥/ +s /¨;(¨) ¾¨/§;(§) ˡ§/¥;(¥) ȿʤ¥/ t /冷/ r /冷/ n /冷/ @@ -8337,26 +8337,26 @@ c /Ω/ r // z // -s //// -n // +s /;դסָդ/;ָƤ𤹤// +n /;ݵ/ j // -d // +d /;ݵ/ g /ź/ n /ư/ -w //ź// -u //ź// -t //ź//ȿ// +w /;(go along) ƻ˱褦/ź;ź// +u /;(go along) ƻ˱褦/ź;ź// +t /;(go along) ƻ˱褦/ź;ź/;(shave)ɦ/ȿ;(curve)Ĥȿ// s // -r ///ȿ/¶/ -o //ź// -n /¶///ȿ/ -m /// -i //ź//// +r /;(shave)ɦ/;(stray)ä/ȿ;(curve)Ĥȿ/¶;-/ +o /;(go along) ƻ˱褦/ź;ź// +n /¶//;(shave)ɦ/ȿ;(curve)Ĥȿ/ +m //;Τ/ +i /;(go along) ƻ˱褦/ź;ź//// h //ź// g /// -e /ź/// +e /ź;ź/;(go along) ƻ˱褦// d // -c //ź///ȿ/ +c /;(go along) ƻ˱褦/ź;ź//;(shave)ɦ/ȿ;(curve)Ĥȿ/ t /Ω/ k // Ҥk /ʹ/ @@ -8379,7 +8379,7 @@ g /̵/ 󤿤Фm // 󤿤s // -󤾤r //ĵ/ +󤾤r //ĵ;NB:¿֤פȤ/ 󤸤m // 󤵤s // 󤵤n // @@ -8388,12 +8388,12 @@ 󤫤k /̵/ 󤫤i /̵/ 󤫤g /̵/ -z //// -s //Ѩ// +z /;(consider)-ˡ/;(boil)// +s /;(declare)ֳ̿뤹/Ѩ;(ose)ֲѨ// j /// 鷺k /ù/ s /˻/ -k // +k /;ζ꾡/ s // ꤫t /꾡/ ꤫c /꾡/ @@ -8415,8 +8415,8 @@ Τc // k /ȴ/ i /ȴ/ -Ĥk /³/դ³/ -᤿t /Ω/դΩ/ +Ĥk /³;򹶤³/դ³;Ԥդ³/ +᤿t /Ω;Ũ򹶤ΩƤ/դΩ;ԤդΩƤ/ ᤵn /դ/ ᤵm /դ/ ᤳs /դỦ/ @@ -8433,7 +8433,7 @@ ᤭r // ᤭n // ᤭c // -ᤪs //դ/ +ᤪs //դ;/ ᤪt // ᤤt // ᤤr // @@ -8441,14 +8441,14 @@ ᤤc // ᤢn // ᤢm // -ᤢw //դ/ -ᤢu //դ/ -ᤢt //դ/ -ᤢo //դ/ -ᤢi //դ/ -ᤢe //դ/ -ᤢc //դ/ -r // +ᤢw /;Ϥ-/դ;Ԥ-/ +ᤢu /;Ϥ-/դ;Ԥ-/ +ᤢt /;Ϥ-/դ;Ԥ-/ +ᤢo /;Ϥ-/դ;Ԥ-/ +ᤢi /;Ϥ-/դ;Ԥ-/ +ᤢe /;Ϥ-/դ;Ԥ-/ +ᤢc /;Ϥ-/դ;Ԥ-/ +r /;/ i // g // ޤꤳz // @@ -8470,27 +8470,27 @@ ޤg // ޤs // t //ɯ/ -s /// +s //;ֶפε(̾Ѵ)/ r //ɯ/ n //ɯ/ -m /// -k /// -i /// -g /// +m //;ֶפε(̾Ѵ)/ +k //;ֶפε(̾Ѵ)/ +i //;ֶפε(̾Ѵ)/ +g //;ֶפε(̾Ѵ)/ c //ɯ/ m /Ƨ/ -m /// +m //;ֶפε(̾Ѵ)/ s /˻/ b /ؿ/ ʤw // Ĥᤤɤr // Ĥᤤs // Ĥs /³/ -s // -n // +s /;/ +n /;/ k // i // -d // +d /;/ äѤĤt /ڱ/ äѤĤr /ڱ/ äѤĤn /ڱ/ @@ -8551,18 +8551,18 @@ k // s // n // -s ///// -n // -z // -y // -t //// -r //// -n //// -m /// -k ///// -i ///// +s /;(control) /;(conquer) ࿤/;(produce) ޤ// +n /;ʤ/ +z /;do/ +y /;do/ +t ///; =/ +r ///; =/ +n ///; =/ +m /;(attack)Ũ򹶤/;(blame)Ԥդ/ +k ///;=ɤ/;=᤯/ +i ///;=ɤ/;=᤯/ g // -c //// +c ///; =/ r // 줳n // 줳m // @@ -8590,10 +8590,10 @@ r /޼/ k /Ƭ/ s /ޡ/ -s // +s /;Ф-()/ r // -m ///߻/ -k //// +m ///߻;ֺѡפε/ +k //;(Ϣ) Ԥ,ǼԤ,¾ͿԤ/;֤̾k/ m // ʤs /¤ľ/ ꤳn /¤/ @@ -8620,32 +8620,32 @@ k // i // g // -t /// -r /// -n /// -c /// +t //;/ +r //;/ +n //;/ +c //;/ k /// i /// t /긺/ r /긺/ n /긺/ c /긺/ -k /ȴ/ȴ/ȴ/ٶ/ -i /ȴ/ȴ/ȴ/ٶ/ +k /ȴ/ȴ/ȴ/ٶ;/ +i /ȴ/ȴ/ȴ/ٶ;/ Ĥs //// -k // -ꤳn ///// -ꤳm ///// -꤯k /ڧ/ڧ/ -꤯i /ڧ/ڧ/ -꤭t //// -꤭r //// -꤭n //// -꤭c //// +k /;NB:֤kס֤ʤkפƱ/ +ꤳn /;(imprint) Ϲޤ/;(rub into) Ѥ/;// +ꤳm /;(imprint) Ϲޤ/;(rub into) Ѥ/;// +꤯k /ڧ;ֺա׵/ڧ/ +꤯i /ڧ/ڧ;ֺա׵/ +꤭t ///;/ +꤭r ///;/ +꤭n ///;/ +꤭c ///;/ ꤫r /ۤ/ ꤫w /ۤ/ ꤫e ///ۤ/ -ꤢs /// +ꤢs /;ΰƤ-/;=碌/ ꤢw /// ꤢg // k /Ǿ/ @@ -8656,7 +8656,7 @@ ߤ錄c // ߤk /ʬ/ʬ/ ߤk /ú/ -ߤs // +ߤs /;-ä/ ߤr /ߴ// ߤk // ߤi // @@ -8668,9 +8668,9 @@ ߤn // ߤc // y /®/ -u // -i // -h // +u /;/ +i /;/ +h /;/ n // m // ٤m // @@ -8680,10 +8680,10 @@ ٤ꤪt // ٤ꤪc // ٤k // -t ////// -r /// -n /// -c /// +t ////;פε/;()/ +r //;()/ +n //;()/ +c //;()/ r /ǿ/ Фs // Фs // @@ -8718,7 +8718,7 @@ Ƥg /Τ/ Ƥk /Τ/ Ƥi /Τ/ -r /Τ/ +r /Τ;/ k // äݤk /äȴ/ äѤk /Ǥȴ/äȴ/åȴ/ @@ -8728,18 +8728,18 @@ äb //Ǥ/ t /Ω/ c /Ω/ -t ///צ/ -r ///צ/ -n ///צ/ -c ///צ/ +t //;NB:֤rפƱ/צ;ѡפε/ +r //;NB:֤rפƱ/צ;ѡפε/ +n //;NB:֤rפƱ/צ;ѡפε/ +c //;NB:֤rפƱ/צ;ѡפε/ k /ʬ/ r // r // y // -s /// +s //;áפε(̾Ѵ)/ r /̡/ -n /// -m /// +n //;áפε(̾Ѵ)/ +m //;áפε(̾Ѵ)/ k /ӵ/ i /ӵ/ ꤳn /ӵ/ @@ -8753,12 +8753,12 @@ t /ӵ/ r /ӵ/ n //ӵ/ -m /////Ұ/ +m //;(advise) αؤ򴫤/;(recommend) ܤ/;(encourage) ٳؤ򾩤/Ұ;ִפε/ k // -i ////ӳ/ -g ////ӳ/ +i /;ʪ-/;-/;Ѥ-/ӳ; / +g /;ʪ-/;-/;Ѥ-/ӳ; / c /ӵ/ -b // +b /;ܤϧ/ i /ڰ/ ͤr /ڶ/ i /ڹ/ @@ -8768,10 +8768,10 @@ c // t // r // -n ///ͷ// -m ///ͷ// +n /;褬Ӥ,᤭Ӥ//ͷ;ͷ,ɮͷ (NB:֤bפƱ)// +m /;-ޤ/;褬Ӥ/ͷ;ͷ// c // -b //ͷ// +b /;᤭Ӥ/ͷ;ɮͷ (NB:֤bפƱ)// r /϶/ g // 䤹s /ᤴ/ @@ -8791,37 +8791,37 @@ i /ǵ̵/ g /ǵ̵/ e /ޤ// -n /ǵ/ +n /ǵ;-ʤǤ/ k /ȴ/ i /ȴ/ -t // +t /;̼¤ NB:֤rס֤rפƱ/ s // -r /ͥ//// -n /ľ// -c // -s //// -k ///// -i ///// -g //// +r /ͥ//;̼¤ NB:֤rס֤rפƱ// +n /ľ/;̼¤ NB:֤rס֤rפƱ/ +c /;̼¤ NB:֤rס֤rפƱ/ +s /;§(n)/;(:Ӥʤ)/;(:Τʤ)/ +k /;§(n)/;/;(:Ӥʤ)/;(:Τʤ)/ +i /;§(n)/;/;(:Ӥʤ)/;(:Τʤ)/ +g /;§(n)/;(:Ӥʤ)/;(:Τʤ)/ g /Ť/ s /ߤ/ g /Ť/ -w ////// -u //////㤯/ -t ////// -o ////// -n //// -m /// -i ////// +w //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/ +u //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/㤯;/ +t //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/ +o //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/ +n //;­/;/ +m //;/ +i //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/ h ///// -e ////// -c ////// +e //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/ +c //;ֿŤס­Ť//;(Ū˵ߺѤ)/;Ť/ k /᤮/ t /᤮/ r /᤮/ n /᤮/ c /᤮/ -n /᤮/ +n /᤮;/ Ȥt /Ʃ/ƩŰ/ Ȥs /Ʃ/ Ȥr /Ʃ/ƩŰ/ @@ -8851,7 +8851,7 @@ t // r //// n // -m // +m /;-,-/ c // z /Ʃ/ y /Ʃ/ @@ -8861,7 +8861,7 @@ n /Ʃ/ m /Ʃ/ c /Ʃ/ -s /Ʃ// +s /Ʃ;ƩƸ/;ͨѤ/ Ҥg // ʤs //Ĺ/ ʤk //Ĺ/ @@ -8888,21 +8888,21 @@ n // d // g // -w //// -u /// -t ////////ڧ///// +w ///;ֱʤ NB:Ūɽ/ +u //;ֱʤ NB:Ūɽ/ +t ///;ܤ/;(:פڤäƤƤ)/;ֱʤ NB:Ūɽ/;ޥå򻤤/;Dz/ڧ;ڧ/;Ϥ/;ۤۤ/;ŷ/;=r/ s // -r /////ڧ////// +r /;ޥå򻤤/;ܤ/;do/;Dz/ڧ;ڧ/;Ϥ/;ۤۤ/;ŷ/;=r/;ְ١פε(̾Ѵ)/ p // -o /// -n /////ٹ/߻////ڧ////////߭/ -m ///////߻/߭// -k ///Ʃ//////// -i ///////Ʃ//߻////// +o //;ֱʤ NB:Ūɽ/ +n ///;(ưʪ) //ٹ;-ͤ/߻;ֺѡפε/;ޥå򻤤/;ܤ/;Dz/ڧ;ڧ/;Ϥ/;ۤۤ/;ŷ/;=r/;ְ١פε(̾Ѵ)/;/;/߭;פΰλ/ +m ///;(ưʪ) //;/;/߻;ֺѡפε/߭;פΰλ/;do/ +k ///Ʃ/;/;(comb) ȱय/;(cultivate) Ȫ/;/;(slice) NB:֤kפƱ/;=// +i ////;ֱʤ NB:Ūɽ//;(comb) ȱय/Ʃ//߻;ֺѡפε/;/;(cultivate) Ȫ/;/;(slice) NB:֤kפƱ/;=/ g //ľ/ -e ///// -c //////ڧ///// -b //// +e ///;(spoil) 񾤨/;ֱʤ NB:Ūɽ/ +c //;ֱʤ NB:Ūɽ/;ޥå򻤤/;ܤ/;Dz/ڧ;ڧ/;Ϥ/;ۤۤ/;ŷ/;=r/ +b //;٤/;פε/ t /ؼ/ r /ؼ/ n /ؼ/ @@ -8918,12 +8918,12 @@ 礦ɤr // 礦s // 礦k // -礦z //Ы/ +礦z //Ы;־פε(̾Ѵ)/ 礦s // 礦n /// -礦j //Ы/ +礦j //Ы;־פε(̾Ѵ)/ 礦d // -s ///// +s /;/;//;(뤹)/ 椦d /ͳ/ 椦d /ͳ/ Фt // @@ -8934,13 +8934,13 @@ 󤸤t /Ω/ r /緫/ 󤪤r // -z ///// +z ///;ֽפά/;ֽפΰλ/ s // n /// -j ///// +j ///;ֽפά/;ֽפΰλ/ d // Ĥb /Ҹ/ -夯s // +夯s /;ripe/ 夦礦g /̵/ 夦餤ɤr // 夦֤n /ʬ/ @@ -8960,7 +8960,7 @@ r // ƤŤk /̳³/ ޤt // -t /Ϥ/ +t /Ϥ;/ Ҥ֤s /ῼ/ Ҥ֤k /ῼ/ Ҥ֤i /ῼ/ @@ -8990,7 +8990,7 @@ r // Ϥr // s /ľ/ -n /ľ/ +n /ľ;-/ d /ľ/ m /ϸ/ r // @@ -9000,7 +9000,7 @@ n /ľ/ k /ų/ r /;/ -s //// +s /;/;򼭤/;(Ϥ٤) ˻/ r // n /// m // @@ -9027,17 +9027,17 @@ 󤸤k // 󤸤i // 󤸤g // -t // -r // +t /;/ +r /;/ 󤷤Ȥn /ȶ/ 󤳤s /ʹ/ 󤱤d // -󤭤s /ɵ// -󤭤k /ɵ// -󤭤i /ɵ// -󤭤g /ɵ// +󤭤s /ɵ/;=ɵ/ +󤭤k /ɵ/;=ɵ/ +󤭤i /ɵ/;=ɵ/ +󤭤g /ɵ/;=ɵ/ r // -z //// +z ///;/ n // j // r // @@ -9046,7 +9046,7 @@ i // 郎r // s // -k /ʬ/// +k /ʬ/;NB:Ǥ餺ֻפȽ񤯤Τ// i // g // r // @@ -9068,10 +9068,10 @@ 錄r /Τ/ 錄n /Τ/ 錄c /Τ/ -s ////ħ///ɸ// -k // -i // -g // +s //;ƻ, 餫Ǥ/;(mark) ­פ/ħ;(predict) ħ/;⵭/;⵭/ɸ;ǤƤ뤹/;?/ +k /;ƻ, 餫Ǥ/ +i /;ƻ, 餫Ǥ/ +g /;ƻ, 餫Ǥ/ ̤i // k /Τȴ/ i /Τȴ/ @@ -9093,16 +9093,16 @@ ꤢe /Τ/ ꤢc /Τ/ ٤g /Ĵپ/ -r /Ĵ/ +r /Ĵ;/ ̤z /Τ¸/ k // 餸s // -z /Τ/ -s //Τ/ +z /Τ;/ +s //Τ;/ n // m // k // -g /// +g /;Ƥ򤲤(=򤹤)/;=򤲤/ b /Ĵ/ 褦s /Ѳ/ 褦s // @@ -9137,7 +9137,7 @@ 礲r /ء/ 礲n /ء/ 礲c /ء/ -礯s //°// +礯s //°;()°(=)/;°/ 礭Фi /뵤ʧ/ 礭s // 礦ʤs /ή/ @@ -9164,7 +9164,7 @@ 礦k /Ҳĺ/ 礦s /Ҳ/ 礦z /// -礦s /////// +礦s //////;(ⲻ)/ 礦j //// 礤n /餤/ 礤m /餤/ @@ -9208,11 +9208,11 @@ 餯i /ޯ/ 餯g /ޯ/ ٤s // -t //ĵ/ -r //ĵ/ -n //ĵ/ +t //ĵ;/ +r //ĵ;/ +n //ĵ;/ k // -c //ĵ/ +c //ĵ;/ ֤k /֤/ ֤i /֤/ är /ڶ/ @@ -9227,12 +9227,12 @@ 㤷n /㤷/ 㤳r /ָ/ 㤯ꤢg /㤯/ -㤯t /ٱ/// +㤯t /ٱ;ܤ- (NB:֤rס֤rפƱ)/;=ٱ/;=ٱ/ 㤯s // -㤯r /ٱ/// -㤯n /ٱ//// +㤯r /ٱ;ܤ- (NB:֤rס֤rפƱ)/;=ٱ/;=ٱ/ +㤯n /ٱ;ܤ- (NB:֤rס֤rפƱ)/;=ٱ/;=ٱ/;-˾/ 㤯d // -㤯c /ٱ/// +㤯c /ٱ;ܤ- (NB:֤rס֤rפƱ)/;=ٱ/;=ٱ/ 㤬r // s // k // @@ -9248,18 +9248,18 @@ ᤯r // ᤯n // ᤯c // -᤭t //Ĥ// -᤭r //Ĥ// -᤭n //Ĥ// -᤭c //Ĥ// +᤭t /;-/Ĥ;-// +᤭r /;-/Ĥ;-// +᤭n /;-/Ĥ;-// +᤭c /;-/Ĥ;-// ᤤs /̾/ ᤢg // -t ///߼/ -s ///߼/ -r ///߼/ -p //߼/ -n ///߼/ -c ///߼/ +t ///߼;ּפε(̾Ѵ)/ +s ///߼;ּפε(̾Ѵ)/ +r ///߼;ּפε(̾Ѵ)/ +p //߼;ּפε(̾Ѵ)/ +n ///߼;ּפε(̾Ѵ)/ +c ///߼;ּפε(̾Ѵ)/ k /Ÿ/ ߤȤt /Ʃ/ ߤȤr /Ʃ/ @@ -9282,10 +9282,10 @@ ߤr // ߤn // ߤc // -t // -r // -n // -c // +t /;§(m)/ +r /;§(m)/ +n /;§(m)/ +c /;§(m)/ ޤʤs /ή/ ޤn /񤤹/ ޤm /񤤹/ @@ -9302,27 +9302,27 @@ ܤꤳn /ʤ/ ܤꤳm /ʤ/ ܤꤢg /ʤ/ -t /// -r /// -n ///// +t //;() / +r //;() / +n ////;() / m /// -c /// -t //ߧ/ߨ/ -s //ߧ/ߨ/ -r //ߧ/ߨ/ -n //ߧ/ߨ/ +c //;() / +t //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ +s //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ +r //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ +n //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ m // -k //ߧ/ߨ/ -i //ߧ/ߨ/ -g //ߧ/ߨ/ -c //ߧ/ߨ/ +k //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ +i //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ +g //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ +c //ߧ;ֽ¡פε(̾Ѵ)/ߨ;ֽ¡פε2/ r // Фk // Фꤢg // Фk // Фk // Фi // -Фr /ƴ/Ǵ/ +Фr /ƴ;() ؼƴ/Ǵ;() μǴ/ Фm /ǵ/ t // s // @@ -9354,23 +9354,23 @@ ΤӤn /Ǧ/ ΤӤc /Ǧ/ ΤФɤr /Ǧ/ -Τk // +Τk /;-()/ Τn /ͤθ/ -n /Ǧ// +n /Ǧ;ѤǦ/;ԤŤ/ i /ο/ g /ο/ -b //Ǧ/ +b /;ԤŤ/Ǧ;ѤǦ/ ˤ狼r // ˤΤi /ʪ/ ˤt /˲/ ˤe // ˤn /»/ ˤn /»/ -ˤs /// -ˤk /// -ˤi /// -ˤg /// -ˤr // +ˤs //;ְ١׵/ +ˤk //;ְ١׵/ +ˤi //;ְ١׵/ +ˤg //;ְ١׵/ +ˤr /;(̤)-ʤ/ ˤk /˳/ ˤr // ˤi /˵/ @@ -9395,7 +9395,7 @@ c // b // y // -m /α/α/ +m /α/α;ְ١׵/ g /ſ/ٿ/ Ǥs /ٽ/ k /Ž/ٽ/ @@ -9410,13 +9410,13 @@ Ťk /ſ/ Ťi /ſ/ Ťg /ſ/ -r //Ա/ -n //// -m //// +r //Ա;ֿפε/ +n /;첾̾/;áפε(̾Ѵ)/;šפε(̾Ѵ)/ +m /;첾̾/;áפε(̾Ѵ)/;šפε(̾Ѵ)/ Ĥ礦r // Ĥe // Ĥr // -k /// +k /;̾졦Բ/;̾,Բ/ äȤ֤s /ʿ/ äȤ֤k /ʿ/ äȤ֤i /ʿ/ @@ -9425,9 +9425,9 @@ är /Τä/ än /Τä/ äc /Τä/ -ät /// +ät /;-/;-/ är // -s /// +s /;٤˼// ɤs /ݽ/ ɤk /ݽ/ ɤi /ݽ/ @@ -9437,7 +9437,7 @@ r // n /輡/ s /Ž/ -r //޿/ +r //޿;-()/ k // i // s // @@ -9476,18 +9476,18 @@ ߤ֤k /Ƥ߿/ ߤ֤i /Ƥ߿/ ߤ֤g /Ƥ߿/ -m /Ƥ// +m /Ƥ;/;§(s)/ r /忨/ e // -w ////к//ӻ/ -u ////к//ӻ/ -t ////к//ӻ/ -o ////к//ӻ/ +w //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ +u //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ +t //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ +o //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ k // -i ////к//ӻ/ -h ////к//ӻ/ -e ////к//ӻ/ -c ////к//ӻ/ +i //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ +h ////к;ֽפܻ/;ֽפε(̾Ѵ)/ӻ/ +e //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ +c //;(:Τʤޤޤˤ)ɮ˿臘/;(:ƻڤ˱äƹԤ)ŷ̿˽礦/к;ֽפܻ (:ͤͤˤĤƹԤ)/;ֽפε(̾Ѵ)/ӻ;/ t // k // w // @@ -9510,11 +9510,11 @@ ޤ꤫r /Ťޤ/ ޤ꤫n /Ťޤ/ ޤ꤫c /Ťޤ/ -y // +y /;-䤫/ r // -n /// -m /////// -k /// +n //;ספε/ +m ///;(:ŤߤDzդ)ȿä/;šפε(̾Ѵ)/;áפε(̾Ѵ)/;ספε/ +k //;šפε(̾Ѵ)/ 礦k /Ծ/ ɤr /ؼ/ r /Һ/ @@ -9524,35 +9524,35 @@ k // i // s // -t /// -r /// -n /Ź/// +t /;NB:֤rפƱ// +r /;NB:֤rפƱ// +n /Ź/;NB:֤rפƱ// m /Ź/ -c /// -t ///ܾ/ +c /;NB:֤rפƱ// +t ///ܾ; Ф/ s // -r ///ܾ/ -n ///ܾ/ +r ///ܾ; Ф/ +n ///ܾ; Ф/ m // k // -c ///ܾ/ -t /// -r /// +c ///ܾ; Ф/ +t /;(get wet) ݤ/;(storm) / +r /;(get wet) ݤ/;(storm) / p // -n /// -c /// +n /;(get wet) ݤ/;(storm) / +c /;(get wet) ݤ/;(storm) / r // n // m // r /ⷫ/ -m /શ/ +m /શ;ְ١׵/ ʤs /ڤľ/ -m /શ/ +m /શ;ְ١׵/ m /ߤ/ -t /// -r /// -n /// -c /// +t /;ڤ/;(frequent) ߤѤ,Ѥ/ +r /;ڤ/;(frequent) ߤѤ,Ѥ/ +n /;ڤ/;(frequent) ߤѤ,Ѥ/ +c /;ڤ/;(frequent) ߤѤ,Ѥ/ ߤk // ߤi // k // @@ -9560,7 +9560,7 @@ k /̵/ i /̵/ g /̵/ -ʤr //ʻ// +ʤr //ʻ/;֤ʤrפƱ/ t /ͳĥ/ r /ͳĥ/ n /ͳĥ/ @@ -9569,69 +9569,69 @@ k /ͳ/ i /ͳ/ s // -t //// -s //ʻ// +t //;-/;(:dzΤʹ)ޤ/ +s /;(however) ʤ/ʻ;/;(then) / r /// -n /ٷ///ષ/ +n /ٷ///ષ;ְ١׵/ m // -k /ų/ŷ/ +k /ų/ŷ; =ųݤ()/ c // k // -s /લ/ +s /લ;ְ١׵/ k // m /Ĭί/ r /Ĭ/ -t /// -r /// -n /// -c /// +t //;ְ١׵/ +r //;ְ١׵/ +n //;ְ١׵/ +c //;ְ١׵/ s // k // i // g // -s /લ/ +s /લ;ְ١׵/ r ////// -k /// -i /// +k //;ְ١׵/ +i //;ְ١׵/ e /ٽ/ t // -r // +r /;/ g // -t // +t /;/ s /׶/ r // -s ///Ź/ -t /ž夬/ž/ +s //;⹬/Ź;碌Ԥ/ +t /ž夬;/ž/ r /ž/ n /ž/ c /ž/ -w /Ź/ٹ/હ/ -u /ٹ/હ/ -t /ٹ/હ/ -o /ٹ/હ/ -i /ٹ/હ/ +w /Ź/ٹ/હ;ְ١׵/ +u /ٹ/હ;ְ١׵/ +t /ٹ/હ;ְ١׵/ +o /ٹ/હ;ְ١׵/ +i /ٹ/હ;ְ١׵/ g /ž/ -e /ٹ/હ/ -c /ٹ/હ/ -y // -t ////// -s ////// -r ////// -n //////////// -m ////////////// +e /ٹ/હ;ְ١׵/ +c /ٹ/હ;ְ١׵/ +y /;do/ +t //;-Ƹ/;recognise/;-,-᤹ (reign)/;-/ +s //;(contribute)ȯŸ˻/;(ꤹ)/;ֻפε/;do/ +r //;recognise/;-,-᤹ (reign)/;-/;do/ +n ///;do/;recognise/;-,-᤹ (reign)/;-//;(ߤ) Ȥߤ/;ߤ/;(ߤ) ߽Ф/;(ߤ)/ +m /////;ʤ/;(ߤ) Ȥߤ/;ߤ/;(ߤ) ߽Ф/;(ߤ)/;()//;ġפΰλ/;do/ k //ǡ/// -i ////ǡ/// +i ///;-(=Ĥ)/ǡ/// h /// -c //// +c /;do//;recognise/ ͤg /ǰ/ t // -s /// +s /;(Ϣ) Ź,// s // n // d // r // s // -s //// +s ///;/ r // m //// k /// @@ -9648,37 +9648,37 @@ 󤫤s /ò/ 󤫤s // s // -z /// -s ////// -j /// +z /;ڤ/;򻶤/ +s //;(count)/;(participate)/;(agree)/;(praise)/ +j /;ڤ/;ݵʰ򻶤/ 冷s // 冷t /Ω/ y // -t //// -r //// -n //// -i /// -g /// -c //// +t /;touch/;(hinder) ˾/;ֿפε/ +r /;touch/;(hinder) []˾/;ֿפε/ +n /;touch/;(hinder) ˾/;ֿפε/ +i //;פε(̾Ѵ)/ +g //;פε(̾Ѵ)/ +c /;touch/;(hinder) ˾/;ֿפε/ k // 餱s // 餢i // -w /ڼ/޴/Ϋ///߽/ -u /ڼ/޴/Ϋ///߽/ -t /ڼ/޴/Ϋ///߽/ +w /ڼ;Ҷڼ/޴;ɥ֤޴/Ϋ;ڼ/;Ȥ/;޴/߽;޴/ +u /ڼ;Ҷڼ/޴;ɥ֤޴/Ϋ;ڼ/;Ȥ/;޴/߽;޴/ +t /ڼ;Ҷڼ/޴;ɥ֤޴/Ϋ;ڼ/;Ȥ/;޴/߽;޴/ s /// -o /ڼ/޴/Ϋ///߽/ -n /// +o /ڼ;Ҷڼ/޴;ɥ֤޴/Ϋ;ڼ/;Ȥ/;޴/߽;޴/ +n //;/ k // -i /ڼ/޴/Ϋ///߽/ +i /ڼ;Ҷڼ/޴;ɥ֤޴/Ϋ;ڼ/;Ȥ/;޴/߽;޴/ h /޴/// -e /޴//ڼ/Ϋ//߽/ -c /ڼ/޴/Ϋ///߽/ -b // -Фt // -Фr // -Фn // -Фc // +e /޴;ɥ֤޴/;޴/ڼ;Ҷڼ/Ϋ;ڼ/;Ȥ/߽;޴/ +c /ڼ;Ҷڼ/޴;ɥ֤޴/Ϋ;ڼ/;Ȥ/;޴/߽;޴/ +b /;/ +Фt /;᤬-/ +Фr /;᤬-/ +Фn /;᤬-/ +Фc /;᤬-/ 䤢t // r /Фḯ/äḯ/ḯ/ r // @@ -9690,15 +9690,15 @@ k // i // g // -s /// -ޤw //// -ޤu //// -ޤt //// -ޤo //// -ޤi //// -ޤe //// -ޤc //// -ޤg /˸// +s //;NB:ܤΤߤѻ/ +ޤw /;(ϻ)/// +ޤu /;(ϻ)/// +ޤt /;(ϻ)/// +ޤo /;(ϻ)/// +ޤi /;(ϻ)/// +ޤe /;(ϻ)/// +ޤc /;(ϻ)/// +ޤg /˸/;/ ޤn /͡/ ޤr // ޤw // @@ -9717,25 +9717,25 @@ Ӥm // Ӥk /// Ӥi /// -s ///// +s //;NB:ܤΤߤѻ/;(ҤȤʤ)/;(ޤФ)/ r // Фr // -k /// -i /// +k /;(judge) ۤ/;(dispose) ʸ|򻫤/ +i /;(judge) ۤ/;(dispose) ʸ|򻫤/ ʤr // Ȥr /Τ/ Ȥk // t /// -s /͡/////// +s /͡/;ƻ////;(:ȿᤤ)/;(:)/ r /// n /// -k //// -i //// -g //// +k /;(:ᤤ)/;(:ȿᤤ)/;(:)/ +i /;(:ᤤ)/;(:ȿᤤ)/;(:)/ +g /;(:ᤤ)/;(:ȿᤤ)/;(:)/ c /// b // Ƥk /ٮ/ٮ/ -Ƥi /ٮ/ٮ/ +Ƥi /ٮ;-/ٮ;=ٮ֤/ Ĥr // äk /ð/ äi /ð/ @@ -9750,7 +9750,7 @@ g // m // k // -y // +y /;-/ k // s /Ͷ/ n /Ͷ/ @@ -9758,7 +9758,7 @@ s /Ͷ/ w /Ͷ/ w /Ͷ/ -u /Ͷ/Ӧ/ +u /Ͷ/Ӧ; NB:̾ʳӤϹͤˤ/ t /Ͷ/ o /Ͷ/ i /Ͷ/ @@ -9772,10 +9772,10 @@ i /ήΥ/ e /ήΥ/ c /ήΥ/ -t /// -r /// -n /// -c /// +t /;NB:֤rס֤rס֤rס֤ʤrפƱ/;NB:֤rפƱ/ +r /;NB:֤rס֤rס֤rס֤ʤrפƱ/;NB:֤rפƱ/ +n /;NB:֤rס֤rס֤rס֤ʤrפƱ/;NB:֤rפƱ/ +c /;NB:֤rס֤rס֤rס֤ʤrפƱ/;NB:֤rפƱ/ 錄s /// s /// फi // @@ -9786,8 +9786,8 @@ Ҥe /// k /// i /// -Ϥn //// -Ϥm //// +Ϥn //;NB:֤ϤmפƱ/;-/ +Ϥm //;NB:֤ϤmפƱ/;-/ Τt /// Τr /// Τn /// @@ -9816,8 +9816,8 @@ n /// c /// s /ɤ/ -n //ͤ// -m //ͤ//ؤ/ +n /;ץ饰򺹤/ͤ;ۤͤ// +m /;ץ饰򺹤/ͤ;ۤͤ//ؤ;?/ t //ؤ/ r //ؤ/ n //ؤ/ @@ -9863,8 +9863,8 @@ e // 錄s // m // -n /// -m /// +n /;(:ܤˤߤʤ)/;(:ͤȤ)/ +m /;(:ܤˤߤʤ)/;(:ͤȤ)/ i // m // k // @@ -9890,7 +9890,7 @@ k // s // s // -s // +s /;ݿ-/ 錄s // m // k // @@ -9936,18 +9936,18 @@ s /õ/ܤ/ t /õ/ܤ/ t // -s /õ/// -r /// +s /õ/;/;ܡפε(̾Ѵ)/ +r //;/ n // c // r // s // k /մ/ i /մ/ -Τt ////վ/ -Τr ////վ/դΤ/ -Τn ////վ/ -Τc ////վ/ +Τt //;̤/;̤/վ/ +Τr //;̤/;̤/վ/դΤ;/ +Τn //;̤/;̤/վ/ +Τc //;̤/;̤/վ/ ʤr // ʤk // y // @@ -9958,20 +9958,20 @@ s /// r /// n // -e //// +e ///;ֱɡפε(̾Ѵ)/ c // -錄t /㤨// -錄r /㤨// -錄n /㤨// -錄c /㤨// -t //ӯ/ -r //ӯ/ -n //ӯ/ -c //ӯ/ -t //ָ/ -r //ָ/ -n //ָ/ -c //ָ/ +錄t /㤨/;NB:ֺ㤨ϤפŪ/ +錄r /㤨/;NB:ֺ㤨ϤפŪ/ +錄n /㤨/;NB:ֺ㤨ϤפŪ/ +錄c /㤨/;NB:ֺ㤨ϤפŪ/ +t //ӯ;/ +r //ӯ;/ +n //ӯ;/ +c //ӯ;/ +t //ָ;/ +r //ָ;/ +n //ָ;/ +c //ָ;/ 襤s // 襤n // 襤d // @@ -9981,8 +9981,8 @@ Фn // Фc // t /Dz/ -n //// -m //// +n //; NB:ܤΤߤѻ/;/ +m //; NB:ܤΤߤѻ/;/ n /ǹ/ s /Ƹ/ Фt /͵/ @@ -9991,19 +9991,19 @@ Фc /͵/ s /Ƴ/ t // -s /// +s //;() 黲ꤹ/ n // t // -s ////////////// -r //// +s //;ˤɤ/;(point)ؤ/;ɤޤ/;ۤͤ/;򺿤/;/;Ȥ/;ߤ/;/;褹(=)/; ꮤ/;ޡפε/ +r ///;[ʸ]/ n // -m /////// -k ///// -i ///// -g //// -e /// +m //;᤿/;줤ä/;/;⤢/;/ +k ///;֤䤯/;(|)/ +i //;(|)/;֤䤯// +g //;(˻) 󤲤// +e //;ֺפΰλ/ c // -b ///// +b ///;=Ӥ/;()/ k // i // t // @@ -10031,7 +10031,7 @@ 褦㤯s /Ƽϲ/ 褦m /Ǽ/ 󤯤s /Ȳ/ -ޤs /ⲽ/㲽/ +ޤs /ⲽ/㲽;NB:츻ָۻҡ/ ֤r /ʬ/ Фi /ʧ/ m // @@ -10078,7 +10078,7 @@ äݤs // ɤs /ɲ/ 󤷤󤯤s /¿/ -s //// +s /;(Ϣ) 饹ۤ/;(դ) ɬ/;(¤٤) ˸ह/ k // e //Ķ/ k // @@ -10094,11 +10094,11 @@ c /ĥ/ Ťr // 魯g /ݲ/ -s /////// -r //// -k ///ʬ// -i //// -g //// +s ////;/;ֲפε(̾Ѵ)/; NB:֤ĤiפƱ/ +r //;/;ֲפε(̾Ѵ)/ +k ///ʬ/; NB:֤ĤiפƱ/ +i ///; NB:֤ĤiפƱ/ +g ///; NB:֤ĤiפƱ/ b // w // u // @@ -10114,9 +10114,9 @@ ꤪt /ž/ ꤪc /ž/ s // -n /ž// -g /ž// -b /ž// +n /ž/;žפε(̾Ѵ)/ +g /ž/;žפε(̾Ѵ)/ +b /ž/;žפε(̾Ѵ)/ ꤫m /Ť/ 館t // 館r // @@ -10127,17 +10127,17 @@ 䤹k // 䤹i // 䤹g // -s // +s /;/ r // -t //϶// -r /϶//Ҽ// -n /϶/// -c /϶/// +t //϶;ơפΰλ// +r /϶;ơפΰλ//Ҽ// +n /϶;ơפΰλ/// +c /϶;ơפΰλ/// k // 餬r // ऺs // ߤs // -ߤt /// +ߤt //;?/ ߤr // ߤn // ߤc // @@ -10167,22 +10167,22 @@ ޤi /Ե/ ޤm // ޤr /// -ޤi /٤/ +ޤi /٤;/ y //ǻ/ t // s // r // n // -m // +m /;/ k // i // g // c // t // -s //// -r //// +s /;spill//;=ܡ/ +r ///;() ̤/ r //ɹ/ -r /// +r /;ʴ/;ߤˤʤ/ Ӥk /Ӥ/ Ӥi /Ӥ/ ӤؤĤw /ջ/ @@ -10201,7 +10201,7 @@ m // ͤޤs /ԤͲ/ ͤޤs /ͤ/ -ͤg /Ԥ;/ +ͤg /Ԥ;;ѥϤ-/ ˤs // ˤr // ˤk // @@ -10219,10 +10219,10 @@ ɤp /Ҷ/ Ȥ꤭r /Ǥ/ Ȥ꤬k /Ǥ/ -Ȥt ///Ƚ/ -Ȥr //Ƚ// -Ȥn //Ƚ// -Ȥc //Ƚ// +Ȥt //;/Ƚ;(Ƚǡ򤹤)/ +Ȥr //Ƚ;(Ƚǡ򤹤)/;ǡפε/ +Ȥn //Ƚ;(Ƚǡ򤹤)/;ǡפε/ +Ȥc //Ƚ;(Ƚǡ򤹤)/;ǡפε/ Ȥs /// Ȥg /̵/ Ȥۤɤ褦n // @@ -10237,15 +10237,15 @@ Ȥn // Ȥc // Ȥh // -Ȥt //ѣ/ -Ȥk /// +Ȥt //ѣ;׵/ +Ȥk //;=դ()/ Ȥt /­/ Ȥr /­/ Ȥn /­/ Ȥc /­/ -Ȥk // +Ȥk /;֤̾Ȥk/ Ȥs // -Ȥk //// +Ȥk //;= NB:֤kפƱ/;ֿԡפε(̾Ѵ)/ Ȥy // Ȥk // Ȥr // @@ -10256,8 +10256,8 @@ Ȥm // Ȥs // Ȥg // -w /// -n /// +w //;ǡפε/ +n //;-/ Ƥg // Ƥb /Ĵ/ Ťi // @@ -10270,18 +10270,18 @@ äԤi /ù/ äԤg /ù/ äz /// -t //ť/ -r //ť/ -n //ť/ -c //ť/ +t /;:Ĥޤ̤Ȥ˵/ť/ +r /;:Ĥޤ̤Ȥ˵/ť/ +n /;:Ĥޤ̤Ȥ˵/ť/ +c /;:Ĥޤ̤Ȥ˵/ť/ s // s // k // i // g // s // -h //// -e ///// +h ///;ֱפε(̾Ѵ)/ +e /;/;Ԥ˱,Ԥ/;/;ֱפε(̾Ѵ)/ t // r // n // @@ -10291,7 +10291,7 @@ g // s /˻/ 椿k /˭/ -k // +k /;NB:֤ʤkס֤kפƱ/ äs /Ĥÿ/ äk /Ĥÿ/ äi /Ĥÿ/ @@ -10300,20 +10300,20 @@ k /Ŀ/ i /Ŀ/ g /Ŀ/ -t /// +t //; (䥹᤯)/ s // -r /// -n /// +r //; (䥹᤯)/ +n //; (䥹᤯)/ k // i // g /ǻ// -c /// +c //; (䥹᤯)/ k /ٱ/ -t /ٱ/ +t /ٱ;ٱ NB:֤rס֤rפƱ/ s /ؼ/ -r /ٱ/ٹ/ -n /ٱ/ -c /ٱ/ +r /ٱ;ٱ NB:֤rס֤rפƱ/ٹ;礬ٹ,٤ٹ餻/ +n /ٱ;ٱ NB:֤rס֤rפƱ/ +c /ٱ;ٱ NB:֤rס֤rפƱ/ h // e // ޤr // @@ -10356,7 +10356,7 @@ t // c // ߤr // -r // +r /;/ ޤi // t // c // @@ -10420,7 +10420,7 @@ k //Ϲ/ i //Ϲ/ g //Ϲ/ -n /ġ//// +n /ġ/;-/;-/;-/ s /Ǥ/ k /Ǥ/ i /Ǥ/ @@ -10431,10 +10431,10 @@ r // n // c // -s //ڰ/ -k //ڰ/ -i //ڰ/ -g //ڰ/ +s /;-ͼ/ڰ;-/ +k /;-ͼ/ڰ;-/ +i /;-ͼ/ڰ;-/ +g /;-ͼ/ڰ;-/ t // s /// r // @@ -10463,15 +10463,15 @@ s /ڸ/ s // r //ڸ/ -s /ž// +s /ž/;NB:֤sפƱ/ k /ɹ/ k // i // ꤱr /ɹ/ -t //ɹ/ -r //ɹ/ -n //ɹ/ -c //ɹ/ +t //ɹ;/ +r //ɹ;/ +n //ɹ;/ +c //ɹ;/ դt // դr // դn // @@ -10486,10 +10486,10 @@ 뤵i // 뤵g // s /θ/ -t /// -r /// -n /// -c /// +t /;ﳲ NB:֤rפƱ/;() ؤ/ +r /;ﳲ NB:֤rפƱ/;() ؤ/ +n /;ﳲ NB:֤rפƱ/;() ؤ/ +c /;ﳲ NB:֤rפƱ/;() ؤ/ n // n /®/ n // @@ -10501,7 +10501,7 @@ z /////// s /// r // -j ////// +j /;(ů|)֤/;⹷/;̣/;⹷/;˺/ b //˧/ ͤk // ͤw //𤤴/// @@ -10519,24 +10519,24 @@ e // c // k /¿/ -s /// -z //// -y ////// -w ///// -u /////// -t // -s //Ķ////ǻ///// -r //Ĩ////// -o ///// -n ///////// -m ////϶/ -k /ǻ//ž//// -i /ǻ/////////// -h //// -g ////ǻ/ -e //Ķ/////// +s //;פε/ +z //;פε(̾Ѵ)/;פΰλ/ +y ////;פε(̾Ѵ)/;פΰλ/ +w /;:äܤ򸫤/;://;פε/ +u /;:/;:äܤ򸫤///;()/;פε/ +t /;̣˶Ť,Ť/ +s //Ķ;³Ķ/;(filter)/;//ǻ/;ͦݤ/;褹/;פε(̾Ѵ)/;פΰλ/ +r /;̣˶Ť,Ť/Ĩ;-,-餷/;-/;-/;(cut down) ڤ/;פε(̾Ѵ)/;פΰλ/ +o /;:/;:äܤ򸫤//;פε/ +n /////;-,-/;פε(̾Ѵ)/;פΰλ/;̣˶Ť,Ť/ +m ///;Ƥ/϶;ơפΰλ/ +k /ǻ/;򰷤/ž;ƻž,(ư)ž/;/;餱/;=ž/ +i /ǻ/;:///;:äܤ򸫤/;פε(̾Ѵ)/;פΰλ//;פε/;򰷤,򰷤/;/ +h ///;פε/ +g ///;򰷤/ǻ/ +e //Ķ;(äˡ־װդ) ۤ/;/;:ֱۡפķӤפϸ٤/;:/;:äܤ򸫤//;פε/ d /// -c // +c /;̣˶Ť,Ť/ b /ջ/ ʤs /ľ/ k // @@ -10552,8 +10552,8 @@ t // r // i /ӷ/ -s /// -s /// +s //;ʸȯ/ +s //;ֲפΰλ/ r // n // ȤϤr // @@ -10562,12 +10562,12 @@ 󤷤礦m /ں/ 󤤤k // z // -s /// +s /;/;и/ j // w // u // t // -s //// +s //;Ԥƻ/;ָפε(̾Ѵ)/ o // i // e // @@ -10575,35 +10575,35 @@ b // ꤿs // ꤳs /껦/ -ꤳn // -ꤳm // +ꤳn /;ܡŨؤ-/ +ꤳm /;ܡŨؤ-/ ꤤr // ꤢg // t // r // n // c // -t /// +t //;ֱפΰλ/ s // -r /// -n /// +r //;ֱפΰλ/ +n //;ֱפΰλ/ k // i // g // -c /// +c //;ֱפΰλ/ s // ֤s /ӿ/ ֤k /ӿ/ ֤i /ӿ/ ֤g /ӿ/ -t /// +t //;ֱפΰλ/ s // -r /// -n /// +r //;ֱפΰλ/ +n //;ֱפΰλ/ k // i // g // -c /// +c //;ֱפΰλ/ Фt /ӱΩ/ Фc /ӱΩ/ s // @@ -10628,7 +10628,7 @@ äƤs // äƤs // ä夦s /뽸/ -s /// +s //;constipate/ s /// k /// i /// @@ -10653,10 +10653,10 @@ r // n // c // -t /// -r /// -n /// -c /// +t //;(ȱȤ)/ +r //;(ȱȤ)/ +n //;(ȱȤ)/ +c //;(ȱȤ)/ 魯r /ä˺/ n /ä/ m /ä/ @@ -10667,14 +10667,14 @@ c /ä/ n /ä/ m /ä/ -b // +b /;Ф/ k // m // n // -m // +m /;-(Ѹ),-(kick in)/ i /ӷ/ -s //// -r /// +s /;NB:֤褴sפƱ/;/;(ʤΤ)/ +r /;NB:֤褴rפƱ/;/ s // s // t // @@ -10700,19 +10700,19 @@ k /ʵ/ n /ڲ/ s /б/ -s ///// +s /;ɰ/;- [ʸ]ؤǤ/;- [ʸ]夲/;Ļ/ g // y // t // -s //// +s //;-/;()/ r // n /// c // -s // -s /// -k /// -i /// -g /// +s /;army/ +s //;grotesque/ +k //;grotesque/ +i //;grotesque/ +g //;grotesque/ s // m // i // @@ -10727,7 +10727,7 @@ n // c // r // -s /// +s /;(treat) ҤȤƶ/;Ȥ褻/ i // s // r // @@ -10736,8 +10736,8 @@ i // m // k // -r // -t /ä/ +r /;- NB:֤rפƱ/ +t /ä;/ t // 鷺i /鷺/ 廊n //򤨹/ @@ -10746,19 +10746,19 @@ s //// r // k /ʬ/ -e //// +e //;(:äפդ)/;(:Ϥη) / Ӥr // r // g // g // z // u /// -s //// +s ///;/ p // m // -k //// -i //// -g //// +k ///;/ +i ///;/ +g ///;/ k // ʤn /ť/ ʤm /ť/ @@ -10805,19 +10805,19 @@ 餤n /餤/餤/ 餤m /餤/餤/ 餤s // -u /// +u /;/;/ t // -s ////̽//// -n /// -m /////̽//// -k ///̽//// -i ///̽//// -g ///̽//// -e // -b //// +s ///;(:ͼǤΤ餵)/̽;(:ʤƸʤ)/;̽/;(:Ƥ褯ʤ)/;(:֤ʤƸʤ)/ +n /;(ܤޤ)// +m /;(ܤޤ)/;(Ѥ򳢤ޤ)//;(:ͼǤΤ餵)/̽;(:ʤƸʤ)/;̽/;(:Ƥ褯ʤ)/;(:֤ʤƸʤ)/ +k //;(:ͼǤΤ餵)/̽;(:ʤƸʤ)/;̽/;(:Ƥ褯ʤ)/;(:֤ʤƸʤ)/ +i //;(:ͼǤΤ餵)/̽;(:ʤƸʤ)/;̽/;(:֤ʤƸʤ)/;(:Ƥ褯ʤ)/ +g //;(:ͼǤΤ餵)/̽;(:ʤƸʤ)/;̽/;(:Ƥ褯ʤ)/;(:֤ʤƸʤ)/ +e /;/ +b /;:¤٤Ƥ٤/;:ͤ碌Ƥ٤/;:餹/ r /// 䤷k // -s /// +s //;= NB:֤sפƱ/ n // m // k // @@ -10835,7 +10835,7 @@ ߤk //Ȥ/ ߤi /Ȥ/ ߤs /߽/ -ߤr /ȤΩ/ +ߤr /ȤΩ;/ ߤt /ȤΩ/Ω/ ߤ䤹s /Ϳ/ ߤ䤹k /Ϳ/ @@ -10845,20 +10845,20 @@ ߤm /ȹ/Ȥ߹/ ߤs /߸/ ߤw /߸/ -ߤe //Ȥߴ/Ȥ/ȴ/ +ߤe //Ȥߴ/Ȥ/ȴ;-/ ߤk /// ߤi /// ߤr /Ȥ// -ߤs /ȹ/Ȥ߹/Ȥ߹/ +ߤs /ȹ/Ȥ߹/Ȥ߹;/ ߤw /Ȥ߹/ȹ/ -ߤg /߾/Ȥ߾/Ⱦ/ -s /Ϳ// +ߤg /߾;|ո߾夲/Ȥ߾;ʤȤ߾夲/Ⱦ/ +s /Ϳ/;Ϳפε(̾Ѵ)/ ޤt // ޤr // ޤn // ޤc // -n /// -m /// +n //;NB:֤ؤmפƱ/ +m //;NB:֤ؤmפƱ/ ٤s // Ӥꤳs /Ф껦/ ӤҤr /DZ/ @@ -10866,22 +10866,22 @@ Ӥäk /ð/ Ӥr // Ӥm // -t //// -r /// -n /// -c /// +t //;줿ƹ NB:֤rפƱ/;(ߤ) Фƻ/ +r /;줿ƹ NB:֤rפƱ/;(ߤ) Фƻ/ +n /;줿ƹ NB:֤rפƱ/;(ߤ) Фƻ/ +c /;줿ƹ NB:֤rפƱ/;(ߤ) Фƻ/ t // r // n // c // h /// ɤt /⤭/ -s // -k /// -i /// -g // +s /;(tedious) ٤ⶵ/ +k //;(tedious) ٤ⶵ/ +i //;(tedious) ٤ⶵ/ +g /;(tedious) ٤ⶵ/ Ťr // -s // +s /;첾̾/ Ĥi // Ĥg // Ĥr // @@ -10894,7 +10894,7 @@ Ĥc /ʤ/ äk // äi // -t // +t /;?/ s // s // 褴s // @@ -10908,17 +10908,17 @@ Ϥt // t // ʤs /ľ/ -s /̵/ +s /̵;(ͤ)-/ r /// r // m // -k // +k /;(󤭶)-/ s // e /ź/ n /ͷ/ m /ͷ/ -i /// -g /// +i //;=/ +g //;=/ s // t // r // @@ -10949,8 +10949,8 @@ s /// r /// n /// -k /// -i /// +k //;ֺաפε(̾Ѵ)/ +i //;ֺաפε(̾Ѵ)/ c /// r // s // @@ -10972,7 +10972,7 @@ k // ꤦr // t // -r /// +r //;/ n // c // t /ڶ/ @@ -10983,7 +10983,7 @@ k // i // g /ڶ// -b // +b /;-٤ NB:פ¾ưǡ/ k /ް/ k // i // @@ -11007,7 +11007,7 @@ r // t // s // -r /// +r //;(Ĥʤ)/ n // m // k // @@ -11015,10 +11015,10 @@ g // c // k /ȴ/ȴ/ -t //ߪ/ -r //ߪ/ -n //ߪ/ -c //ߪ/ +t //ߪ;/ +r //ߪ;/ +n //ߪ;/ +c //ߪ;/ k // ꤢg // t // @@ -11042,8 +11042,8 @@ g /ƨ/ m /// Ĥs // -Ĥi // -Ĥg // +Ĥi /;ݸ-/ +Ĥg /;ݸ-/ Ĥs // m // k /// @@ -11084,21 +11084,21 @@ r // k /˰/ y // -w /// -u /// -t ////// -s /// -r /////////// -o /// -n ////////// -m //// -k // -i //// +w //;NB:ֿפȶ̤Ʒ֤פɽι/ +u //;NB:ֿפȶ̤Ʒ֤פɽι/ +t ///;NB:ֿפȶ̤Ʒ֤פɽι/// +s /;񤷤(=Ի׵Ĥˤ)/;?/ +r ////////;פε(̾Ѵ)/;פΰλ/;?/ +o //;NB:ֿפȶ̤Ʒ֤פɽι/ +n //;/;,դ/;-ˤ/;[]-///;פε(̾Ѵ)/;פΰλ/ +m //;/;,դ/ +k /;΢室/ +i //;NB:ֿפȶ̤Ʒ֤פɽι// h // g // -e /// -c ////// -b // +e //;NB:ֿפȶ̤Ʒ֤פɽι/ +c //;NB:ֿפȶ̤Ʒ֤פɽι//// +b /;-,(Ф)-٤/ z // j // t /Ω/ @@ -11111,7 +11111,7 @@ 礦m /Ļ/ 礦礦s /ġ/Ķ/ 礦z // -s // +s /;椷䤹/ 夦t // 夦r // 夦n // @@ -11129,7 +11129,7 @@ 㤯d // k /̳/ t // -s ///// +s /;()˵/;()Ĥ/// r /// n //// m // @@ -11148,26 +11148,26 @@ g /ݼ/ t /Ω/ c /Ω/Ω/ -m //// +m //;/;ޤ/ d // r /Ͽ/ 줳n /ڤ/ 줳m /ڤ/ 줤k /﹥/ -줢g /ڤ/ -z // -t // -s // -r // -n // -m // -k // -c // +줢g /ڤ;Ԥ-ä/ +z /;[]/ +t /;[]/ +s /;[]/ +r /;[]/ +n /;[]/ +m /;[]/ +k /;[]/ +c /;[]/ k /ڤʬ/ s /ڤ/ r /ڤ/ m // -ޤs /ڤ/ +ޤs /ڤ;Ź-/ z /ڤ꺮/ s /ڤ/¤/ k /̸/ @@ -11189,11 +11189,11 @@ m /ڤ/ k /ڤ/¤/ s /ڤ/ڽ/ -ꤿs /ڤ/¤/ +ꤿs /ڤ;ڤ-/¤;Ũ-/ ꤿt /ڤΩ/ ꤿc /ڤΩ/ -ꤽe /ڤ·/ -ꤹt /ڤ/¤/ڼ/¼/ +ꤽe /ڤ·;ȱ-/ +ꤹt /ڤ;Ԥ-/¤;-Ƹ/ڼ/¼/ ꤵk /ڤ/¤/ ꤵi /ڤ/¤/ ꤵg /ڤ겼/ڲ/ @@ -11204,7 +11204,7 @@ ꤭n /ڤ/ ꤭m /ڤ/ ꤫s /ڤ/ -꤫r /ڤ괹/ +꤫r /ڤ괹;/ ꤫w /ڤ// ꤫k /¤/ڤ/ ꤫e /ڤ//ڤ괹/ڴ/ @@ -11254,14 +11254,14 @@ 礦ɤr /ʽ/ 礦r // 礦z // -礦s //// +礦s /;(offer) Ѥ˶/;(banquet) Ҥ¤/;go mad/ 礦n // 礦m // 礦j // 礦h // -夦礲r /޽꽳/ +夦礲r /޽꽳;/ 夦夦s /ۼ/ -夦s ////// +夦s /;˵礹/;ǯ뤹/;٤//;Ũ/ 夦n // 夦d // 䤹s // @@ -11311,18 +11311,18 @@ ޤi /ޤ갭/ ޤg /ޤ갭/ ޤr /ʶ/ -t /// -r /// -n /// -c /// +t /;§(m)// +r //;§(m)/ +n //;§(m)/ +c //;§(m)/ ܤs /˾/ ֤r /ı/ դs // դm // -Ӥi // -s /// +Ӥi /;/ +s //;ָפε(̾Ѵ)/ t /ĥ/ -r /ĥ// +r /ĥ;-/;-餷/ n /ĥ/ c /ĥ/ Ϥs /ݼ/ @@ -11344,7 +11344,7 @@ ʤi /ʽ/ʽ/ ʤg /ʽ/ʽ/ ʤs /ή/ -r /崷// +r /崷;崷줿/;(̵ù) Υ/ ɤs // ɤs /ư/ t // @@ -11364,10 +11364,10 @@ Ťe // Ťc // m // -k //// -i //// +k //;첾̾// +i //;첾̾// s // -k //// +k /;-/;-// i // g // äƤt /¤äƼ/ @@ -11377,20 +11377,20 @@ i // t /Ω/ k /̸/ -s /// +s //;/ r // -k /// -i /// -g /// +k //;/ +i //;/ +g //;/ k /äȴ/ i /äȴ/ g /ä/ ɤr // s /Բ/ s // -t /// -s /// -r /// +t //;פε(̾Ѵ)/ +s //;פε(̾Ѵ)/ +r //;פε(̾Ѵ)/ n // e // k // @@ -11402,14 +11402,14 @@ i // e // c // -w //ѿ/ -u //ѿ/ -t //ѿ/ -o //ѿ/ -i //ѿ/ +w //ѿ;λ/ +u //ѿ;λ/ +t //ѿ;λ/ +o //ѿ;λ/ +i //ѿ;λ/ h // -e //ѿ/ -c //ѿ/ +e //ѿ;λ/ +c //ѿ;λ/ s /˻/ e /夻/ Ĥw /դ/ @@ -11424,7 +11424,7 @@ g /ۤ/ i // t // -k /// +k //;֤̾k/ i // m // 礯s // @@ -11432,11 +11432,11 @@ 礯i // 礯g // k /߶/ -t /// -r /// -n /// +t //; ¤/ +r //; ¤/ +n //; ¤/ m // -c /// +c //; ¤/ r // ߤk // ߤn /߹/ @@ -11446,7 +11446,7 @@ n // m // s // -k // +k /;/ s /ʹ/ n // m // @@ -11477,7 +11477,7 @@ ˤg /ʹ/ ʤs /ʹή/İή/ ʤs /ʹľ/İľ/ -r /ʹ/ʹ/ +r /ʹ/ʹ;ʹ/ Ȥk /ʹ/ Ȥm /ʹ/ Ȥs /İ/ʹ/ @@ -11488,7 +11488,7 @@ Ĥk /ʹ³/ݳ/ k /ʹ/ e /ʹ/ -s /ʹ// +s /ʹ;ʹФ/;Ф/ e /ʹ/ n /ʹ»/ t // @@ -11525,7 +11525,7 @@ r /ʹ/ n /ʹ/ c /ʹ/ -k /ʹ˰/İ˰/ +k /ʹ˰;-/İ˰;-CD/ s // k // i // @@ -11576,27 +11576,27 @@ Ϥc // r // i // -z ///// -y /////// -w ///// -u /// -t ////////Ȳ//٣// -s /////////// -r ////Ȳ//٣/// -p /// -o /// -n ///////////Ȳ//٣// -m //////////// -k /ʹ/İ////////// -j /// -i /ʹ/İ///////// -h ///// -g ///// -e //// -d //////// -c ///////Ȳ//٣/// -b //// -a /// +z //; /;?/;ֵפε(̾Ѵ)/ +y ///;פε(̾Ѵ)/;פΰλ//; / +w //;ֵפε(̾Ѵ)//; / +u //; / +t ////;ͤ¤/; /;פε(̾Ѵ)/;פΰλ/Ȳ;ڤȲ/;ߺϤ/٣;Ϥ٣/; ФӤ(=ǤФDzФ򵯤)/ +s ///;(note)̻˵/;(expect),/;(lead to)ˢ˵/;פε(̾Ѵ)/;פΰλ/;ֵפε/;ֵפΰλ/; / +r ///;ͤ¤/Ȳ;ڤȲ/;ߺϤ/٣;Ϥ٣/; ФӤ(=ǤФDzФ򵯤)/; / +p //; / +o //; / +n /////;ֵפε(̾Ѵ)/; /;פε(̾Ѵ)/;פΰλ//;ͤ¤/Ȳ;ڤȲ/;ߺϤ/٣;Ϥ٣/; ФӤ(=ǤФDzФ򵯤)/ +m ///;NB:֤mפƱ////;ַפΰλ/;פε(̾Ѵ)/;פΰλ/;ֵפε(̾Ѵ)/; / +k /ʹ/İ;(դƤ) ڤİ/;(effect) /;(work) ,/;(inquire) ƻ֤//;-ʤ/;İפε(̾Ѵ)/;ָפε//; / +j //; / +i /ʹ/İ;(դƤ) ڤİ/;(effect) /;(work) ,//;(inquire) ƻ֤/;ָפε/;İפε(̾Ѵ)//; / +h //;ֵפε(̾Ѵ)//; / +g //;ֵפε(̾Ѵ)//; / +e ///; / +d //;ֵפε(̾Ѵ)//;פε(̾Ѵ)/;פΰλ//; / +c ///;פε(̾Ѵ)/;פΰλ//;ͤ¤/Ȳ;ڤȲ/;ߺϤ/٣;Ϥ٣/; ФӤ(=ǤФDzФ򵯤)/; / +b ///; / +a //; / Фk /ĥȴ/ Фi /ĥȴ/ ФȤs /ĥ/ @@ -11623,18 +11623,18 @@ ޤŤk // ޤŤi // ޤŤg // -ʤꤿt /ʤΩ/ +ʤꤿt /ʤΩ;󥫡-Ƥ/ u // ä礦Ҥr /羸DZ/ ä礦Ťr /羸¤/ är /ع/ s // -s // +s /;ͤ NB:֤ˤiפƱ/ r // m // -k // -i // -g // +k /;ͤ NB:֤ˤiפƱ/ +i /;ͤ NB:֤ˤiפƱ/ +g /;ͤ NB:֤ˤiפƱ/ r // n // r // @@ -11642,18 +11642,18 @@ z // j // s // -r ///// +r ///;ֵפε/;ֵפΰλ/ n // -s /// +s //;ǰ/ w //// t // -s /// +s //;ǯ/ r //// k //// i // e /// k /Ϣ/ -z /Ϣ/ +z /Ϣ;?/ s /Ϣ/ d /Ϣ/ r // @@ -11668,7 +11668,7 @@ Фr // Фn // Фc // -s /˧/// +s /˧;(generic, ޤäŪ) ɾȽ˧ʤ/;ᤷ// ΤӤk /Ѳ/ ͤs /ǰ/ m /̵/ @@ -11683,10 +11683,10 @@ 󤻤s // 󤹤b /ؿ/ 󤸤礦Ƥg /Ū/ -󤸤礦s // -󤸤礦k // -󤸤礦i // -󤸤礦g // +󤸤礦s /;⻻׹⤤/ +󤸤礦k /;⻻׹⤤/ +󤸤礦i /;⻻׹⤤/ +󤸤礦g /;⻻׹⤤/ 󤸤䤹s // 󤸤䤹k // 󤸤䤹i // @@ -11712,7 +11712,7 @@ c // 󤭤m // r // -󤬤r /դ/ +󤬤r /դ;/ 󤬤֤s /ͤ/ 󤬤֤k /ͤ/ 󤬤֤i /ͤ/ @@ -11722,7 +11722,7 @@ 󤬤ʤs /ͤľ/ 󤬤k /ͤ/ 󤬤i /ͤ/ -󤬤i /ͤ/ +󤬤i /ͤ;̾/ 󤬤s /ͤ/ 󤬤g /ͤ/ 󤬤n /ͤ/ @@ -11735,14 +11735,14 @@ 󤬤֤k // 󤬤֤i // 󤬤֤g // -m /// +m //;λ/ h // -e ////ڿ/ +e //;/;/ڿ;/ 󤫤Ĥi /ɳ/ r // -z /// +z /;(feel)/;(contemplate) Ѥ/ t // -s //////// +s /;ؿ//;//;(silence) Ȥ//;ִءפε/ j // g // d /// @@ -11759,14 +11759,14 @@ 襤k /İ/ 襤i /İ/ 襤g /İ/ -t ////// -s /// -r ////// -n ////// -k /// -i /// -c ////// -y /// +t //;ѡפε//// +s //;(avoid) / +r /////;ѡפε/ +n /////;ѡפε/ +k //;(thirst) 餯/ +i //;(thirst) 餯/ +c /////;ѡפε/ +y //;ַڡפε/ u // n // n // @@ -11781,20 +11781,20 @@ c // 뤹g /ڲ/ 뤬s /ڡ/ڷ/ -u /// -s /// -m /// -k /// -i /// -g /// +u //;ַڡפε/ +s //;ַڡפε/ +m //;ַڡפε/ +k //;ַڡפε/ +i //;ַڡפε/ +g //;ַڡפε/ 錄s // i /˥/ t /// r /// n /// c /// -äѤs /ڤ/ -s /ڤ/// +äѤs /ڤ;١-/ +s /ڤ;(borrow)ܤڤФ/;(bring out)˶Ф/;(hunt out)ȿͤФ/ ꤿs /ڤ/ ꤿt /Ω/ ꤽm // @@ -11811,7 +11811,7 @@ ꤫s /ڤ/ ꤫e /ڤ괹/ڴ/ ꤦk /ڤ/ -ꤤr /ڤ//// +ꤤr /ڤ///;̾,Բ/ ꤢm /꽸/ ꤢg /ڤ// n // @@ -11838,19 +11838,19 @@ 餿r /ݳ/ 餹g /ɲ/ 餵g // -餯t // -餯r // -餯n // -餯c // +餯t /;[ʸ]-/ +餯r /;[ʸ]-/ +餯n /;[ʸ]-/ +餯c /;[ʸ]-/ 餦r // 餢g // -s //Ϥ// +s /;(hot) ɤ졼/Ϥ;/;(salty) Ḥ̂/ p // n // -m ///// -k /// -i /// -g ///// +m //;(hot) ɤ졼/;/;(salty) Ḥ̂/ +k /;(hot) ɤ졼/;(salty) Ḥ̂/ +i /;(hot) ɤ졼/;(salty) Ḥ̂/ +g /;/;/;(hot) ɤ졼/;(salty) Ḥ̂/ s // k // i // @@ -11871,15 +11871,15 @@ i // e // c // -s /// +s //;=ڤ/ m // -k /// -i /// -g /// +k //;=ڤ/ +i //;=ڤ/ +g //;=ڤ/ k // r /㸯/ ⤷s // -s /// +s //;־פε(̾Ѵ)/ r // t /// r /// @@ -11917,7 +11917,7 @@ ߤe /߹/ ߤc /߹/ s // -g // +g /;-,-ä (ꡦ)/ ޤӤs // w // u // @@ -11932,18 +11932,18 @@ ܤk // ܤi // ܤg // -t /// -r /// +t /;ֵפε/;ֵפΰλ/ +r /;ֵפε/;ֵפΰλ/ ֤k /ʬ/ -֤k // -֤i // -t /// +֤k /;NB:֤kפƱ/ +֤i /;NB:֤kפƱ/ +t //;[ʸ](Ի)-դ/ s // -r //// -n /// -k // -i // -c /// +r //;֤/;[ʸ](Ի)-դ/ +n //;[ʸ](Ի)-դ/ +k /;Ÿ졣ֲפθ츻/ +i /;Ÿ졣ֲפθ츻/ +c //;[ʸ](Ի)-դ/ Ӥs /཭/ӽ/ Ӥk /ӽ/཭/ Ӥi /཭/ӽ/ @@ -11992,15 +11992,15 @@ ʤr // ʤr // ʤk /̾/ -w //Ũ/Ŭ/ -u //Ũ/Ŭ/ -t //Ŭ/Ũ/ -s //// -o //Ũ/Ŭ/ -i //Ũ/Ŭ/ -e //Ũ/Ŭ/ +w /;̴/Ũ;ˤŨʤ/Ŭ;(conform) ŪŬ/ +u /;(come true) ̴/Ũ;(rival) ŨԤʤ/Ŭ;(conform) ŪŬ/ +t /;(come true) ̴/Ŭ;(conform) ŪŬ/Ũ;(rival) ŨԤʤ/ +s /;(:ĥ)/;(:פǶĤ)/;(:Ⱕ) NB:֤sפƱ/ +o /;(come true) ̴/Ũ;(rival) ŨԤʤ/Ŭ;(conform) ŪŬ/ +i /;(come true) ̴/Ũ;(rival) ŨԤʤ/Ŭ;(conform) ŪŬ/ +e /;(come true) ̴/Ũ;(rival) ŨԤʤ/Ŭ;(conform) ŪŬ/ d // -c //Ũ/Ŭ/ +c /;(come true) ̴/Ũ;(rival) ŨԤʤ/Ŭ;(conform) ŪŬ/ k // Ƥs // Ĥs /ô/ @@ -12008,8 +12008,8 @@ Ĥm /ô/ Ĥg /ô/ t // -i /ô/ٿ/ -g /ô/ٿ/ +i /ô/ٿ;ôפε/ +g /ô/ٿ;ôפε/ e // äѤw /ߤʧ/ äѤu /ߤʧ/ @@ -12102,7 +12102,7 @@ t // o // i // -g /// +g //;[]/ c // 餤s /˵/ 餤k /˵/ @@ -12135,8 +12135,8 @@ k // i // r /Ҹ/ -k // -i // +k /;Ÿ/ +i /;Ÿ/ Ӥk /ҳ/ Ҥk /ҳ/ Фr // @@ -12147,7 +12147,7 @@ s /̵/ ɤr // t // -r //// +r //;ݤ/;(ˤ)/ n // c // Ťr // @@ -12178,17 +12178,17 @@ Ӥm /ҳϷ/ r // y // -t /// -s ////// -r /// +t //;(deceive) ̾٤/ +s /;()ֹŤСա/;(generic)/;(ä)ַ/;(difficult)/;(clean) -/ +r //;(deceive) ̾٤/ p // -n /// -m ////// -k ///// -i ///// -g ////// +n //;(deceive) ̾٤/ +m ////;§(k)/;(difficult)/ +k /;(generic)/;()ֹŤСա/;(ä)ַ/;(difficult)/ +i /;(generic)/;()ֹŤСա/;(ä)ַ/;(difficult)/ +g /;-/;(generic)/;()ֹŤСա/;(ä)ַ/;(difficult)/ d // -c /// +c //;(deceive) ̾٤/ r /²Ϣ/ w /²/ t /Ω/ @@ -12198,7 +12198,7 @@ c // r // g // -e /// +e //;/ s /ͩ/ k /ͩ/ k // @@ -12230,21 +12230,21 @@ ߤ錄n // ߤ錄c // ɤr // -t /Ϋ// -r //Ϋ/ -n ///Ϋ// -m //Ϋ// -k //ͩ/ -c //Ϋ/ +t /Ϋ/;NB:֤rס֤rס֤ʤrפƱ/ +r /;NB:֤rס֤rס֤ʤrפƱ/Ϋ/ +n //;NB:֤rס֤rס֤ʤrפƱ/Ϋ/; ܤʤ/ +m //Ϋ/; ܤʤ/ +k /;(:Ωʤ)/ͩ;(:Ťɤʤ)/ +c /;NB:֤rס֤rס֤ʤrפƱ/Ϋ/ k // i // 礦k /վ/ n /ج/ m /ج/ -t //// -r //// -n //// -c //// +t ///;פΰλ/ +r //;פΰλ// +n //;פΰλ// +c //;פΰλ// s // k /ߤ// s /ߤ/߽/ @@ -12254,27 +12254,27 @@ r /ߤ/ n /ߤ/ c /ߤ/ -s /// +s //;(¿)/ m // -k /// -i /// -g /// +k //;(¿)/ +i //;(¿)/ +g //;(¿)/ t /ߤ// r /ߤ// n /ߤ// c /ߤ// r /ߤ/ i //// -g //// +g /;¥Ը[gi]/;¥Ը[gi]// k // ꤿt /Ω/ k // Ȥs // -t //// +t //;־פΰλ/;(°Ǥ)/ s // -r //// -n //// -c //// +r //;(°Ǥ)/;־פΰλ/ +n //;(°Ǥ)/;־פΰλ/ +c //;(°Ǥ)/;־פΰλ/ t /ĥ/ r /ĥ/ n /ĥ/ @@ -12293,29 +12293,29 @@ ʤꤢi /Ťʤ/ ʤꤢe /Ťʤ/ ʤꤢc /Ťʤ/ -t /Ť/ +t /Ť;/ n /// m // k // n /׹/ n /Ϥ/ m /Ϥ/ -w //ԣ/ -u //ԣ/ -t ////ԣ/ -o //ԣ/ -n //ԣ/ -m //ԣ/ -i //ԣ/ -e //ԣ/ -c //ԣ/ +w //ԣ;ְϡפε/ +u //ԣ;ְϡפε/ +t ///;/ԣ;ְϡפε/ +o //ԣ;ְϡפε/ +n //ԣ;ְϡפε/ +m //ԣ;ְϡפε/ +i //ԣ;ְϡפε/ +e //ԣ;ְϡפε/ +c //ԣ;ְϡפε/ m /Ƨ/ g // t /// r /// n /// c /// -錄s /ͤ/ݤ/ +錄s /ͤ;-/ݤ;-/ t // r // n // @@ -12330,7 +12330,7 @@ ޤr // ޤn // ޤc // -k /// +k /;()-// Τt /櫓/ Τr /櫓/ Τn /櫓/ @@ -12341,7 +12341,7 @@ Ƥt /櫓ƹ/ƹ/ Ƥk /ƹ/櫓ƹ/ Ƥc /ƹ/櫓ƹ/ -Ĥt /դ/ +Ĥt /դ;/ k // w /ݤ/ u /ݤ/ @@ -12349,7 +12349,7 @@ o /ݤ/ i /ݤ/ c /ݤ/ -s ///ݤ/ݽ/ +s ///ݤ;-Ǩ/ݽ/ ޤt // ޤr // ޤn // @@ -12409,10 +12409,10 @@ r /Ѵ/ t // g /ʾ/ -t //ۤ/ -s ///ƿ/// -r /// -m /ƿ/ +t //ۤ;/ +s //;褹/ƿ;(:ʪƤ) Ᵽ/;褹/;ֱפε/ +r //;ֱפε/ +m /ƿ;§(u)/ k /̤ʬ/ s /¤̵/ k /¤̵/ @@ -12430,7 +12430,7 @@ n // c // 魯r /˺/ -k /ߤʬ/ʬ/ʬ/ +k /ߤʬ;ȱ-/ʬ;ʸΤ-/ʬ/ 褴s /񤭱/ 䤹s /񤭰/ 䤹k /񤭰/ @@ -12453,7 +12453,7 @@ i /ȴ/ ʤs /ߤ/ ʤb // -ʤs /ή/ +ʤs /ή;ä-/ ʤs /ľ/ r //ߤ/񤭴/ Ȥm /α/ @@ -12504,10 +12504,10 @@ n /ߤ/ e /ߤ// c /ߤ/ -r /񤭴/ +r /񤭴;/ w // e /񤭴//// -s /// +s //;/ n /񤭵/ b /񤭵/ s // @@ -12540,15 +12540,15 @@ 䤭錄r // 䤭錄n // 䤭錄c // -k //// -i //// +k //;(:餮Ȥ䤯)/;(:֡ȲоȤ)/ +i //;(:餮Ȥ䤯)/;(:֡ȲоȤ)/ ߤn /߹/ ߤm /߹/ -t // -r // -n /// +t /;sew/ +r /;sew/ +n //;sew/ m // -c // +c /;sew/ ꤢw /ؤ// ꤢu /ؤ// ꤢt /ؤ// @@ -12556,21 +12556,21 @@ ꤢi /ؤ// ꤢe /ؤ// ꤢc /ؤ// -t //// -r //// -n //// -c //// +t /;(:óݤ)֤ˤ⹴餺/;(:ɳǤĤʤ) ֡Ĥ˷ˡΧ NB:֤rפƱ/;(:̤Τ褦˻ʪĤʤ) ֥ץȤ˴ؤ/ +r /;(:ɳǤĤʤ) ֡Ĥ˷ˡΧ NB:֤rפƱ/;(:óݤ)֤ˤ⹴餺/;(:̤Τ褦˻ʪĤʤ) ֥ץȤ˴ؤ/ +n /;(:ɳǤĤʤ) ֡Ĥ˷ˡΧ NB:֤rפƱ/;(:óݤ)֤ˤ⹴餺/;(:̤Τ褦˻ʪĤʤ) ֥ץȤ˴ؤ/ +c /;(:ɳǤĤʤ) ֡Ĥ˷ˡΧ NB:֤rפƱ/;(:óݤ)֤ˤ⹴餺/;(:̤Τ褦˻ʪĤʤ) ֥ץȤ˴ؤ/ k /ݤ/ ꤹg /ݤ/ n // m // -w ///// -t //// -r //// -n //// +w /;(:̤Τ褦˻ʪĤʤ) ֥ץȤ˴ؤ/;(:ɳǤĤʤ) ֡Ĥ˷/;(:óݤ)֤ˤ⹴餺/;ִءפε/ +t ///;µ/ +r ///;µ/ +n ///;µ/ g // e // -c //// +c ///;µ/ ꤿs // ꤿk // ꤿi // @@ -12594,22 +12594,22 @@ ꤶi /֤/ ꤬k // ꤦt /֤Ƥ/ -m /// -äƤz /ä/֤ä/ -äƤy /ä/֤ä/ -äƤs /ä/֤ä/ -äƤr /ä/֤ä/ -äƤn /ä/֤ä/ -äƤi /ä/֤ä/ -äƤr /ä/֤ä/ -äƤn /ä/֤ä/ -äƤy /ä/֤ä/ -äƤt /ä/֤ä/ -äƤs /ä/֤ä/ -äƤn /ä/֤ä/ -äƤm /ä/֤ä/ -äƤd /ä/֤ä/ -äƤc /ä/֤ä/ +m /;(ȿ) 椬Ȥʤߤ/;(look back) ܤߤ,ܤߤʤ/ +äƤz /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤy /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤs /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤr /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤn /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤi /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤr /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤn /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤy /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤt /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤs /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤn /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤm /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤd /ä;ҶȤ-/֤ä;᡼뤬-/ +äƤc /ä;ҶȤ-/֤ä;᡼뤬-/ s /֤/ s /夨/ k /夨/ @@ -12617,12 +12617,12 @@ g /夨/ z /// y /// -t ////ȿ//////// -s /////ȿ///// -r /////ȿ///// -n /////ȿ///// +t /;Ȥ˵/;֤,Ҥä֤//ȿ;(ȿž)/;() ڤ˴Ԥ/;ֵפε/;ֵפΰλ/;(۲) ۤ///;ֵѡפΰλ/ +s /;֤,΢֤/;Ȥ˵/;(᤹) ˴Ԥ/;(۲) ۤ/ȿ;(֤) ȿž/;ֵפε/;ֵפΰλ/// +r /;Ȥ˵/;֤,Ҥä֤/;() ڤ˴Ԥ/;(۲) ۤ/ȿ;(ȿž)///;ֵפε/;ֵפΰλ/ +n /;Ȥ˵/;֤,Ҥä֤/;() ڤ˴Ԥ/;(۲) ۤ/ȿ;(ȿž)///;ֵפε/;ֵפΰλ/ m /// -c ///////ȿ/// +c /;Ȥ˵/;ֵפε/;ֵפΰλ/;֤,Ҥä֤/;() ڤ˴Ԥ/;(۲) ۤ/ȿ;(ȿž)/// s //㤤/ m /㤤/ ޤz /ָ/ @@ -12705,24 +12705,24 @@ c /㤤/ w // g /㤤/ -t /// -s ////// +t //;ֲפΰλ/ +s /;դ˲򤹤/;ȼԤ𤹤,դ˲𤷤ʤ/;Ʋ˲񤹤/;ֲפε/;ֲפΰλ/ s // -w ////////// -u ///// -t //////////////// -s //////////// -r //////////// -o ///// -n ///////////// -m ///// -k //////////////////// -i /////////////// +w /;(Ѳ)Ѥ/;()˽ʤ/;魯/;夬ؤ////;ѡפε/;/ +u ////;/ +t ////;(crop)򴢤/;(hunt)Ƥ/;-Ĥ/;Хä/;Ӹä/;(overcome) ն˹/;-ƤƲä/;ִפΰλ/;ֶפε/;/;(Ȭ)θ()// +s ///;Ǥݤ/;Ĩʤ/;˲Ǥ/;ͤ/;=-/;//// +r //;𤬸Ϥ/;(hunt)Ƥ/;(crop)򴢤/;(drive)֤,ư˶/;/;Τ//;(Ȭ)θ()/;ִפΰλ/;ֶפε/ +o ////;/ +n ////;(hunt)Ƥ/;(crop)򴢤/;(drive)֤,ư˶/;ߤĤּؤ/;٤ߺդ/;[ʸ]()⤹/;(Ȭ)θ()/;ִפΰλ/;ֶפε/ +m //;ߤĤּؤ/;٤ߺդ/;[ʸ]()⤹/ +k ////;­/;(bet) Ҥ/;ڤȤߤ/; NB:֤kפƱ/;褯/;ͤ/;ֶפε(̾Ѵ)/;Ƥ/;-()/;̿/;(ҤǤĤʤ)/;礱/;Ƥͤ/;ֲפε/;ַפε/;/ +i ///; NB:֤kפƱ//;褯/////;ֲפε/;ַפε/;/;礱/;Ƥͤ/ h ///////// g // -e /////////// -c ///////////// -b // +e /;(Ѳ) ٤Ѥ/;(ؤ) ʤؤ/;() Ĥ夨/;() ˴////;ѡפε//;/ +c /////;/;(overcome) ն˹/;(hunt)Ƥ/;(crop)򴢤/;(drive)֤,ư˶/;ִפΰλ/;ֶפε// +b /;-Ӥ/ m // k // ʤs // @@ -12736,7 +12736,7 @@ s // r // p // -j /Ʊ/ +j /Ʊ;/ s // 󤬤s // i // @@ -12747,14 +12747,14 @@ 狼k // 狼i // 狼g // -t //ɭ/ +t //ɭ;(:Ļäͤ)/ s /// -r //ɭ// -n //ɭ/ -c //ɭ/ +r //ɭ;(:Ļäͤ)/;/ +n //ɭ;(:Ļäͤ)/ +c //ɭ;(:Ļäͤ)/ k // e /³/ -s /// +s /;(wholesale)ʤ򲷤,纬򲷤/;NB:֤sפƱ/ k // ޤt /ޤ/ ޤr /ޤ/ @@ -12781,8 +12781,8 @@ ꤿm /ޤ/޾/ ꤿt /ߤΩ/Ω/ ꤿc /ߤΩ/Ω/ -ꤳn /ޤ//޹// -ꤳm /ޤ//޹// +ꤳn /ޤ;饷ޤ/;Ϥ⤦ߺѤߤ/޹// +ꤳm /ޤ;饷ޤ/;Ϥ⤦ߺѤߤ/޹// ꤫n /ޤ/ ꤫s /ޤ// ꤤt /ޤ/ @@ -12809,8 +12809,8 @@ r // n // m // -i /// -g /// +i //; (:̤餹)/ +g //; (:̤餹)/ b // 椺r /ƾ/ 䤹s // @@ -12840,8 +12840,8 @@ भ֤k // भ֤i // भ֤g // -k /// -i /// +k /;(go) 뤯/;񤭤/ +i /;(go) 뤯/;񤭤/ ߤk /Ť/ Ϥs /̱/ Ϥk /̱/ @@ -12859,9 +12859,9 @@ Ƥc /ɽΩ/ Ƥk /ɽ/ Ƥm /ɽ/ -t /Ω/Ω/ -c /Ω/ -⤹r /Ų᤮/ +t /Ω/Ω;=Ω/ +c /Ω;=Ω/ +⤹r /Ų᤮;/ ⤹g /Ų/ ⤷s /ľ/ ⤷u // @@ -12943,21 +12943,21 @@ ⤤t /פ/ ⤤g /פ/ y // -w ///ǰ// -u ///ǰ/// -t //////ǰ// +w //;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)/ +u //;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)// +t /////;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)/ s // r // -o ///ǰ// +o //;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)/ n /// m // k // -i ////ǰ// +i ///;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)/ h /// g // -e ///ǰ// +e //;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)/ d // -c /////ǰ// +c ////;(:оݤ˸⤦)/ǰ;(:ǿ⤦)/;(:줳Ȥ⤦)/ ᤶm /ܳ/ s // n // @@ -12993,7 +12993,7 @@ t // s /// r /Ů/ -e //// +e //;(äˡ) ǯ򲱤/;ֳСפε/ m /˫/ h //ʤ/ w // @@ -13007,8 +13007,8 @@ Ӥs // Ӥs /Ͷ/ Ӥs /Ͷ/ -k /Ͷ/ -i /Ͷ/ +k /Ͷ;Ÿ/ +i /Ͷ;Ÿ/ e /// ҤȤs /͹/ Ҥs /// @@ -13024,7 +13024,7 @@ Τn // z // r // -g // +g /;-()/ ͤi /// ͤt // ˤi // @@ -13061,12 +13061,12 @@ ɤr // ɤn // ɤc // -t //// -s //// -r //// -n //// -k //// -c //// +t /;dance/;١פΰλ/;jump/ +s ///;(λ֤)/ +r /;dance/;jump/;١פΰλ/ +n /;dance/;jump/;١פΰλ/ +k //;-/;:ܤ򸫤ƶ줵/ +c /;dance/;jump/;١פΰλ/ Ȥe // Ȥs /// Ȥꤪk // @@ -13084,7 +13084,7 @@ Ȥr /ˬ/ Ȥn /Ȥ/ Ȥm /Ȥ/ -Ȥr /// +Ȥr //;ִ١פε(̾Ѵ)/ Ȥm // Ȥr // Ȥs /˽/ @@ -13097,7 +13097,7 @@ Ȥm // Ȥs // Ȥw // -z /ˬ/ +z /ˬ;§(Ȥr)/ t // s // r // @@ -13109,7 +13109,7 @@ Ƥw // Ƥg /// Ĥm // -Ĥr //¤/ +Ĥr /;ꤷޤ/¤;¤(=ɿ)/ Ĥi /դ/ Ĥr // Ĥi // @@ -13128,7 +13128,7 @@ äѤc /ɤʧ/ äѤm /û/ äk /ɤ/ -än /û/ +än /û;¥ʹԸ(-)/ ät /Ω/ɤΩ/Ω/ äc /Ω/Ω/ ät //ͭ/ @@ -13138,7 +13138,7 @@ äc //ͭ/ äs // äk /ɤó/ -t /ɤ/ +t /ɤ;/ r /// Фk /ʲ/ b // @@ -13154,10 +13154,10 @@ m // n // m // -t ///// -r ///// -n ///// -c ///// +t //;ִ١פε(̾Ѵ)/// +r ////;ִ١פε(̾Ѵ)/ +n //;ִ١פε(̾Ѵ)/// +c //;ִ١פε(̾Ѵ)/// w // u // t // @@ -13165,10 +13165,10 @@ i // e // c // -r //Ĥ/Ƥ// -i // +r //Ĥ;/Ƥ;/;/ +i /;§(r)/ k // -y /// +y //;/ t // s // s // @@ -13181,17 +13181,17 @@ i /// g /// b // -s //// +s /;äȤ/;ɤ󤯤/;/ t /ݵΩ/ c /ݵΩ/ -m /// +m /;(hideous)ޤ/; dull/ s // i /·/ 줪Τk // 줪Τi // -줪s /ڤ¿/¿/ -줪k /ڤ¿/¿/ -줪i /ڤ¿/¿/ +줪s /ڤ¿/¿;NB:ְڤ¿פܵȿǤѻ/ +줪k /ڤ¿/¿;NB:ְڤ¿פܵȿǤѻ/ +줪i /ڤ¿/¿;NB:ְڤ¿פܵȿǤѻ/ 줤t // 줤r // 줤n // @@ -13220,14 +13220,14 @@ w /// u // t // -s /// -r /////// +s //;/ +r //;(郎)/;(ɤ)/;(Ȥεǽ) NB:Ū/;ӤӤ/;פΰλ/ o // -m /// -k /// -i //// +m //;/ +k //;/ +i ///;/ h // -g /// +g //;/ e // c // t /Ω/ @@ -13330,17 +13330,17 @@ g // c // r /// -g /ˤ/ +g /ˤ;/ e // g // s /洨// k /洨// i /洨// g /洨// -s /// -k /// -i /// -g /// +s //;NB:֤Ȥiס֤狼iפƱ/ +k //;NB:֤Ȥiס֤狼iפƱ/ +i //;NB:֤Ȥiס֤狼iפƱ/ +g /;NB:֤Ȥiס֤狼iפƱ// s /满/ w /Ͷ/ k //ޤ// @@ -13351,14 +13351,14 @@ n /ޤ/// c /ޤ/// n // -m //Ǽ//// -e ///// +m /;-,̤-/Ǽ;Ǥ-/;-/;ضȤ-/;ּפε(̾Ѵ)/ +e /;(suppress) ܤޤ/;(catch) 򲡤//;ְפε/ ꤿb // -k /// -t //// -r //// -n //// -c //// +k //;ָפε(̾Ѵ)/ +t /;/;ʿ// +r /;/;ʿ// +n /;/;ʿ// +c /;/;ʿ// ꤨz // ꤨy // ꤨt // @@ -13371,11 +13371,11 @@ ꤦb // r // m // -w //Ԥ/ -u //Ԥ/ +w //Ԥ;/ +u //Ԥ;/ t // o // -i //Ԥ/ +i //Ԥ;/ h // e // c // @@ -13384,13 +13384,13 @@ r // n // c // -t //// -s /////// -r //// -n ///// -g /// -c //// -r // +t ///;(prosper)񤬶/ +s /;򶽤//;Ф/;=褳//;/ +r //;(prosper)񤬶// +n //;[] -/;(prosper)񤬶// +g /;-ޤ// +c //;(prosper)񤬶// +r /;/ फe // ʤs /ľ/ Ȥk // @@ -13400,7 +13400,7 @@ ꤳn // ꤳm // ꤫s // -椫s // +椫s /;ƻ/ k // ֤s // ֤k // @@ -13411,11 +13411,11 @@ դi // դg // y // -t //£/ -s /// -r //£//// -n //£/ -c //£/ +t /;(send)/£;(present) ޤ£/ +s /;/;-/ +r /;(send)/£;(present) ޤ£//;/;١פε/ +n /;(send)/£;(present) ޤ£/ +c /;(send)/£;(present) ޤ£/ w // u // t // @@ -13440,16 +13440,16 @@ c /Ω/ r /֤/ k /֤/ -t /֤/ -r /֤/ -w /֤/֤/֤/ +t /֤;/ +r /֤;/ +w /֤/֤;?/֤;?/ e /֤/ִ/ g // m // k /ʹ/ʹ/ ߤs /Ҥ/ -n /// -m /// +n //;ҡפε(̾Ѵ)/ +m //;ҡפε(̾Ѵ)/ i // r //˵/ ɤi /// @@ -13459,8 +13459,8 @@ r // m /㤤/ g /㤤/ -w /// -s ////ľ// +w /;Ѥꤢޤ/;Ӥ/ +s /;(violate)ˡȤ/;(invade)򿯤/;(risk)/ľ;(ƻ,funny)// k /// i // b // @@ -13474,15 +13474,15 @@ ޤi /ְ/ k // g // -r /翶// +r /翶;HR-ס-δ/;-α/ Ф֤i /׿/׿/ ˤw // ɤr // -ȤΤr // +ȤΤr /;[ʸ]̲(ˤʤ)/ m // i // k /Ĥ/ -t /᤮/ +t /᤮;/ g /¿/ e /涵// g // @@ -13503,30 +13503,30 @@ r /˽/ t // r // -z //// -w /ʤ////// -u /ʤ/////¿// -t /ʤ////// -s /¿//ͺ/// -r //¿/ -o /ʤ////// -m /¿/// -k //¿// -j /// -i /¿//ʤ/////// +z //;֤̾-/;ֱפε(̾Ѵ)/ +w /ʤ/////;/ +u /ʤ/////¿;()/;/ +t /ʤ/////;/ +s /¿//ͺ/;¿פΰλ/;̤/ +r //¿;-餫 / +o /ʤ/////;/ +m /¿//;¿פΰλ/ +k //¿/;¿פΰλ/ +j /;֤̾/;ֱפε(̾Ѵ)/ +i /¿//ʤ/;¿פΰλ/////;/ h //ʤ/ -g //¿/ʤ// -e /ʤ////// -c /ʤ////// +g //¿/ʤ/;¿פΰλ/ +e /ʤ/////;/ +c /ʤ/////;/ i // ܤޤr // ܤs /粼/ Ф֤i /ӿ/ӿ/ s // i // -z /// +z //;ֱפε(̾Ѵ)/ r // -j /// +j //;ֱפε(̾Ѵ)/ i // ʤs /濧ľ/ t /ɤ/ @@ -13558,7 +13558,7 @@ i /ɤ/ r /ɤ/ s /ɤ/ɽ/ -t /Ω/ɤΩ/ +t /Ω;-/ɤΩ;-Ƥ/ s /˻/ t /ɤ/ r /ɤ/ @@ -13585,23 +13585,23 @@ k // i /// z // -w ///// -u ///// -t /////////// -s /////// -r /////// +w ////;() द/ +u ////;() द/ +t /////;corrupt.Ĥ/;go down.ԵƤ///;ġפε/;() द/ +s ///;(recommend) ͤ䤹/;(Ϥä) ؤǰ/;ȽҤ褹/;ְפε/ +r //////;Ҷ-/ p // -o //// +o //;() द// n /// m /// -k ///////ڨ// +k ///;/;ɤä/;ä/;ٮ/ڨ;ɮڨ/;-ä/ j // -i ///Ϸ////// +i ///Ϸ//;//;ֽפΰդλΡ֤/;() द/ h //// -e ///// +e ////;() द/ d // -c ///////// -b /// +c //////;() द/// +b //;ӡפε(̾Ѵ)/ ֤s /θ/ ֤k /θ/ ֤i /θ/ @@ -13636,11 +13636,11 @@ Ӥr /Ӽ/ Ӥs /ӽ/ s // -n //// +n //;(:˼äƤ)/;(ν)-/ k // i // g // -b ///// +b //;(ν)-/;(:˼äƤ)/;-֤/ Ӥt /Ϸȿ/ Ӥr /Ϸȿ/ Ӥn /Ϸȿ/ @@ -13655,12 +13655,12 @@ r /޴/ r /޴/ s /ٱ/ -t /ٱ// -r /ٱ// -n /ٱ// +t /ٱ/; =ٱ/ +r /ٱ/; =ٱ/ +n /ٱ/; =ٱ/ k // i // -c /ٱ// +c /ٱ/; =ٱ/ r // s // s // @@ -13679,15 +13679,15 @@ z /// r // j /// -z /// -y /// -t //// -s /// -r //// -n ///// -m //// -k /// -c //// +z //;NB:֤rפƱ/ +y //;NB:֤rפƱ/ +t //;NB:֤rפƱ/;NB:֤rס֤rפƱ/ +s //;NB:֤rפƱ/ +r //;NB:֤rפƱ/;NB:֤rס֤rפƱ/ +n ///;NB:֤rפƱ/;NB:֤rס֤rפƱ/ +m ///;NB:֤rפƱ/ +k //;NB:֤rפƱ/ +c //;NB:֤rפƱ/;NB:֤rס֤rפƱ/ s // k // i // @@ -13718,7 +13718,7 @@ 蘆ɤr // 蘆s // 郎k // -狼k // +狼k /;?/ z // t // m // @@ -13731,10 +13731,10 @@ Τc // 줷s // 줨r // -u /ͫ/// +u /ͫ//;NB:֤鷺uפƱ/ s // -i /ͫ/// -e /ͫ/// +i /ͫ;(worry)/;(sorrow)/;NB:֤鷺iפƱ/ +e /ͫ//;NB:֤鷺uפƱ/ s //// 뤵s //޷// 뤵k //޷// @@ -13811,19 +13811,19 @@ 餮n /΢/ 餮c /΢/ 餬s // -餬t /΢/ +餬t /΢;-/ 餬s /΢/ -餬r /΢/ -餬n /΢/ -餬c /΢/ +餬r /΢;-/ +餬n /΢;-/ +餬c /΢;-/ 餬k /΢/ 餫s /΢/ 餦t /΢/ 餦c /΢/ 餢m /΢/ r // -n //// -m //// +n /;(:˽Ĥ)/;(:դݵ)/;(䴸ǰ)˻ˤʤ봸ߤ/ +m /;(:˽Ĥ)/;(:դݵ)/;(䴸ǰ)˻ˤʤ봸ߤ/ d /΢/ w // u // @@ -13864,12 +13864,12 @@ ޤ줢s /ޤ/ ޤ줢w /ޤ/ ޤr /Ͼ/ -s ///̣//// +s /;(:äƤȤޤ)/;(:ιٹ)/̣//;/;NB:֤iפƱ/ r // -m //̣/// -k ////̣/// -i ///̣//// -g ///̣//// +m /;(:äƤȤޤ)/̣/;NB:֤iפƱ// +k //;(:äƤȤޤ)/;(:ιٹ)/̣/;NB:֤iפƱ// +i //;(:äƤȤޤ)/̣/;(:ιٹ)/;NB:֤iפƱ// +g //;(:äƤȤޤ)/̣/;(:ιٹ)/;NB:֤iפƱ// ٤w // ٤u // ٤t // @@ -13904,7 +13904,7 @@ i /å/ e /å/ c /å/ -m /// +m //;?/ ̤r //ʹ/ ʤr // ʤs // @@ -13923,12 +13923,12 @@ r /ӹ/ n /ӹ/ c /ӹ/ -s /// +s //;λ/ n // m // -k /// -i /// -g /// +k //;λ/ +i //;λ/ +g //;λ/ Ǥs /ӻ/ ǤƤs /Ω/ Ǥm // @@ -13936,8 +13936,8 @@ Ǥm /Ӹ/ Ǥs /Ӳ/ Ĥk /ܤ/ -Ĥꤳn /̤/Ǥ/ -Ĥꤳm /Ǥ/̤/ +Ĥꤳn /̤;̿˼̤/Ǥ;̤˱Ǥ/ +Ĥꤳm /Ǥ;̤˱Ǥ/̤;̿˼̤/ Ĥ꤫t /ܤ/ Ĥ꤫r /ܤ/ Ĥ꤫n /ܤ/ @@ -13954,14 +13954,14 @@ Ĥn /̤/ Ĥm /̤/ Ĥs // -t ///////// -s ///////ݵ/ -r /////////// -n /////////ݵ/ -k /// +t //;̿˼̤/;˱Ǥ/;Ԥ/;ּ̡פε1/;ּ̡פε2/;ֱǡפΰλ/;(ƻ) ٤/ +s //;(|̿)̤/;˱Ǥ/;ּ̡פε1/;ּ̡פε2/;ֱǡפΰλ/ݵ/ +r //;˱Ǥ/;̿˼̤/;- (̾)/;/;(ƻ) ٤/;Ԥ/;ּ̡פε1/;ּ̡פε2/;ֱǡפΰλ/ +n //;˱Ǥ/;̿˼̤/;(ƻ) ٤/;Ԥ/;ּ̡פε1/;ּ̡פε2/;ֱǡפΰλ/ݵ/ +k /;-/;-()/ d /ݵ/ -c ///////// -äȤs /ݵƫ/ƫ/ +c //;˱Ǥ/;̿˼̤/;(ƻ) ٤/;Ԥ/;ּ̡פε1/;ּ̡פε2/;ֱǡפΰλ/ +äȤs /ݵƫ/ƫ;ݵװλ/ äƤz /Ǥäƽ/ äƤy /Ǥäƽ/ äƤt /Ǥäƽ/ @@ -14025,7 +14025,7 @@ c /Ǥ/Ƥ/ Ĥk /Ǥ³/ k /Ǥ/ -äѤs /Ǥ/ +äѤs /Ǥ;-Υ󥯥/ s /Ǥ/ s /Ǥ/ t /ǤΩ/ @@ -14036,8 +14036,8 @@ g /Ǥ/ s /Ǥ/ s /Ǥ/ -n /Ǥ//ǹ/ -m /Ǥ//ǹ/ +n /Ǥ/;Ƥ-/ǹ/ +m /Ǥ/;Ƥ-/ǹ/ s /Ǥ/Ǿ/ k /Ǥ/ i /Ǥ/ @@ -14099,13 +14099,13 @@ s /Τ/ k /Τ/ g /Τ/𤤾/ -w ///////// -u ///////// -t ///////// -o ///////// -i ///////// -e ///////// -c ///////// +w //;(ڤˤ)/;(ĥ) ǽ/;(̵ȼդǤ)/;(ϤäȤ)/;ءפε(̾Ѵ)/;ֲΡפΰλ/;²ΤӤ/ +u //;(ڤˤ)/;(ĥ) ǽ/;²ΤӤ/;(ϤäȤ)/;(̵ȼդǤ)/;ءפε(̾Ѵ)/;ֲΡפΰλ/ +t //;(ڤˤ)/;(ĥ) ǽ/;(̵ȼդǤ)/;(ϤäȤ)/;ֲΡפΰλ//;ءפε(̾Ѵ)/ +o //;(ڤˤ)/;(ĥ) ǽ/;(̵ȼդǤ)/;(ϤäȤ)/;ءפε(̾Ѵ)/;ֲΡפΰλ/;²ΤӤ/ +i //;(ĥ) ǽ/;(ڤˤ)/;(̵ȼդǤ)/;ֲΡפΰλ/;(ϤäȤ)/;ءפε(̾Ѵ)/;²ΤӤ/ +e //;(ڤˤ)/;(̵ȼդǤ)/;ֲΡפΰλ/;(ϤäȤ)/;(ĥ) ǽ/;ءפε(̾Ѵ)/;²ΤӤ/ +c //;(ڤˤ)/;(ĥ) ǽ/;(ϤäȤ)/;(̵ȼդǤ)/;ءפε(̾Ѵ)/;ֲΡפΰλ/;²ΤӤ/ k // i // s // @@ -14125,7 +14125,7 @@ n /// c /// m // -m // +m /;NB:֤mפƱ/ k // i // i // @@ -14169,16 +14169,16 @@ i // g // t // -w /// -u /// -t /// -o /// -i /// -e /// -c /// +w //;(:ͤλǵ㤯)Ӥ/ +u //;(:ͤλǵ㤯)Ӥ/ +t //;(:ͤλǵ㤯)Ӥ/ +o //;(:ͤλǵ㤯)Ӥ/ +i //;(:ͤλǵ㤯)Ӥ/ +e //;(:ͤλǵ㤯)Ӥ/ +c //;(:ͤλǵ㤯)Ӥ/ i // r // -n // +n /;§(u)/ s // k // i // @@ -14187,8 +14187,8 @@ 󤯤k /ջ/ 󤯤i /ջ/ 󤯤g /ջ/ -k /// -i /// +k //; / +i //; / ޤt /ư/ ޤr /ư/ ޤn /ư/ @@ -14214,7 +14214,7 @@ ޤr // ޤn // ޤc // -w // +w /;NB:츻¤ɽ̾ϡ־/ e // w // u // @@ -14275,17 +14275,17 @@ r // n // c // -w //// -u //// -t //// -o //// -i //// -e //// -c //// -t // -r //⤫/ -n /// -c // +w /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +u /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +t /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +o /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +i /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +e /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +c /;ѷǤ/;ͻҤ򱮤 (:ΤƸ)/;(:äȸ)/ +t /;ƻ/ +r /;ƻ/⤫;/ +n //;ƻ/ +c /;ƻ/ b // r // s // @@ -14297,17 +14297,17 @@ s /项/ z // w // -t ///Ƥ/////ھ/ڽ// +t //;(fire) Ƥ/Ƥ;(kill) ؤƤ//;/;(punch) ˤФ/;̮/ھ/ڽ/;פε(̾Ѵ)/ s //ͫ/ -r ///// -n ///ǿ///// -m /////ǿ// -k ////ͫ///ޢ/ -i //ͫ/ޢ/ +r ////;פε(̾Ѵ)/ +n //;Ҷ򻺤/ǿ;ǿ//;פε(̾Ѵ)/;˷// +m ///;Ҷ򻺤/;˷/ǿ;ǿ// +k ///;餦/ͫ/;򾵤/;/ޢ;/ +i //ͫ/ޢ;/ g /ͫ/ e /// d // -c //Ƥ//////ھ/ڽ// +c //Ƥ;(kill) ؤƤ/;(fire) Ƥ//;/;(punch) ˤФ/;̮/ھ/ڽ/;פε(̾Ѵ)/ b // 󤷤礦֤s /ݿ/ 󤷤礦֤k /ݿ/ @@ -14320,7 +14320,7 @@ 󤭤g // s //// n // -Фr // +Фr /;졢塢Ṿˤ졣-ξΤӤΡ/ w // u // t // @@ -14330,7 +14330,7 @@ i // e // c // -b // +b /;/ k /ʬ/ i // ᤭t /᤭Ω/ @@ -14356,7 +14356,7 @@ i // p // n // -m // +m /;᤯/ 魯r /˺/ z /캮/ ʤs /ľ/ @@ -14388,11 +14388,11 @@ ꤯m // t /Ω/ c /Ω/ -餤餷i /ײפ/ +餤餷i /ײפ;/ w /Ϯ/// u /Ϯ/// t //Ϯ// -s // +s /;Ÿ/ o /Ϯ/// i /Ϯ/// h //Ϯ/ @@ -14401,11 +14401,11 @@ c /Ϯ/// s /// 䤷m // -䤷m /ܤ/ +䤷m /ܤ;/ 䤪s /ݱ̵/ 䤪k /ݱ̵/ 䤪i /ݱ̵/ -s /////// +s ///;/;(:פϤʤ뤳ȡְפϤʤ)/// r // n /// m // @@ -14432,10 +14432,10 @@ ޤs // ޤҤt // ޤФk // -ޤm ///// +ޤm //;פ/;() դͿ/;ٲѿ/ ޤs // y // -s //// +s ///;ߤ/ n // d /̤/ ֤s // @@ -14448,8 +14448,8 @@ s // r // n // -k /©// -i /©// +k /©/;=©᤭/ +i /©/;=©᤭/ c // Ӥs // Ӥn // @@ -14474,8 +14474,8 @@ ͤr /̲/ ͤr // ̤n // -k /ȴ/ʹ/ -i /ȴ/ʹ/ +k /ȴ;ȴʪ/ʹ;ǼʹӤ/ +i /ȴ;ȴʪ/ʹ;ǼʹӤ/ ʤn // ʤb // ʤk // @@ -14495,8 +14495,8 @@ k // n /ĩ/ m /ĩ/ -Ȥn /// -Ȥm /// +Ȥn //;/ +Ȥm //;/ Ȥs /// Ȥk /// Ȥi /// @@ -14512,17 +14512,17 @@ e // c // Ǥt /ФΩ/ -Ƥk //Ƥ/ +Ƥk //Ƥ;/ Ƥi // Ťs // Ťk // Ťi // Ťg // -Ĥt //Ѧ/ -Ĥr //Ѧ/ -Ĥn //Ѧ/ -Ĥc //Ѧ/ -ĤΤn /δ/ +Ĥt //Ѧ;ֵפε(̾Ѵ)/ +Ĥr //Ѧ;ֵפε(̾Ѵ)/ +Ĥn //Ѧ;ֵפε(̾Ѵ)/ +Ĥc //Ѧ;ֵפε(̾Ѵ)/ +ĤΤn /δ;-/ Ĥk /³/ Ĥn // Ĥm // @@ -14565,21 +14565,21 @@ s /ʸ̵/ ⤯k // ⤯i // -Ϥs /®//®///®/ +Ϥs /®;(ʸ) -/;(ʸ) -/®///®/ Ϥk ///®/®//®/ Ϥi /®////®/®/ r /ּ/ k // -k // +k /;֤̾k/ s // m /ַ/ n /쳵/ s /첡/ s // -k /// -i /// +k //;ξ-/ +i //;ξ-/ t /ϫ/ -s /ϫ/ +s /ϫ;ĤϤ-/ r /ϫ/ n /ϫ/ c /ϫ/ @@ -14596,7 +14596,7 @@ Фm /Ķ/ k /ĺ// i /ĺ// -n // +n /;vain.̤ʽ/ g /˲/ s /ˤ/ s // @@ -14605,21 +14605,21 @@ g // s /ˡ/ w /ϫ/ -t //// +t //;/;/ s //// -r //// -n ///////// -m /////// +r //;/;/ +n /;Ƭˤ/;ڤ,ڤ/;//;/;/;/;,/ +m /;Ƭˤ/;ڤ,ڤ//;/;/;,/ k /// i /// g /// -c //// +c //;/;/ r /ȿ/ s /˻/ s // i // g // -r /// +r //;-ˤ/ m /ｻ/ t // r // @@ -14666,7 +14666,7 @@ c //ɨ/ ߤt /ͦΩ/ ߤc /ͦΩ/ -k /// +k /;(:٤)/;(:Ū)/ s // k // i // @@ -14679,26 +14679,26 @@ e // c // w /Ѻٹ/ -n /ͦ/// -m /ͦ/// +n /ͦ//;ݡפΰλ/ +m /ͦ//;ݡפΰλ/ k /ư/ i /ư/ s /ܹ/ -w /// -u /// -t /// -o /// -n //͹/ -m //͹/ -i /// -e /// -c /// +w //;ַơפΰλ/ +u //;ַơפΰλ/ +t //;ַơפΰλ/ +o //;ַơפΰλ/ +n /;cast/͹;shoot/ +m /;cast/͹;shoot/ +i //;ַơפΰλ/ +e //;ַơפΰλ/ +c //;ַơפΰλ/ t // r // n // c // k // -n /Բ/ +n /Բ;ƻ/ Ȥr // t // r // @@ -14725,8 +14725,8 @@ Τn // Τc // b // -k /©ȴ/ȴ/ -i /ȴ/ +k /©ȴ;(relief)ä©ȴ/ȴ;(survive)ȴ/ +i /ȴ;(survive)ȴ/ ʤn /ԤǺ/ ʤm /ԤǺ/ ʤe /¸/ @@ -14742,12 +14742,12 @@ Ƥt /ƹ/ Ƥk /ƹ/ Ƥc /ƹ/ -Ťi /©/©/ -m /Ԥ/©/ +Ťi /©/©;?/ +m /Ԥ;ײ褬Ԥͤޤ/©;©ͤޤǮ/ k /©/ i /©/ Ĥk /³/ -k /Ԥ/Ԥ/ +k /Ԥ;-/Ԥ;-Ź/ i /Ԥ/ g /©/ w /Ԥ/ @@ -14763,7 +14763,7 @@ r /©ޤ/©/ n /©ޤ/©/ c /©ޤ/©/ -k /©/ +k /©;©ޤڤä/ g /Ԥ/Բ/ n /յ/ m /յ/ @@ -14781,10 +14781,10 @@ i /Ԥ/ e /Ԥ/ c /Ԥ/ -t // -r //Ԥ/ -n // -c // +t /;() Ԥ֤/ +r /;() Ԥ֤/Ԥ;()/ +n /;() Ԥ֤/ +c /;() Ԥ֤/ w /Ԥ/ u /Ԥ/ t /Ԥ/ @@ -14817,12 +14817,12 @@ i /Ԥ/ e /Ԥ/ c /Ԥ/ -s /©/// +s /©//;ֿפε(̾Ѵ)/ r /Ǯ/ -n /©/// +n /©//;ֿפε(̾Ѵ)/ m /©/ -g //յ/ -d /// +g /;褬/յ;յ/ +d //;ֿפε(̾Ѵ)/ ߤw /ӱ߹/ ߤu /ӱ߹/ ߤt /ӱ߹/ @@ -14847,19 +14847,19 @@ r /褫/ n /褫/ c /褫/ -w /ǡ/ +w /ǡ;-路/ z /ʲƱ/ j /ʲƱ/ -t //// -r /// -n /ʲ/ǡ/ǡ/// -m // -k /ͳ/ +t ///;/ +r //;/ +n /ʲ/ǡ/ǡ//;/ +m /;ᤷ/ +k /ͳ;-/ g /ǡ/ d /ǡ/ -c /// +c //;/ m // -r // +r /;/ 錄s /// 魯r /˺/ k /ʬ/ @@ -14927,7 +14927,7 @@ g // äѤs // e // -r // +r /;뤳Ȥʤ-餹/ s // e // t /Ω/ @@ -14961,7 +14961,7 @@ k // s // s // -r /ؤ/ +r /ؤ;/ w // n // k // @@ -15007,41 +15007,41 @@ i // e // c // -z /////Ψ// -y ///////Ψ// -w ////////Ψ// -u ////////Ψ// -t ///////////////Ψ//// -s ///////Ψ// -r /////////޻///Ψ/// -p /////Ψ// -o ////////Ψ// -n ////////////Ψ///// -m ///////Ψ// -k //////////Ψ////// -j /////Ψ// -i ////////////Ψ// -h ///////Ψ// -g /////Ψ// -e /////////Ψ// -d //////Ψ// -c /////////////Ψ///// -b /////Ψ// -a /////Ψ// +z ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +y ////;[](=)/;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +w ///;(:˴ؤƤ)///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +u ///;(:˴ؤƤ)///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +t ///////;֤/;֤///;(die) 㤬¤/;(:˴ؤƤ)/;ʪ/;ʼ򾭤/Ψ;⾭//;פε(̾Ѵ)/;() / +s /;/;?///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +r /////;֤/;֤/;ʪ/;ʸƤ/޻;޻/;ؤޤ/;ʼ򾭤/Ψ;⾭//;פε(̾Ѵ)/ +p ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +o ///;(:˴ؤƤ)///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +n //;-ʪ//;[]פʤ(=פʤ)?////;֤/;֤/;ʪ/;ʼ򾭤/Ψ;⾭//;פε(̾Ѵ)//;/ +m ///;//;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +k //;(:꤬Ф)/;(:夬ή)õ褭/;(die) 㤬¤/;() ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)///// +j ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +i ///////;(:˴ؤƤ)///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +h /////;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +g ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +e ////;(:˴ؤƤ)///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +d ////;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +c ////;(:˴ؤƤ)/////;֤/;֤/;ʪ/;ʼ򾭤/Ψ;⾭//;פε(̾Ѵ)/;(die) 㤬¤/;() / +b ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ +a ///;ʪ/;ʼ򾭤/Ψ;⾭/;פε(̾Ѵ)/ ʤs // 󤼤d // 󤷤󤯤s /¿/ 󤷤s /¿/ -z /// +z /;(devise)ְפƤ,(worry)ְƤ껺बפ/;()ֹĤ,(ͻ)֤Ĥˡġ/ n // k // j /// -d /Ԥ/ +d /Ԥ;/ n // m // Ӥहb // -t /ˢΩ/Ω/ -c /ˢΩ/Ω/ +t /ˢΩ;(bubble) иˢΩ/Ω;(Ļȩ) ȩΩ/ +c /ˢΩ;(bubble) иˢΩ/Ω;(Ļȩ) ȩΩ/ 錄s /// 碌n /ʻ/ 碌m /ʻ/ @@ -15052,8 +15052,8 @@ 浪r // 濫s /øø/ø/ t /// -s /ʻ//ø/ -r ///// +s /ʻ;(¤٤) ͤʻ//ø/ +r /;(ʤפ)/;(Ǥ˻פ)/// k /ø/ i /ø/ g /ø/ @@ -15106,34 +15106,34 @@ ꤢn /ͭ;/ ꤢc /ͭ;/ ꤢw /ͭ/ߤ/ -k // -s /ɽ////Ϫ/ +k /;[ʸ]/ +s /ɽ;(represent) ̣ɽ/;(show) Ѥ򸽤/;(author) /;(manifest) ̾򸲤/Ϫ;(:ƩʤΤǸ)/ r /ɽ/// -n /Ϫ// -d /Ϫ// +n /Ϫ;(:ƩʤΤǸ)/;(:򸫤Ƥ)/ +d /Ϫ;(:ƩʤΤǸ)/;(:򸫤Ƥ)/ t /Ω/ 餿n // -餿m ///// -餽w /// -餽u /// -餽t /// -餽o /// -餽i /// -餽e //// -餽c /// +餿m /;generic/;(פڤäѤ)ֹפ/;(inspect)򸡤/;(renew)ַ򹹤/ +餽w //;פε(̾Ѵ)/ +餽u //;פε(̾Ѵ)/ +餽t //;פε(̾Ѵ)/ +餽o //;פε(̾Ѵ)/ +餽i //;פε(̾Ѵ)/ +餽e //;פε(̾Ѵ)// +餽c //;פε(̾Ѵ)/ 餹g /Ʋ/ 餵s /õ/ 餱r /Ӻ/ -餬w ///// -餬u ///// -餬t ///// -餬o ///// +餬w ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ +餬u ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ +餬t ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ +餬o ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ 餬k /ӽ/ -餬i ///// -餬e ///// -餬c ///// +餬i ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ +餬e ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ +餬c ///;NB:֤餽uפƱ/;פε(̾Ѵ)/ 餫g /Ӳ/ -餫m /ͽ/Ю/ +餫m /ͽ/Ю;ͽפε/ 餤ʤs /ή/ 餤ʤs /ľ/ 餤s // @@ -15146,14 +15146,14 @@ w /ɽ/// u // t /// -s //// +s /;(rough) ᤬Ƥ/;(wild) ȤӤ/; Ƥ/ r // p /// o // -k //// +k /;(wild) ȤӤ/;(rough) ᤬Ƥ/; Ƥ/ j // -i ///// -g //// +i //;(wild) ȤӤ/;(rough) ᤬Ƥ/; Ƥ/ +g /;(wild) ȤӤ/;(rough) ᤬Ƥ/; Ƥ/ e // c // b // @@ -15164,10 +15164,10 @@ ߤĤk /³/ n // m // -t ////ɵ/ -r ///ɵ/ -n ///ɵ/ -c ////ɵ/ +t /;-ä NB:ָפϵƤˤ,(err) /;-/;(apologize) ȼդ/ɵ;/ +r /;(apologise) ȼդ/;(err) /ɵ;/ +n /;(apologise) ȼդ/;(err) /ɵ;/ +c /;-/;-ä NB:ָפϵƤˤ,(err) /;(apologize) ȼդ/ɵ;/ t // r // n // @@ -15177,8 +15177,8 @@ 䤫n // 䤫c // u // -s //// -m //// +s /;(Կ) ʪ/;(𤫤,Ե̣) Ťࡼ/; / +m /;ͤ򻦤/;⻦/;- (֤)/ b // t // r // @@ -15198,16 +15198,16 @@ ޤk /// ޤb /ŷ/ ޤr /ŷ/ -ޤĤe // +ޤĤe /;- NB:ϡ֤ޤäפθ/ ޤäe // ޤr // ޤp /Ż/ ޤg /Ų/ ޤi // -ޤt /ŷ/ŷ/ -ޤr /ŷ/ŷ/ -ޤn /ŷ/ŷ/ -ޤc /ŷ/ŷ/ +ޤt /ŷ/ŷ;=ŷ/ +ޤr /ŷ/ŷ;=ŷ/ +ޤn /ŷ/ŷ;=ŷ/ +ޤc /ŷ/ŷ;=ŷ/ ޤe /ŷ/ ޤt /ŷ/ ޤr /ŷ/ @@ -15222,16 +15222,16 @@ ޤn /ŷ/ ޤc /ŷ/ y // -t /;/// -s /;/// -r /;// -n //;//ŷ/ +t /;//;;פε/ +s /;//;;פε/ +r /;/;;פε/ +n //;/;;פε/ŷ/ m // k // i // g // e // -c //;// +c /;-ä/;/;;פε/ ۤs // ۤk // ۤi // @@ -15246,15 +15246,15 @@ ֤餢g // ֤k /// ֤g // -֤s // -֤m // -֤k // -֤i // -֤g // -t //// -r ///// -n ///// -c //// +֤s /;§(n)/ +֤m /;§(n)/ +֤k /;§(n)/ +֤i /;§(n)/ +֤g /;§(n)/ +t /;(:ƴǤ֤) Ʀ/;(:ľФǤ֤) դ// +r /;(:ľФǤ֤) դ/;(:ƴǤ֤) Ʀ/;˰// +n //;(:ľФǤ֤) դ/;(:ƴǤ֤) Ʀ// +c /;(:ľФǤ֤) դ/;(:ƴǤ֤) Ʀ// դy // դt // դs // @@ -15292,7 +15292,7 @@ Ȥr // Ȥޤs // ȤФi /ʧ/ -Ȥk /// +Ȥk /;-/;()-/ Ȥg /׷/ Ȥt // Ȥr // @@ -15300,11 +15300,11 @@ Ȥc // Ȥs /徯/ Ȥr // -Ȥk //Ҥ/ +Ȥk //Ҥ;/ Ȥs /岡/ Ȥi // u /ǽ/ -d /// +d /;Ťͳ/;(trace)ˤפŤ/ y // ƤϤt // ƤϤr // @@ -15322,8 +15322,8 @@ t // Ĥh // Ĥe // -Ĥt /// -Ĥr /// +Ĥt //;/ +Ĥr //;/ Ĥn // Ĥc // Ĥg //Ǯ// @@ -15337,28 +15337,28 @@ Ĥi // Ĥe // Ĥc // -u //Ǯ/// -s ///Ǯ/// -m ///Ǯ////// -k /Ǯ///// -i /Ǯ//// -g //Ǯ/// +u /;뤤/Ǯ;Ǯ/;/;Ƥͧ/ +s /;뤤/;/Ǯ;Ǯ//;Ƥͧ/ +m ///Ǯ//;(õĤ)/; (ˤĤ)/; (ĤŻ)/; ⽴/ +k /Ǯ;Ǯ/;뤤/;/;Ƥͧ/;§(Ĥu)/ +i /Ǯ;Ǯ/;뤤/;/;Ƥͧ/ +g /;뤤/Ǯ;Ǯ/;/;Ƥͧ/ b // äm /// äk /// -äi /򵤤/ +äi /򵤤;/ s // t /Ƥ// p /մձ/ r /껶/껶/ ꤫w /դ깽/ -餷i // +餷i /;/ s // ޤr /Ƭ/ ޤs /Ƭ/ ޤk /Ƭ/ ޤt /Ƭ/ -ʤs /ľ/Ȥľ/ +ʤs /ľ;̣-/Ȥľ;-/ ᤢw //Ȥ/ ᤢu //Ȥ/ ᤢt //Ȥ/ @@ -15370,28 +15370,28 @@ k // i // g // -m /// -k /// -m /// -s ///ѫ/ +m /;(:) Τ򲹤/;(:äƤ) Ȥ/ +k /;Ȥ/;/ +m /;-/;-/ +s /;price. (:ͤΤĤ)/;value. (:ΤΤβ)/ѫ;ֲפε(̾Ѵ)/ w /ǽ/ u /ǽ/ -t /// -r /////// +t /;/;/ +r /;դ/;/;/;§(s)/;աפε1/;աפε2/ o /ǽ/ -n /// +n /;/;/ i /ǽ/ h /Ϳ/ -e /Ϳ//ǽ/ -c /// -d /ͷ/ +e /Ϳ/;Ϳפε(̾Ѵ)/ǽ/ +c /;/;/ +d /ͷ;/ Ӥۤk /ͷ/ͷӹ/ Ӥg /ͷӲ/ Ӥk /ͷ/ Ӥi /ͷ/ Ӥk /ͷ/ -n /ͷ// -b /ͷ// +n /ͷ/;(:褰) ͷ/ +b /ͷ/;(:褰) ͷ/ ˤt // ˤr // ˤn // @@ -15405,14 +15405,14 @@ r // n // c // -b // +b /;Ф/ r /¤/ ꤷt /Ϳ/ ꤷr /Ϳ/ -t /Ϳ// -r /Ϳ// -n /Ϳ// -c /Ϳ// +t /Ϳ;(Ϳ)֤Ϳ (Ϳ) ͿΤ̡/;() Ҷ¤/ +r /Ϳ;(Ϳ)֤Ϳ (Ϳ) ͿΤ̡/;() Ҷ¤/ +n /Ϳ;(Ϳ)֤Ϳ (Ϳ) ͿΤ̡/;() Ҷ¤/ +c /Ϳ;(Ϳ)֤Ϳ (Ϳ) ͿΤ̡/;() Ҷ¤/ k // 襤֤s /̣襤/ 襤֤k /̣襤/ @@ -15434,7 +15434,7 @@ t // s /̣/ r // -n /̣// +n /̣;-()// d /̣/ c // ޤs /­/ @@ -15448,13 +15448,13 @@ r /­/ Ǥޤi /­Ż/ Ƥޤi /­Ż/ -s // +s /;/ k /­/ m /­/ m /­/ r /­/ k /­/ -k //ب/ +k //ب;ְפε(̾Ѵ)/ w /޾/ u /޾/ t /޾/ @@ -15462,7 +15462,7 @@ i /޾/ e /޾/ c /޾/ -k // +k /;§(y)/ k // i // w // @@ -15492,16 +15492,16 @@ k /ī/ r // t // -s /// +s //;פε/ r // p /ī/ n // -m /// -k /// -i /// -g /// +m /;ޤ/;פε/ +k //;פε/ +i //;פε/ +g //;פε/ c // -r /ƴ// +r /ƴ/;ƴ()/ u // Ĥw // Ĥu // @@ -15520,7 +15520,7 @@ äԤg /ù/ù/ äѤs /// t // -r // +r /;/ r // n // m // @@ -15532,8 +15532,8 @@ ߤ礦k /̾/ ߤ礦i /̾/ ߤ礦g /̾/ -r /ƴ/ -r // +r /ƴ;Ÿ졣Υפΰ/ +r /;/ t // 줫t // 줫r // @@ -15547,34 +15547,34 @@ k // 䤹m // r // -w /// -u /// -t /// -o /// -i /// -e /// -c /// +w //; ⾦/ +u //; ⾦/ +t //; ⾦/ +o //; ⾦/ +i //; ⾦/ +e //; ⾦/ +c //; ⾦/ t /˰­/ r /˰­/ n /˰­/ c /˰­/ -r ///// +r ///;(:򸫤) Τ򸲤餫ˤ/;/ ꤳn /夬/ ꤳm /夬/ -w /// -u /// -t /// -o /// -i /// -e /// -c /// -t //ƭ//Ȥ/夬/ -r //ƭ//Ȥ/夬/ -n //ƭ/ +w /;(redeem)ޤ/;(buy)ܤؤ/ +u /;(redeem)ޤ/;(buy)ܤؤ/ +t /;(redeem)ޤ/;(buy)ܤؤ/ +o /;(redeem)ޤ/;(buy)ܤؤ/ +i /;(redeem)ޤ/;(buy)ܤؤ/ +e /;(redeem)ޤ/;(buy)ܤؤ/ +c /;(redeem)ޤ/;(buy)ܤؤ/ +t //ƭ;ʪƭ/;/Ȥ;/夬;/ +r //ƭ;ʪƭ/;/Ȥ;/夬;/ +n //ƭ;ʪƭ/ m // k /­/ i /­/ -c //ƭ/ +c //ƭ;ʪƭ/ 뤹g // s // m // @@ -15590,14 +15590,14 @@ k /ֹ/ i /ֹ/ g /ֹ/ -s /////// -r ///// +s ////;//;餬Ҥ/ +r ////;/ p // n // m //// -k ///// -i ///// -g ///// +k ////;餬Ҥ/ +i ////;餬Ҥ/ +g ////;餬Ҥ/ ꤿt /Ω/ k /ĸ/ i /ĸ/ @@ -15629,18 +15629,18 @@ k /Ĥ/ c /Ĥ/ y // -u //// -t /// -s //// -r /// +u //;(εΤʤ) 餬/;() ˤƷ/ +t /;Ф/;/ +s //;(εΤʤ) 餬/;() ˤƷ/ +r /;Ф/;/ p // -n /// -m //// -k //// -i ////// -g ////// -c /// -t /// +n /;Ф/;/ +m //;(εΤʤ) 餬/;() ˤƷ/ +k //;(εΤʤ) 餬/;() ˤƷ/ +i //;(εΤʤ) 餬/;() ˤƷ//;/ +g //;//;(εΤʤ) 餬/;() ˤƷ/ +c /;Ф/;/ +t //;/ i // g // s // @@ -15658,8 +15658,8 @@ r // Ҥs // Ϥs /ȿ/ -n /꿩/ -m /꿩/ +n /꿩;-/ +m /꿩;-/ r // ʤb /Ⱦ/ t // @@ -15701,26 +15701,26 @@ n // r // w // -t /Ƥ// +t /Ƥ/;Ǥ/ r // s // r // k // i // -w ///ʻ///// -u /////// -t //////ͭ//////// -s ///ب/ -r //ͭ/// -o /////// -n ///ͭ/// -m /// -k //˰//////ͭ/ -i /////////˰///// -h /// -g ////ک/ -e ////////// -c ///////ͭ// +w /;() ä礦/;ͤȲ/ʻ/;(ͤ|̿Ūˤ) 갩/;(äˤ褯ʤȤˤ) Τ/;ֲפε/;/ +u /;() ä礦/;ͤȲ/;(äˤ褯ʤȤˤ) Τ/;(ͤ|̿Ūˤ) 갩/;/;ֲפε/ +t ////;ͤȲ/;() ä礦/ͭ;(̵)֤ͭ/;(Ժ)˺ߤ/;(äˤ褯ʤȤˤ) Τ/;(ͤ|̿Ūˤ) 갩//;פε/;ֲפε/;/ +s ///ب;ְפε(̾Ѵ)/ +r //ͭ;(̵)֤ͭ/;(Ժ)˺ߤ/;(certain) / +o /;() ä礦/;ͤȲ/;ֲפε/;(äˤ褯ʤȤˤ) Τ/;(ͤ|̿Ūˤ) 갩/;/ +n //;-/ͭ;(̵)֤ͭ/;(Ժ)˺ߤ/;/ +m //;/ +k //˰;:ʢ//;(|ǯ|)/;:(ȤΤ褦)ĤƷˤʤ/;:Ʒˤʤ//ͭ;[]ʸͭä/ +i /;() ä礦/;ͤȲ///;(ͤ|̿Ūˤ) 갩/;(äˤ褯ʤȤˤ) Τ/;ֲפε/;/˰;:ʢ/;뤬/;:(ȤΤ褦)ĤƷˤʤ/;:Ʒˤʤ// +h //;ֲפε/ +g //;(ˤ) (|)󤲤/;(⤯) (|餢)Ȥ/ک;ֵפε/ +e /;ͤȲ/;() ä礦/;(ͤ|̿Ūˤ) 갩/;(dare) /;(Ĵ̣Ⱥ) ¤/;¤/;(äˤ褯ʤȤˤ) Τ/;ֲפε/;/ +c /;() ä礦/;ͤȲ/;(äˤ褯ʤȤˤ) Τ/;(ͤ|̿Ūˤ) 갩/;/;ֲפε/ͭ;(̵)֤ͭ/;(Ժ)˺ߤ/ b // >錄s // >魯r /˺/ @@ -15806,7 +15806,7 @@ >Ϥn // >Ϥc // >Ϥs // ->Ϥm // +>Ϥm /;()ֹͤϤסɱϤ/ >t // >Τt // >Τs // @@ -15822,25 +15822,25 @@ >ͤc // >k /ȴ/ >i /ȴ/ ->ˤs // ->ˤk // ->ˤi // ->ˤg // ->ʤr // ->ʤs /ľ/ +>ˤs /;(hard) ͤ NB:֤iפƱ/ +>ˤk /;(hard) ͤ NB:֤iפƱ/ +>ˤi /;(hard) ͤ NB:֤iפƱ/ +>ˤg /;(hard) ͤ NB:֤iפƱ/ +>ʤr /;(ư) ʹ/ +>ʤs /ľ;ξľ/ >s /̵/ >r // >k /̵/ >i /̵/ >g /̵/ ->ɤs // +>ɤs /;(Ϣ) 餱̤,Ω̤,̤/ >Ȥs // >t // >r // ->n /// ->m //α/ +>n /;fly// +>m //α;α/ >c // ->b // +>b /;fly/ >Ǥz // >Ǥy // >Ǥw // @@ -15900,8 +15900,8 @@ >Ĥs // >Ĥr // >k //// ->i //// ->g // +>i ///;Ѥ/ +>g /;Ѥ/ >e // >t // >r // @@ -15933,7 +15933,7 @@ >e /»/ >c /»/ >n /»/ ->m // +>m /;Τ/ >m // >k // >n // @@ -15953,12 +15953,12 @@ >n // >c // >t // ->s // +>s /;ߤ/ >r // >n // >g // >c // ->s // +>s /;(Ϣ) 饹ۤ/ >s // >z // >y // @@ -15975,7 +15975,7 @@ >i // >e // >c // ->b /// +>b /;:¤٤Ƥ٤/;:ͤ碌Ƥ٤/ >s // >r /// >n // @@ -15990,18 +15990,18 @@ >d // >c /// >m // ->s // ->k // ->i // ->g // +>s /;ͤ NB:֤ˤiפƱ/ +>k /;ͤ NB:֤ˤiפƱ/ +>i /;ͤ NB:֤ˤiפƱ/ +>g /;ͤ NB:֤ˤiפƱ/ >t // >k // >s // ->s // ->w // +>s /;֤,΢֤/ +>w /;魯/ >n // >k // ->e // +>e /;(ؤ) ʤؤ/ >t // >r // >n // @@ -16010,7 +16010,7 @@ >m /Ǽ/ >s // >r // ->s // +>s /;̤/ >w // >t // >r // @@ -16058,8 +16058,8 @@ ! //ò/ !! // != // -" ///// -# /#1/#3/#2//#0/#4/#5/#9/ +" /;second/;doublequote(open)/;doublequote(close)/;֤/ +# /#1/#3/#2/;number/#0/#8/#4/#5/ #% /#1/ #) /#1/ #,# /#1#1/#1#1/ @@ -16124,7 +16124,7 @@ #y /#0ǯ/ #y#m#d /#0ǯ#0#0/ #yard /(skk-gadget-units-conversion "yard" (string-to-number (car skk-num-list)) "cm")/(skk-gadget-units-conversion "yard" (string-to-number (car skk-num-list)) "feet")/ -#yen /#1/#0/ +#yen /#1/#0/#8/ ## /#1#1/ ##Ƥ /#1#1/ ##ˤ /#1#1/ @@ -16143,22 +16143,22 @@ # /#3/#1/#0/#2/ # /#0/ # /#0/#1/#3/#2/ -# /#3/#1/#0/#2/ +# /#3;/#1/#0/#2/ # /#3/#1/#0/#2/ # /#3/#1/#0/#2/ -# /#1/#0/#3/#0/#2/ +# /#1/#0/#8/#3/#0/#2/ #󤵤 /#3߻/ #դ /#1/ -# /#1/#3/#0/#2/ +# /#1;10^8/#3;10^8/#0;10^8/#2;10^8/ ##ޤ /#1#1/ # /#0/#1/#3/ #ͤޤ /#3ǯ/ # /#3/#1/#0/#2/ # /#3/#1/#0/#2/ -# /#3/#3/#0/#1/#2/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ +# /#3/#3/#0/#1/#2/#1/#0/#2/#3;ϥ/#1/#0/#2/#3/#1/#0/#2/#3;ʪ/#1/#0/#2/ # /#1/#0/#1/#0/#2/#3/#1/#3/#2/ # /#0/#1/#3/ -# /#0/#1/ +# /#0;lines/#1;rounds/ # /#3/#0/#3/#0/ #Ƥ /#0ž/#3ž/ #Ϥ /#3ȯ/ @@ -16180,7 +16180,7 @@ #⤯ /#0/ ## /#1#1/ # /#1/ -# /#1/#3/#3/#3/#1/#0/#2/#0/#2/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ +# /#1/#3/#3/#3/#1/#0/#2/#0/#2/#1/#0/#2/#3/#1/#0/#2/#3;3.75kg/#1/#0/#2/ # /#0/#1/#3/#2/ # /#3/#0/#3/#0/ # /#3/#1/#0/#2/ @@ -16201,7 +16201,7 @@ # /#3/#1/#0/#2/ # /#1/#2/#1Km/#1kg/#1kbyte/#1/#1/ #Ф /#1kb/#1kbytes/#3kb/#0kb/#2kb/ -# /#9/#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ +# /#3/#1/#0/#2/#3/#1/#0/#2/#3;600g/#1;600g/#0;600g/#2;600g/ # /#1/ #礦 /#0/#1/#2/#3/ #礦 /#0/#1/ @@ -16214,9 +16214,9 @@ # /#3/#1/#0/#2/ #Ȥ /#0/#1/ # /#3/#1/#2/#0/ -# /#0/#1/#1/#3/#3/#3/#2/#0/#2/#1/#0/#2/#3/#1/#0/#2/#0 / +# /#0/#1/#1/#3;6/#3/#3/#2/#0/#2/#1;6/#0;6/#2;6/#3/#1/#0/#2/#0 / # /#1/ -# /#1/#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/#3/#0/#2/ +# /#1/#3/#1/#0/#2/#3;string/#1/#0/#2/#3/#1/#0/#2/#3/#0/#2/ #󤽤 /#1§/ # /#1/ # /#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ @@ -16228,7 +16228,7 @@ # /#3/#1/#0/#2/ # /#3/#1/#0/#2/ # /#0/#1/#3/#2/ -# /#3/#0/#1/#2/#3/#0/#1/#2/#5/#3/#2/#0/#1/ +# /#3/#0/#1/#2/#3/#0/#1/#2/#5;ֹפε/#3;ֹפε/#2;ֹפε/#0;ֹפε/#1;ֹפε/ # /#0/#1/#1/#0/ # /#1浡/ # /#0漼/#2漼/ @@ -16299,7 +16299,7 @@ # /#1/#3/#1/#0/#2/#3/#0/#2/ # /#0/#1/ #礯 /#3/ -# /#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ +# /#3;/#1;/#0;/#2;/#3/#1/#0/#2/#3/#1/#0/#2/ # /#0/ # /#1/ # /#3/ @@ -16310,9 +16310,9 @@ # /#1cm/#1/#3cm/#0cm/#2cm/ #ޤ /#3/ # /#3/#1/#0/#2/ -# /#3/#0/#0/#3/#1/#3/#1/#0/#1/#1/#2/#3/#1/#2/#2/#0/#2/#3/#0/#2/ +# /#3/#0/#0/#3;/#1;/#3;/#1;/#0;/#1/#1/#2/#3/#1/#2/#2/#0/#2/#3/#0/#2/ # /#1/ -# /#3­/#1­/#3®/#1®/#0®/#2®/#0­/#2­/#3«/#1«/#0«/#2«/ +# /#3­;ʪ/#1­;ʪ/#3®;/#1®;/#0®/#2®/#0­/#2­/#3«/#1«/#0«/#2«/ # /#3·/#1·/#0·/#2·/ # /#1°/#3°/#0°/#2°/ # /#0/#3/#1/#2/ @@ -16335,7 +16335,7 @@ #ä /#1å/ #㤯 /#0/#3/#1/#2/ # /#3/#1/#0/#2/ -#礦 /#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/#3ĥ/#1ĥ/#0ĥ/#2ĥ/ +#礦 /#3;10^12/#1;10^12/#0;10^12/#2;10^12/#3/#1/#0/#2/#3/#1/#0/#2/#3ĥ/#1ĥ/#0ĥ/#2ĥ/ #礦 /#1/#3/ #礦 /#1/#0/#2/#3/ # /#1/#0/#2/#3/#3/#1/#0/#2/ @@ -16353,12 +16353,12 @@ #ƤФ /#3/ #Ƥ /#0/#1/#3/#2/#3Ź/#1Ź/#0Ź/#2Ź/ #Ƥ󤻤ä /#0å/ -# /#3/#1/#0/#2/ +# /#3;10/#1;10/#0;10/#2;10/ #Ȥ /#1/#0Ƭ/#3/#3Ƭ/#1Ƭ/#1/#0/#2/#3/#0/#2/#3/#1/#0/#2/#2Ƭ/ #Ȥ /#1Ƭ/ #Ȥ /#1̤/ -#Ȥ /#3/#1/#0/#2/ -# /#1/#3/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ +#Ȥ /#3;ton(1000kg)/#1;ton(1000kg)/#0;ton(1000kg)/#2;ton(1000kg)/ +# /#1/#3/#0/#2/#3;degree/#1;degree/#0;degree/#2;degree/#3;celsius/#1;celsius/#0;celsius/#2;celsius/ #ɤ /#1/#3/ #ʤ /#2/#3/#1/#0/ #ˤ /#1/#0/#3/#2/ @@ -16380,15 +16380,15 @@ #֤ͤ /#3ǯʬ/#0ǯʬ/ #ͤޤ /#3ǯ/#1ǯ/ #ͤ /#0ǯ/#1ǯ/ -#Ϥ /#1/#3/#1/#0/#2/#3/#0/#2/ +#Ϥ /#1/#3;ʪ,,,/#1;ʪ,,,/#0/#2/#3/#0/#2/ #Ϥ /#3/ -#Ϥ /#0/#1/#0/#3/#3/#1/#2/#2/ +#Ϥ /#0;/#1;/#0;̮/#3;/#3;̮/#1;̮/#2;̮/#2;/ #Ϥ# /#3#3/ #Ϥ /#1Ȣ/#3Ȣ/#0Ȣ/#2Ȣ/ #Ϥ /#3/#1/#0/#2/ #Ϥ /#3ȭ/#1ȭ/#0ȭ/#2ȭ/ #Ϥ /#0ȯ/#3ȯ/#1ȯ/#2ȯ/ -#Ϥ /#1/#3ĥ/#1ĥ/#3/#0/#2/#3ĥ/#1ĥ/#0ĥ/#2ĥ/ +#Ϥ /#1/#3ĥ;ݡ/#1ĥ;ݡ/#3/#0/#2/#3ĥ/#1ĥ/#0ĥ/#2ĥ/ #Ϥ /#3/#1/#0/#2/#3/#1/#0/#2/#3/#1/#0/#2/ #Ф /#1/#1/#3/#0/#2/#3/#0/#2/ #Ф /#1ܿ/ @@ -16401,7 +16401,7 @@ #Ф /#3ּ/ #Фɤ /#0̤/#3̤/ #Ф /#0/#1/#3/ -#ѡ /#1/#3/#0/#2/ +#ѡ /#1;percent/#3;percent/#0;percent/#2;percent/ #Ѥ /#3/#1/#0/#2/#3/#1/#0/#2/ #Ѥ /#0/#0/#3/#1/#2/#3/#1/#2/ #Ѥ /#3Ȣ/#1Ȣ/#0Ȣ/#2Ȣ/ @@ -16410,7 +16410,7 @@ #Ѥ /#3/#1/#0/#2/#3/#1/#0/#2/ #Ҥ /#1ɤ/#3ɤ/#0ɤ/#2ɤ/ #Ҥ㤯ͤ /#3ɴǯ/ -#Ҥ礦 /#0ɼ/#3ɼ/#1ɼ/#2ɼ/#3ɶ/#1ɶ/#0ɶ/#2ɶ/ +#Ҥ礦 /#0ɼ;vote/#3ɼ;vote/#1ɼ;vote/#2ɼ;vote/#3ɶ;/#1ɶ;/#0ɶ;/#2ɶ;/ #Ҥ /#3/#1/#0/#2/ # /#3/#1/#0/#2/ #ӡ /#0ӡ/ @@ -16427,7 +16427,7 @@ #դ /#3/#1/#0/#2/ #դ /#3/#1/#0/#2/#3/#1/#0/#2/ #դ /#1/#3/#0/#2/ -#դ /#3/#3/#1/#0/#2/ +#դ /#3;/#3/#1/#0/#2/ #դ /#1ʬ/#0ʬ/#3ʬ/#2ʬ/ #դ#Ӥ礦 /#1ʬ#1/#0#0/ #դ󤫤 /#0ʬ/ @@ -16453,17 +16453,17 @@ #ۤ /#3/#1/#0/#2/ #ۤ /#0/#1/#3/#2/ #ۤ /#1Ω/ -#ۤ /#3ܾ/ +#ۤ /#3ܾ;[]/ #ܤ /#1/#2/#0/#3/ # /#3/#1/#0/#2/ #ݤ /#1/#0/#3/#2/ -#ݤ /#0ݥ/#0/#3/#1/#2/ +#ݤ /#0ݥ/#0;pond,pound/#3;pond,pound/#1;pond,pound/#2;pond,pound/ #ޤ /#1/#0/#2/#3/ #ޤ /#0/#1/ #ޤ֤ /#0ʬ/ #ޤ /#2/ #ޤ /#3/#1/#0/#2/ -#ޤ /#3/#1/ +#ޤ /#3;䴬ʪʤ/#1;䴬ʪʤ/ #ޤ /#3/#1/#0/#2/ #ޤ /#3ʪ/ #ޤ /#0ޥ/#3/#1/#0/#2/ @@ -16481,7 +16481,7 @@ #⤦ /#3/#1/#0/#2/ #⤸ /#1ʸ/#0ʸ/#3ʸ/ #⤸ /#0ʸ/#1ʸ/#3ʸ/ -# /#1/#3/#1/#0/#2/#3/#0/#2/#3ʸ/#1ʸ/#0ʸ/#2ʸ/ +# /#1;question/#3;gate/#1;gate/#0;gate/#2;gate/#3;question/#0;question/#2;question/#3ʸ/#1ʸ/#0ʸ/#2ʸ/ # /#3/#1/#0/#2/ #褦 /#3/#1/#0/#2/ # /#1/#3Τ/#1Τ/#0Τ/#2Τ/ @@ -16500,77 +16500,77 @@ #󤷤礦 /#1Ϣ/ #󤽤 /#0Ϣ/ # /#3Ϣ/#0Ϣ/ -# /#3Ϣ/ +# /#3Ϣ;[]/ #Ѥ /#1Ϣ/ #Ѥ /#3Ϣȯ/#0Ϣȯ/ # /#1Ϣ/#3Ϣ/#0Ϣ/ # /#3ϲ/#1ϲ/#0ϲ/#2ϲ/ #Ф /#0ϩ/ -# /#0/#1/#3/#3/#2/#1/#0/#2/#3/#1/#0/#2/ +# /#0/#1/#3;Ļ,/#3/#2/#1;1/#0;1/#2;1/#3;Ǭ1/#1;Ǭ1/#0;Ǭ1/#2;Ǭ1/ # /#0/#3/#1/#2/ #Ӥ /#1/#3/#1/ #ޤ /#1/ -$ //// -% ///ѡ/ +$ /;dollar/;cent/;pond,pound/ +% //;permill/ѡ/ & ///ѥ/ -' ////ݥȥե// -'' /// +' /;minute///ݥȥե/;accent aigu/ +'' /;second/;doublequote(closing)/ 's // ( ////// (#) /#2/ (#)#-# /#1#1-#1/ ) ///// * //// -+ ////// ++ /;plus/;/;()/;()/;()/ +- // , /// -- //////ޥʥ// // --- /// +- /;minus/;dash/;hyphen/;/;/ޥʥ/;Ĺ/ // +-- /;dash// --- // ---- // -: // -> // -| /// -. ///// +. ////;.../ .# /#1/ .. // -... ///ġ/ +... //;x3/ġ;åx2 ....../ ...... /ġ/ .com /ɥåȥ/ .net /ɥåȥͥå/ / /// -/. /åɥå/slashdot// +/. /åɥå;slashdot.org/slashdot// /= // -0 ////zero// +0 /;ӥ/;//zero// 0base /١/ 0emission /ߥå/ -0metre /᡼ȥ/ +0metre /᡼ȥ;sea level/ 0sum // -0sumgame /ॲ/ -1 ////С///one/ +0sumgame /ॲ;zero-sum game/ +1 ///;ְפ/С;ְפΰλ/;ְפε//one/ 10 //ƥ/ten/ 100 /ɴ/ϥɥå/hundred/ 1000 ///thousand/ -10^-1 /deci/d/ǥ/ -10^-12 /pico/p/ԥ/ -10^-15 /femto/f/ե/ -10^-18 /atto/a// -10^-2 /centi/c// -10^-21 /zepto/z/ץ/ -10^-24 /yocto/y/襯/ -10^-3 /milli/m/ߥ/ -10^-6 /micro//ޥ/ߥ/ -10^-9 /nano/n/ʥ/ -10^1 /deca/da/ǥ/ -10^12 /tera/T/ƥ/ -10^15 /peta/P/ڥ/ -10^18 /exa/E// -10^2 /hecto/h/إ/ -10^21 /zetta/Z// -10^24 /yotta/Y/西/ -10^3 /kilo/K// -10^6 /mega/M/ᥬ/ -10^9 /giga/G// +10^-1 /deci;[SIƬ]/d/ǥ/ +10^-12 /pico;[SIƬ]/p/ԥ/ +10^-15 /femto;[SIƬ]/f/ե/ +10^-18 /atto;[SIƬ]/a// +10^-2 /centi;[SIƬ]/c// +10^-21 /zepto;[SIƬ]/z/ץ/ +10^-24 /yocto;[SIƬ]/y/襯/ +10^-3 /milli;[SIƬ]/m/ߥ/ +10^-6 /micro;[SIƬ]//ޥ/ߥ/ +10^-9 /nano;[SIƬ]/n/ʥ/ +10^1 /deca;[SIƬ]/da/ǥ/ +10^12 /tera;[SIƬ]/T/ƥ/ +10^15 /peta;[SIƬ]/P/ڥ/ +10^18 /exa;[SIƬ]/E// +10^2 /hecto;[SIƬ]/h/إ/ +10^21 /zetta;[SIƬ]/Z// +10^24 /yotta;[SIƬ]/Y/西/ +10^3 /kilo;[SIƬ]/K// +10^6 /mega;[SIƬ]/M/ᥬ/ +10^9 /giga;[SIƬ]/G// 10th /ƥ/ 11 //֥//eleven/ 12 //ȥ/ȥ/twelve/ @@ -16581,20 +16581,20 @@ $ / 17 //֥ƥ/ƥ/seventeen/ 18 /Ȭ/ƥ/eighteen/ 19 //ʥƥ/nineteen/ -1bound /Х/ +1bound /Х;Ѹ(one-hopper)/ 1box /ܥå/ 1boxcar /ܥå/ 1chip /å/ 1click /󥯥å/ 1coin /󥳥/ -1cup /󥫥å/ -1cushion /󥯥å/ +1cup /󥫥å;[ɸ] (:å׼)/ +1cushion /󥯥å;Ѹ졣-֤/ 1drink /ɥ/ 1key /󥭡/ 1man /ޥ/ 1manlive /ޥ饤/ -1manshow /ޥ󥷥硼/ -1more /⥢/ +1manshow /ޥ󥷥硼;one-man show/ +1more /⥢;one more/ 1night /ʥ/ 1out /󥢥/ʥ/ 1pattern /ѥ/ @@ -16606,7 +16606,7 @@ $ / 1rank // 1room /롼/ 1roommansion /롼ޥ󥷥/ -1scene /󥷡/ +1scene /󥷡;one scene/ 1set /󥻥å/ 1shot /󥷥å/ 1shoulder /󥷥/ @@ -16614,28 +16614,28 @@ $ / 1sidegame /󥵥ɥ/ 1size /󥵥/ 1st /ե/ -1staid /եȥ/ +1staid /եȥ;first-aid/ 1stalbum /եȥХ/ 1stbase /եȥ١/ 1stclass /եȥ饹/եȡ饹/ 1stcontact /եȥ󥿥/ 1step /󥹥ƥå/ 1stfly /եȥե饤/ -1stgoro /եȥ/ +1stgoro /եȥ;(grounder)/ 1stimpression /եȥץå/ -1stkiss /եȥ/ +1stkiss /եȥ;first kiss/ 1stlady /եȥǥ/ 1stmit /եȥߥå/ 1stname /եȥ͡/ 1stop /󥹥ȥå/ -1tempo /ƥ/ +1tempo /ƥ;/ 1time /󥿥/ 1top /ȥå/ 1touch /󥿥å/ 1way /󥦥/󥦥/ -2 ///б/ġ/two/ -20 //ȥƥ/twenty/ȥ/twelve/ -2base /ġ١/ +2 ///б;פΰλ/ġ/two/ +20 //ȥƥ/twenty/ +2base /ġ١;double/ 2bass /ġХ/ 2beat /ġӡ/ 2by4 /ġХե/ @@ -16643,7 +16643,7 @@ $ / 2ndbase /ɥ١/ 2ndclass /ɥ饹/ 2ndfly /ɥե饤/ -2ndgoro /ɥ/ +2ndgoro /ɥ;(grounder)/ 2ndhouse /ɥϥ/ 2ndlife /ɥ饤/ 2ndopinion /ɥԥ˥/ @@ -16653,28 +16653,28 @@ $ / 2run /ġ/ 2shot /ġå/ 2step /ġƥå/ -2tone /ġȥ/ġȡ/ -2tonecolor /ġȥ󥫥顼/ -2tonecolour /ġȥ󥫥顼/ +2tone /ġȥ;two-tone/ġȡ/ +2tonecolor /ġȥ󥫥顼;two-tone/ +2tonecolour /ġȥ󥫥顼;two-tone/ 2top /ġȥå/ 2way /ġ/ 2x4 /ġХե/ 3 ///꡼/three/ 30 //ƥ/thirty/ -3base /꡼١/ -3dots // +3base /꡼١;triple/ +3dots /;x3/ 3f /꡼/ -3m /꡼/ +3m /꡼;www.3m.com/ 3out /꡼/ 3piece /꡼ԡ/ 3rd // 3rdbase /ɥ١/ 3rdfly /ɥե饤/ -3rdgoro /ɥ/ +3rdgoro /ɥ;(grounder)/ 3rdparty /ɥѡƥ/ɥѡƥ/ 3run /꡼/ -3season /꡼/ -3size /꡼/ +3season /꡼;three-season/ +3size /꡼;Ѹ(mesurements) NB:Хȡȡҥå/ 3star / / 4 ///ե/four/ 40 /ͽ/եƥ/fourty/ @@ -16693,458 +16693,458 @@ $ / 7th /֥/ 8 //Ȭ//eight/ 80 /Ȭ/ƥ/eighty/ -8ball /ȥܡ/ +8ball /ȥܡ;eight-ball/ 8beat /ȥӡ/ 8mm // 8th // 9 ///ʥ/nine/ 90 /彽/ʥƥ/ninety/ -9ball /ʥܡ/ +9ball /ʥܡ;nine-ball/ 9th /ʥ/ : /// :- // := // -< //////å/crescendo/ +< /;/;/;<-/;subset/;Ż < // -<< /// +<< /;Ż/;much smaller/ <= // <=> // -<> //// -= //// +<> //;ɩ// += /;equal/;/;Ʊ/ =/ // =: // => /// =| // -> ////////accent/ǥߥ̥/diminuendo/ǥå/decrescendo/ +> /;/;///;Ż >>/;much larger/;βä˶/accent/ǥߥ̥;˼夯/diminuendo/ǥå;˼夯/decrescendo/ >= // ->> /// +>> /;Ż/;much larger/ > // -> /̣/ -> // +> /̣;̣,̣/ +> /;(pressure) Ǿ,,͸/ > // -> //// +> /;н,ʲ,š//;⤦20ʬ,˸/ >ޤ /;/ > // -> /// -> /ʲ/ -> /ʳ/ +> /;(Ѱ) // +> /ʲ;300-/ +> /ʳ;ط-,-,-/ > //Ԥ// -> // -> /ʹ/ +> /;ʣϤۤȤɤλ,Ϸ,˷/ +> /ʹ;19-,-/ > /ʸ/ ->礦 /ʾ/ -> // +>礦 /ʾ;18-/ +> /;д-,Ǥ-/ > // ->ä /켰/ ->ä礯 /쿧/ +>ä /켰;ƻ-,-/ +>ä礯 /쿧;-,-/ >ä // >ä // ->äѤ // ->ʤ // ->餤 // +>äѤ /;-,̴-,-/ +>ʤ /;-,300-/ +>餤 /;-,-,-/ > // -> //// -> // +> //;԰,ʰ,¢/;,߰,˰/ +> /;,1ǯ(ǯ),()/ > // -> // ->ޤ /ޤ/ -> /΢/ -> /// +> /;,˾,ǽ/ +>ޤ /ޤ;¿-,-/ +> /΢;ϩ΢,ΰ΢,9΢/ +> /;糨,Գ/;() ,ڸ,Գ/ >礦 /ĶȽ/ -> //// -> ///// -> // -> //֤/ -> /ɽ/ +> //;,ѱ,Ķȱ/;Ų,,ɸ/ +> //;˻,,//;(party) ,ʿ,ָ/ +> /;Ĺ,󴧲,ٹﲦ/ +> /;,纬,Ѳ/֤;(ֳ) 2-,-,ǯ-/ +> /ɽ;ɽ,3ɽ,ɽ/ >䤫 // -> // +> /;ؿ,¿,Ʃ/ > // -> ///////// -> /////// +> ////////;,,ʸ/ +> //////;(solution) [˺][羮Ĺû]-/ > // > /¤/ -> //// -> // -> ///¿/ ->Ƥ // +> /;,ȳ,//;Ʊ̳,,ѷ,ͳ()/ +> /;,,/ +> ///¿;߻-,߸-,-/ +>Ƥ /;(process) -,-,ܹ-/ >Τ /ǽ/ -> // -> ////////// ->󤭤礦 /Ķ/ -> // +> /;ƹ-,ȿ-/ +> /;(sense) ư/;(view) ˴////;ȽŹ,ǯ//// +>󤭤礦 /Ķ;кѴĶ,Ķ/ +> /;-,Ĵ-,-/ > // > /// -> // -> // -> /// +> /;(Ϣ) װƴ,,մ/ +> /;鷸,̷,ͷ/ +> /;ˡ,Ҳ,ʼ/;¶,ij,̳/ > // -> /Ƭ/ -> //// ->ä /ز/ -> /// +> /Ƭ;(top)ĬƬ,(leader)­Ƭ,Ƭ/ +> /;(type)̻,ڤ귿/;(form)÷,û,/;Ȭ,˭,ͼ/ +>ä /ز;ʪ-/ +> /;ƤʪƤޡִҡ/;ʨޡ/ > // -> // +> /;,ʻ,/ > /¦/// -> // -> ///////// +> /;ռ,,/ +> /;(instrument) ޴/;(machine), (chance)ž/;period/;(Ͽ) Ե,/;͵,(󤮤礦),͵/;flag/;,(˼̿),/;(Χ), ()뵪,裴/ > // -> // -> // -> // ->Τ /ǽ/ ->㤯 // ->夦 /// ->礦 /////// +> /;Ʊ-,Ȳ-/ +> /;ȳ-,Ͽ-/ +> /;ŷ-,Ʒ-,̩-/ +>Τ /ǽ;̿-,ɽ-/ +>㤯 /;ʪ,ιԵ,/ +>夦 //;()ʿµ, (ŷ)ŷ긵/ +>礦 ///;(-mania) ,Dz趸,/;,,Φ/;̴,ͳ,涭/;(),()춿,۶/ >礯 // -> ///// +> /;Ӷ,Ͼֶ,Ƶ۶/;,žܶ,ͽŶ/;ǼƦ,Ƕ,Ǯ/;,,ڤ/ >󤳤 // -> /ػ/ +> /ػ;-,-/ >ڤ // -> //// -> /̣/ ->礦 // -> // -> /// +> /;ϵ嵷,嵷,ŷ嵷//;(technique) 赻,ɮ,嵻/ +> /̣;-,-/ +>礦 /;͢,,/ +> /;(Ԥά) ʼ˶,ɩ/ +> //;Ŷ,Ƕȶ,ڶ/ > // >餤 // -> /// -> // +> //;շ,,ϻ/ +> /;,ȶ,ƻ/ > // > // > // > //Ȥ/ -> //// +> /;(county)/;(group)/;,¹/ > // -> ////// +> ////;ٷ,Ű̷,λ÷/;ʼ,¼,Ǥ/ >Ĥ /ٻ/ -> // -> /ͳ/ ->椦 /ͳ/ -> //////// ->󤸤 // -> /// -> // +> /;໤-,Ȳ-/ +> /ͳ;-,-/ +>椦 /ͳ;=/ +> //;(bloc) Ϸ,ե󥹸/;(ticket) Ʒ/;() ƣ,٥븦/;,ɴ,/// +>󤸤 /;-/ +> /;ڤ,ʵ,Ƥ/;ް̲/ +> /;­,ȯ,߷/ > // -> /// ->󤷤礦 // +> /;(decrease) Ǽ,/;(source) ưϸ,ͥ륮/ +>󤷤礦 /;-,Ϸ-,Ӻٴ-/ >Ƥ // > /// -> ////// -> /԰/ -> // -> // -> /⹻/ +> //;׹,̿,Ķ⹩///;ǽ,̤/ +> /԰;΢ڤ-,ȿ-,ȿ-/ +> /;-,Ρ٥-,-/ +> /;-,-/ +> /⹻;-,-/ > /ֺ/ -> // ->ʤ // ->ˤ /ǧ/ +> /;-,»-/ +>ʤ /;-,-,-/ +>ˤ /ǧ;̱-/ > /Ψ/ > // > // >椦 /ͭ/ > // > /// -> /// +> //;(Τι),,궿/ > // > /// > // > // -> ///// +> /;(ǯ)//;() ϻ̵,ɣȬ// > /Ƴ/ > // -> /// +> //;,쿴/ > // > //// > // -> ///// +> ///;,̺,غ/;(goods)غ,ʸ,ͳ/ >夦 /߽/ > // -> // +> /;,,/ > // -> // -> ///////////// -> // -> /// -> /ټ/ ->礦 /Ծ/ -> // +> /;-,ʧ-,-/ +> ////////;,̿,/;ǻ,ʢ,/;ر,ƸҲʡ,ǯݸ//;,ؼ,/ +> /;α-,Ĵ-/ +> //;ܿ(Χ),繩/ +> /ټ;-,ȡ-/ +>礦 /Ծ;Ʀ-,-,-/ +> /;-,ӿ-,-/ > // -> // -> /// +> /;(up to) -,-, (λ)-/ +> //;,Ǵռ/ >Ƥ /Ź/ -> // ->ܤ /˾/ +> /;̾Ų-,-/ +>ܤ /˾;-,-/ > /// -> ///// ->夦 ////// +> /;¤ʪ,,//// +>夦 ///;ˡڽ,,/;ǿͽ,Խ/;,ͽ,ͽ/ >夦 // >夦ؤ // >夦礦 /λ/ >央 // ->央 // ->夷礦 // +>央 /;(-ist) -,̱²-,-/ +>夷礦 /;-,-/ >ä /п/ ->ɤ /Ƴ/ -> //// ->礦 ///////// ->礦 /㳲/ ->礭 // ->礯 //// ->Ȥ /Ƭ/ ->褦 // -> /// -> //ϩ/// -> // -> // -> // -> // +>ɤ /Ƴ;-,̱-/ +> ///;-,Ѵ-/ +>礦 //////;(־عפά)-,-/;() ϫ,ˡ,/;(craftspeople) (ꤷ礦礯礦),Ħ,/ +>礦 /㳲;ռ-,[մ]ǽ-/ +>礭 /;-,Υ-,ȯ-/ +>礯 /;ȼ,,/;迩,ܿ,/;꿦,Ĺ,̿/ +>Ȥ /Ƭ;19-,2038ǯ-/ +>褦 /;-,͢-/ +> /;,ȿƿ,ư// +> //ϩ;ϩ,ϩ,ýϩ/;,꼭,Ƽ/;,/ +> /;̳-,̳-,-/ +> /;ϼ,뾽,Լ/ +> /;­-,ǧ-,-/ +> /;-,ʪ-,-/ > // -> // +> /;ǯ-,ľ-,ͥī-/ >Ƥ /ŵ/ > // >㤯 /// >夦 // ->夯 // +>夯 /;,ƻ,Ѹ/ > // > // > // ->礦 ///// ->礦礦 // ->礦礦 /徺/ ->礦 // ->礦 // ->礦 // ->礷 // +>礦 ////;,(̤̾դ)Ź/ +>礦礦 /;ﳲ-,ư-,д-/ +>礦礦 /徺;-,ʨ-/ +>礦 /;-,-,к-/ +>礦 /;-,ť-,-/ +>礦 /;-,-/ +>礷 /;դɾΡ溬-/ > // > /// -> // -> // +> /;ɻҿ,,߿/ +> /;,,ή/ > // -> // -> // ->󤼤 // +> /;/ +> /;,굡,/ +>󤼤 /;ȯ-,´-/ > /// -> /Ԥ/ +> /Ԥ;-,-/ > // -> ///// -> // -> // -> /// +> /;/;(system) /;(made in,by) /;() / +> /;-,ʿ-,̱-/ +> /;-,ֶ-,ݾ-/ +> /;,/;ͥ,̵,ư/ > // -> /////// ->󤳤 /칶// ->󤷤夦 /콤/ +> /;(battle,game) ,/;(line),/;[˶](gland) ,ñ/;(), ()̾/;(ع),,Ͻ/;ʪ,/ +>󤳤 /칶;ʪ-,ů-,18-/;͵-,-,-/ +>󤷤夦 /콤;Ϫʸ-/ >󤻤 // ->褦 // +>褦 /;ʬ-/ > /// -> ///// -> // -> // +> /;Ķ,»,()/;,,/;,,(Υ̾)[߲],ι/;,,/ +> /;2007ǯ-,-/ +> /;() 20-/ >󤷤夦 // >󤿤 // -> // -> ////// +> /;,Χ(prosodeme),/ +> ////;,,˲// > /᡹/ ->Ȥ // ->ۤ // +>Ȥ /;-/ +>ۤ /;-,-/ > /§/ -> // -> /´/ -> /»/º/ +> /;-,²λ-/ +> /´;´,´/ +> /»;»,»,ޤ»/º/ > // -> ///¢/£/ +> /;,º/;Ǽ,ǯ/¢;Ŀ¢,Ѵ¢/£/ > /²/ -> /»/ -> ///// +> /»;(Ϣ) »,ʹ»,ɾ»/ +> ///;(voice) ư,,ǽ/;к,л/ > /б/ -> /й// ->礦 /о/ -> /// -> // -> // +> /й;ϰ-,Ի-,-/;ɱ-,ά-,-/ +>礦 /о;-,-/ +> /;-,Φ-,ٱ-/;-,̻-,-/ +> /;Ĺ,,ﳲ/ +> /;,,Ļ/ > /ã/ -> /Ω/ +> /Ω;-,-,æ-/ > // > /ñ/ ->Ȥ /ô/ -> // +>Ȥ /ô;Ķ-,ͻ-,-/ +> /;췮,ž,ͭ/ > //// > // > // > // > /// -> //// -> /϶/ ->ۤ // -> // ->㤯 // +> ///;и,,ľ/ +> /϶;̾Ų-,-/ +>ۤ /;Ǯ-,-/ +> /;,ͻ,/ +>㤯 /;,,/ >夦 /// >夦 // -> // ->礦 /Į/Ĺ/Ĵ/Ķ/Ģ/ģ/ ->礦 /Ķ/ ->礯 /ľ/ +> /;,ⶶϺ/ +>礦 /Į/Ĺ/Ĵ/Ķ/Ģ;ǼĢ,Ģ,Ģ/ģ/ +>礦 /Ķ;̳-,͢-/ +>礯 /ľ;Ծľ,ľ()/ >礯 /ľ/ >礯 /ľ/ -> // +> /;,,ߤ/ >Ĥ // ->Ĥ /// +>Ĥ /;(expert)/;(pain)/ >Ĥ /դ// >Ť /դ/ >Ť // ->Ť /Ϣ/ ->Ƥ /š//// ->Ƥ /㲼/ ->Ƥ // ->Ƥ礯 /꿩/ +>Ť /Ϣ;(||Ҷ|²)-/ +>Ƥ /š/;ͷ,ʸ/;Φ,ݳ,/;/ +>Ƥ /㲼;-,-/ +>Ƥ /;-,Ķ-/ +>Ƥ礯 /꿩;-,-/ >Ƥ // >Ƥ /Ū/ >Ƥ //Ÿ/ -> // ->Ǥ /// -> /// ->Ȥ //// ->Ȥ // +> /;(п) ؽ,,ˡ/ +>Ǥ /;(Ǥ),,/;Ȭ,,/ +> //;/ +>Ȥ //;ϫƯ,罰,ǭ(-)/;(building) ,ｻ/ +>Ȥ /;ȯ­-,/ >Ȥ // ->Ȥ礦 // +>Ȥ礦 /;(equivalent) Ż-,-/ >Ȥ椦 /ͭ/ ->Ȥɤ // +>Ȥɤ /;,/ >Ȥ // -> /// ->ɤ /ƻ/Ʋ/ +> //;¤,,/ +>ɤ /ƻ/Ʋ;ʸƲ,ϻƲ,Ʋ/ >ɤ /Ʊ/ >ɤ /Ʊ/ ->ɤ // +>ɤ /;(Ϣ) ӻ,,/ >ɤ /ȼ/ >ɤȤ // >ɤ // >ɤ // ->ɤ // ->ɤ /Ч/ +>ɤ /;˶,,/ +>ɤ /Ч;ƻ-,-,ŷ-/ >ʤ // ->ʤ /¢/ ->ʤ // ->ʤ // +>ʤ /¢;-/ +>ʤ /;,,/ +>ʤ /;(³)⤭סּ㤤/ >ʤ // ->ʤ /¤// +>ʤ /¤/;,/ >ʤ // -> /// ->̤ // -> // +> /;ƻ,ͥ,/;¼,ſɼ,֤/ +>̤ /;ټ,ȼ,/ +> /;,㲻,ǦӲ/ >ͤ // ->ͤ /Ǯ/ +>ͤ /Ǯ;Ǯ,ʳǮ,Ǯ/ >Τ /ǽ/ -> /// ->Ϥ /// ->Ϥ /// ->Ϥ /ȩ/ ->Ϥ /ȯ// +> //;ż,,/ +>Ϥ //;(ʤʤɤǼʬ̾դ) / +>Ϥ //;() ,,/ +>Ϥ /ȩ;ȩ,иȩ,ŷȩ/ +>Ϥ /ȯ/;,Ŀ/ >Ϥ // >Ϥ /Ⱦ//// ->Ϥ /ϰ/ -> // +>Ϥ /ϰ;ư-,-/ +> /;Ͼ,䲰,/ >Ф // ->Ф /ȶ/ +>Ф /ȶ;ȶ,νȶ/ >Фʤ // ->Ф ///Ƚ/ +>Ф /;(edition) ,/;(disk,board) ȯ,/Ƚ;(size) ϻȽ,ӥȽ/ > /// ->Ҥ /ɮ/ ->Ҥ礦 /ɽ/ɼ/ɾ/ +>Ҥ /ɮ;(written by) ɮ,ŷɮ/ +>Ҥ礦 /ɽ/ɼ/ɾ;Dzɾ,ʪɾ,ɸɾ/ >Ҥ // -> /// +> //;,¤,/ >Ӥ礦 // > // >դ // >դ /Բ/ ->դ /ն/ ->դ /׿/ ->դ // ->դΤ /ǽ/ +>դ /ն;-,Į-/ +>դ /׿;Ĺ-,-/ +>դ /;()-,(ܲ)-/ +>դΤ /ǽ;-,¬-/ >դ /ʯ/ > // >֤ /ʪ/ ->֤ // ->֤ /ʬ/ʸ/ ->ؤ /ʼ/ ->ؤ /// ->ؤ /// -> /// +>֤ /;(||5ǯ)-/ +>֤ /ʬ;-/ʸ;sentence/ +>ؤ /ʼ;ڳʼ,̱ʼ,ʼ/ +>ؤ /;(wall) ɲ,и,ҵ/;(habit) ,,ƨ/ +>ؤ /;(ळ)/;(ޤ줿) ŷ,Ϲ,/ +> /;,,()ȼ/;,,/ >٤ // >٤ // -> /// ->ۤ /ˡ/ˤ/ +> /;(assistant) ,/;(shop) ۻ,Ѽ,ʹ/ +>ۤ /ˡ/ˤ;ˤ,ˤ,̵ȿưˤ/ >ۤ // >ۤ // ->ۤ /ܰ/ +>ۤ /ܰ;-,-/ > // ->ܤ /˿/˷/˼/˹/ ->ܤ /ɻ/ ->ܤ // +>ܤ /˿;(ƿ̾)˿,˿/˷;(η)˷,˷,Ĩȳ˼/˼;()˼,ｻ˼,Ĩȳ˼/˹;(˹) ˹,˹,ؿ˹/ +>ܤ /ɻ;-,-/ +>ܤ /;,ܹ,ι/ >ܤ // -> /// +> /;(space)ڤ,(room)ܴ,/;Ͽ,,ڤ/ >ޤ // >ޤ // >ޤ /Į/ ->ޤä // ->ޤ // ->ޤ // ->ޤ // -> /̣/ ->ߤ /̤/ +>ޤä /;Į-,ǥ-/ +>ޤ /;19,ǯ/ +>ޤ /;,/ +>ޤ /;(̾),ʡε,(̾)ȴ/ +> /̣;Ϣ̣,̣,̣(NB:ƻ촴ˤḤ̂פƻ)/ +>ߤ /̤;-,-/ >ߤ /̱/ ->भ // ->ऱ // -> /̵/ +>भ /;[]-,(Ҷ||[˽])-/ +>ऱ /;(||ȯ)-/ +> /̵;-,-,˲-/ > /¼/ -> // +> /;,(NB:ƻ촴ˤĤɽܡפƻ)/ >ᤤ /̾/ >ᤤ /̾/ > // >⤦ // >⤯ // > // -> /ʪ// -> /// -> /// ->䤯 //// ->䤹 // -> /// ->椨 // +> /ʪ;͢ʪ,;ʪ/;,˲/ +> /;() , (ʸ) ε,λ/;(gate),(粼)¼,[ʪ]ưʪ/ +> //;(Ǿ),İ,/ +>䤯 /;۸岰,Ĵ,/;ʩ,/;Ƭ,̱/ +>䤹 /;,ȿư,10߰/ +> /;,ժ,̪/;,,Դ/ +>椨 /;¼-/ >椭 /Ԥ// -> /;/ ->褦 /// ->褦 /Ѹ/ ->褦Ҥ // ->褯 //// ->褳 // +> /;;ɴ;,ǯ;/ +>褦 //;,ŷ,/ +>褦 /Ѹ;-,Ϣ-/ +>褦Ҥ /;-,ݡ-/ +>褯 /;,,/// +>褳 /;ز,Բ,̲/ >Ƥ /ͽ/ ->ܤ /ͽ/ -> // ->餤 // +>ܤ /ͽ;-,-/ +> /;[̾岼Į]-/ +>餤 /;ǯ,,ǯ/ > // -> /Σ/΢/// -> /Ψ/Ω/Χ/ ->㤯 /ά/ ->夦 /ή// ->礦 ///// +> /Σ;(Τ)̩Σ,Σ,̵ռΣ/΢;̩΢,΢,̩΢/;() ,Ǵ,/;/ +> /Ψ;(ratio) Ψ,˴Ψ/Ω/Χ;(law) Χ,޸Χ,Χ/ +>㤯 /ά;ʸά,ɾά/ +>夦 /ή;ή,кή,ή// +>礦 ///;,ʿ/;() ŷ-,滳-(¹ʸ),¢-(ŷ)/ >礯 // >뤤 // ->줤 /// ->줭 /// -> /ϧ/ϩ/ -> /Ϻ/ +>줤 //;,ػ,Ե/ +>줭 /;(history) ž,Υ/;(calendar) ,,/ +> /ϧ;ŵϧ,ȿϧ,ͻϧ/ϩ/ +> /Ϻ;(̾)/ > /Ͽ/ > // > // >來 // ->勞 // ->虜 // -> // +>勞 /;,ͳ,,2/ +>虜 /;(technique) ,,ж/ +> /;㶹,/ ? // @ // -A ////ڥ/ -ACM /Abstract Control Model/ +A /;angstrom/;Alpha/;(Cyrillic)/ڥ;ήñ,SIñ/ +ACM /Abstract Control Model;USB/ AIDS //ŷȱɸ/ ALFEE /ե/ AND // @@ -17157,7 +17157,7 @@ Arbeit / Atena /ƥ/ Audrey /ɥ꡼/ Australia /ȥꥢ/ -B /// +B /;Beta (Greek)/;Be (Cyrillic)/ B-spline /¡ݥץ饤/ BBQ /С٥塼/ BKK /Х󥳥/ @@ -17165,7 +17165,7 @@ BSE /Bovine Spongiform Encephalopathy/ Bach /Хå/ Barbara /СХ/ Barium /Хꥦ/ -Be // +Be /;Cyrillic/ Benedict /٥ͥǥ/ Benz /٥/ Berkeley /С졼/ @@ -17173,23 +17173,23 @@ Beryl / Beta // Bezier /٥/ Biff /ӥ/ -Bonjours /ܥ󥸥塼/ +Bonjours /ܥ󥸥塼;Bonjour?/ Booby /֡ӡ/ Box // Brown /֥饦/ Budapest /֥ڥ/ CD /ѥȡǥ/Compact Disk/ -CDC /Communication Device Class/ +CDC /Communication Device Class;USB/ CISC /ʣ̿᥻åȷ׻/Complex Instruction Set Computer/ -CORBA /Common Object Request Broker Architecture/ +CORBA /Common Object Request Broker Architecture;ץꥱۤʤ졦ץOS֤ư뤿εʡץߥ󥰸줬CORBAѤ뤿IDLȤOMGꤷ/ CS /ߥ˥󥵡/ CTC /ƣƥΥ/ Caesar /// Calbee /ӡ/ Camille /ߡ/ Carter // -Ch // -Cha // +Ch /;Cha (Cyrillic)/ +Cha /;Cyrillic/ Chanel /ͥ/ Charlie /㡼꡼/ Chi // @@ -17200,34 +17200,34 @@ Claire / Claudel /ǥ/ Constantine /󥹥/ Crea /쥢/ -Cyrillic ////////////////////////////////// -D /// +Cyrillic /;A/;Be/;Ve/;Ge/;De/;Je/;Jo/;Zhe/;Ze/;I/;I-kratkoje (J)/;Ka/;El/;Em/;En/;O/;Pe/;Er/;Es/;Te/;U/;Ef/;Xa/;Tse/;Cha/;Sha/;Scha/;Znak (Tvjordyj znak)/;Y/;Znak (Xjaxkij znak)/;E/;Ju/;Ja/ +D /;Delta/;De (Cyrillic)/ DB /ǡ١/ DBA /ǡ١/ DBMS /dbms/ -DOM /Document Object Model/ -DTD /Document Type Definition/ +DOM /Document Object Model;W3C/ +DTD /Document Type Definition;XMLɥȤΥǡ¤᤿Ρ/ Daffy /ե/ Dagger // -De // +De /;Cyrillic/ Delta // Deutschland /ɥ/Ȱ/ -Diamond /// +Diamond /;ɩ/;ɩ/ Dick /ǥå/ Disney /ǥˡ/ -E /// -EE // +E /;Epsilon/;Cyrillic/ +EE /;Eta/ Edinburgh /ǥХ/ Edward /ɥ/ -Ef // +Ef /;Cyrillic/ Egypt /ץ/ -El // +El /;Cyrillic/ Elizabeth /ꥶ٥/ -Em // -En // +Em /;Cyrillic/ +En /;Cyrillic/ Epsilon // -Er // -Es // +Er /;Cyrillic/ +Es /;Cyrillic/ Eskimo /⡼/ Esquimau /⡼/ Eta // @@ -17235,77 +17235,77 @@ Euro / Europa /衼å/ Eve // Evil /ӥ/ -F /// +F /;Phi (Greek)/;Ef (Cyrillic)/ FEN //Far East Network/ FSF /Free Software Foundation/ Fourier /աꥨ/ Franken /ե󥱥/ Frankenstein /ե󥱥󥷥奿/ -G /// +G /;Gamma (Greek)/;Ge (Cyrillic)/ GHQ //Ϣ/General Headquarters/ GLPL /GNU Library Public License/ -GPL /GNU General Public License/ +GPL /GNU General Public License;(concat "http:\057\057www.gnu.org\057licenses\057gpl.ja.html")/ GUI /ե桼󥿥ե/ GW /ȥ/ Gamma // -Ge // +Ge /;Cyrillic/ George /硼/ Giants /㥤/ -Giraffu // -Goddard // -Greek ///////////////////////// +Giraffu /;giraffe?/ +Goddard /;Godard?/ +Greek /;Alpha/;Beta/;Gamma/;Delta/;Epsilon/;Zeta/;Eta/;Theta/;Iota/;Kappa/;Lambda/;Mu/;Nu/;Xi/;Omicron/;Pi/;Rho/;Sigma/;Tau/;Upsilon/;Phi/;Chi/;Psi/;Omega/ Grimm // Guile // HP /ҥ塼åȡѥå/ -HTML /Hyper Text Markup Language/ +HTML /Hyper Text Markup Language;W3C/ Harvard /ϡС/ Henry /إ꡼/ Hudson /ϥɥ/ Hungarian /ϥ󥬥ꥢ/ Hungary /ϥ󥬥꡼/ -I //// +I /;Iota//;Cyrillic/ I'm // -I-kratkoje // +I-kratkoje /;Cyrillic/ IBM /ӡ/ܥӡ/ -ICU /ݴĶ/ -IDFT /ΥաꥨѴ/ -IDL /Interface Definition Language/ -ISO /ɸಽ/ +ICU /ݴĶ;International Christian University/ +IDFT /ΥաꥨѴ;Inverse Discrete Fourier Transform/ +IDL /Interface Definition Language;CORBA֥Ȥ򥳡뤹뤿ɬפʾ󶡤롣/ +ISO /ɸಽ;International Organization for Standardization/ Indian /ǥ/ Internet /󥿡ͥå/ Iota // Itriangle // -J // -JICC /ʣɣãý/ -JIP /Żҷ׻/ -JISC /ܹɸĴ/ -Ja // +J /;Cyrillic(I-kratkoje)/ +JICC /ʣɣãý;[Ǽ̾]/ +JIP /Żҷ׻;www.jip.co.jp/ +JISC /ܹɸĴ;www.jisc.go.jp/ +Ja /;Cyrillic/ Jadeite // James /ॹ/ -Jamiroquai /ߥ磻/ +Jamiroquai /ߥ磻;ߥ塼,Х̾/ Jane // -Je // +Je /;Cyrillic/ Jenny /ˡ/ Jimmy /ߡ/ -Jo // +Jo /;Cyrillic/ Joe /硼/ John // Jr. /˥/ -Ju // +Ju /;Cyrillic/ Julian /ꥢ/ Julie /꡼/ Jupiter /ԥ/ -K ///ӥ// -KH // -Ka // +K /;Kappa (Greek)/;Ka (Cyrillic)/ӥ;(kelvin)Ǯϳز٤ñ,SIñ/;(KH) Chi/ +KH /;Chi/ +Ka /;Cyrillic/ Kappa // Katze /åĥ/ -Kh // +Kh /;Xa (Cyrillic)/ Kiki // Knuth /̡/ Kodak /å/ Kunzite /ĥ/ -L //// +L /;pond/;Lambda/;El (Cyrillic)/ LPF /ѥե륿/ Lagrange /饰󥸥/ Lambda // @@ -17318,7 +17318,7 @@ London / Los_Angeles /󥼥륹/ Lucy /롼/ Lynch // -M /// +M /;Mu (Greek)/;Em (Cyrillic)/ ML /ᥤ󥰥ꥹ/᡼󥰥ꥹ/ MPT /ޥݡȥȥ󥷡С/ MSA /ޥեȥ/ޥեȥ/ɱұ/Micro Software Associates/ @@ -17344,7 +17344,7 @@ Mr. / Mrs. /ߥ/ Ms. /ߥ/ Mu // -N /// +N /;Nu/;En (Cyrillic)/ NEC /ŵ/ NFS /Network File System/ NRT // @@ -17358,22 +17358,22 @@ Nijmegen / Norman /Υޥ/ Norway /Υ륦/ Nu // -O //// -OMG /the Object Management Group/(concat "http:\057\057www.omg.org\057")/ -OO // +O /;Omicron/;(Cyrillic)/;(OO) Omega/ +OMG /the Object Management Group;CORBAΤΥե졼󶡤뤿ȿ줿/(concat "http:\057\057www.omg.org\057")/ +OO /;Omega/ OR /ڥ졼󥺥ꥵ// OS /ڥ졼ƥ󥰥ƥ/ Olympic /ԥå/ Omega // Omicron // Oo // -P /// -PH // +P /;Pi (Greek)/;Pe (Cyrillic)/ +PH /;Phi/ POA /Portable Object Adapter/ -PS /P.S.// +PS /P.S./;Psi/ Palabora /ѥܡ/ Patty /ѥƥ/ -Pe // +Pe /;Cyrillic/ Peanuts /ԡʥå/ Peter /ԡ/ԥ硼ȥ/ڡ/ Phi // @@ -17381,9 +17381,9 @@ Philips / Pi // Polaroid /ݥ/ Psi // -R /// -RDB /طǡ١/ -RE /ɽ/ +R /;Rho (Greek)/;Er (Cyrillic)/ +RDB /طǡ١;relational database/ +RE /ɽ;regular expression/ RISC /̿᥻åȷ׻/Restricted Instruction Set Computer/ RPC /Remote Procedure Call/ RPG /ץ쥤󥰥/ @@ -17394,23 +17394,23 @@ Ritchie / Robert /С/٥/ Robin /ӥ/ Rose // -Russia ////////////////////////////////// -S /// +Russia /;Cyrillic///////////////////////////////// +S /;Sigma/;Es (Cyrillic)/ SAX /The Simple API for event-based XML parsing/ SFO /ե󥷥/ -SPA /¤/Specality Store Retailer of Private Label Apparel/ +SPA /¤;ʹҤΥǥ᤬ݰƤά/Specality Store Retailer of Private Label Apparel/ Sailormoon /顼ࡼ/ Saint // Sally /꡼/ Sandy /ǥ/ Sappho /åե/ -Scha // +Scha /;Cyrillic/ Scotch /å/ -Sh // -ShSh // -Sha // +Sh /;Sha (Cyrillic)/ +ShSh /;Scha (Cyrillic)/ +Sha /;Cyrillic/ Sheena // -Shsh // +Shsh /;Scha (Cyrillic)/ Sibip /ӥå/ Sigma // Singapore /󥬥ݡ/ @@ -17420,28 +17420,28 @@ Stallman / Suesan // Sweden /ǥ/ Sylpheed /ե/ -T /// +T /;Tau (Greek)/;Te (Cyrillic)/ TA /ߥʥ륢ץ/ TDL /ǥˡ/ -TH // +TH /;Theta/ TV /ƥ/ Tau // -Te // +Te /;Cyrillic/ Theta // Ti /ԣ/ Tiananmen /ŷ/ Tibet /٥å/ Toppe /ȥåԡ/ Toronto /ȥ/ -Ts // -Tse // +Ts /;Tse (Cyrillic)/ +Tse /;Cyrillic/ Turing /塼/ -U /// +U /;Upsilon/;Cyrillic/ Unisys /˥/ Upsilon // -V // +V /;Ve (Cyrillic)/ Valentine /Х󥿥/ -Ve // +Ve /;Cyrillic/ Vega /٥/ Venus /ӡʥ/ӥʥ/ Versailles /٥륵/륵/ @@ -17450,25 +17450,25 @@ W3C /The World Wide Web Consortium/ WG /󥰥롼/ WS /ơ/ WW# /#2/ -WW1 /켡/ݿ٥/ -WW2 /ʿ//찡٥/ +WW1 /켡/ݿ٥;/ +WW2 /ʿ//찡٥;/ Watson /ȥ/ -X /// +X /;Xi/;Xa (Cyrillic)/ XEROX /å/ XML /Extensible Markup Language/ -Xa // +Xa /;Cyrillic/ Xi // -Y //// +Y /;Upsilon/;Cyrillic(I-kratkoje)/;Cyrillic/ Yapoos /ס/ -Ye // -Yo // -Yu // -Z /// -Ze // +Ye /;Cyrillic/ +Yo /;Cyrillic/ +Yu /;Y (Cyrillic)/ +Z /;Zeta/;Ze (Cyrillic)/ +Ze /;Cyrillic/ Zeta // -Zh // -Zhe // -Znak /// +Zh /;Zhe (Cyrillic)/ +Zhe /;Cyrillic/ +Znak /;Cyrillic(Tvjordyj znak)/;Cyrillic(Xjaxkij znak)/ Zoisite // [ ///// [[ // @@ -17477,13 +17477,13 @@ Zoisite / \/ // ] ///// ]] // -^ ////accent/ +^ ///;βä˶/accent/ ^^ // ^v // -_ /// -` /// +_ //;ѥڡ/ +` /;singlequote/;accent grave/ `` // -a /////// +a /;alpha///;(ȸ)/;cyrillic// a# /A#0/#1/ a#size /A#0/#1/ a4 // @@ -17504,7 +17504,7 @@ abby / abduction /֥/ abdul /֥ɥ/ abdullah /֥ɥ/֥/֥ɡ/֥ɥ/ -abec /٥å/ +abec /٥å;avec? ٥å?/ abel /٥/٥/ abelia /٥ꥢ/ abend /٥/ @@ -17543,16 +17543,16 @@ academic / academie /ǥߡ/ academism /ǥߥ/ academy /ǥߡ/ -acappella /ڥ/ +acappella /ڥ;a cappella/ acapulco /ץ륳/ -acca /å/ -accel // -accelerando //å/ +acca /å;www.acca.ne.jp/ +accel /;accelerator/ +accelerando //å;[]®/ accelerator /졼//졼/ -accent /////// -accentaigu /ƥ// -accentcirconflexe /󥷥륳եå// -accentgrave /󥰥顼/󥰥顼// +accent //;accent aigue/;accent grave/;accent circonflexe/;trema,umlaut/;ʩ/ +accentaigu /ƥ;accent aigue// +accentcirconflexe /󥷥륳եå;accent circonflexe// +accentgrave /󥰥顼;accent grave/󥰥顼// accept /ץ/ acceptable /ץ֥/ acceptor /ץ/ץ/ @@ -17571,9 +17571,9 @@ accommodation / accord // accordion /ǥ/ account // -accountability /󥿥ӥƥ/󥿥ӥƥ/󥿥ӥƥ/ +accountability /󥿥ӥƥ;(:Ǥ)/󥿥ӥƥ/󥿥ӥƥ/ accounting /ƥ/ -accoustic /ƥå/ +accoustic /ƥå;acoustic?/ accra // accumulator /졼/ accuracy /饷/ @@ -17584,12 +17584,12 @@ acestriker / acetal // acetaldehyde /ȥǥҥ/ acetamido /ȥߥ/ -acetaminophen /ȥߥΥե/ +acetaminophen /ȥߥΥե;C8H9NO2/ acetate /ơ/ aceto // -acetone /ȥ/ +acetone /ȥ;CH3COCH3/ acetonitrile /ȥ˥ȥ/ -acetyl // +acetyl /;CH3CO-/ acetylcholine /륳/ acetylcoa /CoA/ acetylene // @@ -17603,17 +17603,17 @@ acidjazz / ackerman /åޥ/ ackermann /åޥ/ aclass /饹/A饹/ -acm /ƹ׻ز/ +acm /ƹ׻ز;Association for Computing Machinery. www.acm.org/ acme // acne // -acom // -aconcagua /󥫥/ +acom /;[̾]Զͻwww.acom.co.jp/ +aconcagua /󥫥;-()/ aconitine /˥/ acosta // acoustic /ƥå/ acousticguitar /ƥå/ acoustics /ƥå/ -acquapazza /ѥåĥ/ѥåĥ/ +acquapazza /ѥåĥ;(It) acqua pazza/ѥåĥ/ acre // acro // acrobat /Хå/ @@ -17627,7 +17627,7 @@ acryl / acrylonitrile /˥ȥ/ act // actin // -actinium /˥/ +actinium /˥;[]89,Ac/ actinoid /Υ/ action // actiongame /󥲡/ @@ -17646,14 +17646,14 @@ actual / actuality /奢ƥ/ actually /奢꡼/ actualtime /奢륿/ -actuary /奢꡼/ +actuary /奢꡼;ݸ/ actuator /奨/奨/ -acup /Aå/å/ +acup /Aå;10cm/å/ acute /塼/ acyclovir /ӥ/ ad // ada /Ada//// -adac /ɥХ󥹥ɡǡȥ륺/ +adac /ɥХ󥹥ɡǡȥ륺;www.adac.co.jp/ adagio // adam /// adams /ॹ/ @@ -17662,7 +17662,7 @@ adaptation / adapter /ץ/ץ/ adaptive /ץƥ/ץƥ/ adaptor /ץ/ץ/ -adballoon /ɥХ롼/ +adballoon /ɥХ롼;Ѹ(advertising balloon)/ adc /ĥС/ add /å/ adderley /쥤/ @@ -17670,9 +17670,9 @@ addessability / addict /ǥ/ addiction /ǥ/ addie /ǥ/ -addin /ɥ/ -addisababa /٥/ -addisabeba /٥/ +addin /ɥ;add-in/ +addisababa /٥;Addis Ababa/ +addisabeba /٥;Ababa Abeba/ addon /ɥ/ address /ɥ쥹/ addressbar /ɥ쥹С/ @@ -17684,13 +17684,13 @@ adela / adelaide /ǥ졼/ adele /ǥ/ǡ/ǡ/ aden /ǥ/ -adenine /ǥ˥/ +adenine /ǥ˥;A/ adenoid /ǥΥ/ adenosine /ǥΥ/ adenovirus /ǥΥ륹/ǥΥ륹/ adept /ǥץ/ -adhoc /ɥۥå/ -adidas /ǥ/ +adhoc /ɥۥå;ad hoc/ +adidas /ǥ;www.adidas.com/ adieu /ǥ塼/ adios /ǥ/ adjani /㡼/ @@ -17699,15 +17699,15 @@ adjustable / adjuster /㥹/㥹/ adjustment /㥹ȥ/ adler /ɥ顼/ -adlib /ɥ/ +adlib /ɥ;ad lib/ admin /ɥߥ/ administer /ɥߥ˥/ administration /ɥߥ˥ȥ졼/ administrator /ɥߥ˥ȥ졼/ɥߥ˥ȥ졼/ admission /ɥߥå/ admittance /ɥߥ/ -adobe /ɥ// -adolescence /ɥå/ɥ쥻/ +adobe /ɥ;www.adobe.com// +adolescence /ɥå;Ľ/ɥ쥻/ adolf /ɥ/ adolfo /ɥե/ adolph /ɥ/ @@ -17715,7 +17715,7 @@ adolphe / adonai /ɥʥ/ adonis /ɥ˥/ adopt /ɥץ/ -adopter /ץ/ +adopter /ץ;adapter?/ adorno /ɥ/ adrenalin /ɥʥ/ adrenaline /ɥʥ/ @@ -17724,8 +17724,8 @@ adrian / adriana /ɥꥢ/ adriano /ɥꥢ/ adrien /ɥꥢ/ -adrienne /ɥꥨ/ɥꥢ/ -adrive /Aɥ饤/ɥ饤/ +adrienne /ɥꥨ;ʩ/ɥꥢ/ +adrive /Aɥ饤;A:/ɥ饤/ adslmodem /ADSLǥ/ adult // adultdvd /DVD/ @@ -17743,7 +17743,7 @@ advertise / advertisement /ɥХ// advertising /ɥХ/ advice /ɥХ/ɥ/ -advise /ɥХ/ɥХ/ +advise /ɥХ;[ư]/ɥХ;֥̾ɥХפadvice/ adviser /ɥХ/ɥХ/ advisor /ɥХ/ɥХ/ɥ/ advisory /ɥХ꡼/ɥХ/ɥ/ɥХ/ @@ -17752,27 +17752,27 @@ adwords / ady /ǥ/ aegis // aeolia /ꥢ/ -aeolian /ꥢ/ +aeolian /ꥢ;ABCDEFGA/ aeolus // -aeon // -aera //AERA/ +aeon /;www.aeon.info/ +aera /;[̾]īʹ/AERA/ aerial /ꥢ/ aero // -aerobi // +aerobi /;aerobics/ aerobics /ӥ/ -aerobike /Х/ +aerobike /Х;Ѹ(stationary bike)/ aerodynamics /ʥߥ/ -aeroflot /ե/ +aeroflot /ե;www.aeroflot.ru/ aerogramme // aerosol // aerospace /ڡ/ aeschylus // aesop /å/ aesthe // -aesthesalon /ƥ/ +aesthesalon /ƥ;aesthetic salon/ aesthetic /ƥƥå/ aesthetician /ƥƥ/ -aestheticsalon /ƥƥå/ +aestheticsalon /ƥƥå;aesthetic salon/ affair /ե/ affiliate /եꥨ/եꥨ/ affiliateprogram /եꥨȥץ/ @@ -17781,9 +17781,9 @@ affine / affinity /ե˥ƥ/ե˥ƥ/ affordance /ե/ afghan /ե/ -afghanistan /ե˥/ +afghanistan /ե˥;.af/ aflatoxin /եȥ/ -afreco /ե쥳/ +afreco /ե쥳;after recording/ africa /եꥫ/ africaans /եꥫ/ african /եꥫ/ @@ -17796,7 +17796,7 @@ afterburner / aftercare /ե/ afterdark /ե/ afterfive /եե/ -afterfollow /եե/ +afterfollow /եե;Ѹ(follow-up)/ afternoon /ե̡/ afterservice /եӥ/ ag //Silver/ @@ -17805,7 +17805,7 @@ against / agamben /٥/ agamemnon /Υ/ agape /ڡ/ -agaricus /ꥯ/ +agaricus /ꥯ;ϥ饿°/ agarose // agata /// agate // @@ -17844,14 +17844,14 @@ ahead / ahriman /ޥ/ ai /AI/͹ǽ/ aias /// -aibo // -aic // +aibo /;[ɸ]ˡ/ +aic /;[̾]Զͻaic.jp/ aid // aida // aids //ŷȱɸ/ aidsvirus /륹/ aiexpert /ɥѡ/ -aiful /ե/ +aiful /ե;[̾]Զͻwww.aiful.co.jp/ aila // aileen /꡼/ aim // @@ -17870,17 +17870,17 @@ airborn / airborne /ܡ/ airbrush /֥饷/ airbus /Х/ -aircap /å/ +aircap /å;פפ/ aircheck /å/ aircleaner /꡼ʡ/ -aircon // -airconditioner /ǥʡ/ +aircon /;air conditioner/ +airconditioner /ǥʡ;air conditioner/ aircraft /ե/ -airduct // +airduct /;air duct/ airflow /ե/ -airforce /ե/ -airforceone /ե/ -airfrance /ե/ +airforce /ե;air force/ +airforceone /ե;Air Force One/ +airfrance /ե;www.airfrance.fr/ airgun // airhockey /ۥå/ airi // @@ -17897,16 +17897,16 @@ airship / airsystem /ƥ/ airterminal /ߥʥ/ airticket /å/ -airvalve /Х/ +airvalve /Х;air valve/ airway // airways // aischylos // aisha //// -aisle // +aisle /;ϩ/ ajanta //󥿡/ ak /Alaska/饹/ akademeia /ǥᥤ/ -akapella /ڥ/ڥ/ +akapella /ڥ;a capella?/ڥ;a capella?/ akashic /å/ akbar /Х/ akcl /AKCL/AKCL(Austin Kyoto Common Lisp)/ @@ -17918,27 +17918,27 @@ akropolis / aku // al //ߥ˥/Aluminum/Х/Alabama/ ala //顦/ -alabama /Х/ +alabama /Х;AL/ alabaster /Х/ -alacarte /饫/顦/ +alacarte /饫;a la carte/顦/ aladdin /饸/ -alaikum /饤/ +alaikum /饤;(ӥ)/ alain // alamo // -alamode /⡼/顦⡼/ +alamode /⡼;a la mode/顦⡼/ alamos /⥹/ alan // -alanine /˥/ +alanine /˥;Ala/ alarcon /륳/ alarm /顼/ -alaska /饹/ +alaska /饹;AK/ alawi /饦/ -alba // +alba /;[ɸ]/ alban /Х/ -albania /Х˥/ -albatross /Хȥ/ +albania /Х˥;.al/ +albatross /Хȥ;ŷ/ albedo /٥/ -albeit /Х/ +albeit /Х;Ĺ/ albeniz /٥˥/ albert /С/٥/١/ alberta /С/٥륿/ @@ -17947,20 +17947,20 @@ alberto / albina /ӥ/ albino /ӥ/ albion /ӥ/ -albirex /ӥå/ +albirex /ӥå;[J꡼]/ albrecht /֥ҥ/ album /Х/ albumin /֥ߥ/ albumtitle /Хॿȥ/ albuquerque /Х/ -alceste /륻/ +alceste /륻;le Misanthrope/ alchemist /륱ߥ/ alcohol /륳/ alcohollamp /륳/ alcove /륳/ alda // aldehyde /ǥҥ/ -aldente /ǥ/ +aldente /ǥ;al dente/ alder // aldo // ale /// @@ -17972,7 +17972,7 @@ aleksandr / aleksei /쥯/ alena // aleph /// -aleppo /å/ +aleppo /å;ꥢ/ alert /顼/ ales /쥹/ alesi /쥸/ @@ -17982,34 +17982,34 @@ alessio / aleutian /塼/ alex /å/ alexa /쥯/ -alexander /쥭/쥯/쥰/쥯ǥ/쥯ɥ/쥯/ -alexandra /쥯ɥ/쥭ɥ/쥰ɥ/ +alexander /쥭/쥯/쥰;()/쥯ǥ/쥯ɥ/쥯/ +alexandra /쥯ɥ/쥭ɥ/쥰ɥ;()/ alexandre /쥯ɥ/ alexandria /쥭ɥꥢ/쥯ɥꥢ/ alexandrite /쥭ɥ饤/ alexandros /쥯ɥ/ alexei /쥯/ -alexis /쥯/쥯/ +alexis /쥯/쥯;ʩ/ alf // alfa /ե/ alfalfa /եե/ -alfaromeo /եᥪ/ +alfaromeo /եᥪ;www.alfaromeo.com/ alfee /ե/ -alfine /ե/ +alfine /ե;(It) al fine/ alfons /ե/ alfonso /ե/ -alfred /եå/ե졼/ +alfred /եå/ե졼;(ȸ)/ alfredo /ե졼/ alge /른/ alger /른/ -algeria /른ꥢ/ +algeria /른ꥢ;.dz/ algernon /른㡼Υ/ algin /륮/ algol /르/ algorithm /르ꥺ/ˡ/ alhambra /ϥ֥/ ali //꡼/ -alias /ꥢ/ꥢ/ꥢ/ +alias /ꥢ/ꥢ/ꥢ;/ aliasing /ꥢ/ꥢ/ alibaba /Х/ alibi /Х/ @@ -18023,23 +18023,23 @@ alina / alisa /ꥵ/ alison /꥽/ꥹ/ alistair /ꥹƥ/ -alitalia /꥿ꥢ/ +alitalia /꥿ꥢ;www.alitalia.it/ alive /饤/饤/ -aljazeera /른㥸/른㥺/ +aljazeera /른㥸;al-Jazeera. www.aljazeera.net/른㥺/ alk /륯/ alkali /륫/ alkaline /륫/ alkaloid /륫/ alkan /륫/ alkane /륫/ -alkene /륱/ +alkene /륱;C[n]H[2n]/ alkoxide /륳/ alkyd /륭/ -alkyl /륭/ -alkyne /륭/ +alkyl /륭;C[n]H[2n-1]-/ +alkyne /륭;C[n]H[2n-2],RCCR/ all /// alla //å// -allabout /륢Х/롦Хȡ/ +allabout /륢Х;all about/롦Хȡ/ allah /顼/å顼/ allan // allback /Хå/ @@ -18056,7 +18056,7 @@ allemand / allemande /ޥ/ allen /// allene // -aller // +aller /;ʩ/ allergen /륲/ allergy /륮/륮/ alley /쥤/졼/ @@ -18065,14 +18065,14 @@ alliance / allicin /ꥷ/ allie /꡼/ allied /饤/ -alliedtelesis /饤ɥƥ쥷/ +alliedtelesis /饤ɥƥ쥷;www.allied-telesis.co.jp/ alligator /ꥲ/ -allinone /륤/ +allinone /륤;all-in-one/ allison /꥽/ allman /ޥ/ allnight /ʥ/ allnude /̡/ -allo // +allo /;(Ƭ)-/ allocate // allocation /// allocator // @@ -18095,7 +18095,7 @@ alma / almanac /ޥʥå/ almaty /ޥȥ/ almighty /ޥƥ/ޥƥ/ -alminium /ߥ˥/ +alminium /ߥ˥;aluminium/ almodovar /ɥХ/ almond // aloe // @@ -18110,7 +18110,7 @@ alpaca / alpen /ڥ/ alpena /ԥ/ alpenhorn /ڥۥ/ -alpenroute /ڥ롼/ +alpenroute /ڥ롼;ΩδѸƻϩwww.alpen-route.com/ alpenski /ڥ󥹥/ alpha //ե/ե/ alphabet /ե٥å/ @@ -18121,7 +18121,7 @@ alphorn / alpine /ѥ/ alpinist /ԥ˥/ alps /ץ/ -alqaeda /륫/ +alqaeda /륫;al-Qaeda/ alright /饤/饤/ als /륹/ alsace /륶/ @@ -18129,11 +18129,11 @@ alt / alta /륿/ altai /륿/ altamira /륿ߥ/ -altar /륿/ +altar /륿;/ altea /ƥ/ alter /륿/륿/ altered /륿/륿/ -alterna /륿/ +alterna /륿;alternative/ alternate /륿ͥ/륿͡/ alternative /륿ʥƥ/륿ʥƥ/ althorn /ȥۥ/ @@ -18141,15 +18141,15 @@ althusser / altkey /ALT/ȥ/ alto // altoflute /ȥե롼/ -altohorn /ȥۥ/ +altohorn /ȥۥ;alto horn/ altrecorder /ȥꥳ/ altsax /ȥå/ -alumi // -alumifoil /ߥۥ/ +alumi /;aluminium/ +alumifoil /ߥۥ;aluminium foil/ alumina /ߥ/ -aluminium //ߥ˥/ -aluminum /ߥ˥/ -alumisash /ߥå/ +aluminium /;Al/ߥ˥;[]13,Al/ +aluminum /ߥ˥;[]13,Al/ +alumisash /ߥå;aluminum sash/ alumite /ޥ/ alvarez /Х쥹/ alvaro /Х/ @@ -18162,16 +18162,16 @@ alyssum / alz // alzheimer /ĥϥޡ/ am /ꥷ/Americium//// -ama // +ama /;amateur/ amabile /ޡӥ/ amadeus /ޥǥ/ -amalg // +amalg /;ϥʸtse/ amalgam /ޥ륬/ amalia /ޥꥢ/ amalthaea /ޥƥ/ amalthea /ޥƥ/ amanda /ޥ/ -amande /ޥ/ +amande /ޥ;(Fr) / amantadine /ޥ󥿥/ amara /ޥ/ amaranth /ޥ/ @@ -18199,9 +18199,9 @@ ambrosia / ambulance /ӥ/ ambush /֥å/ ameba /᡼/ -amedas // +amedas /;AMeDAS/ amedee // -amefoot /ե/ +amefoot /ե;American football/ amelia /ꥢ/ amelie //꡼/ amen //// @@ -18213,12 +18213,12 @@ americancherry / americancoffee /ꥫ󥳡ҡ/ americancurl /ꥫ󥫡/ americandream /ꥫɥ꡼/ -americanexpress /ꥫ󥨥ץ쥹/ +americanexpress /ꥫ󥨥ץ쥹;www.americanexpress.com/ americanfootball /ꥫեåȥܡ/ americanism /ꥫ˥/ americanleague /ꥫ꡼/ americanshorthair /ꥫ󥷥硼ȥإ/ -americium /ꥷ/ +americium /ꥷ;[]95,Am/ amethyst /᥸/徽/б/ ametrine /ȥ/ amex /å/ꥫ󥨥ץ쥹/ @@ -18240,9 +18240,9 @@ ammons / amnesty /ͥƥ/ amo // amoeba /᡼/ -amor /⡼/ +amor /⡼;() / amoral // -amore /⡼/ +amore /⡼;(It) / amoroso // amorphous /ե/ amortization // @@ -18250,25 +18250,25 @@ amos / amount /ޥ/ amour /ࡼ/ amp //ץե/ -ampere /ڥ/ڡ/ -ampersand /ѥ/ѡ/ +ampere /ڥ;A/ڡ;Andre-Marie Ampere (1775-1836)/ +ampersand /ѥ;&/ѡ/ amphetamine /եߥ/ -amphitheater /ե/ -amphitheatre /ե/ +amphitheater /ե;߷/ +amphitheatre /ե;߷/ ample /ץ/ ampoule /ץ/ ampul /ץ/ amradio /AM饸/ amrduk /ޥɥ/ -amrita /꥿/ +amrita /꥿;[ҥɥ] Իο/ amsterdam /ॹƥ/ amulet /ߥå/ amun // -amur /ࡼ/ +amur /ࡼ;ε/ amuse /ߥ塼/ amusement /ߥ塼/ amusementpark /ߥ塼ȥѡ/ -amway /०/ +amway /०;www.amway.com/ amy /ߡ/ amyl /ߥ/ amylase /ߥ顼/ @@ -18278,7 +18278,7 @@ ana / anabel /ʥ٥/ anabell /ʥ٥/ anabolic /ʥܥå/ -anachro /ʥ/ +anachro /ʥ;anachronism/ anachronism /ʥ˥/ʥ/ anaconda /ʥ/ anaerobics /ͥӥ/ @@ -18287,15 +18287,15 @@ anais / anakin /ʥ/ anal /ʥ/ʥ/ analfuck /ʥեå/ -analizer /ʥ饤/ -analizing /ʥ饤/ +analizer /ʥ饤;analyzer/ +analizing /ʥ饤;analyzing/ analog /ʥ/ analogdata /ʥǡ/ analogrecord /ʥ쥳/ analogue /ʥ/ analogy /ʥ/ analsex /ʥ륻å/ -analvib /ʥХ/ +analvib /ʥХ;anal vibrator/ analyse /ʥ饤/ analyser /ʥ饤/ʥ饤/ analysis /ʥꥷ/ @@ -18303,7 +18303,7 @@ analyst / analyze /ʥ饤/ analyzer /ʥ饤/ʥ饤/ ananas /ʥʥ/ -anaphylaxie /ʥե饭/ +anaphylaxie /ʥե饭;(ȸ)/ anaphylaxis /ʥե饭/ anarchism /ʡ/ʥ/ anarchist /ʡ/ʥ/ @@ -18313,14 +18313,14 @@ anastasia / anatol /ʥȡ/ anatole /ʥȡ/ anatolia /ʥȥꥢ/ -anc /ƥ֥Υȥ/ +anc /ƥ֥Υȥ;active noise control/ anchor /󥫡/ anchorage /󥫥å/󥫥쥸/ anchorman /󥫡ޥ/ anchovy //ӡ/ ancien /󥷥/ -ancienregime /󥷥쥸/ -ancient /󥷥/󥷥/󥷥/󥷥/ +ancienregime /󥷥쥸;ancien regime/ +ancient /󥷥;ʩ/󥷥/󥷥/󥷥/ and ///////&/ andalucia /륷/ andaman /ޥ/ @@ -18331,7 +18331,7 @@ andersen / anderson //ǥ륽/ andes /ǥ/ andor /ɡ/ -andorra /ɥ/ +andorra /ɥ;.ad/ andrade /ɥ顼/ andre /ɥ/ andrea /ɥ쥢/ @@ -18352,51 +18352,51 @@ anecdote / anelka /ͥ륫/ anemone /ͥ/ anergy /ͥ륮/ -ange /󥸥/ +ange /󥸥;(Fr)ŷ/ angel /󥸥/󥼥/إ/󥸥/󥲥/ angela /󥸥/إ/󥲥/ -angeles /󥸥륹/ +angeles /󥸥륹;angels?/ angelfish /󥼥եå/ angelic /󥸥å/󥸥å/ angelica /󥸥ꥫ/󥼥ꥫ/ angelico /󥸥ꥳ/ angelina /󥸥꡼/ -angelique /󥸥꡼/󥸥å/󥸥ꥯ/ +angelique /󥸥꡼;(Fr)ŷȤ/󥸥å/󥸥ꥯ/ angelis /󥸥ꥹ/ angelo /󥸥/ -angelot /󥸥/ +angelot /󥸥;(Fr)ŷ/ angelplan /󥼥ץ/ -angels /󥸥륹/󥸥륺/ +angels /󥸥륹;[MLB]/󥸥륺;[MLB]/ angelus /󥸥饹/ anger /󥬡/󥸥/ angers /󥸥/ angie /󥸡/ angkor /󥳡/ -angkorwat /󥳡å/ +angkorwat /󥳡å;Angkor Wat/ angle /󥰥// anglo /󥰥/ -anglosaxon /󥰥/ -angola /󥴥/ +anglosaxon /󥰥;Anglo-Saxon/ +angola /󥴥;.ao/ angora /󥴥/ angry /󥰥꡼/ angstrom /󥰥ȥ// -anguilla /󥰥/ȥåĥ/ +anguilla /󥰥;.ai/ȥåĥ;.kn/ angulo /󥰥/ angus /󥬥/ anilide /˥/ aniline /˥/ anima /˥/ -animage /˥᡼/ +animage /˥᡼;ֽŹ/ animal /˥ޥ/ animals /˥ޥ륺/ animation /˥᡼/ animato /˥ޡ/ animator /˥᡼/ -animax /˥ޥå/ +animax /˥ޥå;www.animax.co.jp/ anime /˥/ -animechara /˥ᥭ/ +animechara /˥ᥭ;animation character/ animesong /˥᥽/ -animetic /˥å/ +animetic /˥å;Ѹ/ animism /˥ߥ/ animus /˥ॹ/ anion /˥/ @@ -18416,8 +18416,8 @@ annabel / annabell /ʥ٥/ annabella /ʥ٥/ annabelle /ʥ٥/ -annales /ʡ/ -annamillers /ʥߥ顼/ +annales /ʡ;(Fr) ǯ󡣡-ɡ/ +annamillers /ʥߥ顼;Anna Miller's/ annan /ʥ/ annapolis /ʥݥꥹ/ annapurna /ʥץ/ @@ -18436,7 +18436,7 @@ annotation / announce /ʥ/ announcement /ʥ󥹥/ announcer /ʥ󥵡/ -anntena /ƥ/ +anntena /ƥ;antenna?/ annual /˥奢/ anny /ˡ/ ano // @@ -18447,7 +18447,7 @@ anomy / anonymous /Υ˥ޥ/ anorak /Υå/ another /ʥ/ -anritsu // +anritsu /;www.anritsu.co.jp(?)/ ansar /󥵡/ ansel /󥻥/ anselmo /󥻥/ @@ -18455,7 +18455,7 @@ ansermet / ansi /ANSI/ answer /󥵡// ant // -antananarivo /󥿥ʥʥ/ +antananarivo /󥿥ʥʥ;ޥ(tnr)/ antares /󥿥쥹/ antelope /ƥ/ antenna /ƥ/ @@ -18464,11 +18464,11 @@ anthem / anthocyanin /ȥ˥/ anthology /󥽥/ anthony /󥽥ˡ/ȥˡ/ -anthracene /ȥ饻/ +anthracene /ȥ饻;C14H10/ anthurium /󥹥ꥦ/ anthy /󥷡/ anti // -antiaging // +antiaging /;anti-aging/ antialias /ꥢ/ antialiasing /ꥢ/ antichrist /ꥹ/ @@ -18477,10 +18477,10 @@ antico / antidote /ɡ/ antigone /ƥ/ƥ͡/͡// antihero /ҡ/ -antilles /ƥ/ +antilles /ƥ;An,.an/ antilock /å/ -antimon // -antimony //ˡ/ƥˡ/ +antimon /;[]51,Sb/ +antimony /;[]51,Sb/ˡ/ƥˡ/ antinomy /Υߡ/ antiochia /ƥ/ antipasto /ƥѥ/ @@ -18488,7 +18488,7 @@ antique / antishock /å/ antithese /ơ/ antivirus /륹/륹/ -antlers /ȥ顼/ +antlers /ȥ顼;[J꡼]/ antoine /ȥ/ antoinette /ȥͥå/ anton /ȥ/ @@ -18501,13 +18501,13 @@ antony / antwerp /ȥ/ anu // anus /̥/̥/ -anvil /ӥ// +anvil /ӥ;⾲// any /ˡ//˥// anya /˥/ anycast /ˡ㥹/˥㥹/ anything /˥/ -ao /(concat "and" (make-string 1 47) "or")/ -aodai // +ao /(concat "and\057or")/ +aodai /;ao dai/ aorist /ꥹ/ ap /ݥ/ apache /ѥå/ @@ -18518,7 +18518,7 @@ apathy / apatite /ѥ/ aperitif /ڥƥ/ aperture /ѡ/ -apex /ڥå/ +apex /ڥå;advanced purchase excursion/ aphorism /եꥺ/ aphrodite /եǥ/եǥ/ apia /ԥ/ @@ -18532,30 +18532,30 @@ apollon / apollonia /ݥ˥/ apolo /ݥ/ aporia /ݥꥢ/ -aposteriori /ݥƥꥪ/ -apostrophe //ݥȥե/ݥȥ/ +aposteriori /ݥƥꥪ;a posteriori/ +apostrophe //ݥȥե;'/ݥȥ/ apotosis /ݥȡ/ appalachian /ѥ/ apparel /ѥ/ apparelmaker /ѥ᡼/ -appartement /ѥȥޥ/ +appartement /ѥȥޥ;ʩ/ appassionata /ѥåʡ/ appassionato /ѥåʡ/ appeal /ԡ/ -appealpoint /ԡݥ/ +appealpoint /ԡݥ;Ѹ/ appearance /ԥ/ -appellation /ڥ饷/ +appellation /ڥ饷;(Fr) ƾ/ append /ڥ/ appendix /ڥǥå/Ͽ/ appia /åԥ/ applause /ץ/ apple /åץ// -applecomputer /åץ륳ԥ塼/ +applecomputer /åץ륳ԥ塼;www.apple.com/ applepie /åץѥ/ appleseed /åץ륷/ applet /ץå/ appleton /åץȥ/ -appli /ץ/ +appli /ץ;application/ appliance /ץ饤/ application /ץꥱ/ץꥱ// applicationcontext /ץꥱ󥳥ƥ/ @@ -18564,7 +18564,7 @@ applicationserver / applicationsoft /ץꥱ󥽥ե/ applique /åץꥱ/ apply /ץ饤/ -appo // +appo /;appointment/ appoint /ݥ/ appointer /ݥ󥿡/ appointment /ݥȥ/ @@ -18575,20 +18575,20 @@ apres / apricot /ץꥳå/ april /ץ/ aprilfool /ץա/ -apriori /ץꥪ/ +apriori /ץꥪ;a priori/ apron /ץ/ aprondress /ץɥ쥹/ -aqaba // +aqaba /;/ aqua // aquablue /֥롼/ aquacise // -aquafresh /եå/ +aquafresh /եå;[ɸ]/ aqualung // aquamarine /ޥ// aquanaut /Ρ/ aquapolis /ݥꥹ/ aquarium /ꥦ/ -aquarius /ꥢ/ +aquarius /ꥢ;Ӻ/ aquatic /ƥå/ aquatint // aquinas /ʥ/ @@ -18614,7 +18614,7 @@ ararat / arbeit /Х/Х/ arbeiter /Х/ arbiter /ӥ/ -arbitor /ӥ/ +arbitor /ӥ;arbiter?/ arbitrage /ӥȥ顼/ arbitration /ӥȥ졼/ arc /// @@ -18622,13 +18622,13 @@ arcade / arcadegame /ɥ/ arcadia /륫ǥ/ arcana /륫/ -arcanciel /륫󥷥/ +arcanciel /륫󥷥;(Fr) arc-en-ciel, / arch // archaic /륫å/ arche /륷/륱/ archer /㡼/ archery /꡼/ -archet /륷/ +archet /륷;(Fr)/ archetype // archi // archie // @@ -18645,26 +18645,26 @@ arco / arcturus /륯ȥ륹/ ardant // arden /ǥ/ -ardija /ǥ/ -are /// +ardija /ǥ;[J꡼]/ +are /;100m^2// area /ꥢ/// areaguide /ꥢ/ areamap /ꥢޥå/ areastudy /ꥢǥ/ꥢǥ/ -arena /꡼/졼/ +arena /꡼/졼;()Ʈ-/ arenas /ʥ/ arendt /// ares /쥹/ arezzo /åĥ/ -argent /饶/른/ -argentina /를/ +argent /饶/른;ʩ/ +argentina /를;.ar/ argentine /를/ -argentinetango /를󥿥/ +argentinetango /를󥿥;Argentine tango/ argento /른/ argerich /륲å/ -arginine /륮˥/ +arginine /륮˥;Arg/ argo /르/ -argon /르/ +argon /르;[]18,Ar/ argos /르/ argument /// arguments // @@ -18676,7 +18676,7 @@ ariane / arias /ꥢ/ arie // ariel /ꥨ/ -aries /ꥨ/ +aries /ꥨ;Ӻ/ arietta /ꥨå/ arioso /ꥪ/ arirang // @@ -18687,9 +18687,9 @@ aristoteles / aristotelis /ꥹȥƥ쥹/ aristotle /ꥹȥƥ쥹/ arity /ƥ/ -arizona /꥾/ -ark // -arkansas /󥽡/ +arizona /꥾;AZ/ +ark /;Ȣ/ +arkansas /󥽡;AR/ arkas /륫/ arkwright /饤/ arlene // @@ -18702,11 +18702,11 @@ armageddon / armagnac /ޥ˥å/ armand /ޥ/ޥ/ޥ/ armando /ޥ/ -armani /ޡ/ +armani /ޡ;www.armani.it/ armas /ޥ/ armband /Х/ armchair // -armenia /˥/ +armenia /˥;.am/ armeria /ꥢ/ armin /ߥ/ armitage /ߥơ/ @@ -18727,19 +18727,19 @@ arnoul / arnould /̡/ arnoux /̡/ aroma // -aromacandle /ޥɥ/ +aromacandle /ޥɥ;Ѹ/ aromacology /ޥ/ aromaoil /ޥ/ aromatherapy /ޥƥԡ/ޥԡ/ aromatic /ޥƥå/ -aronalpha /󥢥ե/ +aronalpha /󥢥ե;[ɸ]찡/ around /饦/ arowana // arp // arpa // arpeggio /ڥ/ arpeggione /ڥ/ -arpegio /ڥ/ +arpegio /ڥ;arpeggio?/ arrabbiata /ӥ/ arrange // arrangement /󥸥/ @@ -18747,19 +18747,19 @@ arranger / array /쥤/졼// arrival /饤Х/ arriving /饤ӥ/ -arrow //////// -ars /륹/ +arrow //;->/;<-/;^/;v/;=>/;<=>,equiv/ +ars /륹;(Lat)ݽ/ arsenal /ʥ/ arsene /륻/ -arsenic /˥å/륻˥å/˥å/ -arsine /륷/ +arsenic /˥å;As/륻˥å/˥å/ +arsine /륷;AsH3/ art // artaud /ȡ/ -artdeco /ǥ/ +artdeco /ǥ;art deco/ artdirector /ȥǥ쥯/ artemis /ƥߥ/ artemisia /ƥߥ/ƥߥ/ -artflower /ȥե/ +artflower /ȥե;artificial flower/ arthur //塼/ȥ/ƥ塼/ artichoke /ƥ硼/ article /ƥ/ @@ -18771,24 +18771,24 @@ artisan / artist /ƥ// artistic /ƥƥå/ artists /ƥ/ -artnouveau /̡ܡ/̡/ +artnouveau /̡ܡ;art nouveau/̡/ arto // arts // artur /ȥ/ arturo /ȥ/ artwork /ȥ/ -aruba /롼/ +aruba /롼;.aw/ arya /ꥢ/ aryl /꡼/ as ////Arsenic/ asa /// asahibeer /ҥӡ/ asbestos /٥/ -ascension /󥷥/󥷥/ +ascension /󥷥/󥷥;.ac/ ascii //ASCII/ asciiart // asciicode /ASCII// -ascot /å/ +ascot /å;[ɸ]ۥ/ ascottie /åȥ/ asgard // ash /å/ @@ -18800,29 +18800,29 @@ ashtray / asia ///ٰ// asiacup /å/ asian /// -asiana // +asiana /;www.asiana.co.kr/ aside // -asimo // +asimo /;[ɸ]ۥ/ asimov /// -asistance // +asistance /;assistance?/ ask // asklepios /ԥ/ asmara /ޥ/ asmo // asoka /祫/硼/ -aspara /ѥ/ -asparagine /ѥ饮/ +aspara /ѥ;asparagus/ +asparagine /ѥ饮;Asn/ asparagus /ѥ饬/ aspartame /ѥơ/ aspect /ڥ/ asperger /ڥ륬/ asphalt /ե/ -aspirin /ԥ/ +aspirin /ԥ;C9H8O4/ aspite /ԡ/ ass // assad // assai /å/ -assalam /å顼/ +assalam /å顼;(ӥ)/ assam /å/ assassin // assault // @@ -18847,9 +18847,9 @@ assort / assurance /奢/ assyria /åꥢ/ asta // -astatine // +astatine /;[]85,At/ astec /ƥå/ -astem /ƥ/ԹٵѸ/ +astem /ƥ/ԹٵѸ;abbrev: Advanced Software Technology & Mechatronics Research Institute of Kyoto. www.astem.or.jp/ asterisk /ꥹ/ asteroid /ƥ/ asti /ƥ/ @@ -18860,25 +18860,25 @@ astrakhan / astral /ȥ/ astro /ȥ/ astrology /ȥ/ -astros /ȥ/ +astros /ȥ;[MLB]/ astroscope /ȥ/ astrud /ȥå/ asuncion /󥷥/ aswan // -asyl // +asyl /;(ȸ)/ asylum // asymmetry /ȥ꡼/ at /å///Astatine// atacama // atari // atelier /ȥꥨ/ -atempo /ƥ/ƥ/ +atempo /ƥ/ƥ;a tempo/ athena /ƥ/ơʡ//Athena/ athenae /ƥʥ/ƥ/ athenai /ƥʥ/ athene /ƥ/ athens // -atherom /ƥ/ +atherom /ƥ;(ȸ)/ atheroma /ƥ/ƥ/ athlete /꡼/ athletic /å/ƥå/ @@ -18894,7 +18894,7 @@ atlantis / atlas /ȥ饹/ atm /ư갷/ưⵡ/ atman /ȥޥ/ -atmark /åȥޡ/ +atmark /åȥޡ;@/ atmosphere /ȥ⥹ե/ȥ⥹ե/ atok //ATOK/ȥå/ atom /ȥ/ @@ -18905,10 +18905,10 @@ atopy / atrandom /ȥ/ atrium /ȥꥦ/ atropine /ȥԥ/ -att /ԡ/ +att /ԡ;www.att.com/ attach /å/ attache /å/ -attachecase /å奱/ +attachecase /å奱;attache case/ attachment /å/ attack /å/ attacker /å/ @@ -18922,7 +18922,7 @@ attest / attika /åƥ/ attila /åƥ/ attlee /ȥ꡼/ -atto // +atto /;[SIƬ]a,10^-18/ attract /ȥ饯/ attraction /ȥ饯/ attractive /ȥ饯ƥ/ @@ -18936,7 +18936,7 @@ auberge / aubrey /֥꡼/ auckland // auction // -audi /ǥ/ +audi /ǥ;www.audi.com/ audience /ǥ/ audio /ǥ/ audiocable /ǥ֥/ @@ -18969,7 +18969,7 @@ aura / aurelius /ꥦ/ aurora //// aurorasauce /饽/ -auroravision /ӥ/ +auroravision /ӥ;Ѹ/ aus // auschwitz /ӥå/å/ auslese /졼/ @@ -18977,10 +18977,10 @@ ausone / aussie // auster // austin /ƥ// -australia /ȥꥢ/ -australiagp /ȥꥢGP/ +australia /ȥꥢ;.au/ +australiagp /ȥꥢGP;[F1]/ australian /ȥꥢ/ -austria /ȥꥢ/ +austria /ȥꥢ;.at/ authentic /ƥå/ author /// authoring // @@ -18988,9 +18988,9 @@ authorise / authority /ƥ/ƥ/ authorize /饤/ auto // -autobacks /ȥХå/ +autobacks /ȥХå;www.autobacks.com/ autobahn /ȥС/ -autobianchi /ȥӥ/ +autobianchi /ȥӥ;www.autobianchi.com/ autobike /ȥХ/ autocamp /ȥ/ autocomplete /ȥץ꡼/ @@ -19005,7 +19005,7 @@ autoloan / autolock /ȥå/ autologin /ȥ/ automa /ȥ/ -automata /ȥޥ/ȥޥȥ/ +automata /ȥޥ/ȥޥȥ;ñ(automaton)/ automatic /ȥޥå/ȥޥƥå/ automation /ȥ᡼/ automaton /ȥޥȥ/ @@ -19022,24 +19022,24 @@ availability / available /٥֥/֥/Ѳǽ/Ѳǽ/ aval /С/ avant /Х// -avantgarde /Х󥮥/󥮥/ +avantgarde /Х󥮥;avant-garde/󥮥/ avanti /Хƥ/ƥ/ avanture /Х塼/ avatar /Х/Х/ ave /// avec /٥å/ -avemaria /ޥꥢ/٥ޥꥢ/ +avemaria /ޥꥢ;Ave Maria/٥ޥꥢ/ avenue /٥˥塼/˥塼/ average /٥졼/ averagehitter /٥졼ҥå/ -avex /٥å/ +avex /٥å;www.avex.co.jp/ avignon /˥/ avila /ӥ/ -avispa /ӥ/ +avispa /ӥ;[J꡼]ʡ/ avocado /ܥ/ avogadro /ܥɥ/ɥ/ avonlea /ܥ꡼/꡼/ -avril //֥/ +avril /;(Fr) 4/֥/ avsystem /AVƥ/ award // awards /// @@ -19061,7 +19061,7 @@ ay / ayala // ayatullah /ȥ/ aych //å/ -ayeaye // +ayeaye /;aye-aye. / ayersrock /å/ aykroyd // ayler /顼/ @@ -19076,14 +19076,14 @@ azalea / azan // azane // azel // -azerbaijan /Х/ +azerbaijan /Х;.az/ azido // azine // aznar /ʡ/ azteca /ƥ/ -azulene // +azulene /;C10H8/ azur /塼// -b //ӡ/١//ۥ//Boron/ +b /;beta/ӡ/١;(ȸ)/;be (cyrillic)/ۥ//Boron/ b# /#1/B#0/ b#size /B#0/#1/ b-spline /¡ݥץ饤/ @@ -19093,15 +19093,15 @@ bab / baba /С/Х/ babe /٥/١/ babel /Х٥/ -baberuth /١֥롼/٥֥롼/ +baberuth /١֥롼;(1895-1948) Babe Ruth/٥֥롼/ babies /٥ӡ/ babs /Х֥/ baby /٥ӡ/٥ӡ/٥ӥ/ babybath /٥ӡХ/ babybed /٥ӡ٥å/ babyboom /٥ӡ֡/ -babyboomer /٥ӡ֡ޡ/ -babycar /٥ӡ/ +babyboomer /٥ӡ֡ޡ;baby boomer/ +babycar /٥ӡ;Ѹ(pushchair)/ babydoll /٥ӡɡ/ babyface /٥ӡե/ babyfood /٥ӡա/ @@ -19128,7 +19128,7 @@ back / backband /ХåХ/ backbone /Хåܡ/ backchain /Хå/ -backchorus /Хå饹/ +backchorus /Хå饹;background chorus/ backdancer /Хå󥵡/ backdoor /Хåɥ/ backdrop /Хåɥå/ @@ -19139,7 +19139,7 @@ backgear / background /Хå饦/Хå/ط/ backhand /Хåϥ/ backhaus /Хåϥ/ -backhome /Хåۡ/ +backhome /Хåۡ;Ѹ/ backing /Хå/ backlight /Хå饤/ backlog /Хå/ @@ -19187,7 +19187,7 @@ badnews / badtiming /Хåɥߥ/ badtrip /Хåɥȥå/ baffle /Хåե/Хե/ -baffy /Хե/Хåե/ +baffy /Хե;4-wood/Хåե/ bag /Хå/ bagatell /Хƥ/ bagdad /Хå/ @@ -19195,20 +19195,20 @@ bagel / baggage /Х/ baggio /Хå/ baghdad /Х/ -bagnacaoda /С˥㥫/ +bagnacaoda /С˥㥫;(It)bagna cauda/ bagpipe /Хѥ/ -baguette /Хå/ -baguio /Х/ -bahamas /Хϥ/ +baguette /Хå;ե󥹥ѥ/ +baguio /Х;եԥ/ +bahamas /Хϥ;.bs/ bahamut /Хϥࡼ/ -bahrain /С졼/ -bahraingp /С졼GP/ +bahrain /С졼;.bh/ +bahraingp /С졼GP;[F1]/ baht /С/ baikal /Х/ -baikonur /Х̡/ +baikonur /Х̡;ե/ bailey /٥꡼/ -bain /٥/Х/ -baiser /١/ +bain /٥/Х;(Fr)Ϥ/ +baiser /١;(Fr)/ baka /Х/ bake /١/٥/ baked /١/ @@ -19248,12 +19248,12 @@ ballerina / ballet /Х쥨/ balletdancer /Х쥨󥵡/ balley /٥꡼/ -balleys /٥꡼/ +balleys /٥꡼;Balleys's/ ballistic /Хꥹƥå/ balloon /Х롼/ ballpark /ܡѡ/ -ballpen /ܡڥ/ -bally /Х꡼/ +ballpen /ܡڥ;Ѹ(ballpoint)/ +bally /Х꡼;www.bally.com/ balm /С/Х/ balrog /Х/ balsa /Х륵/ @@ -19266,19 +19266,19 @@ balzac / bamako /Хޥ/ bamberg /Х٥륯/ bambi /Х/ -bambino /Хӡ/ +bambino /Хӡ;(It)Ҷ/ bamboo /Х֡/ -bamiyan /Сߥ/ +bamiyan /Сߥ;ե˥/ ban /Х/ banach /Хʥå/ banana /Хʥ/ bananachips /Хʥʥåץ/ bancroft /Х󥯥ե/ band /Х/ -banda /Х/ +banda /Х;(It)/ bandage /Хǡ/ -bandaid /Хɥ/ -bandana /Х/ +bandaid /Хɥ;[ɸ]band-aid/ +bandana /Х;bandanna/ bandanna /Х/ banderas /Хǥ饹/ bandgap /Хɥå/ @@ -19289,7 +19289,7 @@ bandneon / bandoneon /Хɥͥ/ bandpass /Хɥѥ/ bandscore /Хɥ/ -bandung /Хɥ/ +bandung /Хɥ;ɥͥ/ bandwagon /Хɥ若/ bandwidth /Х/ bane /٥/ @@ -19297,16 +19297,16 @@ banff / bang /Х/ bangalore /Х󥬥/ bangkok /Х󥳥/ -bangladesh /Х󥰥ǥ/ +bangladesh /Х󥰥ǥ;.bd/ bangle /Х󥰥/ bangui /Х/ banjo /Х󥸥硼/ bank /Х/ bankbutton /Х󥯥ܥ/ -banker /Х󥫡/ +banker /Х󥫡;Բ/ banking /Х󥭥/ banks /Х󥯥/ -banmas /Хޥ/ +banmas /Хޥ;bandmaster/ banner /Хʡ/ banquet /Х󥱥å/ banshee /Х󥷡/ @@ -19316,16 +19316,16 @@ baobab / baptisma /Хץƥ/ baptist /Хץƥ/Хץƥ/ baptiste /Хץƥ/Хƥ/ -bar /С/С////(make-string (- fill-column 1) ?-)/ +bar /С/С;-Τ褦ʤ/;minus/;pipe//(make-string (- fill-column 1) ?-)/ barabbas /Х/ baraja /Х/ barb /С/ -barbados /ХХɥ/ +barbados /ХХɥ;.bb/ barbapapa /СХѥ/ -barbara /СХ/ХХ/ +barbara /СХ/ХХ;quelle connerie la guerre!/ barbaresco /ХХ쥹/ barbarian /СХꥢ/ -barbaroi /ХХ/ +barbaroi /ХХ;(ꥷ)/ barbecue /С٥塼/ barbell /С٥/ barber /СС/ @@ -19342,14 +19342,14 @@ bardot / bare /٥/ barebone /٥ܡ/ barenboim /Хܥ/ -baretop /٥ȥå/ +baretop /٥ȥå;Ѹ/ bargain /С/ bargainsale /С󥻡/ barge /С/ bari /С/ -baricade /Хꥱ/ +baricade /Хꥱ;barricade/ barilla /Х/ -bariquand /Хꥫ/ +bariquand /Хꥫ;ʩ/ baritone /Хȥ/ baritonesax /Хȥ󥵥å/ barium /Хꥦ/ @@ -19361,7 +19361,7 @@ barnaby / barnard /Сʡ/ barnes /С/ barney /Сˡ/ -barneys /Сˡ/ +barneys /Сˡ;www.barneys.com/ barnum /Сʥ/ barolo /Х/ barometer /Х᡼/Х᡼/ @@ -19377,7 +19377,7 @@ barricade / barrichello /Х/ barrier /Хꥢ/Хꥢ/ barrierfree /Хꥢե꡼/ -barrior /Хꥢ/ +barrior /Хꥢ;barrier?/ barron /Х/ barry /Х꡼/ barrymore /Х⥢/ @@ -19404,7 +19404,7 @@ baseline / basement /١/ basename /١͡/ baserunning /١˥/ -baseup /١å/ +baseup /١å;Ѹ(raise)/ bash /Хå/ bashing /Хå/ bashkortostan /Хȥ/ @@ -19415,13 +19415,13 @@ basilico / basilisk /Хꥹ/ basis /١// bask /Х/ -baske /Х/ +baske /Х;basketball/ basket /Хå/ basketball /Хåȥܡ/ basketshoes /Хåȥ塼/ basque /Х/ -basra /Х/ -bass /Х/١/С/ +basra /Х;饯/ +bass /Х/١/С;̾/ bassclarinet /Хͥå/ bassdrum /Хɥ/ basset /Хå/ @@ -19430,7 +19430,7 @@ bassguitar / bassist /١/ bassline /١饤/ basso /Хå/ -bassoon /Х/եå/ +bassoon /Х/եå;fagotto(It)/ basssolo /١/ bastard /Х/Х/ bastian /Хƥ/ @@ -19443,7 +19443,7 @@ batavia / batch /Хå/ batchfile /Хåե/ batchsize /Хå/ -bateau /Хȡ/ +bateau /Хȡ;(Fr)/ bateson /٥ȥ/ bath /Х/С/ bathmat /Хޥå/ @@ -19455,11 +19455,11 @@ bathtub / batista /Хƥ/ batman /Хåȥޥ/ baton /Хȥ/ -batontouch /Хȥ󥿥å/ +batontouch /Хȥ󥿥å;Ѹ(baton pass)/ batontwirling /Хȥȥ/ batsu // batter /Хå/ -batterbox /Хåܥå/ +batterbox /Хåܥå;batter's box/ battery /Хåƥ꡼/Хåƥ/ batterypack /Хåƥ꡼ѥå/ batting /Хåƥ/ @@ -19476,7 +19476,7 @@ baudrillard / bauer /Х/ bauhaus /Хϥ/ baulk /ܡ/ -baum /Х/ܡ/ +baum /Х;(ȸ)/ܡ/ baumann /Хޥ/ baume /ܡ/ baumkuchen /Х९إ/С९إ/ @@ -19506,14 +19506,14 @@ bazooka / bbc /BBC/ bbs /Ǽ/ bclass /¥饹/B饹/ -bcup /Bå/¥å/ -bday /Сǥ/ -bdrive /Bɥ饤/¥ɥ饤/ -be /ӡ/٥ꥦ/Beryllium// +bcup /Bå;12.5cm/¥å/ +bday /Сǥ;BirthDAY/ +bdrive /Bɥ饤;B:/¥ɥ饤/ +be /ӡ/٥ꥦ/Beryllium/;cyrillic/ beach /ӡ/ beachball /ӡܡ/ beachboys /ӡܡ/ -beachparasol /ӡѥ饽/ +beachparasol /ӡѥ饽;Ѹ(beach umbrella)/ beachresort /ӡ꥾/ beachsandal /ӡ/ beachvolley /ӡХ졼/ @@ -19526,7 +19526,7 @@ beagle / beaker /ӡ/ beam /ӡ/ beamsabre /ӡॵ٥/ -bean /ӡ/ +bean /ӡ;Ʀ/ beanball /ӡܡ/ beans /ӡ/ bear /٥/٥/ @@ -19543,23 +19543,23 @@ beatrice / beatrix /٥ȥꥯ/ӥȥꥯ/٥ȥå/ beatriz /٥ȥꥹ/ beats /ӡ/ -beau /ܡ/ +beau /ܡ;ʩ/ beaucaillou /ܡ/ beaujolais /ܥ졼/ܡ/ܥ/ܡ졼/ -beaujolaisnouveau /ܥ졼̡ܡ/ܡ졼̡ܡ/ܡ̡ܡ/ܡ̡/ܡ졼̡/ܥ졼̡/ +beaujolaisnouveau /ܥ졼̡ܡ;Beaujolais nouveau/ܡ졼̡ܡ/ܡ̡ܡ/ܡ̡/ܡ졼̡/ܥ졼̡/ beaune /ܡ/ -beaute /ܡ/ܥ/ +beaute /ܡ/ܥ;(Fr)/ beautiful /ӥ塼ƥե/ beauty /ӥ塼ƥ/ӥ塼ƥ/ beauvoir /ܡ/ -beauxarts /ܥ/ +beauxarts /ܥ;(Fr) beaux-arts. / beaver /ӡС/ bebe /٥/ bebop /ӥХå/ -bec /٥å/ +bec /٥å;(Fr),ޥԡ/ because /ӥ// bechamel /٥/ -bechamelsauce /٥륽/ +bechamelsauce /٥륽;bechamel sauce/ bechet /٥/ beck /٥å/ beckenbauer /٥åХ/ @@ -19579,7 +19579,7 @@ bedscene / bedsheets /٥åɥ/ bedside /٥åɥ/ bedtime /٥åɥ/ -bedtown /٥åɥ/ +bedtown /٥åɥ;Ѹ(dormitory)/ bee /ӡ/ beef /ӡ/ beefcurry /ӡե졼/ @@ -19595,10 +19595,10 @@ beergarden / beerhall /ӥۡ/ beerken /ӡ/ beermug /ӥޥ/ -beet /ӡ/ +beet /ӡ;纬/ beethoven /١ȡ/١ȡ٥/ beetle /ӡȥ/ -beets /ӡ/ +beets /ӡ;ż/ before /ӥե/ӥե/ begin /ӥ/ beginner /ӥʡ/ @@ -19606,7 +19606,7 @@ beginners / beginnersluck /ӥʡå/ begins /ӥ/ begonia /٥˥/ -beguine /ӥ/ +beguine /ӥ;[]begin the -/ behavior /ӥإӥ/ behind /ӥϥ/ beige /١/ @@ -19619,19 +19619,19 @@ beit / bejart /٥㡼/ bel /٥/ bela /٥/ -belarus /٥롼/ -belcanto /٥륫/ +belarus /٥롼;.by/ +belcanto /٥륫;bel canto/ belem /٥/ belen /٥/ belfast /٥ե/ belgie /٥륮/ -belgiegp /٥륮GP/ -belgium /٥륮/ +belgiegp /٥륮GP;[F1]/ +belgium /٥륮;.be/ belief /ӥ꡼/ believe /ӥ꡼/ӥ꡼/ believer /ӥ꡼С/ belinda /٥/ -belize /٥꡼/ +belize /٥꡼;.bz/ bell /٥/ bella /٥/ belladonna /٥ɥ/ @@ -19639,12 +19639,12 @@ bellamy / bellbottom /٥ܥȥ/ bellcore /٥륳/ belle /٥/ -belleepoque /٥륨ݥå/ +belleepoque /٥륨ݥå;la Belle Epoque/ bellemaison /٥᥾/ bellini /٥꡼/ bellken /٥븦/£츦/ bellman /٥ޥ/ -bellmare /٥ޡ/ +bellmare /٥ޡ;[J꡼]/ bellof /٥/ bells /٥륺/ belltree /٥ĥ꡼/ @@ -19680,15 +19680,15 @@ benedictine / benedictus /٥ͥǥȥ/ benedikt /٥ͥǥ/ benefit /٥ͥեå/ -benelux /٥ͥ륯/ -benesse /٥ͥå/ -benetton /٥ͥȥ/ +benelux /٥ͥ륯;٥륮륯֥륯/ +benesse /٥ͥå;www.benesse.co.jp/ +benetton /٥ͥȥ;www.benetton.com/ bengal /٥󥬥/ bengala /٥󥬥/ bengali /٥󥬥/ benghazi /٥󥬥/ benguela /٥󥲥/ -benin /٥˥/٥ʥ/ +benin /٥˥;.bj/٥ʥ/ bening /٥˥/ benitez /٥˥ƥ/ benjamin /٥󥸥ߥ/٥ߥ/ @@ -19703,7 +19703,7 @@ benoit / benson /٥󥽥/ bent /٥/ bentham /٥󥵥/ -benthos /٥ȥ/ +benthos /٥ȥ;ʪ/ bentley /٥ȥ졼/٥ȥ꡼/ benzaldehyde /٥󥺥ǥҥ/ benzene /٥󥼥/ @@ -19721,9 +19721,9 @@ beret / beretta /٥å/ berg /С/٥륯/٥륰/ bergamasque /٥륬ޥ/ -bergamo /٥륬/ +bergamo /٥륬;ꥢ/ bergamot /٥륬å/ -bergamotto /٥륬å/ +bergamotto /٥륬å;ꥢ/ bergen /٥륲/٥إ/С/٥إС/ berger /٥른/С/ bergerac /٥른å/ @@ -19732,15 +19732,15 @@ bergson / berimbau /ӥХ/ bering /١/ berio /٥ꥪ/ -berkeley /С졼/С꡼/С쥤/ -berkelium /Сꥦ/ +berkeley /С졼;ե˥/С꡼/С쥤/ +berkelium /Сꥦ;[]97,Bk/ berkley /С졼/С꡼/С쥤/ berlin /٥/ -berlinphil /٥ե/ +berlinphil /٥ե;Berliner Philharmonisches Orchester/ berlioz /٥ꥪ/ -berlitz /٥å/ +berlitz /٥å;www.berlitz.com/ berlusconi /٥륹/ -bermuda /Хߥ塼/Сߥ塼/ +bermuda /Хߥ塼;.bm/Сߥ塼/ bern /٥/ berna /٥/ bernanke /Сʥ/ @@ -19761,7 +19761,7 @@ berri / berrichello /Х/ berry /٥꡼/٥/ berserk /С/ -berserker /С/٥륻륯/ +berserker /С/٥륻륯;[̲](NB:Ѹberserkϵ)/ bert /С/٥/١/ berta /٥륿/ bertha /С/٥륿/ @@ -19771,7 +19771,7 @@ bertolt / bertram /Сȥ/٥ȥ/ bertrand /٥ȥ/Сȥ/ beryl /٥/ -beryllium /٥ꥦ/ +beryllium /٥ꥦ;[]4,Be/ besancon /֥󥽥/ beside /ӥ/ bess /٥/ @@ -19817,19 +19817,19 @@ beulah / beverage /ӥХå/ beverley /ӥ꡼/ӥХ꡼/ beverly /ӥХ꡼/ӥ꡼/ -beverlyhills /ӥХ꡼ҥ륺/ +beverlyhills /ӥХ꡼ҥ륺;Beverly Hills/ beyond /ӥ/ bezel /٥/ bezier /٥/٥/ bf /֥륭ʥե/Burkina Faso/ -bflets /Bեå/ +bflets /Bեå;[ɸ]NTT/ bg /Хå饦/ bgata /·/ bh /ܡꥦ/Bohrium/ bhakti /Хƥ/ -bhutan /֡/ +bhutan /֡;.bt/ bhutto /֥å/ -bi /Х/ӥޥ/Bismuth/ +bi /Х;2/ӥޥ/Bismuth/ biafra /ӥե/ bian /ӥ/ bianca /ӥ/ @@ -19837,18 +19837,18 @@ bianchi / bianco /ӥ/ bias /Х/ biathlon /Х/ -bibimbap /ӥӥ/ +bibimbap /ӥӥ;(ī)/ bible /Х֥/ biblio /ӥ֥ꥪ/ bibliography /ӥ֥ꥪե/ biblos /ӥ֥/ bibtex /BibTeX/ -biccamera /ӥå/ +biccamera /ӥå;www.biccamera.com/ bicolor /Х顼/ bicolour /Х顼/ bicycle /Х/ bid /ӥå/ -bidders /ӥå/ +bidders /ӥå;www.bidders.co.jp/ bidding /ӥǥ/ bidet /ӥ/ biedermeier /ӡޥ䡼/ @@ -19856,23 +19856,23 @@ biela / bien /ӥ/ biennale /ӥʡ/ bierce /ӥ/ -biet /ӡ/ +biet /ӡ;()/ biff /ӥ/ bifidus /ӥե/ big /ӥå/ bigband /ӥåХ/ bigbang /ӥåХ/ bigblue /ӥå֥롼/ -bigcomic /ӥåߥå/ +bigcomic /ӥåߥå;ش/ bigendian /ӥåǥ/ bigevent /ӥå٥/ bigfoot /ӥåեå/ bighorn /ӥåۡ/ -biglobe /ӥå/ +biglobe /ӥå;www.biglobe.ne.jp/ bigmac /ӥåޥå/ bigname /ӥå͡/ bignews /ӥå˥塼/ -bigsight /ӥå/ +bigsight /ӥå;www.bigsight.jp/ bigsize /ӥå/ bigtex /BigTeX/ bigwave /ӥå/ @@ -19896,7 +19896,7 @@ billiard / billiards /ӥ䡼/ billie /ӥ꡼/ billing /ӥ/ -billion /ӥꥪ/ +billion /ӥꥪ;1,000,000,000/ billionaire /ӥꥪͥ/ billy /ӥ꡼/ biman /ӡޥ/ @@ -19914,7 +19914,7 @@ binding / bing /ӥ/ bingo /ӥ/ bingogame /ӥ󥴥/ -binladen /ӥǥ/ +binladen /ӥǥ;Bin Laden/ binoche /ӥΥ/ bintan /ӥ󥿥/ bio /Х/ @@ -19930,18 +19930,18 @@ biomass / biomedical /Хǥ/ biometrics /Хȥꥯ/ bionics /Х˥/ -biopsy /Хץ/ +biopsy /Хץ;/ bioreactor /Хꥢ/ biorhythm /Хꥺ/ -bios /Х/ӥ/ +bios /Х;basic IO system/ӥ;[ʪ]/ bioscience /Х/ biosensor /Х󥵡/ -biotech /Хƥå/Хƥ/ +biotech /Хƥå;biotechnology/Хƥ/ biotechnology /ХƥΥ/ -biotin /ӥ/ -biotop /ӥȡ/ -biotope /ӥȡ/ -biphenyl /ӥե˥/ӥեˡ/ +biotin /ӥ;ӥߥH/ +biotop /ӥȡ;(ȸ) ʪꡣꥷBIO(ʪ)TOP()ι/ +biotope /ӥȡ;ʪꡣꥷBIO(ʪ)TOP()ι/ +biphenyl /ӥե˥;C6H5-C6H5/ӥեˡ/ bipolar /Хݡ/ birch /С/ bird /С/ @@ -19950,9 +19950,9 @@ birdland / birds /С/ birdseye /С/ birdwatching /Сɥå/ -bireleys /Х꡼/Х꡼/ +bireleys /Х꡼;[ɸ]/Х꡼/ birgit /ӥ륮å/ -birman /Сޥ/ +birman /Сޥ;ǭ/ birmingham /Сߥ󥬥/ birth /С/ birthday /Сǡ/Сǥ/ @@ -19960,15 +19960,15 @@ birthdaycake / birthdaycard /Сǡ/ birthdayparty /Сǡѡƥ/Сǡѡƥ/Сǥѡƥ/ birthdaypresent /Сǡץ쥼/Сǥץ쥼/ -biscuit /ӥå/ӥ奤/ +biscuit /ӥå/ӥ奤;ʩ/ bisexual /Х/Х奢/ bishkek /ӥ奱/ bishop /ӥå/ -bismuth /ӥޥ/ +bismuth /ӥޥ;[]83,Bi/ bison /Х/Bison/ bisphenol /ӥեΡ/ bissau /ӥ/ -bistro /ӥȥ/ +bistro /ӥȥ;ʩ/ bit /ӥå/ bit-field /ӥåȥե/ bitch /ӥå/ @@ -19986,9 +19986,9 @@ bitter / bitters /ӥ/ bittersweet /ӥ/ӥ/ bivouac /ӥС/ -biz /ӥ/ +biz /ӥ;business/ bizarre /ӥ/ -bizerre /ӥ/ +bizerre /ӥ;bizarre/ bizet /ӥ/ bjorn /ӥ/ bk /Сꥦ/Berkelium/ @@ -20031,14 +20031,14 @@ blanc / blanca /֥/ blanche /֥󥷥/ blanchot /֥󥷥/ -blancmanger /֥ޥ󥸥/֥ޥ󥸥/ +blancmanger /֥ޥ󥸥/֥ޥ󥸥;blanc-manger/ blanco /֥/ blank /֥/֥/ blanket /֥󥱥å/ blas /֥饹/ blast /֥饹/ blaster /֥饹/ -blatt /֥å/ +blatt /֥å;(ȸ)/ blazer /֥쥶/ bldg /ӥ/ bleach /֥꡼/ @@ -20049,7 +20049,7 @@ blending / bleomycin /֥쥪ޥ/ bless /֥쥹/ bley /֥쥤/֥졼/ -blik /֥ꥭ/ +blik /֥ꥭ;()/ blind /֥饤/ blindtest /֥饤ɥƥ/ blindtouch /֥饤ɥå/ @@ -20066,7 +20066,7 @@ blockdiagram / blocker /֥å/ blockflote /֥åե졼/ blocking /֥å/ -blog /֥/ +blog /֥;weBLOG/ blogger /֥/ blois /֥/ blond /֥/ @@ -20085,7 +20085,7 @@ blouson / blow /֥/֥/ blower /֥/ blowing /֥/ -blowser /֥饦/ +blowser /֥饦;browser?/ blue /֥롼/ bluebacks /֥롼Хå/ blueberry /֥롼٥꡼/ @@ -20096,9 +20096,9 @@ bluechip / bluecollar /֥롼顼/ blueday /֥롼ǥ/ bluegill /֥롼/ -blueglass /֥롼饹/ +blueglass /֥롼饹;bluegrass?/ bluegrass /֥롼饹/ -bluejays /֥롼/ +bluejays /֥롼;[MLB]Blue Jays/ bluejeans /֥롼/ bluemonday /֥롼ޥǡ/ bluemoon /֥롼ࡼ/ @@ -20109,16 +20109,16 @@ blues / bluescreen /֥롼꡼/ bluesheet /֥롼/ bluesy /֥롼/ -bluetooth /֥롼ȥ/ +bluetooth /֥롼ȥ;www.bluetooth.com/ bluetopaz /֥롼ȥѡ/ bluetrain /֥롼ȥ쥤/ bluewave /֥롼/ bluff /֥/ bluish /֥롼å/ blum /֥롼/ -bluray /֥롼쥤/ +bluray /֥롼쥤;(DVD)Blu-Ray/ blush /֥å/֥å/ -blushup /֥å奢å/ +blushup /֥å奢å;brushup?/ bmpfile /BMPե/ bnf /BNF(Backus-Naur Form)/ bo // @@ -20137,7 +20137,7 @@ bobby / bobcat /ܥ֥å/ bobsleigh /ܥ֥졼/ bobtail /ܥ֥ƥ/ܥ֥ơ/ -bocca /ܥå/ +bocca /ܥå;(It)/ boccaccio /ܥå/ boch /ܥå/ bochum /ܥåե/ @@ -20152,10 +20152,10 @@ bodybuild / bodybuilder /ܥǥӥ/ bodybuilding /ܥǥӥǥ/ bodycare /ܥǥ/ -bodycheck /ܥǥå/ܥǥå/ +bodycheck /ܥǥå;Ѹ(frisk)/ܥǥå/ bodycolor /ܥǥ顼/ bodycolour /ܥǥ顼/ -bodycon /ܥǥ/ +bodycon /ܥǥ;body-conscious/ bodycream /ܥǥ꡼/ܥǥ꡼/ bodyguard /ܥǥ/ܥǥ/ bodylanguage /ܥǥ󥲡/ @@ -20171,11 +20171,11 @@ bodyshampoo / bodysize /ܥǥ/ܥǥ/ bodyslam /ܥǥ/ bodysoap /ܥǥ/ܥǥ/ -boeing /ܡ/ +boeing /ܡ;www.boeing.com/ bogart /ܥ/ bogen /ܡ/ bogey /ܥ/ -bogota /ܥ/ +bogota /ܥ;ӥ/ bohemia /ܥإߥ/ bohemian /ܥإߥ/ bohm /١/ @@ -20190,16 +20190,16 @@ boke / bolan /ܥ/ bold /ܡ/ bolero /ܥ/ -bolivia /ܥӥ/ +bolivia /ܥӥ;.bo/ bolo /ܡ/ bologna /ܥ˥/ -bolsheviki /ܥꥷ/ -bolshoi /ܥꥷ祤/ +bolsheviki /ܥꥷ;Bol'sheviki/ +bolshoi /ܥꥷ祤;(Ϫ)/ bolt /ܥ/ boltzmann /ܥĥޥ/ bomb /ܥ/ bombay /ܥ٥/ -bombe /ܥ/ܥ/ +bombe /ܥ;(ȸ)/ܥ;(ʩ)/ bomber /ܥС/ bombo /ܥ/ܥ/ bon /ܥ/ @@ -20216,7 +20216,7 @@ boneless / bonelessham /ܥ쥹ϥ/ bongo /ܥ/ bongoes /ܥ/ -bonheur /ܥ̡/ +bonheur /ܥ̡;(Fr)ʡ/ bonita /ܥˡ/ bonjour /ܥ󥸥塼/ bonn /ܥ/ @@ -20235,7 +20235,7 @@ booing / book /֥å/Book/ bookcase /֥å/ bookcenter /֥å󥿡/ -bookcover /֥åС/ +bookcover /֥åС;Ѹ(jacket)/ bookdesign /֥åǥ/ bookend /֥å/ booker /֥å/ @@ -20247,7 +20247,7 @@ booklist / bookmaker /֥å᡼/ bookmark /֥åޡ/ bookmart /֥åޡ/ -bookoff /֥å/ +bookoff /֥å;www.bookoff.co.jp/ bookpost /֥åݥ/ bookreview /֥åӥ塼/ books /֥å/ @@ -20273,18 +20273,18 @@ boots / bootsector /֡ȥ/ bootstrap /֡ȥȥå/ bop /Хå/ -borane /ܥ/ -bord /ܡ/ +borane /ܥ;BH3/ +bord /ܡ;ƻ/ bordeaux /ܥɡ/ borden /ܡǥ/ border /ܡ/ -bordercollie /ܡ꡼/ +bordercollie /ܡ꡼;border collie/ borderless /ܡ쥹/ܡ쥹/ borderline /ܡ饤/ bore /ܥ/ -boreas /ܥ쥢/ +boreas /ܥ쥢;/ borel /ܥ/ -borg /ܡ/ܥ륰/ +borg /ܡ;cyborg/ܥ륰/ borges /ܥإ/ borgia /ܥ른/ borie /ܥ꡼/ @@ -20296,11 +20296,11 @@ borne / borneo /ܥͥ/ borneol /ܥͥ/ borodin /ܥǥ/ -boron /ܥ/ +boron /ܥ;B/ boronia /ܥ˥/ borromeo /ܥᥪ/ borrow /ܥ/Х/Х/ -borshch /ܥ륷/ +borshch /ܥ륷;(Ϫ)ҧ/ borzoi /ܥ륾/ bosch /ܥå/ bose /ܡ/ܡ/ @@ -20309,18 +20309,18 @@ bosnia / boson /ܥ/ܡγ/ bosporus /ܥݥ饹/ܥݥ饹/ boss /ܥ/ -bossa /ܥ/ܥå/ -bossanova /ܥΥ/ܥΥ/ +bossa /ܥ;/ܥå/ +bossanova /ܥΥ;bossa nova/ܥΥ/ boston /ܥȥ/ܥȥ/ bostonbag /ܥȥХå/ bostonterrier /ܥȥƥꥢ/ -bot /ܥå// +bot /ܥå;robot// botanical /ܥ˥/ both /ܥ/ -botswana /ܥĥ/ +botswana /ܥĥ;.bw/ botticelli /ܥåƥ/ bottle /ܥȥ/ -bottlekeep /ܥȥ륭/ +bottlekeep /ܥȥ륭;Ѹ/ bottlemail /ܥȥ᡼/ bottleneck /ܥȥͥå/ bottling /ܥȥ/ @@ -20332,8 +20332,8 @@ botulinus / bougainvillea /֡ӥꥢ/֡ӥ쥢/ bouillabaisse /֥١/ bouillon /֥/ -boulanger /֡󥸥/֥󥸥/ -boulangerie /֡󥸥꡼/֥󥸥꡼/֡󥸥꡼/֥󥸥꡼/ +boulanger /֡󥸥;(Fr)ѥ󿦿/֥󥸥/ +boulangerie /֡󥸥꡼;(Fr)ѥ/֥󥸥꡼/֡󥸥꡼/֥󥸥꡼/ boulevard /֡С/֡/ boulez /֡졼/֥졼/ boulogne /֥˥/֡˥/ @@ -20351,13 +20351,13 @@ bourgeoisie / bourges /֡른/ bourgogne /֥르˥/ boutique /֥ƥå/ -boutiquehotel /֥ƥåۥƥ/ +boutiquehotel /֥ƥåۥƥ;boutique hotel/ bouzouki /֥/ bovary /ܥ꡼/ -bow /ܥ/Х/ +bow /ܥ;/Х;/ bowgun /ܥ/ܡ/ bowie /ܥ/ -bowing /ܡ/ܥ/ +bowing /ܡ;/ܥ/ bowl /ܡ/ܥ/ bowling /ܡ/ܥ/ box /ܥå/// @@ -20375,12 +20375,12 @@ boyish / boyle /ܥ/ boys /ܡ/ boyscout /ܡ/ -boyslove /ܡ/ +boyslove /ܡ;boy's love,Ѹ(=yaoi)/ boysoprano /ܡץ/ -bq // +bq /;backquote/ br //Bromine/ -bra /֥/ -brabus /֥Х/ +bra /֥;brassiere/ +brabus /֥Х;www.brabus.com/ brace /֥졼/// bracelet /֥쥹å/ bracket /֥饱å/// @@ -20428,18 +20428,18 @@ brassy / brat /֥å/ bratislava /֥/ braudel /֥ǥ/ -braun /֥饦/ +braun /֥饦;-/ brautigan /֥ƥ/ brave /֥쥤/ -braves /֥졼֥/ +braves /֥졼֥;[MLB]/ bravo /֥ܡ/֥/֥顼/֥顼/ bray /֥쥤/֥졼/ -brazil /֥饸/ -brazilgp /֥饸GP/ +brazil /֥饸;.br/ +brazilgp /֥饸GP;[F1]/ brazilian /֥饸ꥢ/ brazzaville /֥饶/ bread /֥å/ -break /֥쥤/֥졼/֥졼/ +break /֥쥤/֥졼/֥졼;brake?/ breakbeats /֥쥤ӡ/ breakdance /֥쥤/ breakdancer /֥쥤󥵡/ @@ -20467,16 +20467,16 @@ brendan / brendel /֥ǥ/ brentano /֥󥿡/ bresenham /֥쥼ϥ/ -bresson /֥å/ +bresson /֥å;Henri Cartier-Bresson/ brest /֥쥹/ bret /֥å/ bretagne /֥륿˥/ breton /֥ȥ/֥ȥ/ brett /֥å/ bretton /֥ȥ/ -brettonwoods /֥ȥ󥦥å/ +brettonwoods /֥ȥ󥦥å;Bretton Woods/ brevis /֥ӥ/֥/ -brewers /֥/ +brewers /֥;[MLB]/ brewery /֥꡼/ brezhnev /֥쥸ͥ/ brian /֥饤/ @@ -20487,7 +20487,7 @@ bricolage / bridal /֥饤/ bride /֥饤/ bridge /֥å/ -bridgestone /֥¥ȥ/֥ꥸȥ/ +bridgestone /֥¥ȥ;www.bridgestone.co.jp/֥ꥸȥ/ bridget /֥ꥸå/ bridgetown /֥å/ bridging /֥å/ @@ -20507,11 +20507,11 @@ bring / brio /֥ꥪ/ brioche /֥ꥪå/ brion /֥ꥪ/ -brisbane /֥ꥹ٥/֥ꥹ١/֥ꥺ١/ +brisbane /֥ꥹ٥;뽣/֥ꥹ١/֥ꥺ١/ brisee /֥ꥼ/ bristol /֥ꥹȥ/ brit /֥å/ -britain /֥ƥ/ +britain /֥ƥ;.gb/ britannia /֥꥿˥/ britannica /֥꥿˥/ british /ꥹ/֥ƥå/ @@ -20519,7 +20519,7 @@ britney / britten /֥ƥ/ brix /֥å/ brno /֥/ -broach /֥/ +broach /֥;()/ broad /֥/ broadband /֥ɥХ/ broadbandrouter /֥ɥХɥ롼/ @@ -20537,11 +20537,11 @@ broiler / broke /֥/ broken /֥/ broker /֥/ -brom /֥/ +brom /֥;Br/ bromide /֥ޥ/ bromo /֥/ -bromodichloromethane /֥⥸᥿/ -bromoform /֥ۥ/ +bromodichloromethane /֥⥸᥿;(CHBrCl2) ȥϥ᥿ΰ/ +bromoform /֥ۥ;(CHBr3) ȥϥ᥿ΰ/ bronte /֥/ bronx /֥󥯥/ bronze /֥/ @@ -20554,7 +20554,7 @@ brother / brotherhood /֥饶եå/ brothers /֥饶/ brouter /֥롼/ -brow /֥饦/֥/ +brow /֥饦;/֥;?/ brown /֥饦/ brownie /֥饦ˡ/ browning /֥饦˥/֥˥/ @@ -20565,10 +20565,10 @@ browse / browser /֥饦/֥饦/ browsersoft /֥饦ե/ browsing /֥饦/ -browzer /֥饦/ +browzer /֥饦;browser?/ brubeck /֥롼٥å/ bruce /֥롼/ -bruckner /֥åʡ/ +bruckner /֥åʡ;(1824-96)Josef Anton Bruckner/ brueghel /֥塼/ brule /֥/ brulee /֥/ @@ -20598,7 +20598,7 @@ bryant / bryce /֥饤/ bsantenna /BSƥ/ bsd /BSD/ -bsd# /(concat "BSD\057#0")/(concat "BSD057#0")/ +bsd# /(concat "BSD\057#0")/ bsdi /BSDI/ bsdigital /BSǥ/ bsdlicence /BSD饤/ @@ -20614,13 +20614,13 @@ bubblejet / bubblesort /Х֥륽/ bubbling /Х֥/ bubbly /Х֥꡼/ -bubbule /Х֥/ +bubbule /Х֥;bubble?/ bucharest /֥쥹/ buche /ӥå/ buchwald /֥åեХ/ buck /Хå/֥å/ bucket /Хå/Х/ -bucketrelay /Хĥ졼/ +bucketrelay /Хĥ졼;Ѹ(bucket brigade)/ buckingham /Хå󥬥/ buckle /Хå/ buckler /Хå顼/ @@ -20636,12 +20636,12 @@ budweiser / buena /֥/ bueno /֥/ buenos /֥Υ/ -buenosaires /֥Υ쥹/ +buenosaires /֥Υ쥹;Buenos Aires/ buffalo /Хåե/Хե/ buffaloes /Хե/Хåե/ buffer /Хåե/Хåե/Ȱ/ buffered /Хåե/ -bufferin /Хե/ +bufferin /Хե;[ɸ]饤www.bufferin.net/ buffering /Хåե/ bufferoverflow /ХåեСե/ bufferoverrun /ХåեС/ @@ -20655,7 +20655,7 @@ buggy / bugle /ӥ塼/ buglist /Хꥹ/ bugreport /Хݡ/ -buick /ӥ奤å/ +buick /ӥ奤å;www.buick.com/ buil /ӥ/ build /ӥ/ builder /ӥ/ӥ/ @@ -20667,12 +20667,12 @@ bujumbura / bukhara /֥ϥ/ bukowski /֥/ bulb /Х/ -bulgari /֥륬/ -bulgaria /֥륬ꥢ/ -bulgogi /ץ륳/ +bulgari /֥륬;www.bulgari.com/ +bulgaria /֥륬ꥢ;.bg/ +bulgogi /ץ륳;(ī)/ bulk /Х륯/ bull /֥/ -bulldog /֥ɥå/֥ɥå/ +bulldog /֥ɥå/֥ɥå;[̾]www.bulldog.co.jp/ bulldozer /֥ɡ/֥ɡ/ bulletin /֥ƥ/ bulletinboard /֥ƥܡ/ @@ -20681,14 +20681,14 @@ bump / bumper /Хѡ/ bumpmapping /Хץޥåԥ/ buncher /Х/ -bundesliga /֥ǥ꡼/ +bundesliga /֥ǥ꡼;(ȸ)/ bundle /Хɥ/ bundling /Хɥ/ bungalow /Х󥬥/ bungee /Х󥸡/ bungeejump /Х󥸡/ bunin /֡˥/ -bunker /Х󥫡/ +bunker /Х󥫡;[]/ bunkershot /Х󥫡å/ bunny /Хˡ/ bunnygirl /Хˡ/ @@ -20696,25 +20696,25 @@ buns / bunt /Х/ bunuel /֥˥奨/ buoy /֥/ -burberry /СХ꡼/ +burberry /СХ꡼;www.burberry.com/ burckhardt /֥륯ϥ/ burden /Сǥ/ bureau /ӥ塼/ -burg /֥륯/ +burg /֥륯;(ȸ)Salzburg,Luxemburg/ burger /С/ -burgerking /С/ +burgerking /С;www.bk.com/ burgmuller /֥륰ߥ顼/ burgos /֥르/ burgundy /Сǥ/Сǥ/ burial /٥ꥢ/ burka /֥륫/ -burkinafaso /֥륭ʥե/ +burkinafaso /֥륭ʥե;Burkina Faso,(Burkina Faso) .bf/ burlesque /С쥹/ burma /ӥ/ burn /С/ burnaby /Сʥӡ/ burner /Сʡ/ -burnet /Сͥå/ +burnet /Сͥå;⥳/ burning /С˥/ burnout /С󥢥/ burns /С/ @@ -20725,17 +20725,17 @@ burst / burster /С/ burt /С/ burton /Сȥ/ -burundi /֥/֥ǥ/ +burundi /֥;.bi/֥ǥ/ buryat /֥㡼/ bus /Х/ busch /֥å/ busclock /Хå/ buserror /Х顼/£ ţ/ -busguide /Х/ +busguide /Х;Ѹ(bus tour guide)/ bush /֥å/ bushbaby /֥å٥ӡ/ bushman /֥åޥ/ -business /ӥͥ/ +business /ӥͥ;.biz/ businesscenter /ӥͥ󥿡/ businesscentre /ӥͥ󥿡/ businesschance /ӥͥ/ @@ -20761,19 +20761,19 @@ busterminal / busters /Х/ bustier /ӥ/ bustline /Хȥ饤/ -bustour /Хĥ/ +bustour /Хĥ;bus tour/ bustsize /Хȥ/ busttop /Хȥȥå/ -bustup /Хȥå/ +bustup /Хȥå;Ѹ/ busy /ӥ/ӥ/ but /Хå/ butadiene /֥/ -butan /֥/ -butane /֥/ -butanol /֥Ρ/ +butan /֥;C4H10/ +butane /֥;C4H10/ +butanol /֥Ρ;C4H9OH/ butch /֥å/ butcher /֥å㡼/ -butene /֥ƥ/ +butene /֥ƥ;=butylene/ butler /Хȥ顼/ butor /ӥȡ/ butt /Хå/֥å/ @@ -20784,13 +20784,13 @@ butterfly / butterflyknife /Хե饤ʥ/ butterknife /Хʥ/ butterrice /Х饤/ -butterroll /Х/ +butterroll /Х;/ buttersauce /Х/ butterworth /Х/ butting /Хåƥ/ -button /ܥ/Хȥ/ +button /ܥ/Хȥ;̾/ buttonhole /ܥۡ/ܥ/ -butyl /֥/ +butyl /֥;CH3CH2CH2CH2-/ butylene /֥/ buy /Х/ buyer /Х䡼/ @@ -20800,10 +20800,10 @@ buyout / buzz /Х/ buzzer /֥/ buzzing /Х/ -bvlgari /֥륬/ +bvlgari /֥륬;vϥƥɽϤ/ by /Х/ bye /Х/С/ -byebye /ХХ/ +byebye /ХХ;bye-bye/ bypass /Хѥ/ bypath /Хѥ/ byron /Х/ @@ -20815,11 +20815,11 @@ bytecompile / bytecompiler /Хȥѥ/ bytes /Х/ byzantine /ӥ/ -c ////ĥ//ú/Carbon/ø/ +c //;cent//ĥ;(ȸ)/;(ʩ)/ú/Carbon/ø/ c++ /áܡ/C++/ c++compiler /C++ѥ/ ca /륷/Calcium/California/ե˥/ե˥/ -caay /㥤/ +caay /㥤;Hindi/ cab // cabaca /Х/ cabala /Х/ @@ -20827,13 +20827,13 @@ cabaret / cabbage /٥/ cabernet /٥/ cabin /ӥ/ -cabinet /ӥͥå/ӥ/ +cabinet /ӥͥå/ӥ;ʩ/ cable /֥/ cablecar /֥륫/ cablemodem /֥ǥ/ cabletv /֥ƥ/֥TV/ cabling /֥/ -caboverde /ܥ٥/ܥ/ +caboverde /ܥ٥;(Cabo Verde) .cv/ܥ/ cabrera /֥/ cacao // cachable /å֥/ @@ -20841,8 +20841,8 @@ cache / cachememory /å/å꡼/ caching /å/ caco // -cactus // -cad /CAD// +cactus /;ܥƥ/ +cad /CAD/;computer-aided design/ caddie /ǥ/ǥ/ caddy /ǥ/ǥ/ cadence /ǥ/ @@ -20851,17 +20851,17 @@ cadet / cadfael /ɥե/ cadillac /ǥå/ cadiz /ǥ/ -cadmium /ɥߥ/ +cadmium /ɥߥ;[]48,Cd/ cadsoft /CADե/ cady /ǥ/ caen // caesar /// -caesium // -caetla // +caesium /;[]55,Cs/ +caetla /;(Fr)ca et la/ cafe /ե/ -cafeaulait /ե/ե/ +cafeaulait /ե;cafe au lait/ե/ cafebar /եС/ -cafelatte /եå/ +cafelatte /եå;(It)cafe latte/ cafeteria /եƥꥢ/ cafeterrace /եƥ饹/ cafeterrasse /եƥ饹/ @@ -20869,30 +20869,30 @@ caffeine / cage // cagliari /ꥢ/ cagliostro /ꥪȥ/ -cahier // +cahier /;(Fr)Ρ/ caillois // caiman /ޥ/ cain /// caine // -cairns // +cairns /;뽣/ cairo // caisson // cajon /ۥ/ cajun // cake // -cakecut /å/ -cakemix /ߥå/ +cakecut /å;Ѹ/ +cakemix /ߥå;cake mix/ cakeset /å/ cakewalk // cakra /㥯/ calais /졼/ -calbee /ӡ/ +calbee /ӡ;www.calbee.co.jp/ calceolaria /륻ꥢ/ -calcite /륵/ -calcium /륷/ -calciumion /륷।/ +calcite /륵;/ +calcium /륷;[]20,Ca/ +calciumion /륷।;calcium ion/ calculus /륭饹/ -calcutta /륫å/륫/ +calcutta /륫å;NB:ߤϡ֥륫/륫;kolkata/ caldera /ǥ/ caldina /ǥ/ caleca /쥫/ @@ -20905,7 +20905,7 @@ calibration / calico /饳/ꥳ/ calif // california /ե˥/ե˥/ -californium /ե˥/ +californium /ե˥;[]98,Cf/ caligari /ꥬ/ caligula /ꥮ/ calimba // @@ -20917,7 +20917,7 @@ callback / callcenter /륻󥿡/ callcentre /륻󥿡/ called // -calledgame /ɥ/ +calledgame /ɥ;Ѹ/ caller /顼/ƽФ¦/ callgirl /륬/ calligraphy /ꥰե/ꥰե/ @@ -20929,23 +20929,23 @@ calloway / callsign /륵/ callus /륹/ calm // -calme // +calme /;ʩ/ calorie /꡼/ caloriemate /꡼ᥤ/ -calpis /ԥ/ -caltech /ƥå/ +calpis /ԥ;www.calpis.co.jp/ +caltech /ƥå;ե˥ءwww.caltech.edu/ calume // calvados /ɥ/Хɥ/ calvan /Х// calvary /Х꡼/ calvin ///ӥ/ calvinklein /Х󥯥饤/Х󡦥饤/ -calvino // +calvino /;(1923-1985) Italo Calvino/ calypso /ץ/ cam // camara /ޥ/ camber /С/ -cambodia /ܥ/ +cambodia /ܥ;.kh/ cambria /֥ꥢ/ cambridge /֥å/ camel // @@ -20955,12 +20955,12 @@ camelot / camembert /ޥ١/ cameo /ᥪ/ camera // -cameraangle /饢󥰥/ +cameraangle /饢󥰥;camera angle/ cameraeye /饢/ cameraman /ޥ/ camerawork // cameron // -cameroon /롼/ +cameroon /롼;.cm/ cameroun /롼/ camilla /ߥ/ camille /ߡ/ @@ -20982,25 +20982,25 @@ campbell / camper /ѡ/ campfire /ץե䡼/ץե/ camphor /ե/ -campin /ץ/ +campin /ץ;Ѹ/ camping /ԥ/ -campingcar /ԥ󥰥/ -campo // +campingcar /ԥ󥰥;Ѹ(camper)/ +campo /;() / campos /ݥ/ campra /ץ/ campus /ѥ/ campuslife /ѥ饤/ campusmap /ѥޥå/ -camry // +camry /;[ɸ]ȥ西/ camus /ߥ/ -can /// +can //;/ canaan /ʥ/ʡ/ -canada /ʥ// -canadagp /ʥGP/ +canada /ʥ;.ca// +canadagp /ʥGP;[F1]/ canadian /ʥǥ/ canal /ʥ/ʥ/ canape /ʥå/ -canard /ʡ/ʡ/ +canard /ʡ/ʡ;(Fr) ȳ/ canaria /ʥꥢ/ʥ/ canary /ʥꥢ/ʥ/ canasta /ʥ/ @@ -21010,10 +21010,10 @@ cancel / canceler /󥻥/ cancellation /󥻥졼/ canceller /󥻥顼/󥻥/ -cancer /󥵡/ -cancion /󥷥/ -cancun /󥯥/ -candela /ǥ/ +cancer /󥵡;/ +cancion /󥷥;()/ +cancun /󥯥;ᥭ/ +candela /ǥ;cd/ candice /ǥ/ candid /ǥ/ǥå/ candida /󥸥/ @@ -21039,7 +21039,7 @@ cannon / cannonball /Υܡ/ canoe /̡/ canola /Ρ/Ρ/ -canon /Υ/Υ/Υ/ +canon /Υ/Υ/Υ;[̾]www.canon.com/ canonical /Υ˥/ canopus /Ρץ/ canopy /Υԡ/ @@ -21063,14 +21063,14 @@ capability / capacitance /ѥ/ capacity /ѥƥ/ѥƥ/ capati /ѥƥ/ -capcom /ץ/ +capcom /ץ;www.capcom.co.jp/ cape // capek /ڥå/ capella /ڥ/ caper /ѡ/ѡ/ capet /ڡ/ capetown /ץ/ -capeverde /ܥ٥/ +capeverde /ܥ٥;Cape Verde (cv)/ capital /ԥ/ capitalgain /ԥ륲/ capitalism /ԥꥺ/ @@ -21080,19 +21080,19 @@ capoeira / caponata /ݥʡ/ capote /ݡ/ݡƥ/ cappadocia /åѥɥ/ -cappuccino /ץ/ +cappuccino /ץ;ꥢ/ capra /ץ/ capri /ץ/ capriccio /ץå/ץå/ capriccioso /ץ/ caprice /ץꥹ/ capricious /ץꥷ㥹/ -capricorn /ץꥳ/ץꥳ/ -capripants /ץѥ/ +capricorn /ץꥳ;Ӻ/ץꥳ/ +capripants /ץѥ;capri pants/ caprolactam /ץ饯/ capsaicin /ץ/ capsule /ץ/ -capsulehotel /ץۥƥ/ +capsulehotel /ץۥƥ;Ѹ/ captain /ץƥ/ captaincy /ץƥ󥷡/ caption /ץ/ @@ -21106,7 +21106,7 @@ caracas / caramel /// caramelo // caraque /饯/ -carat /å/å/ +carat /å;200mg/å/ caraudio /ǥ/ caravan /Х// caravansarai /Х󥵥饤/ @@ -21118,7 +21118,7 @@ carbine / carbon /ܥ/ carbonara /ܥʡ/ carbonate /ܥͥ/ܥ͡/ -carboncopy /ܥ󥳥ԡ/ +carboncopy /ܥ󥳥ԡ;CC/ carbonfiber /ܥեС/ carbonnanotube /ܥʥΥ塼/ carbonyl /ܥ˥/ @@ -21136,7 +21136,7 @@ cardiff / cardigan /ǥ/ cardin // cardinal /ǥʥ/ -cardinals /ʥ륹/ +cardinals /ʥ륹;[MLB]/ cardioid //ǥ/ cardloan /ɥ/ cardmodem /ɥǥ/ @@ -21148,7 +21148,7 @@ care / career /ꥢ/ꥢ/ careerpath /ꥢѥ/ careerplan /ꥢץ/ -careerup /ꥢå/ +careerup /ꥢå;Ѹ/ careerwoman /ꥢޥ/ careful /ե/ carehouse /ϥ/ @@ -21157,9 +21157,9 @@ carelessmiss / caremanagement /ޥͥ/ caremanager /ޥ͡㡼/ careplan /ץ/ -caret /å/å/ +caret /å;^/å/ carey /꡼/ -carferry /ե꡼/ +carferry /ե꡼;Ѹ/ cargo // carib // caribbean /ӥ/ @@ -21188,8 +21188,8 @@ carmona / carna // carnation /͡/ carnaval /ʥХ/ -carnavi /ʥ/ -carnavigation /ʥӥ/ +carnavi /ʥ;car navigation system/ +carnavigation /ʥӥ;car navigation system/ carnegie /ͥ/ͥ/ carnegiemellon /ͥ/ carnelian /ͥꥢ/ @@ -21224,7 +21224,7 @@ carrace / carrageenin /饮ʥ/ carrasco /饹/ carre // -carrefour /ա/ +carrefour /ա;(Fr)ϩ/ carreras /졼饹/ carriage /å/ carrie /꡼/ @@ -21233,7 +21233,7 @@ carriere / carrol // carroll // carrot /å/ -carry /꡼/졼/ +carry /꡼/졼;curry?/ carrybag /꡼Хå/ carrying // carryingcase /󥰥/ @@ -21245,20 +21245,20 @@ carson / carsten /륹ƥ/ carstereo /ƥ쥪/ cart // -carta /륿/ -carte /// +carta /륿;()/ +carte //;(Fr) ɡ cf. a la carte/ cartel /ƥ/ carter // cartesian /ƥ/ carthago /륿/ -cartier /ƥ/ +cartier /ƥ;www.cartier.com/ cartinine /˥/ carton /ȥ/ȥ/ cartoon /ȥ/ cartrace /ȥ졼/ cartridge /ȥå/ -cartrige /ȥå/ -carve /// +cartrige /ȥå;cartridge/ +carve /;Ħ// carver //С/ carving /ӥ/ cary /꡼/꡼/ @@ -21282,7 +21282,7 @@ cashback / cashcard /å奫/ cashcorner /å女ʡ/ cashdispencer /åǥڥ󥵡/ -cashe /å/ +cashe /å;cache?/ cashew /塼/ cashewnut /塼ʥå/ cashflow /åե/ @@ -21294,7 +21294,7 @@ casimir / casing // casino // casio // -casiopea /ڥ/ +casiopea /ڥ;Х̾ (NB:̾cassiopeia)/ cask /㥹/ casl /CASL/ casper /ѡ/ @@ -21344,10 +21344,10 @@ catalogspec / catalogue // catalonia /˥/ cataluna /˥/ -catalunya /롼˥/ +catalunya /롼˥;ڥ/ catalyst /ꥹ/ catania /˥/ -catanol /Ρ/ +catanol /Ρ;C16H35OH/ catapult /ѥ/ catarina //꡼/ catarrh // @@ -21355,13 +21355,13 @@ catastrophe / catastrophy /ȥե/ȥե/ catch /å/ catchball /åܡ/ -catchcopy /åԡ/ +catchcopy /åԡ;Ѹ/ catcher /å㡼/ catcherfly /å㡼ե饤/ catchermit /å㡼ߥå/ catchphone /åۥ/ catchphrase /åե졼/ -catchsales /å륹/ +catchsales /å륹;Ѹ/ catchup /åå/ catchy /å/ catechin /ƥ/ @@ -21374,7 +21374,7 @@ caterina / catering // caterpillar /㥿ԥ/ catfight /åȥե/ -catfish /åȥեå/ +catfish /åȥեå;/ catfood /åȥա/ cath /㥹/ cathari // @@ -21393,7 +21393,7 @@ cation / catnip /åȥ˥å/ cato /ȡ/ cats /å/ -catseye /åĥ/ +catseye /åĥ;cat's-eye/ catshow /åȥ硼/ catsup /å/ cattle /ȥ/ @@ -21418,14 +21418,14 @@ caxixi / cay // cayenne /// cayennepepper /ڥåѡ/̥ڥåѡ/ -cayman /ޥ/ -cc /ܥ󥳥ԡ/ -ccdcamera /CCD/ +cayman /ޥ;.ky/ +cc /ܥ󥳥ԡ;carbon copy/ +ccdcamera /CCD;charge-coupled device camera/ cclass /C饹/å饹/ ccompiler /Cѥ/ ccr /CCR(Creedence Clearwater Revival)/ -ccup /Cå/åå/ -cd /ѥȥǥ/åǥڥ󥵡/ɥߥ/Cadmium/ǥ/CD/ +ccup /Cå;15cm/åå/ +cd /ѥȥǥ/åǥڥ󥵡/ɥߥ/Cadmium/ǥ;٤ñ,SIñ/CD/ cdb /Command Description Block/ cdbook /CD֥å/ cdcase /CD/ @@ -21437,13 +21437,13 @@ cdplayer /CD cdrack /CDå/ cdradicase /CD饸/ cdreview /CDӥ塼/ -cdrive /Cɥ饤/åɥ饤/ +cdrive /Cɥ饤;C:/åɥ饤/ cdrom /CD-ROM/ãġݣңϣ/ cds /ã/ cdshop /CDå/ ce /ꥦ/Cerium/ ceausescu /㥦/ -cebu // +cebu /;եԥ/ cecil // cecile /// cecilia /ꥢ/ @@ -21455,7 +21455,7 @@ ceilinglight / celadon /ɥ/ celan /ĥ/ celeague /꡼/꡼/ȥ꡼/ -celeb // +celeb /;celebrity/ celebes /٥/ celebration /֥졼/ celebrity /֥ƥ/ @@ -21469,11 +21469,11 @@ celia / celica /ꥫ/ celine /꡼/ cell // -cellanime /륢˥/ -cellar /顼/顼/ +cellanime /륢˥;cell animation/ +cellar /顼/顼;?/ cellinstance /륤󥹥/ cellist /ꥹ/ -cellmotor /⡼/ +cellmotor /⡼;Ѹ(starter)/ cello // cellophane /ե/ϥ/ cellophanetape /ϥơ/ @@ -21488,10 +21488,10 @@ celsius / celt // celtic /ƥå/ƥå/ cembalo /Х/ -cemedine // +cemedine /;www.cemedine.co.jp/ cement // cemetery /᥿꡼/ -censor /󥵡/ +censor /󥵡;/ census /󥵥/ cent /// centaur /󥿥/ @@ -21501,7 +21501,7 @@ centercourt / centerfly /󥿡ե饤/ centering /󥿥/ centerline /󥿡饤/ -centerover /󥿡С/ +centerover /󥿡С;Ѹ/ centerpole /󥿡ݡ/ centi // centime // @@ -21512,7 +21512,7 @@ centralpark / centre /󥿡/ centreline /󥿡饤/ centric /ȥå/ -centrism /ȥꥺ/ +centrism /ȥꥺ;econo-,ego-,ethno-/ centromere /ȥᥢ/ centronics /ȥ˥/ century /꡼/ @@ -21523,42 +21523,42 @@ cepstrum / ceramic /ߥå/ ceramicheater /ߥåҡ/ ceramics /ߥå/ߥ/ -cerberus /٥/ -cercle /륯/ +cerberus /٥;Ѹ֤/ +cercle /륯;(Fr)/ cereal /ꥢ/ ceremony /ˡ/ -cerezo /å/ +cerezo /å;[J꡼]/ ceria /ꥢ/ -cerise /꡼/ -cerium /ꥦ/ +cerise /꡼;(Fr) / +cerium /ꥦ;[]58,Ce/ certan /륿/ certification /ƥե/ cervantes /Хƥ/ cesar /// cesare //// -cesium // +cesium /;[]55,Cs/ cesp /CESP/CESP(Common Extended Self-contained Prolog)/ cessna // -cestlavie // +cestlavie /;C'est la vie./ cetane // ceylon /// cezanne // cf /ۥ˥/Californium/ cg /ԥ塼եå/ -ch /ͥ/ͥ/// -cha // +ch /ͥ/ͥ/;cha (cyrillic)/;chi/ +cha /;cyrillic/ chablis /֥/ chacha // chachacha // chaco /㥳/ chaconne /㥳/ -chad // +chad /;.td/ chador /ɥ/ chadwick /ɥå/ chaff // chagall /㥬/ chaikovski /㥤ե/ -chaikovskii /㥤ե/ +chaikovskii /㥤ե;ѧۧܧӧܧڧ/ chailly /㥤/ chain /// chainletter /쥿/ @@ -21569,10 +21569,10 @@ chainsmoker / chair /// chairman /ޥ/ chakra /㥯/ -chalaza /饶/ +chalaza /饶;ˤɳΤ/ chalcedony /륻ɥˡ/ chalk /硼/ -chalking /硼/ +chalking /硼;򰡲/ challenge // challengeable /󥸥֥/󥸥֥/ challenger /󥸥㡼/ @@ -21582,7 +21582,7 @@ chalone / chamber /С/С/ chamberlain /Х/ chambers /С/ -chambre /֥/ +chambre /֥;(Fr)/ chameleon /쥪/ chamomile /ߡ/ chamonix // @@ -21590,17 +21590,17 @@ chamorro / champ // champagne /ѥ/ѡ˥/ڥ/ champagneglass /ѥ󥰥饹/ -champignon /ԥ˥/ +champignon /ԥ˥;(Fr) Τ/ champion /ԥ/ԥ/ champions /ԥ/ championship /ԥ󥷥å/ -champselysees /󥼥ꥼ/ -chan /// +champselysees /󥼥ꥼ;Champs-Elysees/ +chan //;Jackie Chan/ chance // chandelier /ǥꥢ/ chandler /ɥ顼/ chandra /ɥ/ -chanel /ͥ/ +chanel /ͥ;www.chanel.com/ chang /// change // changer /󥸥㡼/ @@ -21612,20 +21612,20 @@ chanson / chansonnier /󥽥˥/ chant // chantal /󥿥/ -chanter // +chanter /;(Fr)Τ/ chantilly /ƥ/ chaos /// chaotic /ƥå/ƥå/Ū/ chapati /ѥƥ/ -chapeau /ݡ/å/ +chapeau /ݡ;(Fr)˹/å/ chapel /ڥ/ -chapelle /ڥ/ +chapelle /ڥ;ʩ/ chaplin /åץ/ chapman /åץޥ/ chappy /åԡ/ chapter /ץ/ -char //饯/㡼/ -chara // +char /;character/饯/㡼/ +chara /;character/ character /饯/饯/ characterdesign /饯ǥ/ characterdevice /饯ǥХ/ @@ -21661,7 +21661,7 @@ charm / charmin /㡼ߥ/ charming /㡼ߥ/ charmpoint /㡼ݥ/ -charmy /㡼ߡ/ +charmy /㡼ߡ;Ѹ(charming)/ charon //// charpentier /ѥƥ/ charpy /ԡ/ @@ -21675,11 +21675,11 @@ chaser / chasing // chasm /㥺/ chassis /㡼/ -chat /å// -chateau /ȡ/ +chat /å/;(Fr)ͤ/ +chateau /ȡ;(Fr)/ chateaubriand /ȡ֥ꥢ/ chatelet /ȥ졼/ȥ/ -chatnoir /Υ/Υ/㡦Υ/ +chatnoir /Υ;(Fr)chat noir,ǭ/Υ/㡦Υ/ chatroom /åȥ롼/ chattering /㥿/ chatterley /㥿쥤/㥿졼/ @@ -21696,7 +21696,7 @@ chechen / check /å/ checkbox /åܥå/ checker /å/å/ -checkerflag /åեå/ +checkerflag /åեå;checkered flag/ checkerplayer /åץ쥤䡼/ checkers /å/ checkin /å/å/ @@ -21710,10 +21710,10 @@ checksum / cheddar // cheddarcheese // cheek // -cheekdance // +cheekdance /;Ѹ(cheek-to-cheek)/ cheer // cheerful /ե/ -cheergirl // +cheergirl /;Ѹ(cheerleader)/ cheerleader /꡼/ cheerleading /꡼ǥ/ cheers // @@ -21725,7 +21725,7 @@ cheesefondue / cheesepain /ѥ/ cheesesouffle /ե/ cheetah // -cheeze // +cheeze /;cheese/ chef // cheiron /// chekhov /ۥ/ @@ -21740,10 +21740,10 @@ chen / cheney /ˡ/ chenille /ˡ/ chenin /ʥ/ -chennai /ޥɥ饹/ʥ/ +chennai /ޥɥ饹;(maa)/ʥ/ cheque /å/ -cher // -chere /// +cher /;ʩ/ +chere /;ʩ// cherenkov /󥳥/ cheri // cherie /꡼// @@ -21753,7 +21753,7 @@ chernobyl / cherokee // cherry /꡼/ cherryboy /꡼ܡ/ -cherubim /ӥ/ +cherubim /ӥ;ŷ/ cherubini /ӡ/ chervil /㡼ӥ/ cheryl // @@ -21763,12 +21763,12 @@ chester / chesterfield /ե/ chestpass /ȥѥ/ chet /å/ -chevre /֥// +chevre /֥;(Fr) // chevrolet /ܥ졼/ chewable /奢֥/ chewinggum /塼󥬥/ chi /// -chiangmai /ޥ/ +chiangmai /ޥ;Chiang Mai/ chianti /ƥ/ƥ/ chiara /// chiboust /֡/ @@ -21781,11 +21781,11 @@ chicken / chickencurry /󥫥졼/ chickennugget /ʥå/ chickenrace /졼/ -chickenrice /饤/ +chickenrice /饤;chicken and rice/ chickensoup /󥹡/ chicory //꡼/ chief // -chien // +chien /;(Fr)/ chiffon /ե/ chiffoncake /ե󥱡/ chignon /˥/ @@ -21793,15 +21793,15 @@ chihuahua / child /㥤// children /ɥ/ childseat /㥤ɥ/ -chile // -chilipepper /ڥåѡ/ +chile /;.cl/ +chilipepper /ڥåѡ;chili pepper/ chilipowder /ѥ/ chilisauce /꥽/ chilled // chiller /顼/ chilly /꡼/ -chima // -chimachogori /ޥ祴/ +chima /;(ī)/ +chimachogori /ޥ祴;(ī)/ chimaira /ޥ/ chime /㥤/ chimera //ޥ/ @@ -21813,11 +21813,11 @@ chinadress / chinatown /㥤ʥ/ chinchilla // chinese /㥤ˡ/ -chinois /Υ/ +chinois /Υ;(Fr)/ chinoise /Υ/ chinoiserie /Υ梁/Υ梁꡼/ chip /å/ -chipin /åץ/ +chipin /åץ;chip in/ chips /åץ/ chipset /åץå/ chiquita // @@ -21828,7 +21828,7 @@ chiropractic / chita // chitin // chitosan /ȥ/ -chittagong /å/ +chittagong /å;Х󥰥ǥ/ chivas /Х/ chivasregal /Х꡼/ chive /㥤/ @@ -21836,12 +21836,12 @@ chlamydia / chloe // chloral /顼/ chlorella // -chloride /饤// -chlorine // +chloride /饤;// +chlorine /;Cl/ chloris /ꥹ/ -chloro // -chlorobenzene /٥󥼥/ -chloroethylene // +chloro /;/ +chlorobenzene /٥󥼥;C6H5Cl/ +chloroethylene /;C2H3Cl/ chloroform /ۥ/ե/ chlorophyll /ե/ chloroplene /ץ/ @@ -21851,41 +21851,41 @@ choco / chocoball /祳ܡ/ chocobar /祳С/ chococake /祳/ -chocochip /祳å/ +chocochip /祳å;chocolate-chips/ chococream /祳꡼/ chocoflake /祳ե졼/ -chocoice /祳/ +chocoice /祳;choc-ice/ chocolat /祳/ chocolate /祳졼/ chocolatecake /祳졼ȥ/ chocolateparfait /祳졼ȥѥե/ chocoparfait /祳ѥե/ -chogori /祴/ +chogori /祴;(ī)/ choice /祤/ choke /硼/ choker /硼/ choking /硼/ cholera // cholesterol /쥹ƥ/ -choline // +choline /;C5H14ON/ cholinesterase /󥨥ƥ顼/ chombo // chomsky /ॹ/ -chon // +chon /;100chon=1won/ chonbo // chondroitin /ɥ/ -chonggag /󥬡// +chonggag /󥬡;(ī)ch'ong-gak// chop /å/ -chopard /ѡ/ +chopard /ѡ;www.chopard.com/ chopin /ѥ/ chopper /åѡ/ choppy /åԡ/ -chopstick /åץƥå/ +chopstick /åץƥå;Ȥ/ choral //顼/ chorale /顼/ chord // chordbook /ɥ֥å/ -chordname /ɥ͡/ +chordname /ɥ͡;[]/ chords // chordwork /ɥ/ chorizo /꥽/ @@ -21893,7 +21893,7 @@ choro / choros // chorus /饹/ chorusline /饹饤/ -choucreme /塼꡼/ +choucreme /塼꡼;chou a la creme/ chow /㥦/ chowder /㥦/ chris /ꥹ/ @@ -21902,7 +21902,7 @@ christ / christa /ꥹ/ christamas /ꥹޥ/ christao /ꥷ/ -christchurch /饤ȥ㡼/ +christchurch /饤ȥ㡼;˥塼/ christel /ꥹƥ/ christensen /ꥹƥ󥻥/ christer /ꥹƥ/ @@ -21911,7 +21911,7 @@ christian / christiandior /ꥹǥ/ꥹ󡦥ǥ/ christiane /ꥹƥ/ christie /ꥹƥ/ꥹƥ/ -christies /ꥹƥ/ +christies /ꥹƥ;Christie's. www.christies.com/ christina /ꥹƥ/ꥹ/ꥹƥ/ christine /ꥹƥ/ꥹƥ/ꥹƥ/ꥹƥ/ꥹƥ/ christmas /ꥹޥ/ @@ -21931,22 +21931,22 @@ christophe / christopher /ꥹȥե/ christy /ꥹƥ/ chro // -chrom // -chromakey /ޥ/ +chrom /;Cr/ +chromakey /ޥ;chroma-key/ chromatic /ޥå/ޥƥå/ chromatin /ޥ/ chromato /ޥ/ chromatogram /ޥȥ/ chromatograph /ޥȥ/ chromatography /ޥȥե/ޥȥե/ -chrome /// -chromium /ߥ/ +chrome //;[]24,Cr/ +chromium /ߥ;[]24,Cr/ chronicle /˥/ chrono // chronograph /Υ/ chronology /Υ/ chronometer /Υ᡼/ -chrysanthemum /ꥵ󥻥ޥ/ +chrysanthemum /ꥵ󥻥ޥ;/ chrysler /饤顼/ chrysoprase /꥽ץ졼/ chuck /å/ @@ -21960,32 +21960,32 @@ ciao / ciboulette /֥å/ cicero // cider // -cidre /ɥ/ +cidre /ɥ;ʩ/ ciel /// cigar // cigarette /å/ cigarettecase /åȥ/ ciguatera /ƥ/ -cima // -cincinnati /󥷥ʥƥ/ +cima /;[ɸ]/ +cincinnati /󥷥ʥƥ;USA/ cinco /// cinderella /ǥ/ cindy /ǥ/ǥ/ -cine // +cine /;(Fr) cinema/ cineclub /ͥ/ cinema /ͥ/ cinemascope /ͥޥ/ cinematheque /ͥޥơ/ cineraria /ͥꥢ/ͥꥢ/ -cinesco /ͥ/ +cinesco /ͥ;cinemascope/ cinnamon /ʥ/ cinnamonstick /ʥ󥹥ƥå/ cinnamonsugar /ʥ󥷥奬/ cinnamontea /ʥƥ/ cinzano /󥶥/ -cipher /ե/ +cipher /ե;0/ circle ///// -circlek /K// +circlek /K;www.circlek.co.jp// circuit /å/ circuittraining /åȥȥ졼˥/ circular /顼/ @@ -21995,16 +21995,16 @@ circumscribe / circumscription /ॹץ/ circus // cisc /CISC/ -cisco // +cisco /;www.cisco.com/ cisse // cite // citeaux /ȡ/ citi /ƥ/ -citibank /ƥХ/ -citicorp /ƥ/ -citigroup /ƥ롼/ +citibank /ƥХ;www.citibank.com/ +citicorp /ƥ;www.citicorp.com/ +citigroup /ƥ롼;www.citigroup.com/ citizen // -citroen /ȥ/ +citroen /ȥ;www.citroen.fr/ citron /ȥ/ citrus /ȥ饹/ citterio /åƥꥪ/ @@ -22022,9 +22022,9 @@ civilization / cl //Chlorine/ clafouti /եƥ/եƥ/ clafoutis /եƥ/եƥ/ -claidha /쥤/ +claidha /쥤;Compensate for Loudness by Analyzing Input-signal Digital Hearing Aid/ claim /졼/ -claimer /졼ޡ/쥤ޡ/ +claimer /졼ޡ;Ѹ/쥤ޡ/ clair /쥢/졼/ claire /쥢/졼/ clam // @@ -22049,8 +22049,8 @@ clarisse / claritin // clark /顼/ clarke /顼/ -clarte // -clash /å/饷/ +clarte /;(Fr) / +clash /å/饷;/ clasp /饹/ class /饹/ classic /饷å/ @@ -22062,7 +22062,7 @@ classicmusic / classics /饷å/ classification /饷ե/饹ե/ʬ/ classifier /饷ե/ -classique /饷å/ +classique /饷å;ʩ/ classlibrary /饹饤֥/ classmate /饹ᥤ/饹᡼/ claude // @@ -22077,8 +22077,8 @@ clavecin / claves /٥/ clavichord //ӥ/ clavinet /ӥͥå/ͥå/ -clavinova /ӥΡ/ -clavis // +clavinova /ӥΡ;[ɸ]YAMAHA/ +clavis /;ƥ/ claw // clay /쥤/졼/ claycourt /졼/쥤/ @@ -22099,9 +22099,9 @@ clearcut / clearfile /ꥢե/ clearglass /ꥢ饹/ clearing /ꥢ/ -clearmiss /ꥢߥ/ -cleek /꡼/ -clef /// +clearmiss /ꥢߥ;Ѹ/ +cleek /꡼;5-wood/ +clef //;ʩ/ clelia /ꥢ/ clem // clematis /ޥ/ @@ -22119,7 +22119,7 @@ cleopatra / clerc /졼/ cleric /å/ clerk /顼/ -cleveland /꡼֥/꡼/ +cleveland /꡼֥;USA/꡼/ clever /С/ cleves /졼/졼/ cli // @@ -22142,7 +22142,7 @@ clime / clinch // clinet // clinic /˥å/ -clinique /ˡ/ +clinique /ˡ;ʩ/ clinker /󥫡/ clint // clinton /ȥ/ @@ -22165,7 +22165,7 @@ cloning / clooney /롼ˡ/ clop /å/ clos /CLOS(Common Lisp Object System)/CLOS/ -close /// +close //;ᤤ/ closed // closeplay /ץ졼/ closer /// @@ -22177,7 +22177,7 @@ cloth / clothing // cloud /饦/ cloudy /饦ǥ/饦ǥ/ -clove // +clove /;/ clover /С/ cltl# /ạ̃#1/CLtL#0/ club /// @@ -22197,15 +22197,15 @@ clyde / cm /ޡ//᡼ȥ/ꥦ/Curium/ã/ cmdline /ޥɥ饤/ cmsong /CM/ãͥ/ -cmu /ͥ/CMU/ +cmu /ͥ;Carnegie Melon University. www.cmu.edu/CMU/ cmucl /CMU-CL/ co //Х/Cobalt//Colorado// co2 /ã2/ coach // coaching // coal // -coaltar /륿/ -coart // +coaltar /륿;coal-tar/ +coart /;coat? court?/ coast // coastal // coaster // @@ -22215,10 +22215,10 @@ coathanger / coating /ƥ/ coatingstaff /󥰥å/ coats // -cobalt /Х/ +cobalt /Х;[]27,Co/ cobaltblue /Хȥ֥롼/ cobb //å/å/å// -cobe /ӡ/ +cobe /ӡ;Cosmic Background Explorer/ cobol /ܥ/COBOL/ cobra /֥/ coca // @@ -22243,9 +22243,9 @@ coconut / coconutmilk /ʥåĥߥ륯/ʥĥߥ륯/ coconuts /ʥå/ʥ/ coconutsmilk /ʥåĥߥ륯/ʥĥߥ륯/ -cocoon // -cocos // -cocostore /ããϥȥ/ +cocoon /;/ +cocos /;.cc/ +cocostore /ããϥȥ;?/ cocotte /å/ cocteau /ȡ/ cocu // @@ -22288,7 +22288,7 @@ cogito / cognac /˥å/ cohen /إ// coherence /ҡ/ -coherency /ҡ/ҥ/ +coherency /ҡ/ҥ;/ coherent /ҡ/ cohort /ۡ/ۡ/ coil // @@ -22297,12 +22297,12 @@ coimbra / coin // coincase /󥱡/ coincidence /󥷥ǥ/ -coinlaundry /ɥ꡼/ +coinlaundry /ɥ꡼;Ѹ(coin-washer)/ coinlocker /å/ coinparking /ѡ/ cointoss /ȥ/ cointreau /ȥ/ -coke /// +coke //;(ȸkoks)/ col // cola // colbert /١/С/ @@ -22332,21 +22332,21 @@ collection / collective /쥯ƥ/ collector /쥯/쥯/ collectors /쥯/ -collectorsitem /쥯ƥ/ +collectorsitem /쥯ƥ;collector's item/ colleen /꡼/ -college /å/졼/ +college /å/졼;ʩ/ collider /饤/ collie /꡼/ collier /ꥢ/ collina /꡼/ collins // -collision /ꥸ/꡼/ +collision /ꥸ/꡼;/ collocation // colloid // collotype // colo // colombe // -colombia /ӥ/ӥ/ +colombia /ӥ;.co/ӥ/ colombo // colon // colonel /ͥ/ͥ/ @@ -22358,16 +22358,16 @@ colorado / colorbox /顼ܥå/ colorchange /顼/ colorchart /顼㡼/ -colorcontact /顼󥿥/ -colorcontactlens /顼󥿥ȥ/ +colorcontact /顼󥿥;color contact (lens)/ +colorcontactlens /顼󥿥ȥ;color contact lens/ colorcoordinator /顼ǥ͡/ colorcopy /顼ԡ/ colored /顼/ colorfilm /顼ե/ colorful /ե/ -colorillust /顼饹/ +colorillust /顼饹;color illustration/ coloring /顼/ -colorio /ꥪ/ +colorio /ꥪ;[ɸ]epson/ colorist /ꥹ/ colormap /顼ޥå/ colorpage /顼ڡ/ @@ -22383,13 +22383,13 @@ colossus / colour /顼/ colourchange /顼/ colourchart /顼㡼/ -colourcontact /顼󥿥/ -colourcontactlens /顼󥿥ȥ/ +colourcontact /顼󥿥;colour contact (lens)/ +colourcontactlens /顼󥿥ȥ;colour contact lens/ colourcopy /顼ԡ/ coloured /顼/ colourfilm /顼ե/ colourful /ե/ -colourillust /顼饹/ +colourillust /顼饹;colour illustration/ colouring /顼/ colourpage /顼ڡ/ colourpalette /顼ѥå/ @@ -22401,9 +22401,9 @@ colourvariation / colt // coltrane /ȥ졼/ columbia /ӥ/ -columbine /Х/ -columbium /ӥ/ -columbus /֥/Х/ +columbine /Х;US/ +columbium /ӥ;[]41,Cb(Nb)/ +columbus /֥/Х;ϥν/ columella // column /// columnist /˥/ @@ -22421,11 +22421,11 @@ combing / combo // combobox /ܥܥå/ combodrive /ܥɥ饤/ -come /// +come //;ꥢ/ comeback /Хå/Хå/ comedian /ǥ/ -comedical /ǥ/ -comedie /ǥ/ +comedical /ǥ;co-medical/ +comedie /ǥ;ʩ/ comedy /ǥ/ǥ// comely // comeon // @@ -22436,14 +22436,14 @@ comfort / comfrey /ե꡼/ comic /ߥå/ comical /ߥ/ -comicband /ߥåХ/ +comicband /ߥåХ;comic band/ comicmarket /ߥåޡå/ߥ/ comics /ߥå/ -comiket /ߥ/ߥå// +comiket /ߥ/ߥå;ߥαIJҡwww.comiket.co.jp// coming /ߥ/ comingout /ߥ󥰥/ comingsoon /ߥ󥰥/ -comma ///// +comma ////;/ command /ޥ/ commander /ޥ/ commandline /ޥɥ饤/ @@ -22452,13 +22452,13 @@ commandmode / commando /ޥ/ޥɡ/ commandprompt /ޥɥץץ/ comme // -commeca /ॵ/ -commedia /ǥ/ +commeca /ॵ;(Fr) comme ca/ +commedia /ǥ;ꥢ/ comment // commentary /󥿥꡼/ commentator /ơ/ơ/ commenter /󥿡/ -commentout /ȥ/ +commentout /ȥ;comment out/ commerce /ޡ/ commercial /ޡ/ commercialism /ޡꥺ/ @@ -22475,7 +22475,7 @@ common / commons // commonsense /󥻥/ commonwealth /󥦥륹/ -commu //ߥ/ +commu /;communication/ߥ;community/ commune /ߥ塼/ communicate /ߥ˥/ communication /ߥ˥/ @@ -22492,7 +22492,7 @@ communitysite / commuter /ߥ塼/ como // comodo // -comoros // +comoros /;.km/ comp /// compa // compact /ѥ/ @@ -22507,14 +22507,14 @@ comparator / compare /ڥ/ compartment /ѡȥ/ compass /ѥ/ -compati /ѥ/ +compati /ѥ;compatible/ compatibility /ѥӥƥ/ѥ/ compatible /ѥ֥/ѥ/ߴ/ -compe // +compe /;competition/ competency /ԥƥ󥷡/ competition /ڥƥ// competitive /ڥƥƥ/ -compi // +compi /;compilation/ compilation /ԥ졼//ԥ쥤/ compile /ѥ/ compileoption /ѥ륪ץ/ @@ -22543,7 +22543,7 @@ computer / computer-science /ԥ塼/ computer-software /ԥ塼եȥ/ computergame /ԥ塼/ԥ塼/ -computergraphics /ԥ塼եå/ +computergraphics /ԥ塼եå;CG/ computermusic /ԥ塼ߥ塼å/ computerscience /ԥ塼/ computersoftware /ԥ塼եȥ/ @@ -22557,7 +22557,7 @@ comtesse / con // conakry /ʥ/ conan /ʥ/ -conbrio /֥ꥪ/󡦥֥ꥪ/ +conbrio /֥ꥪ;con brio/󡦥֥ꥪ/ concealer /󥷡顼/ concentrate /󥻥ȥ졼/ concentration /󥻥ȥ졼/ @@ -22566,7 +22566,7 @@ concept / conception /󥻥ץ/ conceptual /󥻥ץ奢/ concern /󥵡/ -concert /󥵡/󥻡/ +concert /󥵡/󥻡;ʩ/ concertgebouw /󥻥ȥإܥ/ concerthall /󥵡ȥۡ/ concertmaster /󥵡ȥޥ/ @@ -22580,9 +22580,9 @@ conclave / concord /󥳥/󥳡/ concordance /󥳡/ concorde /󥳥/ -concours /󥯡/ +concours /󥯡;ʩ/ concourse /󥳡/ -concrete /󥯥꡼/󥯥졼/ +concrete /󥯥꡼/󥯥졼;/ concreteblock /󥯥꡼ȥ֥å/ concretejungle /󥯥꡼ȥ󥰥/ concurrency /󥫥󥷡/ @@ -22590,7 +22590,7 @@ concurrent / conde // condense /ǥ/ condensedmilk /ǥ󥹥ߥ륯/ -condensemilk /ǥ󥹥ߥ륯/ +condensemilk /ǥ󥹥ߥ륯;condensed milk/ condenser /ǥ/ǥ󥵡/ condition /ǥ/ conditioner /ǥʡ/ @@ -22606,13 +22606,13 @@ conduit / condyloma /󥸥/ cone // cones // -confectionary /եʥ꡼/ -confede /ե/ +confectionary /եʥ꡼;ۻҲ/ +confede /ե;confederation/ confederation /եǥ졼/ confer /ե/ conference /ե/ե/ confidential /եǥ󥷥/ -config /ե/ե졼/ +config /ե/ե졼;configuration/ configuration /ե졼/ե졼/ configure /ե奢/ confirm /ե/ @@ -22623,7 +22623,7 @@ confocal / conga // congas // conglomerate /󥰥ޥå/ -congo // +congo /;(̱綦¹).cd, (󥴶¹).cg/ congratulations /󥰥졼/󥰥å졼/ congress /󥰥쥹/ congruence // @@ -22633,7 +22633,7 @@ conifer / conn // connect /ͥ/³/ connecter /ͥ/ -connecticut /ͥå/ +connecticut /ͥå;CT/ connection /ͥ/ connectionism /ͥ˥/ connectionist /ͥ˥/ @@ -22651,13 +22651,13 @@ conny / conor /ʡ/ conquistador /󥭥ɡ/ conrad /å/ -conrod /å/ +conrod /å;con-rod, connection rod/ cons // -consadole /󥵥ɡ/ +consadole /󥵥ɡ;[J꡼]/ conscell /󥹥/ consensus /󥻥󥵥/ consent /󥻥/ -conserva /󥵥/ +conserva /󥵥;conservative/ conservative /󥵥Хƥ/󥵡Хƥ/ conservatoire /󥻥ȥ/󥻥Хȥ/ conservatory /󥻥ȡ/ @@ -22666,12 +22666,12 @@ consistency / consolation /󥽥졼/ console /󥽡/ consomme /󥽥/ -consommesoup /󥽥᥹/ +consommesoup /󥽥᥹;(consomme(Fr) + soup())/ consort /󥽡/ consortium /󥽡/ constable /󥹥֥/ constance /󥹥/ -constant /󥹥/󥹥/ +constant /󥹥/󥹥;(1767-1830)Benjamin Constant de Rebecque/ constantin /󥹥ƥ/󥹥/󥹥󥿥/ constantine /󥹥ƥ/ constantinople /󥹥Ρץ/ @@ -22698,7 +22698,7 @@ content / contents /ƥ/ contest /ƥ/ context /ƥ/ƥ/ -contexte /ƥ/ +contexte /ƥ;ʩ/ contextmenu /ƥȥ˥塼/ƥȥ˥塼/ conti /ƥ/ continental /ͥ󥿥/ @@ -22719,7 +22719,7 @@ contribution / control /ȥ// controlcenter /ȥ륻󥿡/ controlcentre /ȥ륻󥿡/ -controler /ȥ/ +controler /ȥ;controLLer/ controlkey /ȥ륭/CONTROL/ controller /ȥ/ȥ顼/ controlpanel /ȥѥͥ/ @@ -22752,7 +22752,7 @@ cooking / cookingheater /å󥰥ҡ/ cooky /å/ cool // -coolbiz /ӥ/ +coolbiz /ӥ;[]Ѹ/ coolbox /ܥå/ cooldown // cooler /顼/ @@ -22780,20 +22780,20 @@ coppelia / copper /åѡ/ coppola /åݥ/ coprocessor /ץå/ -coprod // -copter /ץ/ +coprod /;ϥʸtse/ +copter /ץ;helicopter/ copula /ԥ/ copy /ԡ/ copyback /ԡХå/ -copyband /ԡХ/ +copyband /ԡХ;Ѹ(cover band)/ copyguard /ԡ/ copyleft /ԡե/ copymap /ԡޥå/ copyonce /ԡ/ copyonwrite /ԡ饤/ -copype /ԥ/ +copype /ԥ;copy and paste/ copyprotect /ԡץƥ/ -copyright /ԡ饤/ +copyright /ԡ饤;ά(C)/ copyservice /ԡӥ/ copywriter /ԡ饤/ copywriting /ԡ饤ƥ/ @@ -22804,19 +22804,19 @@ cora / coral // coralie /꡼/ corazon /饽/ -corbusier /ӥ奸/ +corbusier /ӥ奸;(1887-1965) Le Corbusier/ cord // cordelia /ǥꥢ/ cordial /ǥ/ cordoba /ɥ/ cordon /ɥ/ -cordreel /ɥ꡼/ +cordreel /ɥ꡼;cord reel/ cords // cordula /ǥ/ corduroy /ǥ/ core // coredump // -corega /쥬/ +corega /쥬;www.corega.co.jp/ coreless /쥹/ corelli /å/ coretime // @@ -22841,7 +22841,7 @@ cornell / corner /ʡ///////// cornering /ʥ/ʡ/ cornerkick /ʡå/ -cornet /ͥå/// +cornet /ͥå//;(Fr) (ʤɤ)/ cornflake /ե졼/ cornflakes /ե졼/ cornflour /ե/ @@ -22858,8 +22858,8 @@ corona / coronabeer /ʥӡ/ coronado /ʥ/ corot // -corp // -corpo // +corp /;corporation/ +corpo /;corporate house/ corporate /ݥ졼/ corporategovernance /ݥ졼ȥХʥ/ corporation /ݥ졼/ @@ -22867,7 +22867,7 @@ corporatism / corpse /ץ/ corpus /ѥ/ correct /쥯/Τ/ -correction /쥯/ +correction /쥯;/ correlation /졼/ correspondence /쥹ݥǥ/쥹ݥ/ correspondent /쥹ݥǥ/쥹ݥ/ @@ -22884,9 +22884,9 @@ cortot / corundum // corvette /٥å/ cos /// -cosecant // +cosecant /;;/ cosine // -cosme // +cosme /;cosmetics/ cosmetic /ƥå/å/ cosmetics /ƥå/ cosmic /ߥå/ߥå/ @@ -22894,15 +22894,15 @@ cosmo / cosmology // cosmopolitan /ݥ꥿/ cosmos /⥹/ -cosplay /ץ/ +cosplay /ץ;/ǥե;/ defaultresourcefile /ǥեȥ꥽ե/ defect /ǥե/ defence /ǥե/ @@ -23694,25 +23694,25 @@ defense / deffenbacchia /ǥեХ/ define /ǥե/ definition /ǥե˥/ǥե˥/ -defla /ǥե/ +defla /ǥե;deflation/ deflation /ǥե졼/ǥե/ deflator /ǥե졼/ǥե졼/ defoe /ǥե/ deformer /ǥե/ -defrag /ǥե饰/ +defrag /ǥե饰;defragmentation/ degas /ɥ/ degaulle /ɥ/ɡ/ degrade /ǥ졼/ -degree /ǥ꡼/// +degree /ǥ꡼//;celsius/ deimos /⥹/ǥ⥹/ deirdre /ǥɥ/ deja /ǥ/ -dejavu /ǥ/ǥ/ǥ/ǥӥ/ -dejeuner /ǥ/ +dejavu /ǥ;(Fr) deja vu/ǥ/ǥ/ǥӥ/ +dejeuner /ǥ;(Fr)뿩/ dejohnette /ǥͥå/ǥͥå/ del /ǥ/ delacroix /ɥ饯/ɥ饯/ -delaware /ǥ饦/ +delaware /ǥ饦;DE/ delay /ǥ쥤/ǥ졼/ delayed /ǥ쥤/ delayline /ǥ쥤饤/ @@ -23731,7 +23731,7 @@ delicate / delicatessen /ǥꥫƥå/ delicious /ǥꥷ㥹/ delight /ǥ饤/ -delikatessen /ǥꥫƥå/ +delikatessen /ǥꥫƥå;()/ delilah /ǥ/ delimiter /ǥߥ/ delivery /ǥХ꡼/ @@ -23758,19 +23758,19 @@ demand / demel /ǥ/ demerit /ǥå/ demeter /ǥƥ/ -demi /ǥ/ɥ/ +demi /ǥ/ɥ;ʩ/ demian /ǥߥ/ demiglace /ǥߥ饹/ɥߥ饹/ demiglacesauce /ǥߥ饹/ɥߥ饹/ -demitasse /ǥߥ/ -demo /ǥ/ǥ/ +demitasse /ǥߥ;demi-tasse/ +demo /ǥ;demonstration/ǥ/ democracy /ǥ⥯饷/ demokritos /ǥ⥯ȥ/ demon /ǡ/ demonbane /ǥ٥/ demonstration /ǥ󥹥ȥ졼/ demonstrator /ǥ󥹥ȥ졼/ǥ󥹥ȥ졼/ -demorgan /ɡ륬/ɥ륬/ +demorgan /ɡ륬;(1806-1871) Augustus de Morgan/ɥ륬;De Morgan/ demosthenes /ǥ⥹ƥͥ/ demotape /ǥơ/ demy /ɥ/ǥߡ/ @@ -23778,7 +23778,7 @@ den / dendro /ǥɥ/ dendrobium /ǥɥӥ/ deneuve /ɥ̡/ -denhaag /ϡ/ +denhaag /ϡ;Den Haag/ denied /ǥʥ/ݤ줿/ denier /ǥˡ/ denim /ǥ˥/ @@ -23788,21 +23788,21 @@ denimskirt / denis /ǥ˥/ɥ/ɥ/ denise /ǥ˥/ deniz /ǥ˥/ -denmark /ǥޡ/ +denmark /ǥޡ;.dk/ dennett /ǥͥå/ dennis /ǥ˥/ -dennys /ǥˡ/ -denomi /ǥΥ/ +dennys /ǥˡ;Denny's/ +denomi /ǥΥ;denomination/ denomination /ǥΥߥ͡/ denotation /ǥΥơ/ denotational /ǥΥơʥ/ -denpasar /ǥѥ/ +denpasar /ǥѥ;Х(ɥͥ)/ dense /ǥ/ density /ǥ󥷥ƥ/ dent /ǥ/ dental /ǥ󥿥/ dentalcare /ǥ󥿥륱/ -denver /ǥ/ǥС/ +denver /ǥ/ǥС;(USA)/ denys /ǥ˥/ deodorant /ǥɥ/ deoxy /ǥ/ @@ -23811,7 +23811,7 @@ depardieu / depart /ǥѡ/ department /ǥѡȥ/ǥѡ/ departure /ǥѡ㡼/ -depaysement /ǥڥޥ/ +depaysement /ǥڥޥ;ʩ/ depend /ǥڥ/ dependency /ǥڥǥ/ depo /ǥ/ @@ -23829,13 +23829,13 @@ derived / derrick /ǥå/ǥꥯ/ derrida /ǥ/ derringer /ǥ󥸥㡼/ -des //ǥ/ +des /;ʩ/ǥ/ desailly /ǥ/ -desc /һ/ +desc /һ;descriptor/ descartes /ǥ/ descente /ǥ/ describe /ǥ饤/ -descripter /һ/ +descripter /һ;descriptor/ description /ǥץ/ descriptor /ǥץ/һ/ desert /ǥ/ @@ -23845,9 +23845,9 @@ designer / designers /ǥʡ/ designersbrand /ǥʡ֥/ designpattern /ǥѥ/ -desir /ǥ/ -desire /ǥ/ǥ/ǥ/ -desiree /ǥ/ +desir /ǥ;ʩ/ +desire /ǥ/ǥ/ǥ;ʩ/ +desiree /ǥ;ʩ/ desk /ǥ/ desklight /ǥ饤/ desktop /ǥȥå/ @@ -23866,7 +23866,7 @@ destroy / destroyer /ǥȥ䡼/˲/ destruction /ǥȥ饯/ destructor /ǥȥ饯/ǥȥ饯/ǻ/ -det // +det /;determinant/ detach /ǥå/ detail /ǥơ/ detect /ǥƥ/ȯ/ @@ -23879,10 +23879,10 @@ detune / deuce /ǥ塼/塼/ deutsch /ɥ/ɥĸ/ɥ/ deutsche /ɥ/ -deutschegp /ɥGP/ -deutschland /ɥ/ +deutschegp /ɥGP;[F1]/ +deutschland /ɥ;.de/ deux /ɥ/ɥ/ -deuxmagots /ɥޥ/ +deuxmagots /ɥޥ;Les Deux Magots/ develop /ǥ٥å/ǥ٥å/ developer /ǥ٥åѡ/ǥ٥åѡ/ǥ٥å/ development /ǥ٥åץ/ǥ٥åץ/ @@ -23892,7 +23892,7 @@ deviceid / devicemanager /ǥХޥ͡/ǥХޥ͡㡼/ devil /ǥӥ/ devilman /ǥӥޥ/ -devilrays /ǥӥ쥤/ +devilrays /ǥӥ쥤;[MLB]Devil Rays/ devin /ǥ/ devine /ǥ/ǥХ/ devon /ǥܥ/ǥ/ @@ -23902,15 +23902,15 @@ dewey / dex /ǥå/ dexter /ǥ/ dextrin /ǥȥ/ -dharan // -dharma // +dharan /;ӥ/ +dharma /;ˡ/ dhcpc /DHCP饤/ dhcpclient /DHCP饤/ dhcps /DHCP/ dhcpserver /DHCP/ dhole /ɡ/ -di //ǥ/ -dia ///// +di /;2/ǥ/ +dia ///;ɩ/;ɩ/ diablo /ǥ֥/ diabolo /ǥܥ/ diacritical /ƥ/ @@ -23926,25 +23926,25 @@ dialogue / dialq# /Q#0/#1/ dialq2 /Q2/ѣ/ dialup /륢å/륢å/ -diamond /////// -diamondbacks /ɥХå/ +diamond ///;ɩ/;ɩ/// +diamondbacks /ɥХå;[MLB]/ diamondcut /ɥå/ diamonddust /ɥ/ diana //ǥ/ǥ/ diane //ǥ/ dianne // diary /꡼// -diaspora /ǥݥ/ +diaspora /ǥݥ;(ꥷ)Υ/ diastase // diatone /ȡ/ diatonic /ȥ˥å/ diaz /ǥ/ǥ/ -dibromochloromethane /֥⥯᥿/ +dibromochloromethane /֥⥯᥿;(CHBr2Cl) ȥϥ᥿ΰ/ dic /ǥå// -dicaprio /ǥץꥪ/ +dicaprio /ǥץꥪ;DiCaprio/ dice // dichloro // -dichloroethylene // +dichloroethylene /;C2H2Cl2/ dichloromethane /᥿/ dick /ǥå/ dickens /ǥ/ @@ -23953,13 +23953,13 @@ dickson / dictionary /ǥʥ꡼/ǥʥ// did /ǥ/ diderot /ǥɥ/ -didge /ǥ/ +didge /ǥ;didgeridoo/ didgeridoo /ǥɥ/ǥɥ/ǥɥ/ǥɥ/ǥɥ/ǥɥ/ didier /ǥǥ/ dido /ǥ/ didot /ǥ/ die //ǥ/ -diecast /㥹// +diecast /㥹;die-cast// diego /ǥ/ diehard /ϡ/ dies // @@ -23973,7 +23973,7 @@ dieter / dietfood /åȥա/ diethyl // dietrich /ǥȥå/ǥȥ/ -dieu /ǥ塼/ +dieu /ǥ塼;(Fr)/ diff /ǥ/ difference /ǥե/ different /ǥե/ @@ -23983,12 +23983,12 @@ diffusion / dig /ǥ/ digest // digger /ǥ/ -digicame /ǥ/ -digipak /ǥѥå/ +digicame /ǥ;digital camera/ +digipak /ǥѥå;[ɸ]AGI/ digit /ǥå/ǥå/ digital /ǥ/ǥ/Digital/ digitalaudio /ǥ륪ǥ/ -digitalaudioplayer /ǥ륪ǥץ졼䡼/ǥ륪ǥץ쥤䡼/ +digitalaudioplayer /ǥ륪ǥץ졼䡼;dap/ǥ륪ǥץ쥤䡼/ digitalcamera /ǥ륫/ǥ/ digitaldata /ǥǡ/ digitaldivide /ǥǥХ/ǥǥХ/ǥǥХ/ǥǥХ/ @@ -24014,10 +24014,10 @@ dilettante / dill /ǥ/ dillon /ǥ/ dilly /ǥ꡼/ -dim /ǥ/ǥߥ̥/diminuendo/ -dimaggio /ǥޥ/ -dimanche /ǥޥ󥷥/ -dimbula /ǥ֥/ +dim /ǥ/ǥߥ̥;˼夯/diminuendo/ +dimaggio /ǥޥ;DiMaggio/ +dimanche /ǥޥ󥷥;(Fr) / +dimbula /ǥ֥;/ dime // dimension /ǥ󥷥/ǥ󥸥/ dimethyl // @@ -24030,7 +24030,7 @@ dina / dinah // dinar /ǥʡ/ dine // -diner /ʡ/ǥ/ +diner /ʡ/ǥ;(Fr)ͼ/ diners /ʡ/ʡ/ dinghy /ǥ󥮡/ dingo /ǥ/ @@ -24051,7 +24051,7 @@ diol / dion /ǥ/ dionne /ǥ/ dionysos /ǥ˥好/ǥ˥/ -dior /ǥ/ +dior /ǥ;www.dior.com/ diorama //ǥ/ dios /ǥ/ dioxin // @@ -24061,7 +24061,7 @@ diplomacy / diplomat /ǥץޥå/ diplomate /ǥץޥå/ diplomatic /ǥץޥƥå/ -diplomatique /ǥץޥƥ/ +diplomatique /ǥץޥƥ;ʩ/ dipole /ݡ/ dipswitch /ǥåץå/DIPå/ dir /ǥ쥯ȥ/ǥ쥯ȥ꡼/ @@ -24069,7 +24069,7 @@ dirac / direct /쥯/ direction /ǥ쥯/ directive /ǥ쥯ƥ/ -directlink /쥯ȥ/ +directlink /쥯ȥ;ľ/ directmail /쥯ȥ᡼/ director /ǥ쥯/ directory /ǥ쥯ȥ/ǥ쥯ȥ꡼/ǥ쥯ȥꥣ/ǥ쥯ȥ꡼/ @@ -24088,7 +24088,7 @@ discard / discarray /ǥ쥤/ discbrake /ǥ֥졼/ discharge /ǥ㡼/ -discjockey /ǥå/ +discjockey /ǥå;DJ/ disclosure /ǥ㡼/ǥ/ discman /ǥޥ/ disco /ǥ/ @@ -24124,7 +24124,7 @@ diskspace / disney /ǥˡ/ disneyland /ǥˡ/ disneyresort /ǥˡ꥾/ -disneysea /ǥˡ/ +disneysea /ǥˡ;DisneySea/ disorder /ǥ/ dispatch /ǥѥå/ dispatcher /ǥѥå/ @@ -24136,16 +24136,16 @@ disposer / distance /ǥ/ distemper /ƥѡ/ distortion /ǥȡ/ -distri /ǥȥ/ +distri /ǥȥ;distribution (NB:ѸǤdistro)/ distribution /ǥȥӥ塼/ distributor /ǥȥӥ塼/ǥȥӥ塼/ district /ǥȥꥯ/ -distro /ǥȥ/ +distro /ǥȥ;(Linux)distribution/ dita /ǥ/ dither /ǥ/ dithering /ǥ/ div // -diva /ǥ/ǥ/ +diva /ǥ/ǥ;ɱ/ dive /// diver /С/ divergence /С/ @@ -24165,7 +24165,7 @@ dizzy / dj /ǥå/ django // djembe // -djibouti /֥/ +djibouti /֥;.dj/ djinni // dma /DMA/Direct Memory Access/ dmitri /ɥߥȥ꡼/ @@ -24175,13 +24175,13 @@ dnepr / do /ɥ// dob /ɥ/ doberman /ɡ٥ޥ/ -dobermann /ɡ٥ޥ/ -doc /ɥ/ɥ/ +dobermann /ɡ٥ޥ;(ȸ)/ +doc /ɥ;doctor/ɥ;document/ docetaxel /ɥ/ dock /ɥå/ docking /ɥå/ -docment /ɥ/ -docomo /ɥ/DoCoMo/ +docment /ɥ;document/ +docomo /ɥ;www.nttdocomo.co.jp/DoCoMo/ doctor /ɥ/ɥȥ///β/ doctorcar /ɥ/ doctorcheck /ɥå/ @@ -24194,9 +24194,9 @@ documentary / documentation /ɥơ/ dodge /ɥå/ dodgeball /ɥåܡ/ -dodgers /ɥ㡼/ +dodgers /ɥ㡼;[MLB]/ dodo /ɡɡ/ -doek /å/ +doek /å;()/ does // dog /ɥå/ dogfight /ɥåե/ @@ -24213,9 +24213,9 @@ doha / dohran /ɡ/ doimoi /ɥ⥤/ dolby /ɥӡ/ -dolbydigital /ɥӡǥ/ +dolbydigital /ɥӡǥ;Dolby digital/ dolbysurround /ɥӡ饦/ -dolce /ɥ/ +dolce /ɥ;www.dolcegabbana.it/ dolcetto /ɥå/ dole /ɡ/ dolittle /ɥȥ/ @@ -24228,7 +24228,7 @@ dolores / dolphin /ɥե/륫/ dolphy /ɥե/ɥե/ dom /ɥ/ -domain /ɥᥤ/ɥ᡼/ +domain /ɥᥤ/ɥ᡼;/ domainname /ɥᥤ͡/ɥᥤ̾/ domani /ɥޡ/ dome /ɡ/ @@ -24240,19 +24240,19 @@ domina / dominant /ɥߥʥ/ domingo /ɥߥ/ dominic /ɥߥ˥/ -dominica /ɥߥ˥/ +dominica /ɥߥ˥;.dm/ dominik /ɥߥ˥/ dominion /ɥߥ˥/ dominique /ɥߥ˥/ domino /ɥߥ/ -domperi /ɥڥ/ -domperignon /ɥڥ˥/ɥڥ˥/ɥڥ/ +domperi /ɥڥ;Dom Perignon/ +domperignon /ɥڥ˥;Dom Perignon/ɥڥ˥/ɥڥ/ don /ɥ/ donald /ɥʥ/ -donaldduck /ɥʥɥå/ +donaldduck /ɥʥɥå;[ɸ]Disney/ donaldson /ɥʥɥ/ donatello /ɥʥƥå/ɥʥƥ/ɥʥƥ/ -donation /ɥ͡/ +donation /ɥ͡;/ donato /ɥʡ/ donau /ɥʥ/ done // @@ -24260,7 +24260,7 @@ donetsk / dongle /ɥ󥰥/ doni /ɥ/ donizetti /ɥ˥åƥ/ -donjuan /ɥե/ +donjuan /ɥե;Don Juan/ donkey /ɥ󥭡/ donna /ɥ/ɥ/ donnie /ɥˡ/ @@ -24268,13 +24268,13 @@ donny / donor /ɥʡ/ donorcard /ɥʡ/ donovan /ɥΥ/ɥΥХ/ -donquijote /ɥ󥭥ۡ/ɥ󡦥ۡ/ -donquixote /ɥ󥭥ۡ/ɥ󡦥ۡ/ -dont /ɥ/ -dontmind /ɥޥ/ +donquijote /ɥ󥭥ۡ;Don Quijote/ɥ󡦥ۡ/ +donquixote /ɥ󥭥ۡ;(Ѹ) Don Quixote/ɥ󡦥ۡ/ +dont /ɥ;don't/ +dontmind /ɥޥ;Don't mind/ donut /ɡʥ/ɡʥå/ donuts /ɡʥ/ɡʥå/ -dooard /ɥ/ +dooard /ɥ;/ dooley /ɡ꡼/ doom /ɥ/ door /ɥ/ɥ/ @@ -24285,13 +24285,13 @@ doorknob / doorlock /ɥå/ doorman /ɥޥ/ doormirror /ɥߥ顼/ -doorphone /ɥۥ/ +doorphone /ɥۥ;Ѹ(intercom)/ doors /ɥ/ doorstopper /ɥȥåѡ/ -dopa /ɡ/ +dopa /ɡ;DihydrOxyPhenylAlanine/ dopamine /ɡѥߥ/ɥѥߥ/ dope /ɡ/ -doping /ɡԥ/ +doping /ɡԥ;ʪ/ doppelganger /ɥåڥ륲󥬡/ doppler /ɥåץ顼/ɥåץ/ dor /ɡ/ @@ -24301,7 +24301,7 @@ doremi / doremifa /ɥߥե/ dorham /ɡϥ/ doria /ɥꥢ/ɡꥢ/ -dorian /ɥꥢ/ +dorian /ɥꥢ;DEFGABCD/ doris /ɥꥹ/ɡꥹ/ dormie /ɡߡ/ dormitory /ɥߥȥ꡼/ @@ -24310,16 +24310,16 @@ dorris / dortmund /ɥȥ/ dos /ɥ/DOS/ dose /ɡ/ -dostoevskii /ɥȥե/ɥȥե/ +dostoevskii /ɥȥե;֧ӧܧڧ/ɥȥե/ dostoevsky /ɥȥե/ɥȥե/ dostoyevsky /ɥȥե/ɥȥե/ -dosv /(concat "DOS\057V")/(concat "DOS057V")/ -dot /ɥå/./////Ц/// -dotcom /ɥåȥ/ -dotfile /ɥåȥե/ +dosv /(concat "DOS\057V")/ +dot /ɥå/.///;/;comma/Ц;֥פλ//;x3/ +dotcom /ɥåȥ;.com/ +dotfile /ɥåȥե;.skk/ dotfont /ɥåȥե/ dotpitch /ɥåȥԥå/ -dots /ɥå///...// +dots /ɥå///.../;x3/ dotted /ɥåƥ/ dotter /ɥå/ double /֥/ @@ -24330,7 +24330,7 @@ doublebind / doublebooking /֥֥å/ doubleclick /֥륯å/ doublecount /֥륫/ -doubledagger // +doubledagger /;ddagger/ doubledecker /֥ǥå/ doubledribble /֥ɥ֥/ doubleeagle /֥륤/ @@ -24339,8 +24339,8 @@ doubleflat / doubleheader /֥إå/ doubleplay /֥ץ졼/֥ץ쥤/ doublepunch /֥ѥ/ -doublequotation /֥륯ơ/ -doublequote /֥륯/// +doublequotation /֥륯ơ;/ +doublequote /֥륯/;opening/;closing/ doublereed /֥꡼/ doubleroom /֥롼/ doubles /֥륹/ @@ -24391,8 +24391,8 @@ downvest / dowsing // doyle /ɥ/ dozen /// -dq /ɥ饯/ -drab /ɥ/ +dq /ɥ饯;[]Dragon Quest/ +drab /ɥ;п/ dracaena /ɥ饻/ drachma /ɥ饯/ dracula /ɥ饭/ @@ -24403,12 +24403,12 @@ draganddrop / dragee /ɥ饸/ dragging /ɥå/ dragon /ɥ饴/ -dragonball /ɥ饴ܡ/ +dragonball /ɥ饴ܡ;[˥]/ dragonfruit /ɥ饴ե롼/ -dragonquest /ɥ饴󥯥/ɥ饯/ +dragonquest /ɥ饴󥯥;[]Enix/ɥ饯/ dragons /ɥ饴/ dragonslayer /ɥ饴󥹥쥤䡼/ -dragoon /ɥ饰/ +dragoon /ɥ饰;εʼ/ dragrace /ɥå졼/ drain /ɥ쥤/ɥ/ɥ󡿥٥/ drak /ɥ饯/ @@ -24430,10 +24430,10 @@ dread / dreadhair /ɥåɥإ/ dreadnought /ɥåɥΡ/ dream /ɥ꡼/ -dreamcast /ɥ꡼७㥹/ +dreamcast /ɥ꡼७㥹;[ɸ]SEGA/ dreamer /ɥ꡼ޡ/ dreaming /ɥ꡼ߥ/ -dreamjumbo /ɥ꡼ॸ/ +dreamjumbo /ɥ꡼ॸ;/ dreamland /ɥ꡼/ dreams /ɥ꡼ॹ/ɥ꡼ॺ/ dreamteam /ɥ꡼/ @@ -24470,7 +24470,7 @@ drivebay / drivecourse /ɥ饤֥/ drivein /ɥ饤֥/ driveletter /ɥ饤֥쥿/ -drivemap /ɥ饤֥ޥå/ +drivemap /ɥ饤֥ޥå;Ѹ(roadmap)/ driven /ɥ֥/ driver /ɥ饤С/ɥ饤/ɥ饤/ driverset /ɥ饤Сå/ @@ -24488,7 +24488,7 @@ dropkick / dropout /ɥåץ/ drops /ɥåץ/ dropshot /ɥåץå/ -drpepper /ɥڥåѡ/Dr Pepper/ +drpepper /ɥڥåѡ;www.drpepper.com/Dr Pepper;"Dr"ϥɥåȤʤ/ druaga /ɥ륢/ drucker /ɥå/ drug /ɥå/ @@ -24499,7 +24499,7 @@ drumbrake / drumhead /ɥإå/ drummer /ɥޡ/ drumming /ɥߥ/ -drumnbass /ɥ١/ +drumnbass /ɥ١;drum'n'bass/ drumroll /ɥ/ drums /ɥॹ/ drumset /ɥॻå/ @@ -24510,13 +24510,13 @@ drunker / dry /ɥ饤/ dryad /ɥꥢ/ɥ饤/ drycleaning /ɥ饤꡼˥/ -drycurry /ɥ饤졼/ +drycurry /ɥ饤졼;dried curry/ dryer /ɥ饤䡼/ dryeye /ɥ饤/ -dryflower /ɥ饤ե/ +dryflower /ɥ饤ե;dried flower/ dryfood /ɥ饤ա/ -dryfruit /ɥ饤ե롼/ -dryfruits /ɥ饤ե롼/ +dryfruit /ɥ饤ե롼;dried fruits/ +dryfruits /ɥ饤ե롼;dried fruits/ dryice /ɥ饤/ drymartini /ɥ饤ޥƥ/ drypoint /ɥ饤ݥ/ @@ -24525,7 +24525,7 @@ drysuit / drysuits /ɥ饤/ drytype /ɥ饤/ dryyeast /ɥ饤/ -dsp /ǥ뿮/ǥ뿮/ +dsp /ǥ뿮;digital signal processing/ǥ뿮/ dte /DTE/ dtmsoft /DTMե/ dtpsoft /DTPե/ @@ -24538,9 +24538,9 @@ dualmode / dualsystem /ǥ奢륷ƥ/ duane /ǥ奢/ɥ/ǥ奨/ dub // -dubai /ɥХ/ +dubai /ɥХ;UAE/ dubbing /ӥ/ -dubble /֥/ +dubble /֥;?/ dublin /֥/ duboeuf /ǥ֥å/ dubois /ǥܥ/ @@ -24581,7 +24581,7 @@ dumdum / dummy /ߡ/ dummyhead /ߡإå/ dump // -dumpcar /ץ/ +dumpcar /ץ;Ѹ(dump truck)/ dumper /ѡ/ dumping /ԥ/ dumpty /ץƥ/ץƥ/ @@ -24594,26 +24594,26 @@ dune / dungarees /ɥ󥴥/ dungeon /󥸥/ dungeons /󥸥/ -dunhill /ҥ/ +dunhill /ҥ;www.dunhill.com/ dunk // dunkerque /󥱥륯/ dunlop /å/ duo /ǥ奪/ duplex /ǥץå/ǥ塼ץå/ǥץ쥯/ duplicate /ǥץꥱ/ǥץꥱ/ǥ塼ץꥱ/ -dupont /ǥݥ/ +dupont /ǥݥ;Du Pont de Nemours/ duralumin /ߥ/ duran /ǥ/ durand /ǥ/ duras /ǥ饹/ duration /ǥ졼/ǥ쥤/ -durban /Х/ +durban /Х;/ durer /ǥ塼顼/ durga /ɥ륬/ durian /ɥꥢ/ durkheim /ǥ륱/ǥ륱/ dushanbe /ɥ/ -duskin // +duskin /;www.duskin.co.jp/ dusseldorf /ǥåɥ/ dust // dustbox /ȥܥå/ @@ -24650,7 +24650,7 @@ dying / dyingmessage /󥰥å/ dylan /ǥ/ģ/Dylan/Dylan(Dynamic language)/ dyna // -dynabook /ʥ֥å/ +dynabook /ʥ֥å;[ɸ]/ dynamic /ʥߥå/ dynamicrange /ʥߥå/ dynamics /ʥߥ/ʥߥå/ @@ -24658,27 +24658,27 @@ dynamism / dynamite /ʥޥ/ dynamo /ʥ/ dynasty /ʥƥ/ʥƥ/ -dyne // -dyquem /ǥ/ -dysprosium /ץ/ +dyne /;10^-5N/ +dyquem /ǥ;d'Yquem/ +dysprosium /ץ;[]66,Dy/ dystrophy /ȥե/ȥե/ -e ////// -e+ /ץ饹/ -eaccess // +e /;epsilon//;cyrillic/;(ȸ)/;(ʩ)/ +e+ /ץ饹;eee.eplus.co.jp/ +eaccess /;www.eaccess.net/ each /å/ eagle // eagles /륹/ ear /䡼// earhook /䡼եå/ earl // -earlgrey /륰쥤/륰졼/ +earlgrey /륰쥤;Earl Grey/륰졼/ early /꡼/ earlyamerican /꡼ꥫ/ earpad /䡼ѥå/ earphone /ۥ/ե/ե/ earring /// earth // -earthday /ǥ/ +earthday /ǥ;4.22/ earthquake // earthy // ease // @@ -24686,7 +24686,7 @@ easel / eason // east //ţ/ eastcoast /ȥ/ -eastend /ȥ/ +eastend /ȥ;East End, London/ easter // easteregg /å/ eastern // @@ -24699,12 +24699,12 @@ easyorder / easyrider /饤/ eat // eater // -eatin /ȥ/ -eau // -eaudecologne /ǥ/ -eaudetoilette /ɥȥ/ -ebank /Х/ -ebay /٥/ +eatin /ȥ;eat-in/ +eau /;(Fr)/ +eaudecologne /ǥ;eau de Cologne/ +eaudetoilette /ɥȥ;eau de toilette/ +ebank /Х;www.ebank.co.jp/ +ebay /٥;www.ebay.com/ ebola /ܥ/ ebonite /ܥʥ/ ebony /ܥˡ/ @@ -24713,7 +24713,7 @@ ecaprolactam / ecbatana /Х/ eccentric /ȥå/ echalote /å/ -echelon // +echelon /;ƹĤİƥ/ echinacea /ʥ/ʥ/ echo // echoback /Хå/ @@ -24723,14 +24723,14 @@ eckhard / eckhardt /åϥ/ eclaire /쥢/ eclipse /ץ/ -eco /// +eco //;(1932-) Umberto Eco/ ecobusiness /ӥͥ/ ecohouse /ϥ/ -ecole // +ecole /;ʩ/ ecological // ecologist // ecology // -ecomark /ޡ/ +ecomark /ޡ;夦ˤ䤵/ ecommerce /eޡ/Eޡ/ economic /Υߥå/ economical /Υߥ/ @@ -24742,8 +24742,8 @@ ecosystem / ecrit // ecriture /塼/ ecstasy // -ecuador /ɥ/ -ecup /Eå/ťå/ +ecuador /ɥ;.ec/ +ecup /Eå;20cm/ťå/ ed // eda // edam // @@ -24753,7 +24753,7 @@ edda / eddie /ǥ/ǥ/ eddy /ǥ/ǥ/ ede // -edel /ǥ/ǥ/ +edel /ǥ;(ȸ)⵮/ǥ/ edelweiss /ǥ磻/ eden /ǥ/ edgar /ɥ/ @@ -24762,7 +24762,7 @@ edge / edging /å/ edible /ǥ֥/ edie /ǥ/ǥ/ǥ/ -edinburgh /ǥХ/Х/ +edinburgh /ǥХ/Х;ꥹ/ edison //ǥ/ edit /ǥå/ǥ/Խ/ edith /ǥ/ǥ/ @@ -24779,7 +24779,7 @@ edna / edoard /ɥ/ɥ/ edoardo /ɥ/ edouard /ɥ/ɥ/ -edrive /Eɥ饤/ťɥ饤/ +edrive /Eɥ饤;E:/ťɥ饤/ edu /ɥ/ eduard /ɥ/ɥ/ǥ奢/ɥ/ eduardo /ɥ/ɥ/ǥ奢/ @@ -24787,28 +24787,28 @@ educatation / education /ǥ奱/ǥ奱/ educational /ǥ奱ʥ/ educator /ǥ奱/ -edutainment /ǥƥ/ǥƥ/ +edutainment /ǥƥ;[]education + entertainment/ǥƥ/ edward /ɥ/ edwin /ɥ/ -ee /// +ee /;eta// eel // eero // -ef /// +ef /;cyrillic// eff // effect /ե/ե/ effector /ե/ե/ե/ effects /ե/ effort /ե/ -egalite // +egalite /;(Fr)ʿ/ egg /å/ -eggman /åޥ/ +eggman /åޥ;Goo goo g'joob!/ egmont // ego // egoism // egoist // egoistic /ƥå/ egon // -egypt /ץ/ +egypt /ץ;.eg/ egyptian /ץ/ egyptianmau /ץޥ/ eichmann /ҥޥ/ @@ -24824,7 +24824,7 @@ eighty / eileen /꡼/ ein // einstein /󥷥奿/ -einsteinium /󥹥˥/ +einsteinium /󥹥˥;[]99,Es/ eira // eire // eisenhower /ϥ/ @@ -24832,7 +24832,7 @@ eiswein / eizenshtein /󥷥ƥ/ eject // ekaterina /ƥ꡼/꡼/ -el /// +el //;cyrillic/ elaine /쥤/쥤/ elan // elastic /饹ƥå/ @@ -24843,9 +24843,9 @@ elbow / elbowpad /ܡѥå/ elda // elder // -eldorado /ɥ/ +eldorado /ɥ;El Dorado/ eleanor //Υ/Υ/ʡ/쥢Ρ/ -elearning /e顼˥/ +elearning /e顼˥;e-learning/ elec /쥭/ elect /쥯/ election /쥯/ @@ -24856,7 +24856,7 @@ electrical / electricbass /쥯ȥå١/ electricguitar /쥯ȥå/ electro /쥯ȥ/ -electroluminescence /쥯ȥߥͥå/쥯ȥߥͥ/ +electroluminescence /쥯ȥߥͥå;EL/쥯ȥߥͥ/ electron /쥯ȥ/ electronic /쥯ȥ˥å/ electronica /쥯ȥ˥/ @@ -24876,7 +24876,7 @@ eleni / elenore /Υ/Υ/ʡ/ eleonora /쥪Ρ/ elephant /ե/ -elescorial /ꥢ/ +elescorial /ꥢ;El Escorial/ elevation /١/ elevator /١/١/ elevatorgirl /١/ @@ -24923,17 +24923,17 @@ elly / elma // elmer /ޡ/ elmo // -elnino /ˡ˥/ +elnino /ˡ˥;El Nino/ elocution /塼/ elodie /ǥ/ elohim /ҥ/ eloise // eloy /// -elpaso /ѥ/ +elpaso /ѥ;El Paso/ elric /å/ elroy // elsa /륶/륵/ -elsalvador /륵Хɥ/ +elsalvador /륵Хɥ;El Salvador,sv,.sv/ else /륹/ elsie /륷/륻/ elton /ȥ/ @@ -24943,7 +24943,7 @@ elvin / elvira /ӥ// elvis //ӥ/ elysee /ꥼ/ -em /// +em /;cyrillic// ema // emacs /ţ//Emacs/ޥå/Editing MACroS/ emacslisp /EmacsLisp/Emacs Lisp/ @@ -24988,14 +24988,14 @@ emporium / empower /ѥ/ empowerment /ѥ/ empty /ץƥ/ץƥ/ -emu /ߥ塼/ߥ/ +emu /ߥ塼;[Ļ]/ߥ;emulator/ emulate /ߥ졼/ߥ졼/ emulation /ߥ졼/ -emulator /ߥ졼/ߥ졼/ߥ졼/ߥ쥤/ +emulator /ߥ졼/ߥ졼/ߥ졼;/ߥ쥤;/ emulsion /ޥ른/ -emurate /ߥ졼/ -emurater /ߥ졼/ -en //// +emurate /ߥ졼;emulate/ +emurater /ߥ졼;emulator/ +en //;ʩ// enable /֥͡/ enableware /֥͡륦/ enamel /ʥ/ @@ -25032,19 +25032,19 @@ endpoint / endtoend /ɥġ/ enduser /ɥ桼/ɥ桼/ endymion /ǥߥ/ -ene // +ene /;energy/ enema /ͥ/ -energisch /ͥ륮å/ -energish /ͥ륮å/ +energisch /ͥ륮å;(ȸ)/ +energish /ͥ륮å;energisch?/ energy /ͥ륮/ʥ/ enfant /ե/ -engage /󥲡/󥬡/ -engagement /󥬡ޥ/󥲡/ +engage /󥲡/󥬡;ʩ/ +engagement /󥬡ޥ;ʩ/󥲡/ engagering /󥲡/ engel /󥲥/ engelbert /󥲥٥/󥲥С/ engelhardt /󥲥ϡ/ -engels /󥲥륹/쥹/ +engels /󥲥륹/쥹;()/ engine /󥸥/ enginebrake /󥸥֥졼/ engineer /󥸥˥/ @@ -25058,7 +25058,7 @@ englishhorn / enhance /ϥ/ enhanced /ϥ󥹥/ϥ󥹥/ enid /˥/ -enigma /˥/ +enigma /˥;/ enix /˥å/ enja // enjoy /󥸥祤/ @@ -25070,7 +25070,7 @@ ennis / ennui /˥奤/ enoch /Υ/Υå/Υå/ enola /Υ/ -enolagay /Υ饲/Υ顦/ +enolagay /Υ饲;Enola Gay/Υ顦/ enos /Υ/ enquete /󥱡/ enqueue /󥭥塼/ @@ -25081,7 +25081,7 @@ ensemble / entailment // entasis /󥿥/ enter /󥿡/ -enterbrain /󥿡֥쥤/ +enterbrain /󥿡֥쥤;www.enterbrain.co.jp/ enterkey /󥿡/ENTER/ enterprise /󥿡ץ饤/ entertainer /󥿡ƥʡ/󥿡ƥʡ/ @@ -25090,7 +25090,7 @@ enthalpy / entire /󥿥/ entitle /󥿥ȥ/ entity /ƥƥ/ -entoutcas /ġ/ +entoutcas /ġ;(Fr)en tout cas/ entrance /ȥ/ entrancehall /ȥ󥹥ۡ/ entrapment /ȥåץ/ @@ -25118,22 +25118,22 @@ epigonen / epigraph /ԥ/ epikuros /ԥ/ԥ/ epilogue /ԥ/ -epiphanie /ԥեˡ/ +epiphanie /ԥեˡ;ʩ/ epiphany /ԥեˡ/ epipolar /ԥݡ/ episode /ԥ/ episteme /ԥơ᡼/ epitaxy /ԥ/ԥ/ epitope /ԥȡ/ -eplus /ץ饹/ +eplus /ץ饹;eee.eplus.co.jp/ epoch /ݥå/ epochmaking /ݥåᥤ/ݥå᡼/ -epock /ݥå/ -epoque /ݥå/ +epock /ݥå;epoch?/ +epoque /ݥå;ʩ/ epoxy /ݥ/ eprecord /EP쥳/ -epsilon //ץ/// -epson /ץ/ +epsilon //ץ/;include// +epson /ץ;www.epson.co.jp/ eq /// equal /// equalise /饤/ @@ -25144,13 +25144,13 @@ equalizer / equity /ƥ/ƥ/ equiv /// equivalent /// -er //ӥ/Erbium/ +er /;cyrillic/ӥ/Erbium/ era //// erase /졼/ eraser /쥤/졼/졼/쥤/ erasmus /饹ॹ/ eratosthenes /ȥƥͥ/ -erbium /ӥ/ +erbium /ӥ;[]68,Er/ erda // erebos /ܥ/ erebus /ܥ/ @@ -25158,10 +25158,10 @@ erect / erection /쥯/ erector /쥯/ eren // -erg /륰/ +erg /륰;10^-7J/ ergo /르/ ergode /르/ -ergonomics /르Υߥ/ +ergonomics /르Υߥ;ʹֹ/ ergosterol /르ƥ/ eria /ꥢ/ eric /å/ @@ -25172,7 +25172,7 @@ erie / erik /å/ꥯ/ꥯ/ erika /ꥫ/ erikson /ꥯ/ -eritrea /ȥꥢ/ +eritrea /ȥꥢ;.er/ erlung // erma /// ermine /ߥ/ @@ -25182,9 +25182,9 @@ ernesto / ernie /ˡ/ ernst /󥹥/ ero // -eroanime /˥/ +eroanime /˥;erotic animation,Ѹ(hentai)/ eroero // -erogro // +erogro /;erotic and grotesque/ eroica // eros // erosite // @@ -25192,7 +25192,7 @@ erotic / erotica // eroticism /ƥ// erotomania /ȥޥ˥/ -erovideo /ӥǥ/ +erovideo /ӥǥ;Ѹ(porn video)/ err /顼/ errata /å/顼/ errol // @@ -25207,7 +25207,7 @@ errorsignal / erwin /// erythritol /ꥹȡ/ erythromycin /ꥹޥ/ -es ///󥹥˥/Einsteinium/ +es //;cyrillic/󥹥˥/Einsteinium/ esa // esc // escalate /졼/ @@ -25227,7 +25227,7 @@ eskimo / esmeralda // esoteric /ƥå/ esp /ESP/ -espace /ѥ/ѡ/ +espace /ѥ;(Fr)/ѡ/ espagnole /ѥ˥硼/ espana /ѡ˥/ espanol /ѥ˥硼/ @@ -25239,20 +25239,20 @@ esperanza / espoir /ݥ/ espressione /ץå/ espressivo /ץå/ -espresso /ץå/ +espresso /ץå;ڥ/ espressocoffee /ץåҡ/ espressomachine /ץåޥ/ץåޥ/ esprit /ץ/ esquimau /⡼/ -esquisse // -essai //å/å/ +esquisse /;ʩ/ +essai /;ʩ/å/å/ essay /å/å/å/ essayist /å/ esse /å/ essen /å/ essence /å/ essential /å󥷥/ -essentialoil /å󥷥륪/ +essentialoil /å󥷥륪;/ essex /å/ establish /֥å/ establishment /֥å/Ω/ @@ -25264,26 +25264,26 @@ ester / esterase /ƥ顼/ esthe // esther /ƥ// -esthesalon /ƥ/ +esthesalon /ƥ;esthetic salon/ esthetic /ƥƥå/ -estheticien /ƥƥ/ -estheticsalon /ƥƥå/ +estheticien /ƥƥ;ʩ/ +estheticsalon /ƥƥå;esthetic salon/ esthetique /ƥƥå/ -estima /ƥ/ -estonia /ȥ˥/ +estima /ƥ;[ɸ]ȥ西/ +estonia /ȥ˥;.ee/ estradiol /ȥ饸/ estragon /ȥ饴/ estrogen /ȥ/ estron /ȥ/ eta /// -etat // +etat /;ʩ/ etcetera /ȥȥ/ etch /å/ etching /å/ eternal /ʥ/ eternity /˥ƥ/˥ƥ/ -ethan /// -ethane // +ethan /;C2H6/;̾/ +ethane /;C2H6/ ethanol /Ρ/ ethel // ether /ƥ// @@ -25291,17 +25291,17 @@ etherboard / ethernet /ͥå/ ethica // ethics /å/ -ethiopia /ԥ/ƥԥ/ +ethiopia /ԥ;.et/ƥԥ/ ethnic /˥å/ ethnicity /˥ƥ/ ethno // ethos /ȥ/ȥ/ -ethyl // +ethyl /;-C2H5/ ethylalcohol /륢륳/ -ethylene // +ethylene /;C2H4/ ethylenediamine /󥸥ߥ/ ethylenegas /󥬥/ -ethyleneglycol /󥰥ꥳ/ +ethyleneglycol /󥰥ꥳ;C2H6O2/ eti /ƥ/ etienne /ƥ/ etiquette /å/ @@ -25320,8 +25320,8 @@ euccode /EUC euclid /桼å/ eudora /桼ɥ/ eugen // -eugene /桼/桼// -eukleides /쥤ǥ/桼å/ +eugene /桼/桼/;ʩ/ +eukleides /쥤ǥ/桼å;euclid/ euler /顼/ eunice /桼˥/ eunos /桼Υ/ @@ -25335,19 +25335,19 @@ euripides / euro /桼/ eurobeat /桼ӡ/ europa //衼å///ݿ/ݿ/ -europagp /衼åGP/ +europagp /衼åGP;[F1]/ europe /衼å////ݿ/ݿ/ european /衼ԥ/ -europium /桼ԥ/ +europium /桼ԥ;[]63,Eu/ eurostar /桼/ -eurus /桼饹// +eurus /桼饹;// eurydike /ǥ/ eva /// evaluate /Х奨/ɾ/ evaluator /Х奨/ -evamilk /Хߥ륯/ +evamilk /Хߥ륯;evaporated milk/ evangeline /󥸥/ -evangelion /󥲥ꥪ/ +evangelion /󥲥ꥪ;[˥]/ evangelist /Х󥸥ꥹ/ evans //Х/ evaporator /Хݥ졼/Хݥ졼/ @@ -25377,16 +25377,16 @@ evian / evidence /ӥǥ/ evil /ӥ/ evolution /ܥ塼/塼/ȯŸ/ -ew /// +ew /;/;/ ewan /楢/ -ewn ///// -ews /////󥸥˥󥰡ơ/ơ/ +ewn //;/;/;/ +ews //;/;/;/󥸥˥󥰡ơ/ơ/ ex /////å/ -exa // +exa /;[SIƬ]E,10^18/ excalibur /С/ exceed // excel // -excelan // +excelan /;[̾]/ excellence // excellent // excentric /ȥå/ @@ -25397,18 +25397,18 @@ exchange / excite // exciting /ƥ/ exclamation /᡼/ò// -exclamationmark /᡼ޡ/ +exclamationmark /᡼ޡ;/ exclusive /롼/ excursion // excuse /塼/ exe // exec /¹/ -exective /ƥ/ +exective /ƥ;executive/ execute /塼/ executive /ƥ/ƥ/ exercise //ţ/ exergy /륮/ -exhibition /ӥ/ӥ/ӥ/ӥ/ +exhibition /ӥ/ӥ;֥ӥפ/ӥ/ӥ/ exist /// exists // exit /å/ @@ -25453,21 +25453,21 @@ eyck / eye // eyebank /Х/ eyebrow /֥/֥/ -eyecatch /å/ +eyecatch /å;Ѹ/ eyecolor /顼/ eyecolour /顼/ eyecontact /󥿥/ eyeguard // eyeline /饤/ eyeliner /饤ʡ/ -eyemake /ᥤ/ +eyemake /ᥤ;eye makeup/ eyemask /ޥ/ eyes // eyeshadow /ɥ/ɡ/ eyre // ezekiel // ezra // -f ////ե/Flourine/ե/forte/ȿ/ +f /;phi//;ef (cyrillic)/ե/Flourine/ե;/forte/ȿ/ f#driver /F#0ɥ饤С/#1ɥ饤С/ f#key /F#0/ f#race /F#0졼/#1졼/ @@ -25477,7 +25477,7 @@ fa / fabian /եӥ/եӥ/ fabien /եӥ/ fabio /եӥ/ -fable /ե֥/ե֥/ +fable /ե֥;ʩ/ե֥/ fabless /ե֥쥹/ fabre /ե֥/ fabric /ե֥å/ @@ -25487,7 +25487,7 @@ facade / face /ե/ե/ facecare /ե/ faceline /ե饤/ -facemark /եޡ/ +facemark /եޡ;:-)/ facet /եå/ facetowel /ե/ facial /ե/ @@ -25522,17 +25522,17 @@ fairytale / faith /ե/ fake /ե/ fakefur /եե/ -falcom /ե륳/ +falcom /ե륳;www.falcom.co.jp/ falcon /ե륳/ -falkland /ե/ +falkland /ե;.fk/ fall /ե/ falla /ե/ fallback /եХå/ -falluja /ե롼/ +falluja /ե롼;饯/ false /ե륹/ե륹/// falsetto /ե륻å/ fame /ե/ե/ƣ/ -fami /ե/ +fami /ե;family/ famicom /եߥ/ famicon /եߥ/ familia /եߥꥢ/ @@ -25540,11 +25540,11 @@ familiar / family /եߥ꡼/եߥ/ familyclub /եߥ꡼/ familycomputer /եߥ꡼ԥ塼/եߥ/ -familymart /եߥ꡼ޡ/ +familymart /եߥ꡼ޡ;www.family.co.jp/ familyname /եߥ꡼͡/ familyplan /եߥ꡼ץ/ familyrestaurant /եߥ꡼쥹ȥ/ -famires /եߥ쥹/ +famires /եߥ쥹;family restaurant/ famous /եޥ/ fan /ե/ fanatic /եʥƥå/ @@ -25575,7 +25575,7 @@ farad / faraday /եǡ/ farandole /եɡ/ farce /ե륹/ -fareast /ե/ +fareast /ե;/ farewell /ե/ farfalle /եեå/ farina /ե꡼/ @@ -25584,7 +25584,7 @@ farmer / farming /եߥ/ farside /ե/ farther /ե/ -fascio /եå/ +fascio /եå;(ꥢ)/ fascism /ե/ fascist /ե/ fashion /եå/ @@ -25605,15 +25605,15 @@ fastener / fastfood /եȥա/եȥա/ fat /եå/ fatah /ե/ -fatal /ե/ե/ե/ +fatal /ե/ե;ʩ/ե;ʩ/ fate /ե/ father /ե/ե/ -fathercon /ե/ +fathercon /ե;father complex/ fatherland /ե/ fathers /ե/ fatima /եƥ/եƥ/ fats /եå/ -fauchon /ե/ +fauchon /ե;www.fauchon.fr/ faulkner /եʡ/ fault /ե/ե/ faulttolerance /եȥȥ/ @@ -25628,14 +25628,14 @@ fauvisme / favor /եС/ favorite /եХå/եå/ favour /եС/ -fax /եå/ե/եߥ/ƣ/FAX/ +fax /եå/ե/եߥ;facsimile/ƣ/FAX/ faxmodem /FAXǥ/եåǥ/ faxservice /FAXӥ/ fay /ե/ faye /ե/ե/ -fazzy /ե/ +fazzy /ե;fuzzy/ fb /ե졼Хåե/ -fcup /Få/ƥå/ +fcup /Få;22.5cm/ƥå/ fd /եåԡǥ/FD/ fe /Ŵ/Iron/ fear /ե/ե/ @@ -25646,7 +25646,7 @@ featuring / february /ե֥꡼/ federal /եǥ/ federico /եǥꥳ/ -fedora /եɡ/եɥ/ +fedora /եɡ;ޤ˹/եɥ/ fee /ե/ feed /ե/ feedback /եɥХå/ @@ -25673,21 +25673,21 @@ fellowship / felt /ե/ feltpen /եȥڥ/ female /ե᡼// -femi /ե/ +femi /ե;feminism,feminist/ femina /եߥ/ feminine /եߥ˥/ feminism /եߥ˥/ feminist /եߥ˥/ femme /ե/ -femto /ե/ +femto /ե;[SIƬ]f,10^-15/ fence /ե/ fencer /ե󥵡/ fencing /ե󥷥/ fender /ե/ fenderrhodes /ե/ -fendi /եǥ/ +fendi /եǥ;www.fendi.it/ fenelon /ե̥/ -fennel /եͥ/ +fennel /եͥ;袹/ fenollosa /եΥ/ fenrir /ե/ fentanyl /ե󥿥˥/ @@ -25701,41 +25701,41 @@ fermat / fermata /եޡ/ fermi /ե/ fermion /եߥ/եγ/ -fermium /եߥ/ +fermium /եߥ;[]100,Fm/ fern /ե/ fernand /եʥ/եʥ/ fernandes /եʥǥ/ fernandez /եʥǥ/ fernando /եʥ/ feroce /ե/ -ferragamo /ե饬/ -ferrara /ե顼/ +ferragamo /ե饬;www.salvatoreferragamo.it/ +ferrara /ե顼;ꥢ/ ferrari /ե顼/ ferre /ե/ ferreira /ե쥤/ ferrer /ե졼/ ferret /եå/ ferretti /եåƥ/ -ferri /ե/ +ferri /ե;(Ƭ) Ŵ/ ferrite /ե饤/ ferry /ե꡼/ fes /ե/ fest /ե/ -festa /ե/ +festa /ե;(ꥢ)/ festiva /եƥ/ festival /եƥХ/եƥ/ fetch /եå/ -feti /ե/ +feti /ե;fetishist/ fetish /եƥå/ fetishism /եƥ/ fettuccine /եåȥ/ -fettucine /եåȥ/ +fettucine /եåȥ;=fettuccine/ feuerbach /եХå/ fever /եС/ feynman /եޥ/ fez /ե/ե/ -ff /font-family/եƥå/fortessimo/ -fff /եƥå/fortessissimo/ +ff /font-family/եƥå;f궯/fortessimo/ +fff /եƥå;ff궯/fortessissimo/ fg /ե饦/ fiance /ե/ fiancee /ե/ @@ -25754,14 +25754,14 @@ fidelio / fidelity /եǥƥ/ field /ե/ fielder /ե/ -fielderschoice /ե祤/ +fielderschoice /ե祤;fielder's choice. / fieldgoal /եɥ/ fielding /եǥ/ fieldmap /եɥޥå/ -fieldnote /եɥΡ/ +fieldnote /եɥΡ;field-note/ fields /ե륺/ -fieldwork /եɥ/ -fiesta /ե/ +fieldwork /եɥ;field-work/ +fiesta /ե;()/ fifteen /եեƥ/ fifth /եե/ fifty /եեƥ/ @@ -25775,7 +25775,7 @@ fightingpose / fightmoney /եȥޥ͡/ figure /ե奢/ե奢/ figureskate /ե奢/ -fiji /ե/ե/ +fiji /ե;.fj/ե/ filament /ե/ filaria /եꥢ/ file /ե/ @@ -25814,7 +25814,7 @@ fin / fina /ե/ե/ final /եʥ/ finale /եʡ/ -finalfantasy /եʥե󥿥/ +finalfantasy /եʥե󥿥;[]Square/ finalise /եʥ饤/ finalist /եʥꥹ/ finalize /եʥ饤/ @@ -25822,7 +25822,7 @@ finallap / finance /եʥ/ financhier /եʥ󥷥/ financial /եʥ󥷥/ -financialplanner /եʥ󥷥ץʡ/ +financialplanner /եʥ󥷥ץʡ;FP/ finch /ե/ find /ե/ finder /ե/ե/ @@ -25841,7 +25841,7 @@ fingerprint / finish /ե˥å/ finishing /ե˥å/ fink /ե/ -finland /ե/ +finland /ե;.fi/ finlay /ե쥤/ finn /ե/ finnegan /եͥ/ @@ -25858,22 +25858,22 @@ firewall / firm /ե/ firmware /ե०/ first /ե//1/ -firstaid /եȥ/ +firstaid /եȥ;first-aid/ firstalbum /եȥХ/ firstbase /եȥ١/ firstclass /եȥ饹/եȡ饹/ firstcontact /եȥ󥿥/ firstfly /եȥե饤/ -firstgoro /եȥ/ +firstgoro /եȥ;(grounder)/ firstimpression /եȥץå/ -firstkiss /եȥ/ +firstkiss /եȥ;first kiss/ firstlady /եȥǥ/ firstmit /եȥߥå/ firstname /եȥ͡/ fischer /եå㡼/ fish /եå/ fisher /եå㡼/ -fisherman /եå㡼ޥ/ +fisherman /եå㡼ޥ;/ fishing /եå/ fisichella /ե/ fissler /ե顼/ @@ -25904,7 +25904,7 @@ flame / flamenco /ե/ flamingo /եߥ/ flamm /ե/ -flamme /ե/ +flamme /ե;(Fr) / flan /ե/ flanagan /եʥ/ flanders /ե/ @@ -25914,7 +25914,7 @@ flannel / flap /եå/ flapping /եåԥ/ flare /ե쥢/ե쥢/ -flareskirt /ե쥢/ե쥢/ +flareskirt /ե쥢;flared skirt/ե쥢/ flash /եå/ flashback /եåХå/ flashmemory /եå/եå꡼/ @@ -25936,13 +25936,13 @@ flavonol / flavor /ե졼С/ե쥤С/ե쥤/ƣ/Flavor/ flavortea /ե졼Сƥ/ flax /եå/ -fleamarket /ե꡼ޡå/ +fleamarket /ե꡼ޡå;¤λ/ fleece /ե꡼/ fleet /ե꡼/ fleming /եߥ/ -flesh /եå/ +flesh /եå;/ fletcher /եå㡼/ -flets /եå/ +flets /եå;flets.com/ fleur /ե롼/ fleuret /ե롼/ flex /եå/ @@ -25963,7 +25963,7 @@ flippers / flo /ե/ float /ե/ư/ floating /եƥ/ư/ -flock /եå/ +flock /եå;/ flon /ե/ flongas /ե󥬥/ floor /ե/ե/ @@ -25975,24 +25975,24 @@ floortam / flop /եå/ floppy /եåԡ/եåԥ/եå/ floppydisk /եåԡǥ/եåԥǥ/ -floppydiskdrive /եåԡǥɥ饤/ +floppydiskdrive /եåԡǥɥ饤;FDD/ flora /ե/ floral /ե/ flore /ե/ե/ floreal /ե쥢/ florence /ե/ե/ե/ե/ florent /ե/ -florentin /ե󥿥/ -florentine /եƥ/ +florentin /ե󥿥;(Fr) եĥ./ +florentine /եƥ;(Fr) եĥ./ flores /ե쥹/ե쥹/ floria /եꥢ/ florian /եꥢ/եꥢ/ florida /ե/ florist /եꥹ/ floss /ե/ -flour /ե/ +flour /ե;ʴ/ flow /ե/ե/ -flowchart /ե㡼/ե㡼/ +flowchart /ե㡼/ե㡼;/ flower /ե/ flowerarrangement /ե󥸥/ flowerbox /եܥå/ @@ -26003,9 +26003,9 @@ flowgraph / floyd /ե/ flugelhorn /ե塼ۥ/ե塼ۡ/ fluid /ե륤/ -fluke /եå/ -fluorine /ե/ -fluorite /ե饤/ե륪饤/ +fluke /եå;ޤ/ +fluorine /ե;F/ +fluorite /ե饤;/ե륪饤/ fluoro /ե륪/եò/ʦ/ fluorocarbon /ե륪ܥ/ flush /եå/ @@ -26015,13 +26015,13 @@ flutter / flux /եå/ fluxus /ե륯/ fly /ե饤/ϥ/ -flyfishing /ե饤եå/ +flyfishing /ե饤եå;fly-fishing/ flying /ե饤/ -flying-pan /ե饤ѥ/ -fm /եߥ/Fermium/ե/ -fmarinos /FޥΥ/ +flying-pan /ե饤ѥ;frying-pan?/ +fm /եߥ/Fermium/ե;frequency modulation/ +fmarinos /FޥΥ;[J꡼]/ fmradio /FM饸/ -foam /ե/ +foam /ե;ˢ/ foaming /եߥ/ focaccia /եå/ focus /ե/ @@ -26031,7 +26031,7 @@ foehn / fog /ե/ foghorn /եۡ/ foglamp /ե/ -foiegras /ե/ +foiegras /ե;foie gras/ foil /ۥ/ե/ fold /ե/ folder /ե/ե/ @@ -26043,23 +26043,23 @@ folk / folkdance /ե/ folkduo /եǥ奪/ folkguitar /ե/ -folklore /ե륯/ե/ +folklore /ե륯;()/ե/ folksong /ե/ -follifollie /եե/ +follifollie /եե;www.follifollie.com/ follow /ե/ե/ follower /ե/ followthrough /ե롼/ followup /եå/ folly /ե꡼/ -foma /ե/ -fond /ե/ե/ +foma /ե;[ɸ]NTT DoCoMo/ +fond /ե/ե;ʩ/ fondant /ե/ -fonddeveau /եɥܡ/ +fonddeveau /եɥܡ;fond de veau/ fondu /եǥ/ fondue /եǥ/ fons /ե/ font /ե/ -fontaine /եơ/ +fontaine /եơ;(Fr)/ fontainebleau /եơ̥֥/եƥ֥/ fontana /ե󥿥/ fontlist /եȥꥹ/ @@ -26099,7 +26099,7 @@ foreman / forest /ե쥹/ forestcat /ե쥹ȥå/ forester /ե쥹/ -foret /ե/ +foret /ե;(Fr) / forever /եС/ե/ fork /ե/ forkball /եܡ/ @@ -26132,14 +26132,14 @@ fortis / fortran /եȥ/ fortress /եȥ쥹/ fortune /ե/ -fortunecookie /ե󥯥å/ +fortunecookie /ե󥯥å;What a pity, you cannot read it!/ fortworth /եȥ/ forum /ե/ forval /եХ/ forward /ե/ forwarder /ե/ե/ե/ forwarding /եǥ/ -forword /ե/ +forword /ե;forward/ foster /ե/ foucault /ա/ foul /ե/ե/ @@ -26165,17 +26165,17 @@ fox / foxtrot /եåȥå/ foxy /ե/ foyer /ۥ磻/ -fp /եƥԥ/forte piano/ +fp /եƥԥ;˼夯/forte piano/ fr /ե󥷥/Francium/ fractal /ե饯/ fragile /ե饸㥤/ fragment /ե饰/ fragmentation /ե饰ơ/ fragrance /ե쥰/ե饰/ -fraiche /ե졼/ -frais /ե/ +fraiche /ե졼;(Fr) / +google /;www.google.com/ goose // gopher /ե/ goran /// gorbachev /Х/ gordon /ɥ/ gore // -goretex /ƥå/ +goretex /ƥå;[ɸ]/ gorge /른/ gorgeous /㥹/ gorgias /륮/ -gorgo /르/ +gorgo /르;13/ gorgon /르/ gorgonzola /르󥾡/ gorilla // @@ -27185,12 +27185,12 @@ gosign / gospel /ڥ/ gossip /å/ gotama /// -goteborg /ƥܥ/衼ƥܥ/ƥܥ/ƥܥ/ +goteborg /ƥܥ;ǥ/衼ƥܥ/ƥܥ/ƥܥ/ goth // gothenburg /ƥܥ/ gothic /å/ gothiclolita /å꡼// -gothloli // +gothloli /;gothic lolita/ gottfried /åȥե꡼/ gottingen /åƥ󥲥/ gouache /å/å/å/ @@ -27205,16 +27205,16 @@ government / governor /Хʡ/ gown // goya // -gpan /ѥ/ǥѥ/Gѥ/ +gpan /ѥ;Ѹ(jeans)/ǥѥ/Gѥ/ gpl /GPL/ -gpllicence /GPL饤/ -gpllicense /GPL饤/ +gpllicence /GPL饤;NB:general public licence licence/ +gpllicense /GPL饤;NB:general public license license/ grab // grabber /С/ grace /졼/쥤/ graceful /쥤ե/졼ե/ gracia /饷/ -gracias /饷/ +gracias /饷;()/ gracie /쥤/ gracious /쥤㥹/ gracq /å/ @@ -27224,7 +27224,7 @@ grade / gradedown /졼ɥ/ gradeup /졼ɥå/쥤ɥå/ gradient /ǥ/ -gradius /ǥ/ +gradius /ǥ;[]ʥ/ graduate /ǥ奨/ر/ graf // graffiti /եƥ/ @@ -27234,31 +27234,31 @@ gram / grammar /ޡ/ gramme // grammy /ߡ/ -grampus /ѥ/ -grampuseight /ѥ/ +grampus /ѥ;[J꡼]̾Ų/ +grampuseight /ѥ;[J꡼]̾Ų/ gramsci /ॷ/ gran // granada /ʥ/ granados /ʥɥ/ -grand /// -grandcanyon /ɥ˥/ -grandcru /󥯥/ +grand //;ʩ/ +grandcanyon /ɥ˥;Grand Canyon/ +grandcru /󥯥;grand cru/ granddesign /ɥǥ/ grande // grandfinale /ɥեʡ/ grandhotel /ɥۥƥ/ grandi /ǥ/ grandioso /ǥ/ -grandmarnier /ޥ˥/ -grandmaster /ɥޥ/ +grandmarnier /ޥ˥;(Fr) grand marnier/ +grandmaster /ɥޥ;grand master/ grandopen /ɥץ/ grandopera /ɥڥ/ grandpiano /ɥԥ/ -grandprix /ץ/ +grandprix /ץ;grand prix/ grandslam /ɥ/ grandvin // grange /󥸥/ -granite /˥å/˥/ +granite /˥å/˥;(Fr)ɹ/ grant // granular /˥顼/ granville /ӥ// @@ -27290,7 +27290,7 @@ grassski / gratin /饿/ grating /졼/졼ƥ/ grau /饦/ -grave /쥤/쥤/顼/顼/顼/ +grave /쥤/쥤/顼;ʩ/顼/顼;(ꥢ)/ graves /顼/ gravity /ӥƥ/ƥ/ gravure /ӥ/ @@ -27304,21 +27304,21 @@ grayzone / graz /顼/ graze /쥤/ grazia /ĥ/ -grazie /å/ +grazie /å;(ꥢ)/ grazioso /ĥ/ grease /ꥹ/꡼/ great /졼/쥤/ greatbarrierreef /졼ȥХꥢ꡼/ -greatbritain /졼ȥ֥ƥ/ +greatbritain /졼ȥ֥ƥ;Great Britain/ greatdane /졼ȥǥ/ greater /졼/쥤/ greatest /졼ƥ/쥤ƥ/ greco /쥳/ grecoroman /쥳ޥ/ -gree /꡼/ -greece /ꥷ/ꥷ/꡼/ -greeclub /꡼/ -greek /////////////////////////꡼/ꥷ/ +gree /꡼;www.gree.jp/ +greece /ꥷ;.gr/ꥷ/꡼/ +greeclub /꡼;gree club/ +greek /;alpha/;beta/;gamma/;delta/;epsilon/;zeta/;eta/;theta/;iota/;kappa/;lambda/;mu/;nu/;xi/;omicron/;pi/;rho/;sigma/;tau/;upsilon/;phi/;chi/;psi/;omega/꡼/ꥷ/ green /꡼/ greenasparagus /꡼󥢥ѥ饬/ greenbelt /꡼٥/ @@ -27327,8 +27327,8 @@ greencard / greene /꡼/ greenfee /꡼ե/꡼ե/ greenhouse /꡼ϥ/ -greenland /꡼/ -greenpeace /꡼ԡ/ +greenland /꡼;.gl/ +greenpeace /꡼ԡ;www.greenpeace.org/ greenpeas /꡼ԡ/ greenpepper /꡼ڥåѡ/ greenpia /꡼ԥ/ @@ -27344,13 +27344,13 @@ gregorio / gregorius /쥴ꥦ/ gregory /쥴꡼/ gremlin // -grenada /ʥ/ +grenada /ʥ;.gd/ grenade /͡/ -grenier /˥/ +grenier /˥;(Fr)΢/ grenoble /Ρ֥/ grep /å/ gresham /쥷/ -gresia /ꥷ/ꥷ/ +gresia /ꥷ;(<)/ꥷ/ greta /쥿/ gretchen /졼ȥҥ/å/졼ȥإ/ grete /졼/ @@ -27380,7 +27380,7 @@ gripper / grisaille /ꥶ/ grissini /å/ grit /å/ -gro // +gro /;grotesque/ grocery /꡼/ groggy /å/ groom /롼/ @@ -27395,7 +27395,7 @@ grotesque / ground //饦/ grounder /饦// grounding /饦ǥ/ -groundzero /饦ɥ/ +groundzero /饦ɥ;/ group /롼/ grouphome /롼ץۡ/ groupid /롼ID/ @@ -27406,7 +27406,7 @@ groupsounds / groupware /롼ץ/ groupwork /롼ץ/ groupy /롼ԡ/ -grow /// +grow /;Ĺ// growing // growl // growth /// @@ -27417,34 +27417,34 @@ gruyere / gruziya /른/ gryphon /ե/ gs /ghostscript/ -gspot /ǥݥå/Gݥå/ +gspot /ǥݥå;G-spot/Gݥå/ gt // gtype /G/ǥ/ guadalajara /ϥ/ guadalcanal /륫ʥ/ -guadeloupe /ɥ롼/ -guam /// +guadeloupe /ɥ롼;.gp/ +guam /;.gu// guanidine /˥/ -guanine /˥/ +guanine /˥;G/ guano // guanosine /Υ/ -guantanamo /󥿥ʥ/ +guantanamo /󥿥ʥ;塼/ guarana // guarantee /ƥ/ƥ// guard // guardian /ǥ/ -guardman /ɥޥ/ +guardman /ɥޥ;Ѹ(security guard)/ guardrail /ɥ졼/ -guatemala /ƥޥ/ƥޥ/ƥޥ/ +guatemala /ƥޥ;gt/ƥޥ/ƥޥ/ guattari // guava /// -guayaquil /䥭/ -gucci /å/ +guayaquil /䥭;ɥ(gye)/ +gucci /å;www.gucci.com/ guccio /å/ guerin /// -guerlain // +guerlain /;www.guerlain.com/ guernica /˥/ -guernsey /󥸡/ +guernsey /󥸡;.gg/ guerre // guerrilla // guess // @@ -27453,7 +27453,7 @@ guestbook / guesthouse /ȥϥ/ guestroom /ȥ롼/ guetre /ȥ/ -guevara /Х/ +guevara /Х;Ernesto Che Guevara/ guggenheim /åϥ/ guglielmo /ꥨ/ gui /ե桼󥿡ե/GUI/ @@ -27473,9 +27473,9 @@ guillaume / guillotine // guilty /ƥ/ƥ/ guin //// -guinea /˥/ -guineabissau /˥ӥ/ -guinness /ͥ/ +guinea /˥;.gn/ +guineabissau /˥ӥ;Guinea-Bissau/ +guinness /ͥ;www.guinness.ie/ guinnessbook /֥ͥå/ guiro // guitar // @@ -27484,21 +27484,21 @@ guitarist / guitarmagazine /ޥ/ guitarsolo // guitarsynth // -gukbap /å/ +gukbap /å;(ī)/ gulda // gulf // -gull // +gull /;/ gulose // gum /// -gumband /Х/ -gumbo // +gumband /Х;rubber band/ +gumbo /;/ gumboat /ܡ/ gumhose /ۡ/ gumpacking /ѥå/ -gumsyrup /ॷå/ -gumtape /ơ/ +gumsyrup /ॷå;gum syrup/ +gumtape /ơ;Ѹ(packing tape)/ gun // -gundam // +gundam /;[˥]/ gunman /ޥ/ gunnar /ʡ/ gunner /ʡ/ @@ -27510,21 +27510,21 @@ gurkha / guru // gus // gushose /ۡ/ -gust // +gust /;www.gust.co.jp/ gusta // gustaf // gustav // gustave //她/她/ -gusto ///ȡ/ +gusto /;Ѹ/;ꥢ)/ȡ/ gut /å/ gutenberg /ƥ٥륯/ƥ٥륰/ gutguitar /åȥ/ gutierrez /ƥ쥹/ guts /å/ -gutspose /åĥݡ/ +gutspose /åĥݡ;Ѹ/ gutter /// -guy ////奤/ -guyana // +guy //;ʩ//奤/ +guyana /;.gy/ gw /ǥ󥦥/ȥ/GateWay/ gwen /// gym // @@ -27534,11 +27534,11 @@ gynt / gypsy /ץ/ gyro /㥤/ gyroscope /㥤/ -h /å//ϡ//Hydrogen/ +h /å//ϡ;(ȸ)//Hydrogen/ h# /ʿ#0ǯ/ʿ#0ǯ/ h#.#.# /ʿ#0ǯ#0#0/ haag /ϡ/ -haagendazs /ϡå/ +haagendazs /ϡå;Haagen-Dazs/ haas /ϡ/ habakkuk /ϥХ/ habanera /ϥХͥ/ @@ -27559,14 +27559,14 @@ hadamard / hades /ϥǥ/ hadley /ϥɥ꡼/ϥɥ졼/ hadron /ϥɥ/ -hafnium /ϥե˥/ +hafnium /ϥե˥;[]72,Hf/ hagen /ϡ/ haggai /ϥ/ -hague /ء/ +hague /ء;the Hague, Holland/ hahn /ϡ/ -hahnium /ϡ˥/ +hahnium /ϡ˥;[]105,Hn/ haines /إ/ -haiphong /ϥե/ +haiphong /ϥե;٥ȥʥ/ hair /إ/إ/ hairaccessory /إ꡼/ hairball /إܡ/ @@ -27580,7 +27580,7 @@ hairdye / hairgum /إ/ hairline /إ饤/ hairmake /إᥤ/إ᡼/ -hairnude /إ̡/ +hairnude /إ̡;Ѹ/ hairpiece /إԡ/ hairpin /إԥ/ hairpincurve /إԥ󥫡/ @@ -27588,8 +27588,8 @@ hairsalon / hairspray /إץ졼/ hairstyle /إ/إ/ hairtonic /إȥ˥å/ -haiti /ϥ/ϥƥ/ -hajj /ϥå/ +haiti /ϥ;.ht/ϥƥ/ +hajj /ϥå;[]/ haken /ϡ/ hakenkreuz /ϡ󥯥/ hakkinen /ϥåͥ/ @@ -27600,7 +27600,7 @@ halcion / half /ϡ/ halfback /ϡեХå/ halfbottle /ϡեܥȥ/ -halfcoat /ϡե/ +halfcoat /ϡե;Ѹ(half-length coat)/ halfcourt /ϡե/ halfmarathon /ϡեޥ饽/ halfmirror /ϡեߥ顼/ @@ -27616,22 +27616,22 @@ halfway / hali /ϡ꡼/ haliburton /ϥСȥ/ halifax /ϥեå/ -halim /ϥ/ +halim /ϥ;ɥͥ(hlp)/ hall /ۡ/ halle /ϥ/ϥ/ hallelujah /ϥ/ -halley /ϥ졼/ϥ꡼/ +halley /ϥ졼/ϥ꡼;Edmund Halley (1656-1742)/ halloween /ϥ/ϥ/ hallstaff /ۡ륹å/ halo /ϥ/ϥ/ halogen /ϥ/ halogenheater /ϥҡ/ halogenlamp /ϥ/ -halon /ϥ/ +halon /ϥ;CF3Brʤ/ halothane /ϥ/ halt /ۥ/ halter /ۥ륿/ -halterneck /ۥ륿ͥå/ +halterneck /ۥ륿ͥå;halter-neck/ ham /ϥ/ hamadan /ϥޥ/ hamam /ϥޥ/ @@ -27640,8 +27640,8 @@ hamas / hambacker /ϥХå/ hamburg /ϥС/ϥ֥륯/ϥ֥륰/ hamburger /ϥС/ -hamegg /ϥ२å/ -hameln /ϡ/ +hamegg /ϥ२å;Ѹ(ham and eggs)/ +hameln /ϡ;ɥ/ hamilton /ϥߥȥ/ hamiltonian /ϥߥȥ˥/ hamlet /ϥå/ @@ -27671,7 +27671,7 @@ handcream / handel /إǥ/ handgun /ϥɥ/ handheld /ϥɥإ/ -handi /ϥǥ/ϥ/ϥǥ/ +handi /ϥǥ;handicap/ϥ/ϥǥ/ handicap /ϥǥå/ handkerchief /ϥ󥫥/ϥ󥫥/ϥ󥱥/ handle /ϥɥ/ @@ -27687,9 +27687,9 @@ handsfree / handshake /ϥɥ/ handsoap /ϥɥ/ handsome /ϥ󥵥/ -handtowel /ϥɥ/ +handtowel /ϥɥ;napkin/ handy /ϥǥ/ϥǥ/ -handycam /ϥǥ/ +handycam /ϥǥ;[ɸ]SONY. (