procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move runtime leim lisp files to lisp/leim directory

Browse source 
This allows us to reuse much of the lisp build and installation machinery,
rather than duplicating it.

* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.

* README: Update for leim changes.

* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.

* make-dist: Update for files from leim/ now being in lisp/leim/.

* doc/lispref/loading.texi (Library Search):
* doc/lispref/os.texi (Startup Summary): No more leim directory.

* leim/Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.

* leim/README: Update for moved leim/ directory.

* leim/leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.

* lisp/Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on lisp/leim rule.
(leim): New rule.

* lisp/loadup.el: Move leim-list.el to leim/ subdirectory.

* lisp/startup.el (normal-top-level): No more leim directory.

* lisp/international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* lisp/international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.

* lisp/leim/quail: Move here from ../leim.

* lisp/leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.

* lisp/leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.

* nt/README.W32:
* nt/addpm.c (env_vars):
* nt/epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* nt/paths.h (PATH_LOADSEARCH): No more leim directory.

* src/Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .

* src/epaths.in (PATH_DUMPLOADSEARCH):

* src/lread.c (load_path_default):

* src/nsterm.m (ns_load_path): No more leim directory.

* .bzrignore: Update for relocated leim files.
This commit is contained in:
Glenn Morris 2013-11-26 22:15:06 -08:00
parent 4cbac8e94b
commit cb6c95a394
67 changed files with 258 additions and 258 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
ChangeLog
View file

@ -1,3 +1,20 @@
2013-11-27 Glenn Morris <rgm@gnu.org>
* Makefile.in (abs_builddir, leimdir): Remove.
(buildlisppath, SUBDIR, COPYDIR, COPYDESTS): No more leim directory.
(epaths-force-w32): No longer set BLD.
(leim): Remove.
(install-arch-indep): No longer run or install leim.
(mostlyclean, clean): No longer run leim rule.
(bootstrap-clean): Change leim target.
(maintainer-clean): Add leim.
(check-declare): Remove leim.
* README: Update for leim changes.
* configure.ac (leimdir): Remove.
(standardlisppath): No more leimdir.
* make-dist: Update for files from leim/ now being in lisp/leim/.
2013-11-26 Glenn Morris <rgm@gnu.org>
Preload leim-list.el.

56
Makefile.in
View file

