------------------------------------------------------------ revno: 117394 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-06-24 23:39:03 -0700 message: nextstep: trivial Makefile simplification * nextstep/Makefile.in (${ns_appbindir}): New. (${ns_appbindir}/Emacs): Use order-only prereq to create output dir. diff: === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2014-06-15 00:17:21 +0000 +++ nextstep/ChangeLog 2014-06-25 06:39:03 +0000 @@ -1,3 +1,8 @@ +2014-06-25 Glenn Morris + + * Makefile.in (${ns_appbindir}): New. + (${ns_appbindir}/Emacs): Use order-only prereq to create output dir. + 2014-06-15 Glenn Morris * Makefile.in (bootstrap-clean): New. === modified file 'nextstep/Makefile.in' --- nextstep/Makefile.in 2014-06-15 00:17:21 +0000 +++ nextstep/Makefile.in 2014-06-25 06:39:03 +0000 @@ -43,9 +43,12 @@ ( cd ${ns_appdir} ; umask 022; tar xf - ) touch ${ns_appdir} -${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} - ${MKDIR_P} ${ns_appbindir} - cp -f ../src/emacs${EXEEXT} ${ns_appbindir}/Emacs +${ns_appbindir}: + ${MKDIR_P} $@ + +${ns_appbindir}/Emacs: ${ns_appdir} ${ns_check_file} ../src/emacs${EXEEXT} | \ + ${ns_appbindir} + cp -f ../src/emacs${EXEEXT} $@ .PHONY: all ------------------------------------------------------------ revno: 117393 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-06-24 23:23:04 -0700 message: admin/grammars: Use pattern rules in Makefile * admin/grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el): (${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el): Replace with pattern rules. (${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el) (${cedetdir}/srecode/srt-wy.el): Use $<. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-06-25 06:03:13 +0000 +++ admin/ChangeLog 2014-06-25 06:23:04 +0000 @@ -1,5 +1,11 @@ 2014-06-25 Glenn Morris + * grammars/Makefile.in (${bovinedir}/c-by.el, ${bovinedir}/make-by.el): + (${wisentdir}/js-wy.el, ${wisentdir}/python-wy.el): + Replace with pattern rules. + (${bovinedir}/scm-by.el, ${wisentdir}/javat-wy.el) + (${cedetdir}/srecode/srt-wy.el): Use $<. + * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc. (.el.elc): Replace with pattern rule. (%.elc): New. === modified file 'admin/grammars/Makefile.in' --- admin/grammars/Makefile.in 2014-04-11 06:51:49 +0000 +++ admin/grammars/Makefile.in 2014-06-25 06:23:04 +0000 @@ -66,39 +66,32 @@ wisent: ${WISENT} - -${bovinedir}/c-by.el: ${srcdir}/c.by - [ ! -f "$@" ] || chmod +w "$@" - ${make_bovine} -o "$@" ${srcdir}/c.by - -${bovinedir}/make-by.el: ${srcdir}/make.by - [ ! -f "$@" ] || chmod +w "$@" - ${make_bovine} -o "$@" ${srcdir}/make.by +## c-by.el, make-by.el. +${bovinedir}/%-by.el: ${srcdir}/%.by + [ ! -f "$@" ] || chmod +w "$@" + ${make_bovine} -o "$@" $< ${bovinedir}/scm-by.el: ${srcdir}/scheme.by [ ! -f "$@" ] || chmod +w "$@" - ${make_bovine} -o "$@" ${srcdir}/scheme.by - - -${cedetdir}/semantic/grammar-wy.el: ${srcdir}/grammar.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" ${srcdir}/grammar.wy + ${make_bovine} -o "$@" $< + +## grammar-wy.el +${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy + [ ! -f "$@" ] || chmod +w "$@" + ${make_wisent} -o "$@" $< + +## js-wy.el, python-wy.el +${wisentdir}/%-wy.el: ${srcdir}/%.wy + [ ! -f "$@" ] || chmod +w "$@" + ${make_wisent} -o "$@" $< ${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" ${srcdir}/java-tags.wy - -${wisentdir}/js-wy.el: ${srcdir}/js.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" ${srcdir}/js.wy - -${wisentdir}/python-wy.el: ${srcdir}/python.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" ${srcdir}/python.wy + ${make_wisent} -o "$@" $< ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" ${srcdir}/srecode-template.wy + ${make_wisent} -o "$@" $< .PHONY: distclean bootstrap-clean maintainer-clean extraclean ------------------------------------------------------------ revno: 117392 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-06-24 23:03:13 -0700 message: admin/unidata: small Makefile simplifications * admin/unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc. (.el.elc): Replace with pattern rule. (%.elc): New. (unidata.txt): Use $<. (compile): Remove. (${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-06-25 05:57:51 +0000 +++ admin/ChangeLog 2014-06-25 06:03:13 +0000 @@ -1,5 +1,12 @@ 2014-06-25 Glenn Morris + * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Make and load .elc. + (.el.elc): Replace with pattern rule. + (%.elc): New. + (unidata.txt): Use $<. + (compile): Remove. + (${DSTDIR}/charprop.el): Use order-only prereqs rather than a sub-make. + * unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo. 2014-06-21 Glenn Morris === modified file 'admin/unidata/Makefile.in' --- admin/unidata/Makefile.in 2014-06-13 23:05:00 +0000 +++ admin/unidata/Makefile.in 2014-06-25 06:03:13 +0000 @@ -35,24 +35,23 @@ all: ${top_srcdir}/src/macuvs.h ${DSTDIR}/charprop.el -${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt - ${EMACS} -batch -l "${srcdir}/uvs.el" \ +## Specify .elc as an order-only prereq so as to not needlessly rebuild +## target just because the .elc is missing. +## Same with charprop.el below. +${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \ + ${srcdir}/uvs.elc + ${emacs} -L ${srcdir} -l uvs \ --eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \ > $@ -.el.elc: +%.elc: %.el ${emacs} -f batch-byte-compile $< unidata.txt: ${srcdir}/UnicodeData.txt - sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < ${srcdir}/UnicodeData.txt > $@ - -compile: ${srcdir}/unidata-gen.elc - -## Depend on .el rather than .elc so as not to needlessly rebuild -## uni-*.el files just because .elc is missing. -## Same for UnicodeData.txt v unidata.txt. -${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt - ${MAKE} compile unidata.txt EMACS="${EMACS}" + sed -e 's/\([^;]*\);\(.*\)/(#x\1 "\2")/' -e 's/;/" "/g' < $< > $@ + +${DSTDIR}/charprop.el: ${srcdir}/unidata-gen.el ${srcdir}/UnicodeData.txt | \ + ${srcdir}/unidata-gen.elc unidata.txt -if [ -f "$@" ]; then \ cd ${DSTDIR} && chmod +w charprop.el `sed -n 's/^;; FILE: //p' < charprop.el`; \ fi ------------------------------------------------------------ revno: 117391 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-06-24 22:57:51 -0700 message: * admin/unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2014-06-24 07:15:26 +0000 +++ admin/ChangeLog 2014-06-25 05:57:51 +0000 @@ -1,3 +1,7 @@ +2014-06-25 Glenn Morris + + * unidata/uvs.el (uvs-print-table-ivd): Fix free variable typo. + 2014-06-21 Glenn Morris * unidata/BidiMirroring.txt: Update to 7.0.0 (only comment changes). === modified file 'admin/unidata/uvs.el' --- admin/unidata/uvs.el 2014-06-02 00:18:22 +0000 +++ admin/unidata/uvs.el 2014-06-25 05:57:51 +0000 @@ -198,8 +198,8 @@ (let ((uvs-alist (with-temp-buffer (insert-file-contents filename) - (setq uvs-alist (uvs-alist-from-ivd collection-id - sequence-id-to-glyph-func))))) + (uvs-alist-from-ivd collection-id + sequence-id-to-glyph-func)))) (princ "/* Automatically generated by uvs.el. */\n") (princ (format "static const unsigned char mac_uvs_table_%s_bytes[] =\n {\n" ------------------------------------------------------------ revno: 117390 committer: Glenn Morris branch nick: trunk timestamp: Tue 2014-06-24 21:29:07 -0400 message: ChangeLog fix diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-24 19:39:22 +0000 +++ lisp/ChangeLog 2014-06-25 01:29:07 +0000 @@ -1,4 +1,4 @@ -2014-06-24 Leonard Randall +2014-06-24 Leonard Randall (tiny change) * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search for comment lines non-greedy and stopping at newlines to fix stack @@ -6,7 +6,7 @@ 2014-06-24 Eli Barzilay - * calculator.el (calculator-last-input): drop 'ascii-character property + * calculator.el (calculator-last-input): Drop 'ascii-character property lookup. 2014-06-24 Leo Liu ------------------------------------------------------------ revno: 117389 author: Leonard Randall committer: Tassilo Horn branch nick: trunk timestamp: Tue 2014-06-24 21:39:22 +0200 message: Make search in reftex-using-biblatex-p non-greedy. * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search for comment lines non-greedy and stopping at newlines to fix stack overflows with large files. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-06-24 07:55:36 +0000 +++ lisp/ChangeLog 2014-06-24 19:39:22 +0000 @@ -1,3 +1,9 @@ +2014-06-24 Leonard Randall + + * textmodes/reftex-parse.el (reftex-using-biblatex-p): Make search + for comment lines non-greedy and stopping at newlines to fix stack + overflows with large files. + 2014-06-24 Eli Barzilay * calculator.el (calculator-last-input): drop 'ascii-character property === modified file 'lisp/textmodes/reftex-parse.el' --- lisp/textmodes/reftex-parse.el 2014-05-04 19:37:56 +0000 +++ lisp/textmodes/reftex-parse.el 2014-06-24 19:39:22 +0000 @@ -363,7 +363,7 @@ (member "biblatex" TeX-active-styles) ;; poor-man's check... (save-excursion - (re-search-forward "^[^%]*\\\\usepackage.*{biblatex}" nil t)))) + (re-search-forward "^[^%\n]*?\\\\usepackage.*{biblatex}" nil t)))) ;;;###autoload (defun reftex-locate-bibliography-files (master-dir &optional files) ------------------------------------------------------------ revno: 117388 committer: Paul Eggert branch nick: trunk timestamp: Tue 2014-06-24 01:10:48 -0700 message: Be more consistent about the 'Qfoo' naming convention. * image.c (Fimagemagick_types): * lisp.h (lisp_h_CHECK_TYPE, CHECK_TYPE, CHECK_ARRAY): * process.c (Fmake_network_process): Rename C local identifier 'Qfoo to avoid giving the false impression that it stands for the symbol 'foo'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-06-23 04:11:29 +0000 +++ src/ChangeLog 2014-06-24 08:10:48 +0000 @@ -1,3 +1,12 @@ +2014-06-24 Paul Eggert + + Be more consistent about the 'Qfoo' naming convention. + * image.c (Fimagemagick_types): + * lisp.h (lisp_h_CHECK_TYPE, CHECK_TYPE, CHECK_ARRAY): + * process.c (Fmake_network_process): + Rename C local identifier 'Qfoo to avoid giving the false + impression that it stands for the symbol 'foo'. + 2014-06-23 Dmitry Antipov Simplify and cleanup character conversion stuff. === modified file 'src/image.c' --- src/image.c 2014-06-21 19:45:59 +0000 +++ src/image.c 2014-06-24 08:10:48 +0000 @@ -8549,7 +8549,6 @@ ExceptionInfo ex; char **imtypes; size_t i; - Lisp_Object Qimagemagicktype; GetExceptionInfo(&ex); imtypes = GetMagickList ("*", &numf, &ex); @@ -8557,8 +8556,8 @@ for (i = 0; i < numf; i++) { - Qimagemagicktype = intern (imtypes[i]); - typelist = Fcons (Qimagemagicktype, typelist); + Lisp_Object imagemagicktype = intern (imtypes[i]); + typelist = Fcons (imagemagicktype, typelist); imtypes[i] = MagickRelinquishMemory (imtypes[i]); } === modified file 'src/lisp.h' --- src/lisp.h 2014-06-23 04:11:29 +0000 +++ src/lisp.h 2014-06-24 08:10:48 +0000 @@ -341,8 +341,8 @@ #define lisp_h_CHECK_LIST_CONS(x, y) CHECK_TYPE (CONSP (x), Qlistp, y) #define lisp_h_CHECK_NUMBER(x) CHECK_TYPE (INTEGERP (x), Qintegerp, x) #define lisp_h_CHECK_SYMBOL(x) CHECK_TYPE (SYMBOLP (x), Qsymbolp, x) -#define lisp_h_CHECK_TYPE(ok, Qxxxp, x) \ - ((ok) ? (void) 0 : (void) wrong_type_argument (Qxxxp, x)) +#define lisp_h_CHECK_TYPE(ok, predicate, x) \ + ((ok) ? (void) 0 : (void) wrong_type_argument (predicate, x)) #define lisp_h_CONSP(x) (XTYPE (x) == Lisp_Cons) #define lisp_h_EQ(x, y) (XLI (x) == XLI (y)) #define lisp_h_FLOATP(x) (XTYPE (x) == Lisp_Float) @@ -388,7 +388,7 @@ # define CHECK_LIST_CONS(x, y) lisp_h_CHECK_LIST_CONS (x, y) # define CHECK_NUMBER(x) lisp_h_CHECK_NUMBER (x) # define CHECK_SYMBOL(x) lisp_h_CHECK_SYMBOL (x) -# define CHECK_TYPE(ok, Qxxxp, x) lisp_h_CHECK_TYPE (ok, Qxxxp, x) +# define CHECK_TYPE(ok, predicate, x) lisp_h_CHECK_TYPE (ok, predicate, x) # define CONSP(x) lisp_h_CONSP (x) # define EQ(x, y) lisp_h_EQ (x, y) # define FLOATP(x) lisp_h_FLOATP (x) @@ -1003,8 +1003,9 @@ /* Type checking. */ -LISP_MACRO_DEFUN_VOID (CHECK_TYPE, (int ok, Lisp_Object Qxxxp, Lisp_Object x), - (ok, Qxxxp, x)) +LISP_MACRO_DEFUN_VOID (CHECK_TYPE, + (int ok, Lisp_Object predicate, Lisp_Object x), + (ok, predicate, x)) /* Deprecated and will be removed soon. */ @@ -2552,9 +2553,9 @@ CHECK_TYPE (VECTORP (x) || STRINGP (x), Qarrayp, x); } INLINE void -CHECK_ARRAY (Lisp_Object x, Lisp_Object Qxxxp) +CHECK_ARRAY (Lisp_Object x, Lisp_Object predicate) { - CHECK_TYPE (ARRAYP (x), Qxxxp, x); + CHECK_TYPE (ARRAYP (x), predicate, x); } INLINE void CHECK_BUFFER (Lisp_Object x) === modified file 'src/process.c' --- src/process.c 2014-06-13 15:55:48 +0000 +++ src/process.c 2014-06-24 08:10:48 +0000 @@ -2844,7 +2844,7 @@ struct gcpro gcpro1; ptrdiff_t count = SPECPDL_INDEX (); ptrdiff_t count1; - Lisp_Object QCaddress; /* one of QClocal or QCremote */ + Lisp_Object colon_address; /* Either QClocal or QCremote. */ Lisp_Object tem; Lisp_Object name, buffer, host, service, address; Lisp_Object filter, sentinel; @@ -2892,8 +2892,8 @@ backlog = XINT (tem); } - /* Make QCaddress an alias for :local (server) or :remote (client). */ - QCaddress = is_server ? QClocal : QCremote; + /* Make colon_address an alias for :local (server) or :remote (client). */ + colon_address = is_server ? QClocal : QCremote; /* :nowait BOOL */ if (!is_server && socktype != SOCK_DGRAM @@ -2920,7 +2920,7 @@ res = &ai; /* :local ADDRESS or :remote ADDRESS */ - address = Fplist_get (contact, QCaddress); + address = Fplist_get (contact, colon_address); if (!NILP (address)) { host = service = Qnil; @@ -3307,7 +3307,7 @@ memcpy (datagram_address[s].sa, lres->ai_addr, lres->ai_addrlen); } #endif - contact = Fplist_put (contact, QCaddress, + contact = Fplist_put (contact, colon_address, conv_sockaddr_to_lisp (lres->ai_addr, lres->ai_addrlen)); #ifdef HAVE_GETSOCKNAME if (!is_server)