commit 1ac42bca8886267dac029a2f19df1a43313e0d95 (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sun Jan 4 00:50:35 2015 -0800 * doc/lispref/files.texi: Fix xref typo. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index c8500d2..2739e3e 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -655,7 +655,7 @@ and also calls the functions in the list Normally, @code{write-region} displays the message @samp{Wrote @var{filename}} in the echo area. This message is inhibited if @var{visit} is neither @code{t} nor @code{nil} nor a string, or if -Emacs is operating in batch mode (@pxref{Batch mode}). This +Emacs is operating in batch mode (@pxref{Batch Mode}). This feature is useful for programs that use files for internal purposes, files that the user does not need to know about. @end deffn commit e82fc62bd46270c50f491c69ca24315c87940004 Author: Glenn Morris Date: Sun Jan 4 00:22:29 2015 -0800 # ChangeLog fixes diff --git a/ChangeLog b/ChangeLog index 68d1391..8051263 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,23 +11,12 @@ 2015-01-01 Paul Eggert - Fix copyright years by hand - These are dates that admin/update-copyright did not update, or - updated incorrectly. Also, back out the copyright-date change to - doc/misc/texinfo.tex, as upstream hasn't updated that date yet. - - Update copyright year to 2015 - Run admin/update-copyright. - Merge from gnulib, incorporating: 2015-01-01 version-etc: new year * .gitattributes: New file. -2015-01-01 Paul Eggert - - * autogen.sh: Port better to non-GNU 'cp'. - Problem reported by Han Boetes. + * autogen.sh: Port better to non-GNU 'cp'. Reported by Han Boetes. 2014-12-31 Paul Eggert @@ -56,32 +45,9 @@ 2014-12-25 Paul Eggert - Prefer stpcpy to strcat - * admin/merge-gnulib (GNULIB_MODULES): Add stpcpy. + Prefer stpcpy to strcat. * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/stpcpy.c, m4/stpcpy.m4: New files, from gnulib. - * lib-src/ebrowse.c (sym_scope_1, operator_name, open_file): - * lib-src/emacsclient.c (get_server_config, set_local_socket) - (start_daemon_and_retry_set_socket): - * lib-src/etags.c (main, C_entries, relative_filename): - * lib-src/pop.c (sendline): - * lib-src/update-game-score.c (main): - * lwlib/xlwmenu.c (resource_widget_value): - * src/callproc.c (child_setup): - * src/dbusbind.c (xd_signature_cat): - * src/doc.c (get_doc_string, Fsnarf_documentation): - * src/editfns.c (Fuser_full_name): - * src/frame.c (xrdb_get_resource): - * src/gtkutil.c (xg_get_file_with_chooser): - * src/tparam.c (tparam1): - * src/xfns.c (xic_create_fontsetname): - * src/xrdb.c (gethomedir, get_user_db, get_environ_db): - * src/xsmfns.c (smc_save_yourself_CB): - Rewrite to avoid the need for strcat, typically by using stpcpy - and/or lispstpcpy. strcat tends to be part of O(N**2) algorithms. - * src/doc.c (sibling_etc): - * src/xrdb.c (xdefaults): - Now a top-level static constant. 2014-12-24 Stephen Leake @@ -96,17 +62,12 @@ 2014-12-23 Paul Eggert - Merge from gnulib + Merge from gnulib. 2014-12-20 utimens: remove unnecessary assert 2014-12-16 stdalign: port better to HP compilers 2014-12-16 stdalign: work around Apple GCC 4.0 bug * lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib. -2014-12-14 Paul Eggert - - Spelling fixes. All uses changed. - * src/regex.c (analyze_first): Rename from analyze_first. - 2014-12-14 Glenn Morris * make-dist: No more lib-src/grep-changelog. @@ -119,22 +80,20 @@ 2014-12-13 Paul Eggert - Git ignore lib/std*.h * .gitignore: Add lib/std*.h, to ignore stdarg.h, stdbool.h, and stddef.h. Remove subsumed entries. Add !lib/std*.in.h, so as to not ignore the .in.h files. 2014-12-13 Paul Eggert - Port commit-msg to mawk - Problem reported by Ted Zlatanov in: + Port commit-msg to mawk. Reported by Ted Zlatanov in: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg01093.html * build-aux/git-hooks/commit-msg (space, non_space, non_print): New vars. Use them as approximations to POSIX bracket expressions, on implementations like mawk that do not support POSIX regexps. - Improve commit-msg messages and autosquash - Problem reported by Michal Nazarewicz in Bug#19337. + Improve commit-msg messages and autosquash. + Reported by Michal Nazarewicz in Bug#19337. * build-aux/git-hooks/commit-msg: Add "commit message" to diagnostics. Distinguish better between tabs and other unprintable chars in diagnostics. Don't complain if a prefix @@ -143,7 +102,7 @@ 2014-12-13 Paul Eggert Port commit-message checking to FreeBSD 9. - This fixes a bug reported by Jan Djärv in: + Reported by Jan Djärv in: http://lists.gnu.org/archive/html/emacs-devel/2014-12/msg00704.html along with some other issues I noticed while testing with FreeBSD. * build-aux/git-hooks/commit-msg: Prefer gawk if available. @@ -158,7 +117,7 @@ 2014-12-12 Paul Eggert - Merge from gnulib + Merge from gnulib. 2014-12-12 stddef: support C11's max_align_t 2014-12-11 unistd: fix iOS check conditional 2014-12-08 apply _GL_ATTRIBUTE_PURE to some inline functions @@ -343,7 +302,7 @@ build: port to GCC 4.6.4 + glibc 2.5 On platforms this old, building with _FORTIFY_SOURCE equal to 2 results in duplicate definitions of standard library functions. - Problem reported by Nelson H. F. Beebe. + Reported by Nelson H. F. Beebe. * configure.ac (_FORTIFY_SOURCE): Sort after GNULIB_PORTCHECK. By default, do not enable this unless GNULIB_PORTCHECK is defined. This better matches the original intent, which as I recall was to @@ -1359,7 +1318,7 @@ Fix problem with MAKE and xcrun configuration. * configure.ac: Don't set MAKE unless 'make' doesn't work. Set it only in the environment, not in the makefile. - Problem reported by Glenn Morris in: + Reported by Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00969.html 2013-12-27 Paul Eggert @@ -3053,7 +3012,7 @@ (bootstrap): Run ./configure, rather than trying to run config.status if it exists. That builds src/epaths.h more reliably. Run autogen/copy_autogen if autogen.sh fails, - to create 'configure'; problem reported by Andreas Schwab in + to create 'configure'. Reported by Andreas Schwab in . * autogen.sh: Exit with status 1 when failing due to missing tools, reverting the 2012-09-10 change to this file. @@ -4385,8 +4344,7 @@ Check pkg-config exit status when configuring (Bug#10626). * configure.in (PKG_CHECK_MODULES): Do not assume that pkg-config - works; check its exit status. Problem reported by Jordi Gutiérrez - Hermoso in + works; check its exit status. Reported by Jordi Gutiérrez Hermoso in . 2012-04-07 Glenn Morris @@ -4544,7 +4502,7 @@ * configure.in (LIB_PTHREAD): Prepend -lpthread to LIBS (Bug#9852) if the library is found. Otherwise, later configure-time tests, such as the test for pthread_sigmask, generate the wrong results - on some platforms. Problem reported for FreeBSD by Nali Toja. + on some platforms. Reported by Nali Toja for FreeBSD. 2011-10-20 Paul Eggert @@ -4775,7 +4733,7 @@ * m4/pthread_sigmask.m4 (gl_FUNC_PTHREAD_SIGMASK): Omit gl_THREADLIB test, which runs afoul of Automake installations where, for example, /usr/share/aclocal contains a copy of gl_THREADLIB. - Problem reported by Sven Joachim in + Reported by Sven Joachim in . This is just a quick temporary fix, specific to Emacs; I'll work with the other gnulib maintainers to get a more-permanent fix. @@ -5387,7 +5345,7 @@ * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses. Sync from gnulib, which has been patched to fix the problem - with the license notices. Problem reported by Glenn Morris in + with the license notices. Reported by Glenn Morris in . 2011-02-09 Stefan Monnier @@ -5541,7 +5499,7 @@ used. The code already assumed two's complement, so there's no need to test for alternatives. All uses removed. (TYPE_MAXIMUM): Don't rely here on overflow behavior not defined by - the C standard. Problem reported by Rich Felker in + the C standard. Reported by Rich Felker in . (twos_complement_arithmetic): Also check long_int and time_t. (time_t_avg, time_t_add_ok, time_t_int_add_ok): New functions. diff --git a/admin/ChangeLog b/admin/ChangeLog index 8338606..8c0c975 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -30,6 +30,10 @@ * update-copyright (emacsver): Change to emacsver.tex.in. +2014-12-25 Paul Eggert + + * merge-gnulib (GNULIB_MODULES): Add stpcpy. + 2014-12-24 Glenn Morris * authors.el (authors-obsolete-files-regexps) diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 1795f021..5d17324 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -11,6 +11,17 @@ since GCC sometimes calls stpcpy when it sees strcpy, under optimization switches. +2014-12-25 Paul Eggert + + * ebrowse.c (sym_scope_1, operator_name, open_file): + * emacsclient.c (get_server_config, set_local_socket) + (start_daemon_and_retry_set_socket): + * etags.c (main, C_entries, relative_filename): + * pop.c (sendline): + * update-game-score.c (main): + Rewrite to avoid the need for strcat, typically by using stpcpy + and/or lispstpcpy. strcat tends to be part of O(N**2) algorithms. + 2014-12-14 Paul Eggert * etags.c (analyze_regex): Rename from analyse_regex. @@ -140,8 +151,7 @@ 2014-05-26 Paul Eggert - Fix rcs2log problems with CVS. - Problem reported by Glenn Morris in + Fix rcs2log problems with CVS. Reported by Glenn Morris in . Plus, fix some security and filename quoting problems. * rcs2log (logdir): Prefer mktemp if available. @@ -3496,7 +3506,7 @@ 2004-04-17 Paul Eggert * rcs2log (Help): Clarify wording of the usage message. - Problem reported by Alan Mackenzie in + Reported by Alan Mackenzie in . 2004-04-07 Stefan Monnier diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa79a8d..f62dc07 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1903,7 +1903,7 @@ 2014-11-18 Paul Eggert Port new time stamp handling to Emacs 23.2. - This fix is for Gnus. Problem reported by Katsumi Yamaoka. + This fix is for Gnus. Reported by Katsumi Yamaoka. * calendar/time-date.el (time-add, time-subtract, time-less-p): Use eval-and-compile, not eval-when-compile. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 023804c..8d536f0 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -5,6 +5,12 @@ (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros. (liblw.a): Use them. +2014-12-25 Paul Eggert + + * xlwmenu.c (resource_widget_value): + Rewrite to avoid the need for strcat, typically by using stpcpy + and/or lispstpcpy. strcat tends to be part of O(N**2) algorithms. + 2014-10-20 Glenn Morris * Merge in all changes up to 24.4 release. diff --git a/src/ChangeLog b/src/ChangeLog index b503a40..592a7f1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -188,6 +188,24 @@ (x_session_initialize, Fhandle_save_session): Prefer NILP (x) to EQ (x, Qnil). +2014-12-25 Paul Eggert + + * callproc.c (child_setup): + * dbusbind.c (xd_signature_cat): + * doc.c (get_doc_string, Fsnarf_documentation): + * editfns.c (Fuser_full_name): + * frame.c (xrdb_get_resource): + * gtkutil.c (xg_get_file_with_chooser): + * tparam.c (tparam1): + * xfns.c (xic_create_fontsetname): + * xrdb.c (gethomedir, get_user_db, get_environ_db): + * xsmfns.c (smc_save_yourself_CB): + Rewrite to avoid the need for strcat, typically by using stpcpy + and/or lispstpcpy. strcat tends to be part of O(N**2) algorithms. + * doc.c (sibling_etc): + * xrdb.c (xdefaults): + Now a top-level static constant. + 2014-12-23 Didier Verna (tiny change). * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a @@ -595,7 +613,7 @@ 2014-11-29 Paul Eggert Improve clarity of USE_LSB_TAG definition. - Problem reported by Lee Duhem. Suggestion by Andreas Schwab in: + Reported by Lee Duhem. Suggested by Andreas Schwab in: http://lists.gnu.org/archive/html/emacs-devel/2014-11/msg02222.html * lisp.h (USE_LSB_TAG): Define in terms of the (simpler) VAL_MAX / 2 rather than in terms of the (more complicated) @@ -621,7 +639,7 @@ 2014-11-27 Oscar Fuentes - * src/w32.c, src/w32heap.c, src/w32term.c: + * w32.c, w32heap.c, w32term.c: Use MINGW_W64 instead of _W64. 2014-11-27 Stefan Monnier @@ -1091,7 +1109,7 @@ 2014-10-25 Noam Postavsky - * src/w32proc.c (create_child): If calling a quoted batch file, + * w32proc.c (create_child): If calling a quoted batch file, pass NULL for exe. (Bug#18745) 2014-10-24 Eli Zaretskii @@ -1510,7 +1528,7 @@ On x86 platforms this works around GCC bug 63495 , and more generally should fix a portability problem in Emacs. - Problem reported by Stefan Monnier in: + Reported by Stefan Monnier in: http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00261.html 2014-10-08 Leo Liu @@ -2026,7 +2044,7 @@ 2014-09-23 Paul Eggert Fix SAFE_ALLOCA to not exhaust the stack when in a loop. - Problem reported by Dmitry Antipov in thread leading to: + Reported by Dmitry Antipov in thread leading to: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00713.html This patch fixes only SAFE_ALLOCA, SAFE_NALLOCA, and SAFE_ALLOCA_LISP; the experimental local_* macros enabled by USE_LOCAL_ALLOCATORS @@ -2359,7 +2377,7 @@ 2014-09-10 Paul Eggert Simplify lisp.h by removing the __COUNTER__ business. - Problem reported by Dmitry Antipov in: + Reported by Dmitry Antipov in: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00220.html * lisp.h (make_local_vector, make_local_string) (build_local_string): Simplify by not bothering with __COUNTER__. @@ -2390,7 +2408,7 @@ * lisp.h (DEFINE_GDB_SYMBOL_ENUM): Remove. These can generate a constant with the correct value but the wrong width, which doesn't work as a printf argument. All uses removed. - Problem reported by Dmitry Antipov in: + Reported by Dmitry Antipov in: http://lists.gnu.org/archive/html/emacs-devel/2014-09/msg00213.html (ENUMABLE): Remove; no longer needed. (ARRAY_MARK_FLAG_val, PSEUDOVECTOR_FLAG_val, VALMASK_val): @@ -4881,7 +4899,7 @@ 2014-06-03 Paul Eggert * emacs.c: Include "sysselect.h", to define its inline functions. - Problem reported by Glenn Morris in: + Reported by Glenn Morris in: http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00077.html Do not require libXt-devel when building with gtk. @@ -5981,7 +5999,7 @@ 2014-03-27 Paul Eggert Port recent signal-related changes to FreeBSD. - Problem reported by Herbert J. Skuhra. + Reported by Herbert J. Skuhra. * lisp.h (block_tty_out_signal, unblock_tty_out_signal): Move decls from here ... * syssignal.h: ... to here, so that lisp.h doesn't depend on signal.h. @@ -6959,7 +6977,7 @@ 2014-01-20 Paul Eggert Avoid undefined behavior by initializing buffer redisplay bit. - Problem reported by Dmitry Antipov in + Reported by Dmitry Antipov in . * buffer.c (Fget_buffer_create): Initialize redisplay bit. @@ -8800,7 +8818,7 @@ 2013-11-21 Paul Eggert Fix some dependency problems that cause unnecessary recompiles. - Problem reported by RMS in + Reported by RMS in . * Makefile.in (OLDXMENU_TARGET, OLDXMENU, OLDXMENU_DEPS) (really-lwlib, really-oldXMenu, stamp-oldxmenu) @@ -9545,8 +9563,7 @@ 2013-10-23 Paul Eggert - Port to Solaris 10 and its bundled GCC. - Problem reported by Timothy C. Burt. + Port to Solaris 10 and its bundled GCC. Reported by Timothy C. Burt. * floatfns.c (isfinite, isnan): Redefine unconditionally. 2013-10-21 Dmitry Antipov @@ -9950,7 +9967,7 @@ so it shouldn't be used all the time. Perhaps we need two flavors of 'eassert', one for where 'assume' is far more likely to help or to hurt; but that can be done later. - Problem reported by Dmitry Antipov in + Reported by Dmitry Antipov in . Also, don't include ; no longer needed. @@ -13678,8 +13695,7 @@ 2013-07-07 Paul Eggert - Port to Ubuntu 10 (Bug#14803). - Problem reported by T.V. Raman. + Port to Ubuntu 10 (Bug#14803). Reported by T.V. Raman. * process.c (close_on_exec, accept4, process_socket): Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC. @@ -13944,7 +13960,7 @@ * emacs.c (malloc_enable_thread): Hoist extern decl to top level. (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]: Invoke malloc_enable_thread even when not interactive. - Problem reported by Ken Brown in . + Reported by Ken Brown in . * process.c (init_process_emacs) [CYGWIN]: Tickle glib even in this case, since the underlying bug has now been fixed. @@ -15169,7 +15185,7 @@ * unexelf.c: Don't assume ElfW (Half) fits in int. (entry_address, find_section, unexec): Use ptrdiff_t, not int, when dealing with ElfW (Half) values, since they can exceed 2**31 - on 64-bit OpenBSD hosts. Problem reported privately by Han Boetes. + on 64-bit OpenBSD hosts. Reported by Han Boetes (privately). (entry_address): Omit unused NUM arg. All uses changed. 2013-05-07 Juri Linkov commit fec9b792f543c35b1a635b3a3326d496e3ca9012 Author: Paul Eggert Date: Sat Jan 3 19:11:50 2015 -0800 Clarify 'make info' * Makefile.in (info): Use GNU make conditional rather than an '@' rule with a shell conditional, so that the builder can see the submake. diff --git a/ChangeLog b/ChangeLog index 9207bd5..68d1391 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2015-01-04 Paul Eggert + Clarify 'make info' + * Makefile.in (info): Use GNU make conditional rather than + an '@' rule with a shell conditional, so that the builder can + see the submake. + Less 'make' chatter for VCSWITNESS * Makefile.in (dirstate, VCSWITNESS): New macros. (src): Use them to lessen 'make' chatter. diff --git a/Makefile.in b/Makefile.in index 7b271f1..4cdd293 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1043,11 +1043,9 @@ uninstall-ps: $(UNINSTALL_PS) # and it's not worth it. This case is only relevant if you download a # release, then change the .texi files. info: - @if test "$(HAVE_MAKEINFO)" = "no"; then \ - echo "Configured --without-makeinfo, not building manuals" ; \ - else \ - $(MAKE) info-real info-dir; \ - fi + ifneq ($(HAVE_MAKEINFO),no) + $(MAKE) info-real info-dir + endif ## build-aux/make-info-dir expects only certain dircategories. check-info: info commit 35127c362a47bc0c452791e18111e3411e22aa52 Author: Paul Eggert Date: Sat Jan 3 18:52:41 2015 -0800 Less 'make' chatter for oldXMenu * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1) (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros. (libXMenu11.a): Use them. diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog index d6a824b..52b873a 100644 --- a/oldXMenu/ChangeLog +++ b/oldXMenu/ChangeLog @@ -1,3 +1,10 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter for oldXMenu + * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1) + (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros. + (libXMenu11.a): Use them. + 2014-10-20 Glenn Morris * Merge in all changes up to 24.4 release. diff --git a/oldXMenu/Makefile.in b/oldXMenu/Makefile.in index cd1cb50..ef2a360 100644 --- a/oldXMenu/Makefile.in +++ b/oldXMenu/Makefile.in @@ -101,6 +101,16 @@ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; am__v_CC_1 = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + DEPDIR = deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS = @DEPFLAGS@ @@ -118,9 +128,9 @@ ALL_CFLAGS=$(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ $(AM_V_CC)$(CC) -c ${ALL_CFLAGS} $< libXMenu11.a: $(OBJS) $(EXTRA) - $(RM) $@ - $(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) - $(RANLIB) $@ + $(AM_V_GEN)$(RM) $@ + $(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS) $(EXTRA) + $(AM_V_at)$(RANLIB) $@ ## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. @oldxmenu_deps_frag@ commit 4d12b5540c0f5a3dfce4c10991789362665b68c1 Author: Paul Eggert Date: Sat Jan 3 18:51:37 2015 -0800 Less 'make' chatter for lwlib * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1) (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros. (liblw.a): Use them. diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog index 12b3a05..023804c 100644 --- a/lwlib/ChangeLog +++ b/lwlib/ChangeLog @@ -1,3 +1,10 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter for lwlib + * Makefile.in (AM_V_GEN, am__v_GEN_, am__v_GEN_0, am__v_GEN_1) + (AM_V_at, am__v_at_, am__v_at_0, am__v_at_1): New macros. + (liblw.a): Use them. + 2014-10-20 Glenn Morris * Merge in all changes up to 24.4 release. diff --git a/lwlib/Makefile.in b/lwlib/Makefile.in index 37ffd55..1f332e9 100644 --- a/lwlib/Makefile.in +++ b/lwlib/Makefile.in @@ -59,6 +59,16 @@ am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; am__v_CC_1 = +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + DEPDIR = deps ## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS = @DEPFLAGS@ @@ -84,9 +94,9 @@ all: liblw.a $(AM_V_CC)$(CC) -c $(CPPFLAGS) $(ALL_CFLAGS) $< liblw.a: $(OBJS) - rm -f $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ + $(AM_V_GEN)rm -f $@ + $(AM_V_at)$(AR) $(ARFLAGS) $@ $(OBJS) + $(AM_V_at)$(RANLIB) $@ globals_h = ../src/globals.h $(globals_h): commit ccb2d93859f6c7e41c648cf3371e42ee265e3408 Author: Paul Eggert Date: Sat Jan 3 18:50:41 2015 -0800 Less 'make' chatter for lisp dir * lisp/Makefile.in (THEFILE): Define to be 'no-such-file' by default, to make it clearer that the caller must specify it. (compile-onefile): Remove, replacing by ... ($(THEFILE)c): ... new rule. This lets us use AM_V_GEN here. ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el) ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el) ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): Use AM_V_GEN to lessen 'make' chatter. (.el.elc): Omit duplicate comment. * src/Makefile.in (%.elc): Adjust to compile-onefile change in ../lisp/Makefile.in. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2feb2af..aa79a8d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,16 @@ 2015-01-04 Paul Eggert + Less 'make' chatter for lisp dir + * Makefile.in (THEFILE): Define to be 'no-such-file' by default, + to make it clearer that the caller must specify it. + (compile-onefile): Remove, replacing by ... + ($(THEFILE)c): ... new rule. This lets us use AM_V_GEN here. + ($(THEFILE)c, .el.elc, $(MH_E_DIR)/mh-loaddefs.el) + ($(TRAMP_DIR)/tramp-loaddefs.el, $(CAL_DIR)/cal-loaddefs.el) + ($(CAL_DIR)/diary-loaddefs.el, $(CAL_DIR)/hol-loaddefs.el): + Use AM_V_GEN to lessen 'make' chatter. + (.el.elc): Omit duplicate comment. + Less 'make' chatter in batch mode * emacs-lisp/autoload.el (autoload-generate-file-autoloads): * emacs-lisp/bytecomp.el (byte-compile-file): diff --git a/lisp/Makefile.in b/lisp/Makefile.in index 67855ba..565ca77 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -257,12 +257,10 @@ TAGS: $(lisptagsfiles1) $(lisptagsfiles2) $(lisptagsfiles3) $(lisptagsfiles4) # src/Makefile.in to rebuild a particular Lisp file, no questions asked. # Use byte-compile-refresh-preloaded to try and work around some of # the most common problems of not bootstrapping from a clean state. -.PHONY: compile-onefile -compile-onefile: - @echo Compiling $(THEFILE) - @# Use byte-compile-refresh-preloaded to try and work around some of - @# the most common bootstrapping problems. - @$(emacs) $(BYTE_COMPILE_FLAGS) \ +THEFILE = no-such-file +.PHONY: $(THEFILE)c +$(THEFILE)c: + $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) \ -l bytecomp -f byte-compile-refresh-preloaded \ -f batch-byte-compile $(THEFILE) @@ -278,12 +276,7 @@ compile-onefile: # An old-fashioned suffix rule, which, according to the GNU Make manual, # cannot have prerequisites. .el.elc: - @echo Compiling $< - @# The BIG_STACK_OPTS are only needed to byte-compile the byte-compiler - @# files, which is normally done in compile-first, but may also be - @# recompiled via this rule. - @$(emacs) $(BYTE_COMPILE_FLAGS) \ - -f batch-byte-compile $< + $(AM_V_GEN)$(emacs) $(BYTE_COMPILE_FLAGS) -f batch-byte-compile $< .PHONY: compile-first compile-main compile compile-always @@ -404,7 +397,7 @@ MH_E_SRC = $(MH_E_DIR)/mh-acros.el $(MH_E_DIR)/mh-alias.el \ .PHONY: mh-autoloads mh-autoloads: $(MH_E_DIR)/mh-loaddefs.el $(MH_E_DIR)/mh-loaddefs.el: $(MH_E_SRC) - $(emacs) -l autoload \ + $(AM_V_GEN)$(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###mh-autoload\")" \ --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ -f batch-update-autoloads $(MH_E_DIR) @@ -421,7 +414,7 @@ TRAMP_SRC = $(TRAMP_DIR)/tramp.el $(TRAMP_DIR)/tramp-adb.el \ $(TRAMP_DIR)/tramp-uu.el $(TRAMP_DIR)/trampver.el $(TRAMP_DIR)/tramp-loaddefs.el: $(TRAMP_SRC) - $(emacs) -l autoload \ + $(AM_V_GEN)$(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###tramp-autoload\")" \ --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ -f batch-update-autoloads $(TRAMP_DIR) @@ -442,19 +435,19 @@ CAL_SRC = $(CAL_DIR)/cal-bahai.el $(CAL_DIR)/cal-china.el \ $(CAL_DIR)/solar.el $(CAL_DIR)/cal-loaddefs.el: $(CAL_SRC) - $(emacs) -l autoload \ + $(AM_V_GEN)$(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###cal-autoload\")" \ --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ -f batch-update-autoloads $(CAL_DIR) $(CAL_DIR)/diary-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/cal-loaddefs.el - $(emacs) -l autoload \ + $(AM_V_GEN)$(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###diary-autoload\")" \ --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ -f batch-update-autoloads $(CAL_DIR) $(CAL_DIR)/hol-loaddefs.el: $(CAL_SRC) $(CAL_DIR)/diary-loaddefs.el - $(emacs) -l autoload \ + $(AM_V_GEN)$(emacs) -l autoload \ --eval "(setq generate-autoload-cookie \";;;###holiday-autoload\")" \ --eval "(setq generated-autoload-file (expand-file-name (unmsys--file-name \"$@\")))" \ -f batch-update-autoloads $(CAL_DIR) diff --git a/src/ChangeLog b/src/ChangeLog index 1629aa0..b503a40 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,9 @@ 2015-01-04 Paul Eggert + Less 'make' chatter for lisp dir + * Makefile.in (%.elc): Adjust to compile-onefile change in + ../lisp/Makefile.in. + batch write-region no longer says "Wrote FOO" This cuts down on 'make' chatter a bit. * fileio.c (Fwrite_region): diff --git a/src/Makefile.in b/src/Makefile.in index ee45846..a2754ea 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -636,7 +636,7 @@ tags: TAGS ../lisp/TAGS $(lwlibdir)/TAGS ## bootstrap-emacs$(EXEEXT) as an order-only prerequisite. %.elc: %.el | bootstrap-emacs$(EXEEXT) - @$(MAKE) -C ../lisp compile-onefile THEFILE=$< EMACS="$(bootstrap_exe)" + @$(MAKE) -C ../lisp EMACS="$(bootstrap_exe)" THEFILE=$< $ Date: Sat Jan 3 18:44:23 2015 -0800 Less 'make' chatter for lib-src * Makefile.in (blessmail): Less 'make' chatter here. diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index eb2b1f3..1795f021 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter for lib-src + * Makefile.in (blessmail): Less 'make' chatter here. + 2014-12-27 Eli Zaretskii * Makefile.in (etags_libs, ebrowse${EXEEXT}, profile${EXEEXT}) diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index 485e2d2..22a5eca 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in @@ -223,8 +223,8 @@ $(EXE_FILES): ../lib/libgnu.a ## Only used if we need blessmail, but no harm in always defining. ## This makes the actual blessmail executable. blessmail: $(srcdir)/../lisp/mail/blessmail.el - $(EMACS) $(EMACSOPT) -l $< - chmod +x $@ + $(AM_V_GEN)$(EMACS) $(EMACSOPT) -l $< + $(AM_V_at)chmod +x $@ ## This checks if we need to run blessmail. ## Do not charge ahead and do it! Let the installer decide. commit c895d02ca13c4f1b57daf75755d32352502b9489 Author: Paul Eggert Date: Sat Jan 3 18:43:27 2015 -0800 Less 'make' chatter for leim * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0) (am__v_at_1): New macros, from src/Makefile.in. (${leimdir}/quail/%.el, misc_convert, ${leimdir}/leim-list.el) (${leimdir}/ja-dic/ja-dic.el): Use them. diff --git a/leim/ChangeLog b/leim/ChangeLog index c858622..4bda9a6 100644 --- a/leim/ChangeLog +++ b/leim/ChangeLog @@ -1,3 +1,12 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter for leim + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0) + (am__v_at_1): New macros, from src/Makefile.in. + (${leimdir}/quail/%.el, misc_convert, ${leimdir}/leim-list.el) + (${leimdir}/ja-dic/ja-dic.el): Use them. + 2014-12-14 Paul Eggert * SKK-DIC/SKK-JISYO.L: Update to version 1.1216. diff --git a/leim/Makefile.in b/leim/Makefile.in index 721565e..573acf7 100644 --- a/leim/Makefile.in +++ b/leim/Makefile.in @@ -29,6 +29,19 @@ srcdir=@srcdir@ # Where the generated files go. leimdir = ${srcdir}/../lisp/leim +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSPATH @@ -88,11 +101,12 @@ ${leimdir}/quail ${leimdir}/ja-dic: ## All of TIT_GB and TIT_BIG5. ${leimdir}/quail/%.el: ${srcdir}/CXTERM-DIC/%.tit - ${RUN_EMACS} -l titdic-cnv \ + $(AM_V_GEN)${RUN_EMACS} -l titdic-cnv \ -f batch-titdic-convert -dir ${leimdir}/quail $< -misc_convert = ${RUN_EMACS} -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail +misc_convert = $(AM_V_GEN)${RUN_EMACS} \ + -l titdic-cnv -f batch-miscdic-convert -dir ${leimdir}/quail ## CTLau.el, CTLau-b5.el. ${leimdir}/quail/CT%.el: ${srcdir}/MISC-DIC/CT%.html @@ -114,16 +128,16 @@ ${leimdir}/quail/tsang-%.el ${leimdir}/quail/quick-%.el: ${srcdir}/MISC-DIC/cang leim-list.el: ${leimdir}/leim-list.el ${leimdir}/leim-list.el: ${srcdir}/leim-ext.el ${TIT_MISC} - rm -f $@ - ${RUN_EMACS} -l international/quail \ + $(AM_V_GEN)rm -f $@ + $(AM_V_at)${RUN_EMACS} -l international/quail \ --eval "(update-leim-list-file (unmsys--file-name \"${leimdir}\"))" - sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < $< >> $@ + $(AM_V_at)sed -n -e '/^[^;]/p' -e 's/^;\(;*\)inc /;\1 /p' < $< >> $@ ${leimdir}/ja-dic/ja-dic.el: | $(leimdir)/ja-dic ${leimdir}/ja-dic/ja-dic.el: $(srcdir)/SKK-DIC/SKK-JISYO.L - $(RUN_EMACS) -batch -l ja-dic-cnv \ + $(AM_V_GEN)$(RUN_EMACS) -batch -l ja-dic-cnv \ -f batch-skkdic-convert -dir "$(leimdir)/ja-dic" "$<" commit 4e2358292540786bcaea085e8094a728d1aa0c30 Author: Paul Eggert Date: Sat Jan 3 18:42:06 2015 -0800 Less 'make' chatter for admin/grammars * grammars/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN) (am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_) (am__v_at_0, am__v_at_1): New macros, from src/Makefile.in. (${bovinedir}/%-by.el, ${bovinedir}/scm-by.el) (${cedetdir}/semantic/%-wy.el, ${wisentdir}/%-wy.el) (${wisentdir}/javat-wy.el, ${cedetdir}/srecode/srt-wy.el): Use them. diff --git a/admin/ChangeLog b/admin/ChangeLog index 2f4d122..8338606 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,5 +1,13 @@ 2015-01-04 Paul Eggert + Less 'make' chatter for admin/grammars + * grammars/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN) + (am__v_GEN_, am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_) + (am__v_at_0, am__v_at_1): New macros, from src/Makefile.in. + (${bovinedir}/%-by.el, ${bovinedir}/scm-by.el) + (${cedetdir}/semantic/%-wy.el, ${wisentdir}/%-wy.el) + (${wisentdir}/javat-wy.el, ${cedetdir}/srecode/srt-wy.el): Use them. + Less chatter in batch mode * unidata/unidata-gen.el (unidata-gen-files): Don't output messages like "Generating ..." in batch mode. diff --git a/admin/grammars/Makefile.in b/admin/grammars/Makefile.in index b88521f..6b54ecc 100644 --- a/admin/grammars/Makefile.in +++ b/admin/grammars/Makefile.in @@ -28,6 +28,19 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ + +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = + +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = + # Prevent any settings in the user environment causing problems. unexport EMACSDATA EMACSDOC EMACSPATH @@ -68,30 +81,30 @@ wisent: ${WISENT} ## c-by.el, make-by.el. ${bovinedir}/%-by.el: ${srcdir}/%.by - [ ! -f "$@" ] || chmod +w "$@" - ${make_bovine} -o "$@" $< + $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" + $(AM_V_at)${make_bovine} -o "$@" $< ${bovinedir}/scm-by.el: ${srcdir}/scheme.by - [ ! -f "$@" ] || chmod +w "$@" - ${make_bovine} -o "$@" $< + $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" + $(AM_V_at)${make_bovine} -o "$@" $< ## grammar-wy.el ${cedetdir}/semantic/%-wy.el: ${srcdir}/%.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" $< + $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" + $(AM_V_at)${make_wisent} -o "$@" $< ## js-wy.el, python-wy.el ${wisentdir}/%-wy.el: ${srcdir}/%.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" $< + $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" + $(AM_V_at)${make_wisent} -o "$@" $< ${wisentdir}/javat-wy.el: ${srcdir}/java-tags.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" $< + $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" + $(AM_V_at)${make_wisent} -o "$@" $< ${cedetdir}/srecode/srt-wy.el: ${srcdir}/srecode-template.wy - [ ! -f "$@" ] || chmod +w "$@" - ${make_wisent} -o "$@" $< + $(AM_V_GEN)[ ! -f "$@" ] || chmod +w "$@" + $(AM_V_at)${make_wisent} -o "$@" $< .PHONY: distclean bootstrap-clean maintainer-clean extraclean commit ed51b8df3c25da47431d4d4cc2af0ff9db2f0421 Author: Paul Eggert Date: Sat Jan 3 18:40:51 2015 -0800 Less 'make' chatter for VCSWITNESS * Makefile.in (dirstate, VCSWITNESS): New macros. (src): Use them to lessen 'make' chatter. diff --git a/ChangeLog b/ChangeLog index 0efa32a..9207bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter for VCSWITNESS + * Makefile.in (dirstate, VCSWITNESS): New macros. + (src): Use them to lessen 'make' chatter. + 2015-01-01 Paul Eggert Fix copyright years by hand diff --git a/Makefile.in b/Makefile.in index b8d914b..7b271f1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -389,15 +389,13 @@ lib lib-src lisp nt: Makefile # repository pull. In git there is no single file that guarantees # this, but the local log for the current head should be close enough. # -# Note the use of single quotes in the value of vcswitness. -# This passes an unexpanded $srcdir to src's Makefile, which then +# Pass an unexpanded $srcdir to src's Makefile, which then # expands it using its own value of srcdir (which points to the # source directory of src/). +dirstate = .git/logs/HEAD +VCSWITNESS = $(if $(wildcard $(srcdir)/$(dirstate)),$$(srcdir)/../$(dirstate)) src: Makefile - dirstate='.git/logs/HEAD'; \ - vcswitness='$$(srcdir)/../'$$dirstate; \ - [ -r "$(srcdir)/$$dirstate" ] || vcswitness=''; \ - $(MAKE) -C $@ all VCSWITNESS="$$vcswitness" + $(MAKE) -C $@ VCSWITNESS='$(VCSWITNESS)' all blessmail: Makefile src $(MAKE) -C lib-src maybe-blessmail commit cd2d58c1c81d608d6e1aefe1eb8a3d1f1cd60540 Author: Paul Eggert Date: Sat Jan 3 18:28:35 2015 -0800 Less 'make' chatter in batch mode * admin/unidata/unidata-gen.el (unidata-gen-files): * lisp/emacs-lisp/autoload.el (autoload-generate-file-autoloads): * lisp/emacs-lisp/bytecomp.el (byte-compile-file): * lisp/files.el (save-buffer, basic-save-buffer): * lisp/international/quail.el (quail-update-leim-list-file): Don't output messages like "Generating ..." in batch mode. diff --git a/admin/ChangeLog b/admin/ChangeLog index d702565..2f4d122 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@ -1,3 +1,9 @@ +2015-01-04 Paul Eggert + + Less chatter in batch mode + * unidata/unidata-gen.el (unidata-gen-files): + Don't output messages like "Generating ..." in batch mode. + 2015-01-02 Paul Eggert Less 'make' chatter for unidata diff --git a/admin/unidata/unidata-gen.el b/admin/unidata/unidata-gen.el index ca3bae1..8af6fa0 100644 --- a/admin/unidata/unidata-gen.el +++ b/admin/unidata/unidata-gen.el @@ -1329,7 +1329,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." (insert (format "(define-char-code-property '%S %S\n %S)\n" prop basename docstring)) (with-temp-buffer - (message "Generating %s..." file) + (or noninteractive (message "Generating %s..." file)) (when (file-exists-p file) (insert-file-contents file) (goto-char (point-max)) @@ -1356,7 +1356,7 @@ Property value is a symbol `o' (Open), `c' (Close), or `n' (None)." ";; End:\n\n" (format ";; %s ends here\n" basename))) (write-file file) - (message "Generating %s...done" file)))) + (or noninteractive (message "Generating %s...done" file))))) (message "Writing %s..." charprop-file) (insert ";; Local Variables:\n" ";; coding: utf-8\n" diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 77a7ec3..2feb2af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2015-01-04 Paul Eggert + + Less 'make' chatter in batch mode + * emacs-lisp/autoload.el (autoload-generate-file-autoloads): + * emacs-lisp/bytecomp.el (byte-compile-file): + * files.el (save-buffer, basic-save-buffer): + * international/quail.el (quail-update-leim-list-file): + Don't output messages like "Generating ..." in batch mode. + 2015-01-04 Dmitry Gutov Unbreak `mouse-action' property in text buttons. diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index e9d13b8..073d923 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -539,7 +539,7 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE (autoload-find-file file)) ;; Obey the no-update-autoloads file local variable. (unless no-update-autoloads - (message "Generating autoloads for %s..." file) + (or noninteractive (message "Generating autoloads for %s..." file)) (setq load-name (if (stringp generated-autoload-load-name) generated-autoload-load-name @@ -623,7 +623,8 @@ Return non-nil if and only if FILE adds no autoloads to OUTFILE (nth 5 (file-attributes relfile)))) (insert ";;; Generated autoloads from " relfile "\n"))) (insert generate-autoload-section-trailer)))) - (message "Generating autoloads for %s...done" file)) + (or noninteractive + (message "Generating autoloads for %s...done" file))) (or visited ;; We created this buffer, so we should kill it. (kill-buffer (current-buffer)))) diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el index 4c694ad..1acd4fe 100644 --- a/lisp/emacs-lisp/bytecomp.el +++ b/lisp/emacs-lisp/bytecomp.el @@ -1858,7 +1858,7 @@ The value is non-nil if there were no errors, nil if errors." ;; recompiled). Previously this was accomplished by ;; deleting target-file before writing it. (rename-file tempfile target-file t) - (message "Wrote %s" target-file)) + (or noninteractive (message "Wrote %s" target-file))) ;; This is just to give a better error message than write-region (signal 'file-error (list "Opening output file" diff --git a/lisp/files.el b/lisp/files.el index 22362ca..80b538c 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4663,7 +4663,7 @@ See the subroutine `basic-save-buffer' for more information." ;; then Rmail-mbox never displays it due to buffer swapping. If ;; the test is ever re-introduced, be sure to handle saving of ;; Rmail files. - (if (and modp (buffer-file-name)) + (if (and modp (buffer-file-name) (not noninteractive)) (message "Saving file %s..." (buffer-file-name))) (basic-save-buffer) (and modp (memq arg '(4 64)) (setq buffer-backed-up nil)))) @@ -4805,7 +4805,7 @@ Before and after saving the buffer, this function runs ;; Support VC `implicit' locking. (vc-after-save) (run-hooks 'after-save-hook)) - (message "(No changes need to be saved)")))) + (or noninteractive (message "(No changes need to be saved)"))))) ;; This does the "real job" of writing a buffer into its visited file ;; and making a backup file. This is what is normally done diff --git a/lisp/international/quail.el b/lisp/international/quail.el index f194b93..2755fd6 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -2985,7 +2985,7 @@ of each directory." quail-dirs list-buf pkg-list pos) (if (not (file-writable-p leim-list)) (error "Can't write to file \"%s\"" leim-list)) - (message "Updating %s ..." leim-list) + (or noninteractive (message "Updating %s ..." leim-list)) (setq list-buf (find-file-noselect leim-list)) ;; At first, clean up the file. @@ -3077,7 +3077,7 @@ of each directory." (let ((coding-system-for-write 'utf-8)) (save-buffer 0))) (kill-buffer list-buf) - (message "Updating %s ... done" leim-list))) + (or noninteractive (message "Updating %s ... done" leim-list)))) (defun quail-advice (args) "Advise users about the characters input by the current Quail package. commit d20f82e6f1ab902469723ebd530ca21bea9cc41b Author: Paul Eggert Date: Sat Jan 3 17:48:23 2015 -0800 batch write-region no longer says "Wrote FOO" This cuts down on 'make' chatter a bit. * doc/lispref/files.texi (Writing to Files): * etc/NEWS: Document this. * src/fileio.c (Fwrite_region): Don't output "Wrote /whatever/foo.elc" if noninteractive. diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index de1a760..941be3c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2015-01-04 Paul Eggert + + batch write-region no longer says "Wrote FOO" + * files.texi (Writing to Files): Document this. + 2014-12-31 Paul Eggert Less 'make' chatter for Emacs doc diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index 51d1369..c8500d2 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -653,8 +653,9 @@ and also calls the functions in the list @xref{Format Conversion}. Normally, @code{write-region} displays the message @samp{Wrote -@var{filename}} in the echo area. If @var{visit} is neither @code{t} -nor @code{nil} nor a string, then this message is inhibited. This +@var{filename}} in the echo area. This message is inhibited if +@var{visit} is neither @code{t} nor @code{nil} nor a string, or if +Emacs is operating in batch mode (@pxref{Batch mode}). This feature is useful for programs that use files for internal purposes, files that the user does not need to know about. @end deffn diff --git a/etc/ChangeLog b/etc/ChangeLog index 2816044..c72c560 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -1,3 +1,8 @@ +2015-01-04 Paul Eggert + + batch write-region no longer says "Wrote FOO" + * NEWS: Document this. + 2014-12-30 Paul Eggert * PROBLEMS: Omit obsolete mention of FQDNs. diff --git a/etc/NEWS b/etc/NEWS index ca63ff1..ac42a9f 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -551,6 +551,9 @@ system's name has changed or if the Emacs process has changed systems, and to avoid long waits it no longer consults DNS to canonicalize the name. The variable `system-name' is now obsolete. ++++ +** Function `write-region' no longer outputs "Wrote FILE" in batch mode. + --- ** New utilities in subr-x.el: *** New macros `if-let' and `when-let' allow defining bindings and to diff --git a/src/ChangeLog b/src/ChangeLog index 46ab94c..1629aa0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-01-04 Paul Eggert + + batch write-region no longer says "Wrote FOO" + This cuts down on 'make' chatter a bit. + * fileio.c (Fwrite_region): + Don't output "Wrote /whatever/foo.elc" if noninteractive. + 2015-01-03 Paul Eggert Revert previous change to produce_composite_glyph diff --git a/src/fileio.c b/src/fileio.c index b04d998..0f0fd1a 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -4741,8 +4741,8 @@ Optional fifth argument VISIT, if t or a string, means If VISIT is a string, it is a second file name; the output goes to FILENAME, but the buffer is marked as visiting VISIT. VISIT is also the file name to lock and unlock for clash detection. -If VISIT is neither t nor nil nor a string, - that means do not display the \"Wrote file\" message. +If VISIT is neither t nor nil nor a string, or if Emacs is in batch mode, + do not display the \"Wrote file\" message. The optional sixth arg LOCKNAME, if non-nil, specifies the name to use for locking and unlocking, overriding FILENAME and VISIT. The optional seventh arg MUSTBENEW, if non-nil, insists on a check @@ -5109,7 +5109,7 @@ write_region (Lisp_Object start, Lisp_Object end, Lisp_Object filename, return Qnil; } - if (!auto_saving) + if (!auto_saving && !noninteractive) message_with_string ((NUMBERP (append) ? "Updated %s" : ! NILP (append) commit d94007484ab6b98054b043c1bedeaf7a58eb8606 Author: Dmitry Gutov Date: Sun Jan 4 03:24:53 2015 +0300 Unbreak `mouse-action' property in text buttons * lisp/button.el (push-button): Fix regression from 2012-12-06. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 49640f8..77a7ec3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-04 Dmitry Gutov + + Unbreak `mouse-action' property in text buttons. + + * button.el (push-button): Fix regression from 2012-12-06. + 2015-01-03 Dmitry Gutov * progmodes/xref.el (xref-marker-stack-empty-p): New function. diff --git a/lisp/button.el b/lisp/button.el index 2836b89..189a1c2 100644 --- a/lisp/button.el +++ b/lisp/button.el @@ -449,7 +449,7 @@ return t." (if (posn-string posn) ;; mode-line, header-line, or display string event. (button-activate (posn-string posn) t) - (push-button (posn-point posn)) t))) + (push-button (posn-point posn) t)))) ;; POS is just normal position (let ((button (button-at (or pos (point))))) (when button commit 5395106b0e8a9ea0c9ad34da6a2231152617d73c Author: Paul Eggert Date: Sat Jan 3 14:37:05 2015 -0800 Revert previous change to produce_composite_glyph * term.c (produce_composite_glyph): Revert previous change (Bug#19496). diff --git a/src/ChangeLog b/src/ChangeLog index 12852b8..46ab94c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2015-01-03 Paul Eggert + Revert previous change to produce_composite_glyph + * term.c (produce_composite_glyph): Revert previous change (Bug#19496). + Pacify gcc -Wparentheses * frame.c (x_set_frame_parameters): Add parens (Bug#19428). diff --git a/src/term.c b/src/term.c index 74879ec..48447bc 100644 --- a/src/term.c +++ b/src/term.c @@ -1736,7 +1736,7 @@ produce_composite_glyph (struct it *it) { struct composition *cmp = composition_table[it->cmp_it.id]; - it->pixel_width = cmp->pixel_width; + it->pixel_width = cmp->width; } else { commit 8bef7b6ad1775124eeed81acf46551c0fc3aa75e Author: Dmitry Gutov Date: Sat Jan 3 16:02:04 2015 +0200 Only show "Back" when the marker stack is non-empty * lisp/menu-bar.el (menu-bar-goto-menu): Use it. * lisp/progmodes/xref.el (xref-marker-stack-empty-p): New function. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 34e22af..49640f8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,11 @@ 2015-01-03 Dmitry Gutov + * progmodes/xref.el (xref-marker-stack-empty-p): New function. + + * menu-bar.el (menu-bar-goto-menu): Use it. + +2015-01-03 Dmitry Gutov + * progmodes/xref.el (xref--window-configuration): New variable. (xref-show-location-at-point): New command. (xref--restore-window-configuration): New function. diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 7d7e466..67cb327 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -381,6 +381,7 @@ (bindings--define-key menu [xref-pop] '(menu-item "Back" xref-pop-marker-stack + :visible (not (xref-marker-stack-empty-p)) :help "Back to the position of the last search")) (bindings--define-key menu [xref-apropos] diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index cb331e1..7bc6500 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -301,6 +301,10 @@ backward." (let ((marker (ring-remove ring))) (set-marker marker nil nil))))) +(defun xref-marker-stack-empty-p () + "Return t if the marker stack is empty; nil otherwise." + (ring-empty-p xref--marker-ring)) + (defun xref--goto-location (location) "Set buffer and point according to xref-location LOCATION." commit 5496236583e22bce185650988a1ae675216e883e Author: Dmitry Gutov Date: Sat Jan 3 15:53:18 2015 +0200 Don't remap `next-line' and `previous-line' in xref keymap * lisp/progmodes/xref.el (xref--window-configuration): New variable. (xref-show-location-at-point): New command. (xref--restore-window-configuration): New function. (xref-next-line, xref-prev-line): Delegate to `xref-show-location-at-point'. (xref--location-at-point): Don't signal the error. (xref-goto-xref): Do that here instead. (xref--xref-buffer-mode): Add `xref--restore-window-configuration' to `pre-command-hook'. (xref--xref-buffer-mode-map): Don't remap `next-line' and `previous-line'. Additionally bind `xref-next-line' and `xref-prev-line' to `n' and `p' respectively. Bind `xref-show-location-at-point' to `C-o'. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4b413fb..34e22af 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,19 @@ +2015-01-03 Dmitry Gutov + + * progmodes/xref.el (xref--window-configuration): New variable. + (xref-show-location-at-point): New command. + (xref--restore-window-configuration): New function. + (xref-next-line, xref-prev-line): Delegate to + `xref-show-location-at-point'. + (xref--location-at-point): Don't signal the error. + (xref-goto-xref): Do that here instead. + (xref--xref-buffer-mode): Add `xref--restore-window-configuration' + to `pre-command-hook'. + (xref--xref-buffer-mode-map): Don't remap `next-line' and + `previous-line'. Additionally bind `xref-next-line' and + `xref-prev-line' to `n' and `p' respectively. Bind + `xref-show-location-at-point' to `C-o'. + 2015-01-01 Eli Zaretskii * tool-bar.el (tool-bar-local-item) diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index a5ff5ee..cb331e1 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el @@ -328,6 +328,8 @@ WINDOW controls how the buffer is displayed: ;; The xref buffer is used to display a set of xrefs. +(defvar-local xref--window-configuration nil) + (defun xref--display-position (pos other-window recenter-arg) ;; show the location, but don't hijack focus. (with-selected-window (display-buffer (current-buffer) other-window) @@ -341,46 +343,56 @@ WINDOW controls how the buffer is displayed: (xref--display-position (point) t 1)) (user-error (message (error-message-string err))))) -(defun xref--next-line (backward) - (let ((loc (xref--search-property 'xref-location backward))) +(defun xref-show-location-at-point () + "Display the source of xref at point in the other window, if any." + (interactive) + (let ((loc (xref--location-at-point))) (when loc - (save-window-excursion - (xref--show-location loc) - (sit-for most-positive-fixnum))))) + (setq xref--window-configuration (current-window-configuration)) + (xref--show-location loc)))) + +(defun xref--restore-window-configuration () + (when xref--window-configuration + (set-window-configuration xref--window-configuration) + (setq xref--window-configuration nil))) (defun xref-next-line () "Move to the next xref and display its source in the other window." (interactive) - (xref--next-line nil)) + (xref--search-property 'xref-location) + (xref-show-location-at-point)) (defun xref-prev-line () "Move to the previous xref and display its source in the other window." (interactive) - (xref--next-line t)) + (xref--search-property 'xref-location t) + (xref-show-location-at-point)) (defun xref--location-at-point () - (or (get-text-property (point) 'xref-location) - (error "No reference at point"))) + (get-text-property (point) 'xref-location)) (defvar-local xref--window nil) (defun xref-goto-xref () "Jump to the xref at point and bury the xref buffer." (interactive) - (let ((loc (xref--location-at-point)) + (let ((loc (or (xref--location-at-point) + (error "No reference at point"))) (window xref--window)) (quit-window) (xref--pop-to-location loc window))) (define-derived-mode xref--xref-buffer-mode fundamental-mode "XREF" "Mode for displaying cross-references." - (setq buffer-read-only t)) + (setq buffer-read-only t) + (add-hook 'pre-command-hook #'xref--restore-window-configuration nil t)) (let ((map xref--xref-buffer-mode-map)) (define-key map (kbd "q") #'quit-window) - (define-key map [remap next-line] #'xref-next-line) - (define-key map [remap previous-line] #'xref-prev-line) + (define-key map (kbd "n") #'xref-next-line) + (define-key map (kbd "p") #'xref-prev-line) (define-key map (kbd "RET") #'xref-goto-xref) + (define-key map (kbd "C-o") #'xref-show-location-at-point) ;; suggested by Johan Claesson "to further reduce finger movement": (define-key map (kbd ".") #'xref-next-line) commit c6e9f7838aaf2efbb519c7401a60caffa36a4f9d Author: Paul Eggert Date: Sat Jan 3 12:19:00 2015 -0800 Pacify gcc -Wparentheses * frame.c (x_set_frame_parameters): Add parens (Bug#19428). diff --git a/src/ChangeLog b/src/ChangeLog index 6d25fc2..12852b8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2015-01-03 Paul Eggert + + Pacify gcc -Wparentheses + * frame.c (x_set_frame_parameters): Add parens (Bug#19428). + 2015-01-03 Martin Rudalics * frame.c (x_set_frame_parameters): Call Fset_frame_size only if diff --git a/src/frame.c b/src/frame.c index bdc914f..5a0d142 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3219,7 +3219,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) if ((width_change && width != FRAME_TEXT_WIDTH (f)) || (height_change && height != FRAME_TEXT_HEIGHT (f)) - || f->can_x_set_window_size && (f->new_height || f->new_width)) + || (f->can_x_set_window_size && (f->new_height || f->new_width))) { /* If necessary provide default values for HEIGHT and WIDTH. Do that here since otherwise a size change implied by an commit 8c38c2b77a5f0b256948bda0d3f9b6272483a42d Author: Martin Rudalics Date: Sat Jan 3 17:40:40 2015 +0100 Two fixes for setting up sizes of a new frame (Bug#19428). * frame.c (x_set_frame_parameters): Call Fset_frame_size only if f->can_x_set_window_size is true. * xterm.c (x_set_window_size_1): Call change_frame_size with text sizes instead of pixel sizes (Bug#19428). diff --git a/src/ChangeLog b/src/ChangeLog index d204ccf..6d25fc2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2015-01-03 Martin Rudalics + + * frame.c (x_set_frame_parameters): Call Fset_frame_size only if + f->can_x_set_window_size is true. + * xterm.c (x_set_window_size_1): Call change_frame_size with + text sizes instead of pixel sizes (Bug#19428). + 2015-01-01 Eli Zaretskii * xdisp.c (pos_visible_p): Fix up the X coordinate for diff --git a/src/frame.c b/src/frame.c index 13b05c6..bdc914f 100644 --- a/src/frame.c +++ b/src/frame.c @@ -3219,7 +3219,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist) if ((width_change && width != FRAME_TEXT_WIDTH (f)) || (height_change && height != FRAME_TEXT_HEIGHT (f)) - || f->new_height || f->new_width) + || f->can_x_set_window_size && (f->new_height || f->new_width)) { /* If necessary provide default values for HEIGHT and WIDTH. Do that here since otherwise a size change implied by an diff --git a/src/xterm.c b/src/xterm.c index 0a60bd1..cf4aab0 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -9542,7 +9542,7 @@ x_set_window_size_1 (struct frame *f, bool change_gravity, x_wait_for_event (f, ConfigureNotify); else { - change_frame_size (f, pixelwidth, pixelheight, false, true, false, true); + change_frame_size (f, width, height, false, true, false, true); x_sync (f); } }