@ -164,7 +164,6 @@ bitmapdir=@bitmapdir@
# We use $(srcdir) explicitly in dependencies so as not to depend on VPATH.
srcdir=@srcdir@
abs_srcdir=@abs_srcdir@
abs_builddir=@abs_builddir@
# MinGW CPPFLAGS may use this.
abs_top_srcdir=@abs_top_srcdir@
@ -191,15 +190,13 @@ iconsrcdir=$(srcdir)/etc/images/icons
# These variables hold the values Emacs will actually use. They are
# based on the values of the standard Make variables above.
# Where to install the lisp, leim files distributed with
# Emacs. This includes the Emacs version, so that the
# lisp files for different versions of Emacs will install
# themselves in separate directories.
# Where to install the lisp files distributed with Emacs.
# This includes the Emacs version, so that the lisp files for different
# versions of Emacs will install themselves in separate directories.
lispdir=@lispdir@
leimdir=@leimdir@
# Directories Emacs should search for standard lisp files.
# The default is ${lispdir}:${leimdir}.
# The default is ${lispdir}.
standardlisppath=@standardlisppath@
# Directories Emacs should search for lisp files specific to this
@ -219,11 +216,9 @@ lisppath=@lisppath@
# to help Emacs find its lisp files before they've been installed
# in their final location.
# This should be a colon-separated list of directories.
# Normally it points to the lisp/ directory in the sources and
# the leim/ directory in the build tree.
# Normally it points to the lisp/ directory in the sources.
# NB lread.c relies on lisp/ being first here.
# TODO generate leim in srcdir also, prebuild in tarfiles.
buildlisppath=${abs_srcdir}/lisp:${abs_builddir}/leim
buildlisppath=${abs_srcdir}/lisp
# Where to install the other architecture-independent
# data files distributed with Emacs (like the tutorial,
@ -278,7 +273,7 @@ EMACS = ${EMACS_NAME}${EXEEXT}
EMACSFULL = `echo emacs-${version} | sed '$(TRANSFORM)'`${EXEEXT}
# Subdirectories to make recursively.
SUBDIR = $(NTDIR) lib lib-src src lisp leim
SUBDIR = $(NTDIR) lib lib-src src lisp
# The subdir makefiles created by config.status.
SUBDIR_MAKEFILES_IN = @SUBDIR_MAKEFILES_IN@
@ -287,10 +282,9 @@ SUBDIR_MAKEFILES = `echo $(SUBDIR_MAKEFILES_IN:.in=) | sed 's|$(srcdir)/||g'`
# 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"
# separately.
COPYDIR = ${srcdir}/etc ${srcdir}/lisp
COPYDESTS = "$(DESTDIR)${etcdir}" "$(DESTDIR)${lispdir}"
all: ${SUBDIR}
@ -341,7 +335,6 @@ msys_sed_sh_escape=sed -e 's/[];$$*.^[]/\\\\&/g'
# '/foo/bar').
epaths-force-w32: FRC
@(w32srcdir=`${srcdir}/build-aux/msys-to-w32 "${srcdir}"`; \
w32blddir=`${srcdir}/build-aux/msys-to-w32 .`; \
w32prefix=`${srcdir}/build-aux/msys-to-w32 "${prefix}" N`; \
w32prefixpattern=`echo "${w32prefix}" | ${msys_sed_sh_escape}` ; \
w32locallisppath=`${srcdir}/build-aux/msys-to-w32 "${locallisppath}" N ":" "\\;" | ${msys_w32prefix_subst}` ; \
@ -349,7 +342,6 @@ epaths-force-w32: FRC
-e 's;\(#.*PATH_SITELOADSEARCH\).*$$;\1 "'"$${w32locallisppath}"'";' \
-e '/^.*#/s/@VER@/${version}/g' \
-e '/^.*#/s/@CFG@/${configuration}/g' \
-e '/^.*#/s|@BLD@|$${w32blddir}|g' \
-e "/^.*#/s|@SRC@|$${w32srcdir}|g") && \
${srcdir}/build-aux/move-if-change epaths.h.$$$$ src/epaths.h
@ -361,12 +353,11 @@ lib-src src: $(NTDIR) lib
src: lib-src
# We need to build `emacs' in `src' to compile the *.elc files in `lisp'
# and `leim'.
lisp leim: src
# We need to build `emacs' in `src' to compile the *.elc files in `lisp'.
lisp: src
# These targets should be "${SUBDIR} without `src'".
lib lib-src lisp leim nt: Makefile FRC
lib lib-src lisp nt: Makefile FRC
cd $@ && $(MAKE) all $(MFLAGS) \
CC='${CC}' CFLAGS='${CFLAGS}' CPPFLAGS='${CPPFLAGS}' \
LDFLAGS='${LDFLAGS}' MAKE='${MAKE}'
@ -567,7 +558,7 @@ set_installuser=for installuser in $${LOGNAME} $${USERNAME} $${USER} \
## work correctly, and therefore no idea when tar can be replaced.
## See also these comments from 2004 about cp -r working fine:
## http://lists.gnu.org/archive/html/autoconf-patches/2004-11/msg00005.html
install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
install-arch-indep: lisp install-info install-man ${INSTALL_ARCH_INDEP_EXTRA}
-set ${COPYDESTS} ; \
unset CDPATH; \
$(set_installuser); \
@ -579,13 +570,8 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
[ "$$exp_dest" = "`cd $${dir} && /bin/pwd`" ] && continue ; \
else true; \
fi; \
if [ "$${dir}" = "leim/quail" ]; then \
[ "`cd $${dir} && /bin/pwd`" = "`cd ${srcdir}/leim/quail && /bin/pwd`" ] && \
continue ; \
else \
rm -rf "$${dest}" ; \
umask 022; ${MKDIR_P} "$${dest}" ; \
fi ; \
rm -rf "$${dest}" ; \
umask 022; ${MKDIR_P} "$${dest}" ; \
echo "Copying $${dir} to $${dest}..." ; \
(cd $${dir}; tar -chf - . ) \
| (cd "$${dest}"; umask 022; \
@ -612,8 +598,6 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
done ); \
find "$${dest}" -exec chown $${installuser} {} ';' ;\
done
-rm -f "$(DESTDIR)${leimdir}/leim-list.el"
${INSTALL_DATA} leim/leim-list.el "$(DESTDIR)${leimdir}/leim-list.el"
-rm -f "$(DESTDIR)${lispdir}/subdirs.el"
umask 022; $(srcdir)/build-aux/update-subdirs "$(DESTDIR)${lispdir}"
subdir="$(DESTDIR)${datadir}/emacs/${version}/site-lisp" ; \
@ -624,7 +608,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
( echo "Compressing *.el ..." ; \
unset CDPATH; \
thisdir=`/bin/pwd`; \
for dir in "$(DESTDIR)${lispdir}" "$(DESTDIR)${leimdir}"; do \
for dir in "$(DESTDIR)${lispdir}"; do \
cd "$${thisdir}" ; \
cd "$${dir}" || exit 1 ; \
for f in `find . -name "*.elc" -print`; do \
@ -821,7 +805,6 @@ mostlyclean: FRC
-cd doc/misc && $(MAKE) $(MFLAGS) mostlyclean
-cd doc/lispref && $(MAKE) $(MFLAGS) mostlyclean
-cd doc/lispintro && $(MAKE) $(MFLAGS) mostlyclean
cd leim && $(MAKE) $(MFLAGS) mostlyclean
### `clean'
### Delete all files from the current directory that are normally
@ -843,7 +826,6 @@ clean: FRC
-cd doc/misc && $(MAKE) $(MFLAGS) clean
-cd doc/lispref && $(MAKE) $(MFLAGS) clean
-cd doc/lispintro && $(MAKE) $(MFLAGS) clean
cd leim && $(MAKE) $(MFLAGS) clean
cd nextstep && $(MAKE) $(MFLAGS) clean
### `bootclean'
@ -892,7 +874,7 @@ bootstrap-clean: FRC
-cd doc/misc && $(MAKE) $(MFLAGS) maintainer-clean
-cd doc/lispref && $(MAKE) $(MFLAGS) maintainer-clean
-cd doc/lispintro && $(MAKE) $(MFLAGS) maintainer-clean
cd leim && $(MAKE) $(MFLAGS) maintainer-clean
cd leim && $(MAKE) $(MFLAGS) bootstrap-clean
cd lisp && $(MAKE) $(MFLAGS) bootstrap-clean
cd nextstep && $(MAKE) $(MFLAGS) maintainer-clean
for dir in test/automated admin/unidata; do \
@ -917,6 +899,7 @@ top_maintainer_clean=\
rm -fr autom4te.cache
maintainer-clean: bootstrap-clean FRC
cd src && $(MAKE) $(MFLAGS) maintainer-clean
cd leim && $(MAKE) $(MFLAGS) maintainer-clean
cd lisp && $(MAKE) $(MFLAGS) maintainer-clean
for dir in test/automated admin/unidata; do \
[ ! -d $$dir ] || (cd $$dir && $(MAKE) $(MFLAGS) maintainer-clean); \
@ -1083,5 +1066,4 @@ check-declare:
echo "You must build Emacs to use this command"; \
exit 1; \
fi
cd leim && $(MAKE) $(MFLAGS) $@
cd lisp && $(MAKE) $(MFLAGS) $@

7
README
View file

@ -64,9 +64,10 @@ There are several subdirectories:
its primitives, the redisplay code, and some basic editing
functions).
`lisp' holds the Emacs Lisp code for Emacs (most everything else).
`leim' holds the library of Emacs input methods, Lisp code and
auxiliary data files required to type international characters
which can't be directly produced by your keyboard.
`leim' holds the original source files for the generated files
in lisp/leim. These form the library of Emacs input methods,
required to type international characters that can't be
directly produced by your keyboard.
`lib' holds source code for libraries used by Emacs and its utilities
`lib-src' holds the source code for some utility programs for use by or
with Emacs, like movemail and etags.

5
configure.ac
View file

@ -80,8 +80,7 @@ dnl hence the single quotes. This is per the GNU coding standards, see
dnl (autoconf) Installation Directory Variables
dnl See also epaths.h below.
lispdir='${datadir}/emacs/${version}/lisp'
leimdir='${datadir}/emacs/${version}/leim'
standardlisppath='${lispdir}:${leimdir}'
standardlisppath='${lispdir}'
locallisppath='${datadir}/emacs/${version}/site-lisp:'\
'${datadir}/emacs/site-lisp'
lisppath='${locallisppath}:${standardlisppath}'
@ -1683,7 +1682,6 @@ if test "${HAVE_NS}" = yes; then
infodir="\${ns_appresdir}/info"
mandir="\${ns_appresdir}/man"
lispdir="\${ns_appresdir}/lisp"
leimdir="\${ns_appresdir}/leim"
INSTALL_ARCH_INDEP_EXTRA=
fi
@ -4490,7 +4488,6 @@ AC_SUBST(libexecdir)
AC_SUBST(mandir)
AC_SUBST(infodir)
AC_SUBST(lispdir)
AC_SUBST(leimdir)
AC_SUBST(standardlisppath)
AC_SUBST(locallisppath)
AC_SUBST(lisppath)

5
doc/lispref/ChangeLog
View file

@ -1,3 +1,8 @@
2013-11-27 Glenn Morris <rgm@gnu.org>
* loading.texi (Library Search):
* os.texi (Startup Summary): No more leim directory.
2013-11-26 Glenn Morris <rgm@gnu.org>
* os.texi (Startup Summary): Update for leim-list being preloaded.

11
doc/lispref/loading.texi
View file

@ -270,7 +270,6 @@ is a directory something like
"/usr/local/share/emacs/@var{version}/lisp"
@end example
followed by a similarly named @file{leim} directory.
(In this and the following examples, replace @file{/usr/local} with
the installation prefix appropriate for your Emacs.)
These directories contain the standard Lisp files that come with
@ -278,10 +277,12 @@ Emacs. If Emacs cannot find them, it will not start correctly.
If you run Emacs from the directory where it was built---that is, an
executable that has not been formally installed---Emacs instead
initializes @code{load-path} using the @file{lisp} and @file{leim}
directories in the directory containing the sources from which it
was built. If you built Emacs in a separate directory from the
sources, it also adds those directories from the build directory.
initializes @code{load-path} using the @file{lisp}
directory in the directory containing the sources from which it
was built.
@c Though there should be no *.el files in builddir/lisp, so it's pointless.
If you built Emacs in a separate directory from the
sources, it also adds the lisp directories from the build directory.
(In all cases, elements are represented as absolute file names.)
@cindex site-lisp directories

8
doc/lispref/os.texi
View file

@ -74,11 +74,9 @@ automatically when Emacs is installed.
It loads any @file{leim-list.el} that it finds in the @code{load-path}
directories. This file is intended for registering input methods.
The search is only for any personal @file{leim-list.el} files that you
may have created; so it skips the directories containing the standard Emacs
libraries (for efficiency, since @file{leim-list.el} should not exist
in those directories), as well as the @file{leim} directory that is
part of the distribution (since the @file{leim-list.el} file in this
directory is compiled into the Emacs executable).
may have created; it skips the directories containing the standard Emacs
libraries (these should contain only a single @file{leim-list.el} file,
which is compiled into the Emacs executable).
@vindex before-init-time
@item

16
leim/ChangeLog
View file

@ -1,3 +1,19 @@
2013-11-27 Glenn Morris <rgm@gnu.org>
* Makefile.in (leimdir): New variable.
(TIT_GB, TIT_BIG5, MISC, changed.tit, changed.misc)
(${leimdir}/leim-list.el, ${leimdir}/ja-dic/ja-dic.el):
Generate in $leimdir.
(all): Remove compilation, add ja-dic.
(leim-list.el): Now PHONY.
(setwins, compile-targets, compile-main, clean, mostlyclean)
(extraclean): Remove.
(bootstrap-clean): Delete all generated files.
* README: Update for moved leim/ directory.
* leim-ext.el (ucs-input-activate, hangul-input-method-activate):
Remove manual autoloads; now in loaddefs.el.
Disable byte-compile, version-control, autoloads in the output.
2013-11-23 Glenn Morris <rgm@gnu.org>
* Makefile.in (RUN_EMACS): Empty EMACSLOADPATH rather than unsetting.

138
leim/Makefile.in
View file

@ -26,8 +26,11 @@ SHELL = @SHELL@
# Here are the things that we expect ../configure to edit.
srcdir=@srcdir@
# Where the generated files go.
leimdir = ${srcdir}/../lisp/leim
# Which Emacs to use to convert TIT files to Emacs Lisp files,
# byte-compile Emacs Lisp files, and generate the file leim-list.el.
# and generate the file leim-list.el.
EMACS = ../src/emacs
# How to run Emacs.
@ -38,45 +41,39 @@ MKDIR_P = @MKDIR_P@
# Files generated from TIT dictionaries for Chinese GB character set.
TIT_GB=\
quail/CCDOSPY.el \
quail/Punct.el \
quail/QJ.el \
quail/SW.el \
quail/TONEPY.el
${leimdir}/quail/CCDOSPY.el \
${leimdir}/quail/Punct.el \
${leimdir}/quail/QJ.el \
${leimdir}/quail/SW.el \
${leimdir}/quail/TONEPY.el
# Files generated from TIT dictionaries for Chinese BIG5 character set.
TIT_BIG5=\
quail/4Corner.el \
quail/ARRAY30.el \
quail/ECDICT.el \
quail/ETZY.el \
quail/Punct-b5.el \
quail/PY-b5.el \
quail/QJ-b5.el \
quail/ZOZY.el
${leimdir}/quail/4Corner.el \
${leimdir}/quail/ARRAY30.el \
${leimdir}/quail/ECDICT.el \
${leimdir}/quail/ETZY.el \
${leimdir}/quail/Punct-b5.el \
${leimdir}/quail/PY-b5.el \
${leimdir}/quail/QJ-b5.el \
${leimdir}/quail/ZOZY.el
CHINESE_TIT=${TIT_GB} ${TIT_BIG5}
MISC= \
quail/tsang-b5.el \
quail/quick-b5.el \
quail/tsang-cns.el \
quail/quick-cns.el \
quail/PY.el \
quail/ZIRANMA.el \
quail/CTLau.el \
quail/CTLau-b5.el
${leimdir}/quail/tsang-b5.el \
${leimdir}/quail/quick-b5.el \
${leimdir}/quail/tsang-cns.el \
${leimdir}/quail/quick-cns.el \
${leimdir}/quail/PY.el \
${leimdir}/quail/ZIRANMA.el \
${leimdir}/quail/CTLau.el \
${leimdir}/quail/CTLau-b5.el
## The generated .el files.
TIT_MISC=${CHINESE_TIT} ${MISC}
.SUFFIXES: .elc .el
.el.elc:
@echo Compiling $<
@${RUN_EMACS} -l international/quail -f batch-byte-compile $<
all: leim-list.el compile-main
all: ${leimdir}/leim-list.el ${leimdir}/ja-dic/ja-dic.el
.PHONY: all
TIT_SOURCES= \
@ -106,10 +103,10 @@ ${CHINESE_TIT}: changed.tit
## quail/%.el: CXTERM-DIC/%.tit
## It doesn't seem possible to do this with VPATH and suffix rules.
changed.tit: ${TIT_SOURCES}
@${MKDIR_P} quail
@${MKDIR_P} ${leimdir}/quail
${RUN_EMACS} -l titdic-cnv \
-f batch-titdic-convert -dir quail ${srcdir}/CXTERM-DIC; \
echo "changed" > $@
-f batch-titdic-convert -dir ${leimdir}/quail ${srcdir}/CXTERM-DIC
echo "changed" > $@
MISC_SOURCES= \
${srcdir}/MISC-DIC/CTLau-b5.html \
@ -123,75 +120,36 @@ ${MISC}: changed.misc
@true
changed.misc: ${MISC_SOURCES}
@${MKDIR_P} quail
@${MKDIR_P} ${leimdir}/quail
${RUN_EMACS} -l titdic-cnv \
-f batch-miscdic-convert -dir quail ${srcdir}/MISC-DIC; \
echo "changed" > $@
-f batch-miscdic-convert -dir ${leimdir}/quail ${srcdir}/MISC-DIC
echo "changed" > $@
leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
rm -f leim-list.el
if [ "`cd ${srcdir} && /bin/pwd`" = "`/bin/pwd`" ] ; then \
${RUN_EMACS} -l international/quail \
--eval "(update-leim-list-file \".\")" ; \
else \
${RUN_EMACS} -l international/quail \
--eval "(update-leim-list-file \".\" (unmsys--file-name \"${srcdir}\"))" ; \
fi
.PHONY: leim-list.el
leim-list.el: ${leimdir}/leim-list.el
${leimdir}/leim-list.el: ${TIT_MISC} ${srcdir}/leim-ext.el
rm -f $@
${RUN_EMACS} -l international/quail \
--eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))"
sed -n '/^[^;]/ p' < ${srcdir}/leim-ext.el >> $@
$(srcdir)/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
@$(MKDIR_P) $(srcdir)/ja-dic
${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L
@$(MKDIR_P) $(leimdir)/ja-dic
$(RUN_EMACS) -batch -l ja-dic-cnv \
-f batch-skkdic-convert -dir "$(srcdir)/ja-dic" \
-f batch-skkdic-convert -dir "$(leimdir)/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`" ] && \
wins="$$wins ${srcdir}/quail"
.PHONY: bootstrap-clean distclean maintainer-clean
.PHONY: compile-targets
# TARGETS is set dynamically in the recursive call from `compile-main'.
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} $(srcdir)/ja-dic/ja-dic.el
@($(setwins); \
els=`echo "$$wins " | sed -e 's| |/*.el |g'`; \
for el in $$els; do \
test -f $$el || continue; \
test ! -f $${el}c && GREP_OPTIONS= grep '^;.*no-byte-compile: t' $$el > /dev/null && continue; \
echo "$${el}c"; \
done | xargs echo) | \
while read chunk; do \
$(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
done
.PHONY: clean mostlyclean bootstrap-clean distclean maintainer-clean extraclean
clean mostlyclean:
bootstrap-clean:
rm -f ${TIT_MISC} ${TIT_MISC:.el=.elc} \
leim-list.el changed.tit changed.misc
${leimdir}/leim-list.el changed.tit changed.misc
rm -rf ${leimdir}/ja-dic
# The following target is needed because the `clean' target only removes
# TIT-generated files and doesn't touch compiled Quail packages. But
# bootstrapping should not leave non-fresh .elc files behind.
bootstrap-clean: clean
$(setwins); for w in $$wins; do rm -f $$w/*.elc; done
distclean: clean
-[ "`cd ${srcdir} && /bin/pwd`" != "`/bin/pwd`" ] && rm -rf quail
distclean:
rm -f Makefile
maintainer-clean: distclean bootstrap-clean
extraclean: maintainer-clean
-rm -f *~ \#* */*~ */\#*
.PHONY: check-declare
check-declare:
$(RUN_EMACS) -l check-declare \
--eval '(check-declare-directory (unmsys--file-name "$(srcdir)"))'
### Makefile.in ends here

24
leim/README
View file

@ -20,24 +20,22 @@ This directory contains various dictionaries for Chinese input
methods. These dictionaries are automatically converted to Quail
packages (Emacs Lisp source files) by `make'.
quail:
This directory contains Emacs Lisp source files for Quail packages.
SKK-DIC:
This directory contains source dictionary for Japanese input method
distributed with SKK (Japanese input method run with Mule). But, you
don't need this file because we distribute an Emacs Lisp source file
ja-dic/ja-dic.el which has already been converted from the source
dictionary (See below).
distributed with SKK (Japanese input method run with Mule).
ja-dic:
This directory contains Emacs Lisp source file ja-dic.el which is
generated from a source dictionary in SKK-DIC directory. The
inclusion of this file is for users convenience because it takes
rather long time to generate it.
The above source files are used to generate the following outputs:
../lisp/leim/quail:
This directory contains Emacs Lisp source files for Quail packages.
../lisp/leim/ja-dic:
This directory contains Emacs Lisp source file ja-dic.el,
generated from a source dictionary in SKK-DIC directory.
This file is part of GNU Emacs.

25
leim/leim-ext.el
View file

@ -37,21 +37,9 @@
(eval-after-load "quail/Punct-b5"
'(quail-defrule " " ?　 nil t))
(autoload 'ucs-input-activate "quail/uni-input"
"Activate UCS input method.
With arg, activate UCS input method if and only if arg is positive.
While this input method is active, the variable
`input-method-function' is bound to the function `ucs-input-method'.")
(register-input-method "ucs" "UTF-8" 'ucs-input-activate "U+"
"Unicode input as hex in the form Uxxxx.")
(autoload 'hangul-input-method-activate "quail/hangul"
"Activate Hangul input method INPUT-METHOD.
FUNC is a function to handle input key.
HELP-TEXT is a text set in `hangul-input-method-help-text'.")
(register-input-method
"korean-hangul"
"UTF-8"
@ -88,3 +76,16 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'.")
'hangul390-input-method
"Input method: korean-hangul390 (mode line indicator:한390)\n\nHangul 3-Bulsik 390 input method.")
;; Following lines are indented so that Makefile adds them to output.
;; leim-list-header adds "coding: utf-8"; we could move that here,
;; unless others are using that stuff to generate their own leim files.
;; Local Variables:
;; no-byte-compile: t
;; version-control: never
;; no-update-autoloads: t
;; End:
;;; leim-list.el ends here
;;; leim-ext.el ends here

18
lisp/ChangeLog
View file

@ -1,3 +1,21 @@
2013-11-27 Glenn Morris <rgm@gnu.org>
* Makefile.in (setwins_for_subdirs): Skip leim/ directory.
(compile-main): Depend on leim rule.
(leim): New rule.
* loadup.el: Move leim-list.el to leim/ subdirectory.
* startup.el (normal-top-level): No more leim directory.
* international/ja-dic-cnv.el (skkdic-convert):
Disable version-control and autoloads in output files.
* international/titdic-cnv.el (titdic-convert, miscdic-convert):
Disable version-control and autoloads in output files.
* leim/quail: Move here from ../leim.
* leim/quail/hangul.el (hangul-input-method-activate):
Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
* leim/quail/uni-input.el (ucs-input-activate): Add autoload cookie.
(generated-autoload-load-name): Set file-local value.
2013-11-26 Kenjiro NAKAYAMA <knakayam@redhat.com> (tiny change)
* net/eww.el (eww-bookmark-browse): Use 'eww-browse-url'.

17
lisp/Makefile.in
View file

@ -118,14 +118,15 @@ setwins=for file in `find . -type d -print`; do \
# Find all subdirectories except `obsolete' and `term'.
setwins_almost=for file in `find ${srcdir} -type d -print`; do \
case $$file in ${srcdir}*/obsolete | ${srcdir}*/term ) ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
esac; \
done
# Find all subdirectories in which we might want to create subdirs.el.
setwins_for_subdirs=for file in `find ${srcdir} -type d -print`; do \
case $$file in ${srcdir}*/cedet* ) ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
case $$file in \
${srcdir}*/cedet* | ${srcdir}*/leim* ) ;; \
*) wins="$$wins$${wins:+ }$$file" ;; \
esac; \
done
@ -172,6 +173,10 @@ finder-data: doit
# The chmod +w is to handle env var CVSREAD=1.
# Use expand-file-name rather than $abs_scrdir so that Emacs does not
# get confused when it compares file-names for equality.
#
# Note that we set no-update-autoloads in _generated_ leim files.
# If you want to allow autoloads in such files, remove that,
# and make this depend on leim.
autoloads: $(LOADDEFS) doit
cd $(lisp) && chmod +w $(AUTOGEN_VCS)
$(setwins_almost); \
@ -291,7 +296,7 @@ compile-targets: $(TARGETS)
# Compile all the Elisp files that need it. Beware: it approximates
# `no-byte-compile', so watch out for false-positives!
compile-main: compile-clean
compile-main: leim compile-clean
@(cd $(lisp) && $(setwins); \
els=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.el |g'`; \
for el in $$els; do \
@ -315,6 +320,10 @@ compile-clean:
fi \
done
.PHONY: leim
leim:
cd ../leim && $(MAKE) $(MFLAGS) all EMACS="$(EMACS)"
# Compile all Lisp files, but don't recompile those that are up to
# date. Some .el files don't get compiled because they set the
# local variable no-byte-compile.

15
lisp/international/ja-dic-cnv.el
View file

@ -1,5 +1,7 @@
;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
;; Copyright (C) 2001-2013 Free Software Foundation, Inc.
;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
;; 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
@ -342,15 +344,12 @@ The name of generated file is specified by the variable `ja-dic-filename'."
(with-current-buffer buf
(erase-buffer)
(buffer-disable-undo)
(insert ";;; ja-dic.el --- dictionary for Japanese input method"
" -*-coding: utf-8; -*-\n"
(insert ";;; ja-dic.el --- dictionary for Japanese input method\n"
";;\tGenerated by the command `skkdic-convert'\n"
";;\tOriginal SKK dictionary file: "
(file-relative-name (expand-file-name filename) dirname)
"\n\n"
";; This file is part of GNU Emacs.\n\n"
";;; Commentary:\n\n"
";; Do byte-compile this file again after any modification.\n\n"
";;; Start of the header of the original SKK dictionary.\n\n")
(set-buffer skkbuf)
(goto-char 1)
@ -398,7 +397,13 @@ The name of generated file is specified by the variable `ja-dic-filename'."
;; Postfix
(with-current-buffer buf
(goto-char (point-max))
(insert ";;\n(provide 'ja-dic)\n\n;;; ja-dic.el ends here\n")))
(insert ";;\n(provide 'ja-dic)\n\n"
";; Local Variables:\n"
";; version-control: never\n"
";; no-update-autoloads: t\n"
";; coding: utf-8\n"
";; End:\n\n"
";;; ja-dic.el ends here\n")))
;; Save the working buffer.
(set-buffer buf)

25
lisp/international/titdic-cnv.el
View file

@ -272,13 +272,11 @@ SPC, 6, 3, 4, or 7 specifying a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
(princ ";; Quail package `")
(princ package)
(princ (format "' -*- coding:%s -*-\n" coding-system-for-write))
(princ "\n")
(princ ";; Generated by the command `titdic-convert'\n")
(princ ";;\tOriginal TIT dictionary file: ")
(princ (file-name-nondirectory filename))
(princ "\n\n;;; Comment:\n\n")
(princ ";; Byte-compile this file again after any modification.\n\n")
(princ ";;; Start of the header of original TIT dictionary.\n\n")
(princ "\n\n")
(while (not (eobp))
(let ((ch (following-char))
@ -518,7 +516,13 @@ the generated Quail package is saved."
(widen)
;; Process the body part
(tit-process-body))))))
(tit-process-body)
(princ ";; Local Variables:\n")
(princ ";; version-control: never\n")
(princ ";; no-update-autoloads: t\n")
(princ (format ";; coding: %s\n" coding-system-for-write))
(princ ";; End:\n"))))))
;;;###autoload
(defun batch-titdic-convert (&optional force)
@ -1148,8 +1152,7 @@ the generated Quail package is saved."
(setq coding-system-for-write
(coding-system-change-eol-conversion coding 'unix))
(with-temp-file (expand-file-name quailfile dirname)
(insert (format ";; Quail package `%s' -*- coding:%s -*-\n"
name coding))
(insert (format ";; Quail package `%s'\n" name))
(insert ";; Generated by the command `miscdic-convert'\n")
(insert ";; Source dictionary file: " dicfile "\n")
(insert ";; Copyright notice of the source file\n")
@ -1168,7 +1171,13 @@ the generated Quail package is saved."
(coding-system-change-eol-conversion coding 'unix))
(dicbuf (find-file-noselect filename)))
(funcall converter dicbuf name title)
(kill-buffer dicbuf)))
(kill-buffer dicbuf))
(insert ";; Local Variables:\n"
";; version-control: never\n"
";; no-update-autoloads: t\n"
(format ";; coding: %s\n" coding)
";; End:\n\n"
";;; " quailfile " ends here\n"))
(message "Converting %s to %s...done" dicfile quailfile))
(setq tail (cdr tail)))))

