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

Merge from trunk.

Browse source
This commit is contained in:
Paul Eggert 2012-04-09 15:55:58 -07:00
commit 271e61eb60
5 changed files with 34 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
leim/ChangeLog
View file

@ -1,3 +1,12 @@
2012-04-09 Glenn Morris <rgm@gnu.org>
* Makefile.in (EMACS): Rename from BUILT_EMACS.
(RUN_EMACS, compile-main): Update for this change.
* Makefile.in (../src/emacs): Remove this rule, no longer relevant
since leim distributed with Emacs (eg lisp/ has no such rule).
(all): Remove $BUILT_EMACS dependence.
2012-04-09 Eli Zaretskii <eliz@gnu.org>
* quail/latin-ltx.el (latin-ltx--define-rules): Comment out
@ -5,8 +14,9 @@
2012-04-09 Glenn Morris <rgm@gnu.org>
* Makefile.in: Compute the list of .el files to be compiled dynamically,
* Makefile.in: Compute list of .el files to be compiled dynamically,
as the lisp/ directory does, rather than hard-coding it.
Also, separate leim-list generation from byte-compilation.
(TIT_GB, TIT_BIG5, CHINESE_TIT, MISC, TIT_MISC):
Make them store the .el files rather than the .elc files.
(NON_TIT_GB, NON_TIT_BIG5, CHINESE_NON_TIT, CHINESE_GB)

13
leim/Makefile.in
View file

@ -41,13 +41,13 @@ GZIP_PROG = @GZIP_PROG@
# Which Emacs to use to convert TIT files to Emacs Lisp files,
# byte-compile Emacs Lisp files, and generate the file leim-list.el.
BUILT_EMACS = ../src/emacs
EMACS = ../src/emacs
buildlisppath=${srcdir}/../lisp
# How to run Emacs.
RUN_EMACS = EMACSLOADPATH=$(buildlisppath) LC_ALL=C \
${BUILT_EMACS} -batch --no-site-file --no-site-lisp
${EMACS} -batch --no-site-file --no-site-lisp
# Subdirectories to be made if ${srcdir} is different from the current
# directory.
@ -93,12 +93,7 @@ TIT_MISC=${CHINESE_TIT} ${MISC}
@echo Compiling $<
@${RUN_EMACS} -l ${buildlisppath}/international/quail -f batch-byte-compile $<
all: ${BUILT_EMACS} ${SUBDIRS} leim-list.el compile-main
# To ensure that we can run Emacs. This target is ignored (never
# being hit) if a user changes default value of BUILT_EMACS.
../src/emacs:
cd ../src; ${MAKE} ${MFLAGS} emacs
all: ${SUBDIRS} leim-list.el compile-main
${SUBDIRS}:
mkdir $@
@ -176,7 +171,7 @@ compile-main: ${TIT_MISC}
echo "$${el}c"; \
done | xargs echo) | \
while read chunk; do \
$(MAKE) $(MFLAGS) compile-targets BUILT_EMACS="$(BUILT_EMACS)" TARGETS="$$chunk"; \
$(MAKE) $(MFLAGS) compile-targets EMACS="$(EMACS)" TARGETS="$$chunk"; \
done
MV_DIRS = for i in $$dir; do rm -fr `basename "$$i"` ; mv "$$i" . ; done

8
src/ChangeLog
View file

@ -11,6 +11,14 @@
the Emacs and Gnulib regex code is merged.
(xmalloc, xrealloc): Now static.
2012-04-09 Glenn Morris <rgm@gnu.org>
* doc.c (Fsnarf_documentation): Check variables, functions are bound,
not just in the obarray, before snarfing them. (Bug#11036)
* Makefile.in ($(leimdir)/leim-list.el):
Pass EMACS rather than BUILT_EMACS.
2012-04-09 Teodor Zlatanov <tzz@lifelogs.com>
* process.c (make_process):

2
src/Makefile.in
View file

@ -396,7 +396,7 @@ LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
all: emacs$(EXEEXT) $(OTHER_FILES)
$(leimdir)/leim-list.el: bootstrap-emacs$(EXEEXT)
cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el BUILT_EMACS=$(bootstrap_exe)
cd $(leimdir) && $(MAKE) $(MFLAGS) leim-list.el EMACS=$(bootstrap_exe)
## Does anyone ever pay attention to the load-path-shadows output here?
## The dumped Emacs is as functional and more efficient than

17
src/doc.c
View file

@ -1,6 +1,6 @@
/* Record indices of function doc strings stored in a file.
Copyright (C) 1985-1986, 1993-1995, 1997-2012
Free Software Foundation, Inc.
Copyright (C) 1985-1986, 1993-1995, 1997-2012 Free Software Foundation, Inc.
This file is part of GNU Emacs.
@ -671,15 +671,18 @@ the same file name is found in the `doc-directory'. */)
/* Install file-position as variable-documentation property
and make it negative for a user-variable
(doc starts with a `*'). */
Fput (sym, Qvariable_documentation,
make_number ((pos + end + 1 - buf)
* (end[1] == '*' ? -1 : 1)));
if (!NILP (Fboundp (sym)))
Fput (sym, Qvariable_documentation,
make_number ((pos + end + 1 - buf)
* (end[1] == '*' ? -1 : 1)));
}
/* Attach a docstring to a function? */
else if (p[1] == 'F')
store_function_docstring (sym, pos + end + 1 - buf);
{
if (!NILP (Ffboundp (sym)))
store_function_docstring (sym, pos + end + 1 - buf);
}
else if (p[1] == 'S')
; /* Just a source file name boundary marker. Ignore it. */