commit 7e3507cfc48cdeec6b131922826f8379218710ae (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Wed Dec 31 11:59:02 2014 -0800 Less 'make' chatter for doc and lisp [doc/emacs/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/emacs.info, emacs.html): Use them. [doc/lispintro/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html): Use them. [doc/lispref/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/elisp.info, elisp.html): Use them. [doc/misc/ChangeLog] Less 'make' chatter for Emacs doc * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. (ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info) (${buildinfodir}/efaq%.info, efaq%.html): Use them. [lisp/ChangeLog] Less 'make' chatter in lisp directory * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) (am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in. (custom-deps, finder-data, autoloads, update-subdirs): Use them. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 0016ee0..9299e13 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,11 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/emacs.info, emacs.html): + Use them. + 2014-12-27 Eli Zaretskii * buffers.texi (Kill Buffer): Improve indexing. diff --git a/doc/emacs/Makefile.in b/doc/emacs/Makefile.in index 5e53c07..8384db0 100644 --- a/doc/emacs/Makefile.in +++ b/doc/emacs/Makefile.in @@ -73,8 +73,15 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips +# 'make' verbosity. +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ +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 = + +ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" \ MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" DVI_TARGETS = emacs.dvi emacs-xtra.dvi @@ -162,7 +169,7 @@ ${buildinfodir}: # There is no provision for Info files to exist in the build directory. # In a distribution of Emacs, the Info files should be up to date. $(buildinfodir)/emacs.info: ${EMACSSOURCES} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< @@ -171,7 +178,7 @@ emacs.pdf: ${EMACSSOURCES} $(ENVADD) $(TEXI2PDF) $< emacs.html: ${EMACSSOURCES} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index 572875c..2a44153 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog @@ -1,3 +1,11 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/eintr.info, emacs-lisp-intro.html): + Use them. + 2014-11-09 Glenn Morris * Makefile.in (version): Remove variable. diff --git a/doc/lispintro/Makefile.in b/doc/lispintro/Makefile.in index 4bcbb53..89ee378 100644 --- a/doc/lispintro/Makefile.in +++ b/doc/lispintro/Makefile.in @@ -55,8 +55,17 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ - MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" +# '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 = + +ENVADD = \ + $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" DVI_TARGETS = emacs-lisp-intro.dvi HTML_TARGETS = emacs-lisp-intro.html @@ -83,7 +92,7 @@ ${buildinfodir}: # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing. ${buildinfodir}/eintr.info: ${srcs} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< emacs-lisp-intro.dvi: ${srcs} $(ENVADD) $(TEXI2DVI) $< @@ -92,7 +101,7 @@ emacs-lisp-intro.pdf: ${srcs} $(ENVADD) $(TEXI2PDF) $< emacs-lisp-intro.html: ${srcs} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< emacs-lisp-intro.ps: emacs-lisp-intro.dvi $(DVIPS) -o $@ $< diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index c9f576a..bb4f183 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,11 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/elisp.info, elisp.html): + Use them. + 2014-12-30 Martin Rudalics * display.texi (Temporary Displays): Amend description of diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in index 11cc0ec..ab9abef 100644 --- a/doc/lispref/Makefile.in +++ b/doc/lispref/Makefile.in @@ -59,8 +59,17 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ - MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" +# '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 = + +ENVADD = \ + $(AM_V_GEN)TEXINPUTS="$(srcdir):$(texinfodir):$(emacsdir):$(TEXINPUTS)" \ + MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" DVI_TARGETS = elisp.dvi HTML_TARGETS = elisp.html @@ -137,13 +146,13 @@ ${buildinfodir}: ${MKDIR_P} $@ $(buildinfodir)/elisp.info: $(srcs) | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< elisp.dvi: $(srcs) $(ENVADD) $(TEXI2DVI) $< elisp.html: $(srcs) - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< elisp.pdf: $(srcs) $(ENVADD) $(TEXI2PDF) $< diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 95e6a1c..285d5b3 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,12 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info) + (${buildinfodir}/efaq%.info, efaq%.html): + Use them. + 2014-12-18 Eric Abrahamsen * gnus.texi (Gnus Registry Setup): Explain pruning changes. Mention diff --git a/doc/misc/Makefile.in b/doc/misc/Makefile.in index 40a072a..aff1f13 100644 --- a/doc/misc/Makefile.in +++ b/doc/misc/Makefile.in @@ -96,7 +96,15 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips -ENVADD = TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ +# '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 = + +ENVADD = $(AM_V_GEN)TEXINPUTS="$(srcdir):$(emacsdir):$(TEXINPUTS)" \ MAKEINFO="$(MAKEINFO) $(MAKEINFO_OPTS)" gfdl = ${srcdir}/doclicense.texi @@ -133,7 +141,8 @@ ${buildinfodir}: EXTRA_OPTS = ${buildinfodir}/%.info: ${srcdir}/%.texi ${gfdl} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) $(EXTRA_OPTS) \ + -o $@ $< ## The short aliases, eg efaq = $(buildinfodir)/efaq.info. define info_template @@ -153,7 +162,8 @@ $(foreach ifile,$(filter-out info.info,$(INFO_TARGETS)),$(eval $(call info_templ $(ENVADD) $(TEXI2PDF) $< %.html: ${srcdir}/%.texi ${gfdl} - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) $(EXTRA_OPTS) \ + -o $@ $< %.ps: %.dvi $(DVIPS) -o $@ $< @@ -175,12 +185,12 @@ $(buildinfodir)/semantic.info semantic.dvi semantic.pdf semantic.html: ${srcdir} ## Please can we just rename cc-mode.texi to ccmode.texi... ${buildinfodir}/ccmode.info: ${srcdir}/cc-mode.texi ${gfdl} | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< ## efaq, efaq_w32 do not depend on gfdl. ## Maybe we can use .SECONDEXPANSION for this. ${buildinfodir}/efaq%.info: ${srcdir}/efaq%.texi | ${buildinfodir} - $(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(INFO_OPTS) -o $@ $< efaq%.dvi: ${srcdir}/efaq%.texi $(ENVADD) $(TEXI2DVI) $< @@ -189,7 +199,7 @@ efaq%.pdf: ${srcdir}/efaq%.texi $(ENVADD) $(TEXI2PDF) $< efaq%.html: ${srcdir}/efaq%.texi - $(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< + $(AM_V_GEN)$(MAKEINFO) $(MAKEINFO_OPTS) $(HTML_OPTS) -o $@ $< ${buildinfodir}/emacs-mime.info emacs-mime.html: EXTRA_OPTS = --enable-encoding diff --git a/lisp/ChangeLog b/lisp/ChangeLog index acafe24..ca7a3c4 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter in lisp directory + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../src/Makefile.in. + (custom-deps, finder-data, autoloads, update-subdirs): Use them. + 2014-12-31 Filipp Gunbin * info.el (info-display-manual): Limit the completion alternatives diff --git a/lisp/Makefile.in b/lisp/Makefile.in index ba2a229..41c0c8e 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -28,6 +28,14 @@ VPATH = $(srcdir) # limitation. XARGS_LIMIT = @XARGS_LIMIT@ +# '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 = + # You can specify a different executable on the make command line, # e.g. "make EMACS=../src/emacs ...". @@ -156,7 +164,7 @@ all: compile-main $(lisp)/cus-load.el $(lisp)/finder-inf.el $(lisp)/cus-load.el: $(MAKE) custom-deps custom-deps: - $(setwins_almost); \ + $(AM_V_GEN)$(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l cus-dep \ --eval '(setq generated-custom-dependencies-file (unmsys--file-name "$(srcdir)/cus-load.el"))' \ @@ -165,7 +173,7 @@ custom-deps: $(lisp)/finder-inf.el: $(MAKE) finder-data finder-data: - $(setwins_finder); \ + $(AM_V_GEN)$(setwins_finder); \ echo Directories: $$wins; \ $(emacs) -l finder \ --eval '(setq generated-finder-keywords-file (unmsys--file-name "$(srcdir)/finder-inf.el"))' \ @@ -178,7 +186,7 @@ finder-data: # If you want to allow autoloads in such files, remove that, # and make this depend on leim. autoloads: $(LOADDEFS) - $(setwins_almost); \ + $(AM_V_GEN)$(setwins_almost); \ echo Directories: $$wins; \ $(emacs) -l autoload \ --eval '(setq autoload-ensure-writable t)' \ @@ -191,7 +199,7 @@ autoloads: $(LOADDEFS) $(lisp)/subdirs.el: $(MAKE) update-subdirs update-subdirs: - $(setwins_for_subdirs); \ + $(AM_V_GEN)$(setwins_for_subdirs); \ for file in $$wins; do \ $(srcdir)/../build-aux/update-subdirs $$file; \ done; commit 5d6b37084b0ef76c495f338b38c00d1b31656b8f Author: Paul Eggert Date: Wed Dec 31 07:47:41 2014 -0800 Less 'make' chatter at top level * 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, copied from src/Makefile.in. ($(srcdir)/src/config.in, ${srcdir}/info/dir): Be less chatty when not verbose. ($(srcdir)/src/stamp-h.in): Simplify with '$@'. diff --git a/ChangeLog b/ChangeLog index 6557ef9..ad3630c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2014-12-31 Paul Eggert + + Less 'make' chatter at top level + * 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, copied from src/Makefile.in. + ($(srcdir)/src/config.in, ${srcdir}/info/dir): + Be less chatty when not verbose. + ($(srcdir)/src/stamp-h.in): Simplify with '$@'. + 2014-12-29 Paul Eggert system-name's returned value can vary diff --git a/Makefile.in b/Makefile.in index ccb70a4..038430b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,6 +94,19 @@ configuration=@configuration@ ### The nt/ subdirectory gets built only for MinGW NTDIR=@NTDIR@ +# '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 = + # ==================== Where To Install Things ==================== # Location to install Emacs.app under GNUstep / Mac OS X. @@ -441,11 +454,11 @@ $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in @ # because stamp-h.in has changed (since building stamp-h.in @ # refreshes config.in as well), but if config.in is missing @ # then we really need to do something more. - [ -r "$@" ] || ( cd ${srcdir} && ${AUTOHEADER} ) + $(if $(wildcard $@),,cd $(srcdir) && $(AUTOHEADER)) $(srcdir)/src/stamp-h.in: $(AUTOCONF_INPUTS) cd ${srcdir} && ${AUTOHEADER} - rm -f $(srcdir)/src/stamp-h.in - echo timestamp > $(srcdir)/src/stamp-h.in + rm -f $@ + echo timestamp > $@ # ==================== Installation ==================== @@ -964,8 +977,8 @@ info_dir_deps = \ ## but then we would need to depend on info-real, which would ## slow down parallelization. ${srcdir}/info/dir: ${info_dir_deps} - ${MKDIR_P} ${srcdir}/info - tempfile=info-dir.$$$$; \ + $(AM_V_at)${MKDIR_P} ${srcdir}/info + $(AM_V_GEN)tempfile=info-dir.$$$$; \ rm -f $${tempfile}; \ (cd ${srcdir}/doc && \ AWK='${AWK}' ../build-aux/make-info-dir ${info_dir_inputs} \ commit f588156cbc7b15d6c5c2da3b1cd0e3d56df937b6 Author: Filipp Gunbin Date: Wed Dec 31 17:14:33 2014 +0300 Use prefix argument in `info-display-manual' * lisp/info.el (info-display-manual): Limit the completion alternatives to currently visited manuals if prefix argument is non-nil. diff --git a/CONTRIBUTE b/CONTRIBUTE index 0e019d3..5cf015f 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -180,10 +180,12 @@ by following links from http://savannah.gnu.org/mail/?group=emacs . Any change that matters to end-users should have an entry in etc/NEWS. -Think about whether your change requires updating the documentation -(both manuals and doc-strings). If you know it does not, mark the NEWS -entry with "---". If you know that *all* the necessary documentation -updates have been made, mark the entry with "+++". Otherwise do not mark it. +Doc-strings should be updated together with the code. + +Think about whether your change requires updating the manuals. If you +know it does not, mark the NEWS entry with "---". If you know +that *all* the necessary documentation updates have been made, mark +the entry with "+++". Otherwise do not mark it. ** Understanding Emacs Internals. diff --git a/doc/misc/info.texi b/doc/misc/info.texi index a3a14a3..0e2e64f 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi @@ -1151,7 +1151,10 @@ switches to the buffer @file{*info*<2>}, creating it if necessary. If you have created many Info buffers in Emacs, you might find it difficult to remember which buffer is showing which manual. You can use the command @kbd{M-x info-display-manual} to show an Info manual -by name, reusing an existing buffer if there is one. +by name, reusing an existing buffer if there is one. When given a +prefix argument, this command limits the completion alternatives to +currently visited info files, thus giving a convenient way to switch +between several manuals. @node Emacs Info Variables @section Emacs Info-mode Variables diff --git a/etc/NEWS b/etc/NEWS index ae0cb70..ec5fe0d 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -338,6 +338,11 @@ The remainder were: --- ** `Info-fontify-maximum-menu-size' can be t for no limit. ++++ +** `info-display-manual' can now be given a prefix argument which (any +non-nil value) directs the command to limit the completion +alternatives to currently visited manuals. + --- ** ntlm.el has support for NTLM2. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4203e05..acafe24 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-31 Filipp Gunbin + + * info.el (info-display-manual): Limit the completion alternatives + to currently visited manuals if prefix argument is non-nil. + 2014-12-30 Paul Eggert * Makefile.in (semantic): Simplify. diff --git a/lisp/info.el b/lisp/info.el index 7c4d7f3..33e982d 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -5277,13 +5277,15 @@ type returned by `Info-bookmark-make-record', which see." (defun info-display-manual (manual) "Display an Info buffer displaying MANUAL. If there is an existing Info buffer for MANUAL, display it. -Otherwise, visit the manual in a new Info buffer." +Otherwise, visit the manual in a new Info buffer. In interactive +use, a prefix argument directs this command to limit the +completion alternatives to currently visited manuals." (interactive (list (progn (info-initialize) (completing-read "Manual name: " - (info--manual-names) + (info--manual-names current-prefix-arg) nil t)))) (let ((blist (buffer-list)) (manual-re (concat "\\(/\\|\\`\\)" manual "\\(\\.\\|\\'\\)")) @@ -5302,7 +5304,7 @@ Otherwise, visit the manual in a new Info buffer." (info (Info-find-file manual) (generate-new-buffer-name "*info*"))))) -(defun info--manual-names () +(defun info--manual-names (visited-only) (let (names) (dolist (buffer (buffer-list)) (with-current-buffer buffer @@ -5313,11 +5315,12 @@ Otherwise, visit the manual in a new Info buffer." (file-name-nondirectory Info-current-file)) names)))) (delete-dups (append (nreverse names) - (all-completions - "" - (apply-partially 'Info-read-node-name-2 - Info-directory-list - (mapcar 'car Info-suffix-list))))))) + (when (not visited-only) + (all-completions + "" + (apply-partially 'Info-read-node-name-2 + Info-directory-list + (mapcar 'car Info-suffix-list)))))))) (provide 'info)