0
leim/quail/.gitignore → lisp/leim/quail/.gitignore vendored
View file

0
leim/quail/arabic.el → lisp/leim/quail/arabic.el
View file

0
leim/quail/croatian.el → lisp/leim/quail/croatian.el
View file

0
leim/quail/cyril-jis.el → lisp/leim/quail/cyril-jis.el
View file

0
leim/quail/cyrillic.el → lisp/leim/quail/cyrillic.el
View file

0
leim/quail/czech.el → lisp/leim/quail/czech.el
View file

0
leim/quail/ethiopic.el → lisp/leim/quail/ethiopic.el
View file

0
leim/quail/georgian.el → lisp/leim/quail/georgian.el
View file

0
leim/quail/greek.el → lisp/leim/quail/greek.el
View file

5
leim/quail/hangul.el → lisp/leim/quail/hangul.el
View file

@ -508,6 +508,7 @@ When a Korean input method is off, convert the following hangul character."
(defvar hangul-input-method-help-text nil)
(make-variable-buffer-local 'hangul-input-method-help-text)
;;;###autoload
(defun hangul-input-method-activate (input-method func help-text &rest args)
"Activate Hangul input method INPUT-METHOD.
FUNC is a function to handle input key.
@ -542,4 +543,8 @@ HELP-TEXT is a text set in `hangul-input-method-help-text'."
(provide 'hangul)
;; Local Variables:
;; generated-autoload-load-name: "quail/hangul"
;; End:
;;; hangul.el ends here

0
leim/quail/hanja-jis.el → lisp/leim/quail/hanja-jis.el
View file

0
leim/quail/hanja.el → lisp/leim/quail/hanja.el
View file

0
leim/quail/hanja3.el → lisp/leim/quail/hanja3.el
View file

0
leim/quail/hebrew.el → lisp/leim/quail/hebrew.el
View file

0
leim/quail/indian.el → lisp/leim/quail/indian.el
View file

0
leim/quail/ipa-praat.el → lisp/leim/quail/ipa-praat.el
View file

0
leim/quail/ipa.el → lisp/leim/quail/ipa.el
View file

0
leim/quail/japanese.el → lisp/leim/quail/japanese.el
View file

0
leim/quail/lao.el → lisp/leim/quail/lao.el
View file

0
leim/quail/latin-alt.el → lisp/leim/quail/latin-alt.el
View file

0
leim/quail/latin-ltx.el → lisp/leim/quail/latin-ltx.el
View file

0
leim/quail/latin-post.el → lisp/leim/quail/latin-post.el
View file

0
leim/quail/latin-pre.el → lisp/leim/quail/latin-pre.el
View file

0
leim/quail/lrt.el → lisp/leim/quail/lrt.el
View file

0
leim/quail/persian.el → lisp/leim/quail/persian.el
View file

0
leim/quail/py-punct.el → lisp/leim/quail/py-punct.el
View file

0
leim/quail/pypunct-b5.el → lisp/leim/quail/pypunct-b5.el
View file

0
leim/quail/rfc1345.el → lisp/leim/quail/rfc1345.el
View file

0
leim/quail/sgml-input.el → lisp/leim/quail/sgml-input.el
View file

0
leim/quail/sisheng.el → lisp/leim/quail/sisheng.el
View file

0
leim/quail/slovak.el → lisp/leim/quail/slovak.el
View file

0
leim/quail/symbol-ksc.el → lisp/leim/quail/symbol-ksc.el
View file

0
leim/quail/thai.el → lisp/leim/quail/thai.el
View file

0
leim/quail/tibetan.el → lisp/leim/quail/tibetan.el
View file

7
leim/quail/uni-input.el → lisp/leim/quail/uni-input.el
View file

@ -85,6 +85,7 @@
(set-buffer-modified-p modified-p)
(run-hooks 'input-method-after-insert-chunk-hook)))))
;;;###autoload
(defun ucs-input-activate (&optional arg)
"Activate UCS input method.
With ARG, activate UCS input method if and only if ARG is positive.
@ -124,10 +125,14 @@ Input method: ucs (mode line indicator:U+)
Input as Unicode: U<hex> or u<hex>, where <hex> is a four-digit hex number.")))
;; The file ../leim-ext.el contains the following call.
;; The file leim-list.el contains the following call.
;; (register-input-method "ucs" "UTF-8" 'ucs-input-activate "U+"
;; "Unicode input as hex in the form Uxxxx.")
(provide 'uni-input)
;; Local Variables:
;; generated-autoload-load-name: "quail/uni-input"
;; End:
;;; uni-input.el ends here

0
leim/quail/viqr.el → lisp/leim/quail/viqr.el
View file

0
leim/quail/vntelex.el → lisp/leim/quail/vntelex.el
View file

0
leim/quail/vnvni.el → lisp/leim/quail/vnvni.el
View file

0
leim/quail/welsh.el → lisp/leim/quail/welsh.el
View file

2
lisp/loadup.el
View file

@ -282,7 +282,7 @@
;; This file doesn't exist when building a development version of Emacs
;; from the repository. It is generated just after temacs is built.
(load "leim-list.el" t)
(load "leim/leim-list.el" t)
;; If you want additional libraries to be preloaded and their
;; doc strings kept in the DOC file rather than in core,

8
lisp/startup.el
View file

@ -499,8 +499,6 @@ It is the default value of the variable `top-level'."
;; available input methods.
(let ((tail load-path)
(lispdir (expand-file-name "../lisp" data-directory))
;; For out-of-tree builds, leim-list is generated in the build dir.
(leimdir (expand-file-name "../leim" doc-directory))
dir)
(while tail
(setq dir (car tail))
@ -508,12 +506,8 @@ It is the default value of the variable `top-level'."
(load (expand-file-name "subdirs.el") t t t))
;; Do not scan standard directories that won't contain a leim-list.el.
;; http://lists.gnu.org/archive/html/emacs-devel/2009-10/msg00502.html
;; Also skip leim/leim-list.el, since we preloaded that one.
;; (Except the preloaded one in lisp/leim.)
(or (string-prefix-p lispdir dir)
;; Not supposed to be subdirs.el in leim, but someone
;; might have added one and be keeping their own leim-list
;; files in subdirs of leim.
(string-equal leimdir dir)
(let ((default-directory dir))
(load (expand-file-name "leim-list.el") t t t)))
;; We don't use a dolist loop and we put this "setq-cdr" command at

21
make-dist
View file

@ -201,13 +201,11 @@ fi
if [ $check = yes ]; then
ls -1 lisp/[a-zA-Z]*.el lisp/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el \
leim/[a-z]*/[a-z]*.el > /tmp/el
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.el > /tmp/el
ls -1 lisp/[a-zA-Z]*.elc lisp/[a-z]*/[a-zA-Z0-9]*.elc \
lisp/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc \
leim/[a-z]*/[a-z]*.elc > /tmp/elc
lisp/[a-z]*/[a-z]*/[a-z]*/[a-zA-Z0-9]*.elc > /tmp/elc
## Check for .elc files with no corresponding .el file.
sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc
@ -262,7 +260,7 @@ if [ $update = yes ]; then
(cd leim && make leim-list.el EMACS="$EMACS")
echo "Recompiling Lisp files"
$EMACS -batch -f batch-byte-recompile-directory lisp leim
$EMACS -batch -f batch-byte-recompile-directory lisp
fi # $update = yes
echo "Creating staging directory: \`${tempparent}'"
@ -291,8 +289,7 @@ ln aclocal.m4 ${tempdir}
echo "Creating subdirectories"
for subdir in site-lisp \
leim leim/CXTERM-DIC leim/MISC-DIC \
leim/SKK-DIC leim/ja-dic leim/quail \
leim leim/CXTERM-DIC leim/MISC-DIC leim/SKK-DIC \
build-aux build-aux/snippet \
src src/bitmaps lib lib-src oldXMenu lwlib \
nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \
@ -340,16 +337,8 @@ echo "Making links to \`leim' and its subdirectories"
ln CXTERM-DIC/README CXTERM-DIC/*.tit ../${tempdir}/leim/CXTERM-DIC
ln SKK-DIC/README SKK-DIC/SKK-JISYO.L ../${tempdir}/leim/SKK-DIC
ln MISC-DIC/README MISC-DIC/*.* ../${tempdir}/leim/MISC-DIC
ln ja-dic/*.el ja-dic/*.elc ../${tempdir}/leim/ja-dic
ln Makefile.in ../${tempdir}/leim/Makefile.in
ln leim-ext.el ../${tempdir}/leim/leim-ext.el
## Lisp files that start with a capital (also 4Corner.el) are
## generated from TIT dictionaries so we don't distribute them.
ln quail/[a-z]*.el quail/[a-z]*.elc ../${tempdir}/leim/quail
rm -f ../${tempdir}/leim/quail/quick-b5.*
rm -f ../${tempdir}/leim/quail/quick-cns.*
rm -f ../${tempdir}/leim/quail/tsang-b5.*
rm -f ../${tempdir}/leim/quail/tsang-cns.*)
ln leim-ext.el ../${tempdir}/leim/leim-ext.el)
echo "Making links to \`build-aux'"
(cd build-aux

7
nt/ChangeLog
View file

@ -1,3 +1,10 @@
2013-11-27 Glenn Morris <rgm@gnu.org>
* README.W32:
* addpm.c (env_vars):
* epaths.nt (PATH_LOADSEARCH, PATH_DUMPLOADSEARCH):
* paths.h (PATH_LOADSEARCH): No more leim directory.
2013-11-26 Glenn Morris <rgm@gnu.org>
* epaths.nt (PATH_DUMPLOADSEARCH): Add leim/.

4
nt/README.W32
View file

@ -20,8 +20,8 @@ See the end of the file for license conditions.
* Preliminaries
Along with this file should be six subdirectories (bin, etc, info,
lisp, leim, site-lisp). If you have downloaded the barebin
Along with this file should be five subdirectories (bin, etc, info,
lisp, site-lisp). If you have downloaded the barebin
distribution, then it will contain only the bin directory and the
built in documentation in etc/DOC, the rest of the subdirectories
are in the src distribution, which the barebin distribution is

2
nt/addpm.c
View file

@ -82,7 +82,7 @@ env_vars[] =
{
#ifdef OLD_PATHS
{"emacs_dir", NULL},
{"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
{"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp;%emacs_dir%/lisp"},
{"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
{"EMACSDATA", "%emacs_dir%/etc"},
{"EMACSPATH", "%emacs_dir%/bin"},

10
nt/epaths.nt
View file

@ -34,10 +34,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
load-path, which is the search path for the Lisp function "load".
Configure (using "make epaths-force") sets this to
${standardlisppath}, which typically has a value like:
<datadir>/emacs/VERSION/lisp:<datadir>/emacs/VERSION/leim
where datadir is eg /usr/local/share.
<datadir>/emacs/VERSION/lisp where datadir is eg /usr/local/share.
*/
#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp;%emacs_dir%/share/emacs/@VER@/leim"
#define PATH_LOADSEARCH "%emacs_dir%/share/emacs/@VER@/lisp"
/* Like PATH_LOADSEARCH, but contains the non-standard pieces.
These are the site-lisp directories. Configure sets this to
@ -51,10 +50,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Like PATH_LOADSEARCH, but used only during the build process
when Emacs is dumping. Configure (using "make epaths-force-w32") sets
this to $buildlisppath, which normally has the value:
<srcdir>/lisp;<builddir>/leim.
this to $buildlisppath, which normally has the value: <srcdir>/lisp.
*/
#define PATH_DUMPLOADSEARCH "@SRC@/lisp;@BLD@/leim"
#define PATH_DUMPLOADSEARCH "@SRC@/lisp"
/* The extra search path for programs to invoke. This is appended to
whatever the PATH environment variable says to set the Lisp

5
nt/paths.h
View file

@ -1,7 +1,6 @@
/* paths.h file for MS Windows
Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software
Foundation, Inc.
Copyright (C) 1993, 1995, 1997, 1999, 2001-2013 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -26,7 +25,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* The default search path for Lisp function "load".
Together with PATH_SITELOADSEARCH, this sets load-path. */
/* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */
#define PATH_LOADSEARCH "%emacs_dir%/lisp;%emacs_dir%/leim"
#define PATH_LOADSEARCH "%emacs_dir%/lisp"
/* Like PATH_LOADSEARCH, but contains the non-standard pieces. */
#define PATH_SITELOADSEARCH "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp"

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2013-11-27 Glenn Morris <rgm@gnu.org>
* Makefile.in (leimdir): Now in lisp source directory.
($(leimdir)/leim-list.el): Just use ../leim .
* epaths.in (PATH_DUMPLOADSEARCH):
* lread.c (load_path_default):
* nsterm.m (ns_load_path): No more leim directory.
2013-11-26 Andreas Schwab <schwab@suse.de>
* .gdbinit (xgettype): Add cast.

4
src/Makefile.in
View file

@ -52,7 +52,7 @@ lispsource = $(srcdir)/../lisp
lib = ../lib
libsrc = ../lib-src
etc = ../etc
leimdir = ../leim
leimdir = ${lispsource}/leim
oldXMenudir = ../oldXMenu
lwlibdir = ../lwlib
@ -415,7 +415,7 @@ all: emacs$(EXEEXT) $(OTHER_FILES)
.PHONY: all
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)"
cd ../leim && $(MAKE) $(MFLAGS) leim-list.el EMACS="$(bootstrap_exe)"
## The dumped Emacs is as functional and more efficient than
## bootstrap-emacs, so we replace the latter with the former.

8
src/epaths.in
View file

@ -22,8 +22,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
load-path, which is the search path for the Lisp function "load".
Configure (using "make epaths-force") sets this to
${standardlisppath}, which typically has a value like:
<datadir>/emacs/VERSION/lisp:<datadir>/emacs/VERSION/leim
where datadir is eg /usr/local/share.
<datadir>/emacs/VERSION/lisp where datadir is eg /usr/local/share.
*/
#define PATH_LOADSEARCH "/usr/local/share/emacs/lisp"
@ -41,10 +40,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* Like PATH_LOADSEARCH, but used only during the build process
when Emacs is dumping. Configure (using "make epaths-force") sets
this to $buildlisppath, which normally has the value:
<srcdir>/lisp:<builddir>/leim.
this to $buildlisppath, which normally has the value: <srcdir>/lisp.
*/
#define PATH_DUMPLOADSEARCH "../lisp:../leim"
#define PATH_DUMPLOADSEARCH "../lisp"
/* The extra search path for programs to invoke. This is appended to
whatever the PATH environment variable says to set the Lisp

28
src/lread.c
View file

@ -4157,14 +4157,12 @@ static Lisp_Object dump_path;
are not yet installed, we should not use them, even if they exist.)
If installation-dir/lisp does not exist, just add dump_path at the
end instead.
Add installation-dir/leim (if exists and not already a member) at the front.
Add installation-dir/site-lisp (if !no_site_lisp, and exists
and not already a member) at the front.
If installation-dir != source-dir (ie running an uninstalled,
out-of-tree build) AND install-dir/src/Makefile exists BUT
install-dir/src/Makefile.in does NOT exist (this is a sanity
check), then repeat the above steps for source-dir/lisp,
leim and site-lisp. */
check), then repeat the above steps for source-dir/lisp, site-lisp. */
static Lisp_Object
load_path_default (bool changed)
@ -4233,9 +4231,9 @@ load_path_default (bool changed)
if (NILP (Fmember (tem, lpath)))
{
/* We are running uninstalled. The default load-path
points to the eventual installed lisp, leim
directories. We should not use those now, even
if they exist, so start over from a clean slate. */
points to the eventual installed lisp directories.
We should not use those now, even if they exist,
so start over from a clean slate. */
lpath = list1 (tem);
}
}
@ -4244,16 +4242,6 @@ load_path_default (bool changed)
Lisp dirs instead. */
lpath = nconc2 (lpath, dump_path);
/* Add leim under the installation dir, if it is accessible. */
tem = Fexpand_file_name (build_string ("leim"),
Vinstallation_directory);
tem1 = Ffile_accessible_directory_p (tem);
if (!NILP (tem1))
{
if (NILP (Fmember (tem, lpath)))
lpath = Fcons (tem, lpath);
}
/* Add site-lisp under the installation dir, if it exists. */
if (!no_site_lisp)
{
@ -4269,7 +4257,7 @@ load_path_default (bool changed)
/* If Emacs was not built in the source directory,
and it is run from where it was built, add to load-path
the lisp, leim and site-lisp dirs under that directory. */
the lisp and site-lisp dirs under that directory. */
if (NILP (Fequal (Vinstallation_directory, Vsource_directory)))
{
@ -4294,12 +4282,6 @@ load_path_default (bool changed)
if (NILP (Fmember (tem, lpath)))
lpath = Fcons (tem, lpath);
tem = Fexpand_file_name (build_string ("leim"),
Vsource_directory);
if (NILP (Fmember (tem, lpath)))
lpath = Fcons (tem, lpath);
if (!no_site_lisp)
{
tem = Fexpand_file_name (build_string ("site-lisp"),

10
src/nsterm.m
View file

@ -1,7 +1,7 @@
/* NeXT/Open/GNUstep / MacOSX communication module.
Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2013 Free Software
Foundation, Inc.
Copyright (C) 1989, 1993-1994, 2005-2006, 2008-2013
Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -445,8 +445,8 @@ Updated by Christian Limpach (chris@nice.ch)
const char *
ns_load_path (void)
/* If running as a self-contained app bundle, return as a path string
the filenames of the site-lisp, lisp and leim directories.
Ie, site-lisp:lisp:leim. Otherwise, return nil. */
the filenames of the site-lisp and lisp directories.
Ie, site-lisp:lisp. Otherwise, return nil. */
{
NSBundle *bundle = [NSBundle mainBundle];
NSString *resourceDir = [bundle resourcePath];
@ -456,7 +456,7 @@ Updated by Christian Limpach (chris@nice.ch)
BOOL isDir;
NSArray *paths = [resourceDir stringsByAppendingPaths:
[NSArray arrayWithObjects:
@"site-lisp", @"lisp", @"leim", nil]];
@"site-lisp", @"lisp", nil]];
NSEnumerator *pathEnum = [paths objectEnumerator];
resourcePaths = @"";