diff options
| -rw-r--r-- | leim/ChangeLog | 12 | ||||
| -rw-r--r-- | leim/Makefile.in | 13 | ||||
| -rw-r--r-- | src/ChangeLog | 8 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/doc.c | 17 |
5 files changed, 34 insertions, 18 deletions
diff --git a/leim/ChangeLog b/leim/ChangeLog index f5976279290..07e26cf766b 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -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) diff --git a/leim/Makefile.in b/leim/Makefile.in index 2f707f0f46d..21561a357d1 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -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 diff --git a/src/ChangeLog b/src/ChangeLog index 7027e9e5a95..5abf92bc4e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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): diff --git a/src/Makefile.in b/src/Makefile.in index 19f586396cb..9525996caea 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -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 diff --git a/src/doc.c b/src/doc.c index 02db4dde072..9e48a4d49f3 100644 --- a/src/doc.c +++ b/src/doc.c @@ -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. */ |