From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Filipp Gunbin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Dec 2014 17:07:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 19443@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.141961362026907 (code B ref -1); Fri, 26 Dec 2014 17:07:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 Dec 2014 17:07:00 +0000 Received: from localhost ([127.0.0.1]:58356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4YLr-0006zv-Es for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55255) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4YLo-0006zm-La for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4YLn-00065P-Iq for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:56 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4YLn-00065L-Fj for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4YLm-0000iU-FU for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 12:06:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4YLj-000658-96 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 12:06:54 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4YLi-000654-Tq for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 12:06:51 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 539FB20939 for ; Fri, 26 Dec 2014 12:06:50 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 26 Dec 2014 12:06:50 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:from:to:subject:date:message-id:mime-version :content-type; s=mesmtp; bh=4D27myUjvnmM+kt+bvxg8mFzT7A=; b=pCNC j/c8xUozciVQLN+vgiljkJjCRAJb9M/ZI1gRwF94BKdbfGAlnmkCXNhArbY7Hin3 duNZLrDLVFLPzN+nW6/+CRblJJ/wLjM+WoI3/embFIYxEsz6iwfV2n7XbF1EDYXU ec8p0n0lVeuCDx8zOlBcKS1fKbrWx0QAODVV8r0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:subject:date :message-id:mime-version:content-type; s=smtpout; bh=4D27myUjvnm M+kt+bvxg8mFzT7A=; b=WdFv2A32x0VwNAMXPZeRORj6IaR+y/KtfgORgXetJX2 UxZYm1H060Tp7sUej2/FnMzVwfF1A40eVNZI6PcPQWUAuNBy/xU5GzhRCEBGbgHv UD4O/Sob0LxPOhBJsKNvI6gJMg1VuBLGtR2c1i8dOHGYplN8yeG3GamuhyXuJVDo = X-Sasl-enc: ewAiIly9lcpsjL2e1p6SUqKhHGxTnPRPMG0OvfDooHOU 1419613609 Received: from fgunbin.local (unknown [94.25.218.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 3C7DB6800F1 for ; Fri, 26 Dec 2014 12:06:49 -0500 (EST) From: Filipp Gunbin Date: Fri, 26 Dec 2014 20:06:45 +0300 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) Here's the patch on the subject. I'll apply it if no one objects. Filipp diff --git a/etc/NEWS b/etc/NEWS index 14933aa..9e0c9c7 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 choice of manual to +currently visited manuals. + --- ** ntlm.el has support for NTLM2. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a2bee14..3119d80 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-26 Filipp Gunbin + + * info.el (info-display-manual): Limit the choice of manuals to + currently visited if prefix argument is non-nil. + 2014-12-25 Helmut Eller Dmitry Gutov diff --git a/lisp/info.el b/lisp/info.el index 7c4d7f3..c5e3b21 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 choice +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) From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Dec 2014 20:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Filipp Gunbin Cc: 19443@debbugs.gnu.org Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141962626920245 (code B ref 19443); Fri, 26 Dec 2014 20:38:01 +0000 Received: (at 19443) by debbugs.gnu.org; 26 Dec 2014 20:37:49 +0000 Received: from localhost ([127.0.0.1]:58431 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4bds-0005GS-Uv for submit@debbugs.gnu.org; Fri, 26 Dec 2014 15:37:49 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:41092) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4bdq-0005GK-Pd for 19443@debbugs.gnu.org; Fri, 26 Dec 2014 15:37:47 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Y4bdo-0006hu-CT; Fri, 26 Dec 2014 15:37:44 -0500 From: Glenn Morris References: X-Spook: ANC bluebird 9/11 BLU-114/B 9705 Samford Road Centro X-Ran: y7i}m}mwvK]MuhL$QjV]b2?r{?x'F&_:CMm>g"Y=40J{'c+w"HQA7A8G;YnVX\72z)AflI X-Hue: black X-Attribution: GM Date: Fri, 26 Dec 2014 15:37:44 -0500 In-Reply-To: (Filipp Gunbin's message of "Fri, 26 Dec 2014 20:06:45 +0300") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.0 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -5.0 (-----) Filipp Gunbin wrote: > ++++ > +** `info-display-manual' can now be given a prefix argument which (any > +non-nil value) directs the command to limit the choice of manual to > +currently visited manuals. "+++" is inappropriate since your patch includes no doc/ changes. From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 26 Dec 2014 21:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Filipp Gunbin Cc: 19443@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.1419630945678 (code B ref 19443); Fri, 26 Dec 2014 21:56:02 +0000 Received: (at 19443) by debbugs.gnu.org; 26 Dec 2014 21:55:45 +0000 Received: from localhost ([127.0.0.1]:58451 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4crI-0000Ar-4E for submit@debbugs.gnu.org; Fri, 26 Dec 2014 16:55:44 -0500 Received: from mtaout27.012.net.il ([80.179.55.183]:46445) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4crF-0000Ai-Ak for 19443@debbugs.gnu.org; Fri, 26 Dec 2014 16:55:42 -0500 Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NH700B00L21MA00@mtaout27.012.net.il> for 19443@debbugs.gnu.org; Fri, 26 Dec 2014 23:51:52 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NH700EC5M2FXY00@mtaout27.012.net.il>; Fri, 26 Dec 2014 23:51:52 +0200 (IST) Date: Fri, 26 Dec 2014 23:55:38 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83wq5ekrdx.fsf@gnu.org> References: X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Filipp Gunbin > Date: Fri, 26 Dec 2014 20:06:45 +0300 > > Here's the patch on the subject. I'll apply it if no one objects. Fine with me, thanks. One minor comment about the doc string: you are talking about "the choice", but no choice was mentioned before in the doc string. This might confuse the user. I think you should mention completion in order to make this clear. From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Filipp Gunbin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 00:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Glenn Morris Cc: 19443@debbugs.gnu.org Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141963843812736 (code B ref 19443); Sat, 27 Dec 2014 00:01:02 +0000 Received: (at 19443) by debbugs.gnu.org; 27 Dec 2014 00:00:38 +0000 Received: from localhost ([127.0.0.1]:58473 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4eo7-0003JK-Vb for submit@debbugs.gnu.org; Fri, 26 Dec 2014 19:00:36 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:53123) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4enz-0003J2-2R for 19443@debbugs.gnu.org; Fri, 26 Dec 2014 19:00:32 -0500 Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id A0D4A20960 for <19443@debbugs.gnu.org>; Fri, 26 Dec 2014 19:00:26 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute4.internal (MEProxy); Fri, 26 Dec 2014 19:00:26 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=mesmtp; bh=91mKLgbm285K DuRZXmv4SNBjRew=; b=Vl/xgvwTjB9uthcXOGofCesfK1cKxJ5LubQnRh7Rqg7P CU4dCZip3UJvBgkczuBiTxAXhLMGng+X6Hc39dtfeOjiy/fexTv1NttAOVTAmd4z y2EeNNVj/BM81Y9Irln7UPr+d/7oOfizgTRBxvjp+GO3KZOW+4kMJHT1mBrUaf4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:cc:subject:references :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=91mKLgbm285KDuRZXmv4SNBjRew=; b=HBS7rN0EnlMl3/HqSlSr DJrUitz2HYjUasGd4XhJdVMMlSKmGzW79mutaZtrpUd3r1/IoVpSd9lrGUkN3zwF RLB8G6Tp6DKK59+AN1uYc9TAfDS8e6Oq7jCFetrKddhO+0Hc56GxM+tvBHt7mebT x9N5GPfx4BvJWlIHKhU38dI= X-Sasl-enc: QQ4D9McGI3Twz0ZRPRbVxrvIIgw0noRDye4JgCSWsin9 1419638426 Received: from fgunbin.local (unknown [178.66.176.174]) by mail.messagingengine.com (Postfix) with ESMTPA id CEE7668013E; Fri, 26 Dec 2014 19:00:25 -0500 (EST) From: Filipp Gunbin References: Date: Sat, 27 Dec 2014 03:00:23 +0300 In-Reply-To: (Glenn Morris's message of "Fri, 26 Dec 2014 15:37:44 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 26/12/2014 15:37 -0500, Glenn Morris wrote: > Filipp Gunbin wrote: > >> ++++ >> +** `info-display-manual' can now be given a prefix argument which (any >> +non-nil value) directs the command to limit the choice of manual to >> +currently visited manuals. > > "+++" is inappropriate since your patch includes no doc/ changes. But etc/CONTRIBUTE says: "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." And I've updated the doc-string. Am I missing something? From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Filipp Gunbin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 00:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 19443@debbugs.gnu.org Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141963894713525 (code B ref 19443); Sat, 27 Dec 2014 00:10:02 +0000 Received: (at 19443) by debbugs.gnu.org; 27 Dec 2014 00:09:07 +0000 Received: from localhost ([127.0.0.1]:58477 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4ewM-0003W4-VB for submit@debbugs.gnu.org; Fri, 26 Dec 2014 19:09:07 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:58484) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4ewG-0003Va-FX for 19443@debbugs.gnu.org; Fri, 26 Dec 2014 19:09:05 -0500 Received: from compute6.internal (compute6.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 60271207FA for <19443@debbugs.gnu.org>; Fri, 26 Dec 2014 19:09:00 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute6.internal (MEProxy); Fri, 26 Dec 2014 19:09:00 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=mesmtp; bh=ihffV8Dq5/pe vml8WlDsp7/U5lo=; b=PYj9KefEtqauBsInyjl3ne1dMpmndip6waSgdimDMFX/ 8o17fA333yuCpVkBvBuOUE9nz77kOU5Y9nPvPc3s08I0msiVhYnhzpGha1EYA/MM JcbyjmFdDX/YG3TXAsEMubC8Jgz6Ay9V8vMefonTeyfGZCcUNQSZ38rcpqw4TUE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:cc:subject:references :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=ihffV8Dq5/pevml8WlDsp7/U5lo=; b=PxsJE0yqXtI4fwcCxZAm 6bGb+3rBnguGjzkV4NjLsEJkVmQuu0LBXvKR9J6jJpfY6bZETw5mFcCr3EkksKQi bYCNuRjGPNb6wUFczAi1czNLOu2H7kbrx6N189xQTA/MfCshL9yZtF4dMx+uSbjm I5VX4dOFIGM+dzwa+c9QNZ4= X-Sasl-enc: EH5tbOwA5AFrxwdDHhyR5KJylpkyDY5dgl5dBYjYKZdJ 1419638939 Received: from fgunbin.local (unknown [178.66.176.174]) by mail.messagingengine.com (Postfix) with ESMTPA id 8743C680076; Fri, 26 Dec 2014 19:08:59 -0500 (EST) From: Filipp Gunbin References: <83wq5ekrdx.fsf@gnu.org> Date: Sat, 27 Dec 2014 03:08:57 +0300 In-Reply-To: <83wq5ekrdx.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 26 Dec 2014 23:55:38 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 26/12/2014 23:55 +0200, Eli Zaretskii wrote: >> From: Filipp Gunbin >> Date: Fri, 26 Dec 2014 20:06:45 +0300 >> >> Here's the patch on the subject. I'll apply it if no one objects. > > Fine with me, thanks. > > One minor comment about the doc string: you are talking about "the > choice", but no choice was mentioned before in the doc string. This > might confuse the user. I think you should mention completion in > order to make this clear. Ok, changed to "completion alternatives". Thanks. diff --git a/etc/NEWS b/etc/NEWS index 14933aa..315332f 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 a2bee14..d3d587d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-26 Filipp Gunbin + + * info.el (info-display-manual): Limit the completion alternatives + to currently visited manuals if prefix argument is non-nil. + 2014-12-25 Helmut Eller Dmitry Gutov 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) From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 07:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Filipp Gunbin Cc: rgm@gnu.org, 19443@debbugs.gnu.org Reply-To: Eli Zaretskii Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141966558730424 (code B ref 19443); Sat, 27 Dec 2014 07:34:02 +0000 Received: (at 19443) by debbugs.gnu.org; 27 Dec 2014 07:33:07 +0000 Received: from localhost ([127.0.0.1]:58568 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4ls3-0007ue-7o for submit@debbugs.gnu.org; Sat, 27 Dec 2014 02:33:07 -0500 Received: from mtaout23.012.net.il ([80.179.55.175]:61526) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4ls0-0007uR-FC for 19443@debbugs.gnu.org; Sat, 27 Dec 2014 02:33:05 -0500 Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0NH800H00BOBP500@a-mtaout23.012.net.il> for 19443@debbugs.gnu.org; Sat, 27 Dec 2014 09:33:02 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NH800H3MCZ1OW30@a-mtaout23.012.net.il>; Sat, 27 Dec 2014 09:33:02 +0200 (IST) Date: Sat, 27 Dec 2014 09:33:02 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83vbkxlf81.fsf@gnu.org> References: X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Filipp Gunbin > Date: Sat, 27 Dec 2014 03:00:23 +0300 > Cc: 19443@debbugs.gnu.org > > On 26/12/2014 15:37 -0500, Glenn Morris wrote: > > > Filipp Gunbin wrote: > > > >> ++++ > >> +** `info-display-manual' can now be given a prefix argument which (any > >> +non-nil value) directs the command to limit the choice of manual to > >> +currently visited manuals. > > > > "+++" is inappropriate since your patch includes no doc/ changes. > > But etc/CONTRIBUTE says: > > "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." > > And I've updated the doc-string. > > Am I missing something? Yes, you are missing info.texi, which does describe this command. I think a sentence about the significance of the prefix argument in this case would be appropriate there. If you do that, then +++ will be appropriate. Thanks. (In general, "C-h k" AND "C-h f" are useful to see if there's any documentation in any manual for a key or a function. There's no such command for variables, unfortunately.) From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 15:17:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Filipp Gunbin Cc: Glenn Morris , 19443@debbugs.gnu.org Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141969337926466 (code B ref 19443); Sat, 27 Dec 2014 15:17:01 +0000 Received: (at 19443) by debbugs.gnu.org; 27 Dec 2014 15:16:19 +0000 Received: from localhost ([127.0.0.1]:59194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4t6I-0006so-Ox for submit@debbugs.gnu.org; Sat, 27 Dec 2014 10:16:19 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:20998) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4t6H-0006sh-FF for 19443@debbugs.gnu.org; Sat, 27 Dec 2014 10:16:17 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AssIAOwQflTO+ILA/2dsb2JhbABbgweDYMgVgmIEAgKBJBcBAQEBAQF8hAMBAQRWIxALDiYHCxQYDSQtiCbWWQEBAQEBAQQBAQEBHpAYVweESAWLAZIxj3OCCoF4gjeBYiGBNYFCAQEB X-IPAS-Result: AssIAOwQflTO+ILA/2dsb2JhbABbgweDYMgVgmIEAgKBJBcBAQEBAQF8hAMBAQRWIxALDiYHCxQYDSQtiCbWWQEBAQEBAQQBAQEBHpAYVweESAWLAZIxj3OCCoF4gjeBYiGBNYFCAQEB X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="103638436" Received: from 206-248-130-192.dsl.teksavvy.com (HELO pastel.home) ([206.248.130.192]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Dec 2014 10:16:16 -0500 Received: by pastel.home (Postfix, from userid 20848) id C20DE106D; Sat, 27 Dec 2014 10:16:16 -0500 (EST) From: Stefan Monnier Message-ID: References: Date: Sat, 27 Dec 2014 10:16:16 -0500 In-Reply-To: (Filipp Gunbin's message of "Sat, 27 Dec 2014 03:00:23 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > "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." The --- and +++ in etc/NEWS only relate to the manual. The docstrings should *always* be updated right away. Stefan From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Eli Zaretskii Cc: 19443@debbugs.gnu.org, Filipp Gunbin Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141969608230805 (code B ref 19443); Sat, 27 Dec 2014 16:02:02 +0000 Received: (at 19443) by debbugs.gnu.org; 27 Dec 2014 16:01:22 +0000 Received: from localhost ([127.0.0.1]:59217 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4tnt-00080m-ID for submit@debbugs.gnu.org; Sat, 27 Dec 2014 11:01:21 -0500 Received: from ironport2-out.teksavvy.com ([206.248.154.181]:15434) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4tnq-00080a-OD for 19443@debbugs.gnu.org; Sat, 27 Dec 2014 11:01:19 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AssIAOwQflTO+ILA/2dsb2JhbABbgweDYMgVgmIEAgKBJBcBAQEBAQF8hAMBAQRWIxALNAcLFBgNJIhT1lkBAQEBAQEEAQEBAR6QGFcHhEgFiwGkLoF4gjeBYiGBNYFCAQEB X-IPAS-Result: AssIAOwQflTO+ILA/2dsb2JhbABbgweDYMgVgmIEAgKBJBcBAQEBAQF8hAMBAQRWIxALNAcLFBgNJIhT1lkBAQEBAQEEAQEBAR6QGFcHhEgFiwGkLoF4gjeBYiGBNYFCAQEB X-IronPort-AV: E=Sophos;i="5.07,502,1413259200"; d="scan'208";a="103641375" Received: from 206-248-130-192.dsl.teksavvy.com (HELO pastel.home) ([206.248.130.192]) by ironport2-out.teksavvy.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 27 Dec 2014 11:01:18 -0500 Received: by pastel.home (Postfix, from userid 20848) id D80FD106D; Sat, 27 Dec 2014 11:01:17 -0500 (EST) From: Stefan Monnier Message-ID: References: <83vbkxlf81.fsf@gnu.org> Date: Sat, 27 Dec 2014 11:01:17 -0500 In-Reply-To: <83vbkxlf81.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 27 Dec 2014 09:33:02 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: 0.3 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) > (In general, "C-h k" AND "C-h f" are useful to see if there's any > documentation in any manual for a key or a function. Hmm... I must be missing something, because neither of those gives me any indication about the presence of related info in the manual, Stefan From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Dec 2014 18:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier Cc: 19443@debbugs.gnu.org, fgunbin@fastmail.fm Reply-To: Eli Zaretskii Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.141970526712837 (code B ref 19443); Sat, 27 Dec 2014 18:35:02 +0000 Received: (at 19443) by debbugs.gnu.org; 27 Dec 2014 18:34:27 +0000 Received: from localhost ([127.0.0.1]:59240 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4wC2-0003Ky-Ch for submit@debbugs.gnu.org; Sat, 27 Dec 2014 13:34:26 -0500 Received: from mtaout25.012.net.il ([80.179.55.181]:41776) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4wBy-0003Ko-VS for 19443@debbugs.gnu.org; Sat, 27 Dec 2014 13:34:24 -0500 Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NH900H007E10300@mtaout25.012.net.il> for 19443@debbugs.gnu.org; Sat, 27 Dec 2014 20:30:12 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NH900DK67EC1K30@mtaout25.012.net.il>; Sat, 27 Dec 2014 20:30:12 +0200 (IST) Date: Sat, 27 Dec 2014 20:34:11 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83fvc1kkm4.fsf@gnu.org> References: <83vbkxlf81.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Stefan Monnier > Cc: Filipp Gunbin , 19443@debbugs.gnu.org > Date: Sat, 27 Dec 2014 11:01:17 -0500 > > > (In general, "C-h k" AND "C-h f" are useful to see if there's any > > documentation in any manual for a key or a function. > > Hmm... I must be missing something, because neither of those gives me > any indication about the presence of related info in the manual, Strange, I'm positive I typed "C-h K" and "C-h F". From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Filipp Gunbin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Dec 2014 11:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Stefan Monnier , Eli Zaretskii Cc: Glenn Morris , 19443@debbugs.gnu.org Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.14199400052110 (code B ref 19443); Tue, 30 Dec 2014 11:47:01 +0000 Received: (at 19443) by debbugs.gnu.org; 30 Dec 2014 11:46:45 +0000 Received: from localhost ([127.0.0.1]:60754 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y5vG8-0000Xx-UL for submit@debbugs.gnu.org; Tue, 30 Dec 2014 06:46:45 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:42773) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y5vFz-0000XX-08 for 19443@debbugs.gnu.org; Tue, 30 Dec 2014 06:46:41 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 5C8C220BC0 for <19443@debbugs.gnu.org>; Tue, 30 Dec 2014 06:46:34 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute3.internal (MEProxy); Tue, 30 Dec 2014 06:46:34 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=mesmtp; bh=m+OAyGy3Mffy y7SktuqvuhH0r9Q=; b=HCPYnusN+qAzl/e75OLo1ftuF7RbxT75ny0d2Pwqrz3A BMUT6r4tpe3BDmB3/odBBXlmN6CCVAhERZoVH1lUsEYMvk9pql5XZN3Sahm2oNu4 GRK204NYSywFPBXUFPrxv0eKae5pdrSXcCPL6oe6ODNM6Ha4+XpW0D9bZQKudzg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:cc:subject:references :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=m+OAyGy3Mffyy7SktuqvuhH0r9Q=; b=gzamDYALhSU77ZfmMhjz A1LftfC3wlvA4s+AJ6xE5ucI90bkSwCrl9wZobndU4DsLipR9kyihexLTDf0DFmv 3H9dA8RHmb26rSYaxXVzjG+cnYUD3lbmCJ4sayod7wqfT2qXiW2UrhN3NZACDyYA OHYNHmOz9r9p7hx9F/dlrFc= X-Sasl-enc: 5W66E/8EgYJ4NB76du7Puh8LNKi+YjV7W9wgMF4dJ+43 1419939993 Received: from fgunbin.local (unknown [94.25.218.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 347CCC00283; Tue, 30 Dec 2014 06:46:33 -0500 (EST) From: Filipp Gunbin References: Date: Tue, 30 Dec 2014 14:46:30 +0300 In-Reply-To: (Stefan Monnier's message of "Sat, 27 Dec 2014 10:16:16 -0500") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 27/12/2014 10:16 -0500, Stefan Monnier wrote: >> "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." > > The --- and +++ in etc/NEWS only relate to the manual. > The docstrings should *always* be updated right away. > > > Stefan Thanks Stefan and Eli, Here's the revised patch. I also updated the CONTRIBUTE file in accordance with what you wrote. Could you please review? Filipp 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 6249a30..86ed70f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-30 Filipp Gunbin + + * info.el (info-display-manual): Limit the completion alternatives + to currently visited manuals if prefix argument is non-nil. + 2014-12-30 Dmitry Gutov * menu-bar.el (menu-bar-goto-uses-etags-p): New function. 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) From unknown Mon Aug 18 09:08:47 2025 X-Loop: help-debbugs@gnu.org Subject: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Dec 2014 16:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 19443 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Filipp Gunbin Cc: rgm@gnu.org, 19443@debbugs.gnu.org, monnier@iro.umontreal.ca Reply-To: Eli Zaretskii Received: via spool by 19443-submit@debbugs.gnu.org id=B19443.14199558365784 (code B ref 19443); Tue, 30 Dec 2014 16:11:01 +0000 Received: (at 19443) by debbugs.gnu.org; 30 Dec 2014 16:10:36 +0000 Received: from localhost ([127.0.0.1]:32965 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y5zNS-0001V8-JU for submit@debbugs.gnu.org; Tue, 30 Dec 2014 11:10:36 -0500 Received: from mtaout22.012.net.il ([80.179.55.172]:50948) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y5zNP-0001Uv-OZ for 19443@debbugs.gnu.org; Tue, 30 Dec 2014 11:10:32 -0500 Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0NHE00800KF4KE00@a-mtaout22.012.net.il> for 19443@debbugs.gnu.org; Tue, 30 Dec 2014 18:10:30 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NHE00839KXIOC10@a-mtaout22.012.net.il>; Tue, 30 Dec 2014 18:10:30 +0200 (IST) Date: Tue, 30 Dec 2014 18:10:20 +0200 From: Eli Zaretskii In-reply-to: X-012-Sender: halo1@inter.net.il Message-id: <83k319azkj.fsf@gnu.org> References: X-Spam-Score: 1.0 (+) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) > From: Filipp Gunbin > Cc: Glenn Morris , 19443@debbugs.gnu.org > Date: Tue, 30 Dec 2014 14:46:30 +0300 > > Thanks Stefan and Eli, > > Here's the revised patch. I also updated the CONTRIBUTE file in > accordance with what you wrote. Could you please review? LGTM, thanks. From unknown Mon Aug 18 09:08:47 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.503 (Entity 5.503) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Filipp Gunbin Subject: bug#19443: closed (Re: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience) Message-ID: References: X-Gnu-PR-Message: they-closed 19443 X-Gnu-PR-Package: emacs Reply-To: 19443@debbugs.gnu.org Date: Wed, 31 Dec 2014 15:45:03 +0000 Content-Type: multipart/mixed; boundary="----------=_1420040703-28056-1" This is a multi-part message in MIME format... ------------=_1420040703-28056-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #19443: 25.0.50; `info-display-manual' could limit the choice to currently = visited manuals if given a prefix arg for convenience which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 19443@debbugs.gnu.org. --=20 19443: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D19443 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1420040703-28056-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 19443-done) by debbugs.gnu.org; 31 Dec 2014 15:44:36 +0000 Received: from localhost ([127.0.0.1]:33835 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6LRr-0007Hp-Kg for submit@debbugs.gnu.org; Wed, 31 Dec 2014 10:44:35 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:37200) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y6LRo-0007Hg-2K for 19443-done@debbugs.gnu.org; Wed, 31 Dec 2014 10:44:32 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 833CD20B83 for <19443-done@debbugs.gnu.org>; Wed, 31 Dec 2014 10:44:31 -0500 (EST) Received: from frontend1 ([10.202.2.160]) by compute3.internal (MEProxy); Wed, 31 Dec 2014 10:44:31 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:from:to:cc:subject:references:date:in-reply-to :message-id:mime-version:content-type; s=mesmtp; bh=RUv73m+DUxJ9 1kpJXCeuXzX9SVg=; b=FdSjQ2iFHDLxp3+ZMr2mNG46Q3xjO1icSvwweVOSv61R 0rDtU9rdwScv6tYniDFt9r6+dAsF52W+4Gu1os8siD8O4i4ik2tMJUC+EgdJODKC buZSHsK/MAo6BqQ+2nwtKPgVmcx6xURl95Af32tPaVArej118ybuIsOe1QtW16k= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:cc:subject:references :date:in-reply-to:message-id:mime-version:content-type; s= smtpout; bh=RUv73m+DUxJ91kpJXCeuXzX9SVg=; b=euDlXz7obqinLB8twcoi bawTUzbfyKwHJ0JH4GjTt7sK3IMvIlK/NJVcFRNMoFHAzRaEDS4l9l5Ri3eiLqFl CMIWRoxymfPcigiqRjE2gjVSlPIpSacHMvWILrcEskoBiex+7KSGQfX7ryxJhgjd FO+tWqwHzHlpqeSO4sJ9FF4= X-Sasl-enc: G/0tiWzT+P63W8ERRj+OhkBNr0rTvwhW4p7tytU7RfiJ 1420040671 Received: from fgunbin.local (unknown [94.25.218.10]) by mail.messagingengine.com (Postfix) with ESMTPA id A4854C0027E; Wed, 31 Dec 2014 10:44:30 -0500 (EST) From: Filipp Gunbin To: Eli Zaretskii Subject: Re: bug#19443: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience References: <83k319azkj.fsf@gnu.org> Date: Wed, 31 Dec 2014 18:44:28 +0300 In-Reply-To: <83k319azkj.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 30 Dec 2014 18:10:20 +0200") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (darwin) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 19443-done Cc: rgm@gnu.org, 19443-done@debbugs.gnu.org, monnier@iro.umontreal.ca X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) On 30/12/2014 18:10 +0200, Eli Zaretskii wrote: >> From: Filipp Gunbin >> Cc: Glenn Morris , 19443@debbugs.gnu.org >> Date: Tue, 30 Dec 2014 14:46:30 +0300 >> >> Thanks Stefan and Eli, >> >> Here's the revised patch. I also updated the CONTRIBUTE file in >> accordance with what you wrote. Could you please review? > > LGTM, thanks. Applied. ------------=_1420040703-28056-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 26 Dec 2014 17:07:00 +0000 Received: from localhost ([127.0.0.1]:58356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4YLr-0006zv-Es for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:59 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55255) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y4YLo-0006zm-La for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4YLn-00065P-Iq for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:56 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,FREEMAIL_FROM, T_DKIM_INVALID autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:47834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4YLn-00065L-Fj for submit@debbugs.gnu.org; Fri, 26 Dec 2014 12:06:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4YLm-0000iU-FU for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 12:06:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y4YLj-000658-96 for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 12:06:54 -0500 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:44300) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y4YLi-000654-Tq for bug-gnu-emacs@gnu.org; Fri, 26 Dec 2014 12:06:51 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 539FB20939 for ; Fri, 26 Dec 2014 12:06:50 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute5.internal (MEProxy); Fri, 26 Dec 2014 12:06:50 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=fastmail.fm; h= x-sasl-enc:from:to:subject:date:message-id:mime-version :content-type; s=mesmtp; bh=4D27myUjvnmM+kt+bvxg8mFzT7A=; b=pCNC j/c8xUozciVQLN+vgiljkJjCRAJb9M/ZI1gRwF94BKdbfGAlnmkCXNhArbY7Hin3 duNZLrDLVFLPzN+nW6/+CRblJJ/wLjM+WoI3/embFIYxEsz6iwfV2n7XbF1EDYXU ec8p0n0lVeuCDx8zOlBcKS1fKbrWx0QAODVV8r0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=x-sasl-enc:from:to:subject:date :message-id:mime-version:content-type; s=smtpout; bh=4D27myUjvnm M+kt+bvxg8mFzT7A=; b=WdFv2A32x0VwNAMXPZeRORj6IaR+y/KtfgORgXetJX2 UxZYm1H060Tp7sUej2/FnMzVwfF1A40eVNZI6PcPQWUAuNBy/xU5GzhRCEBGbgHv UD4O/Sob0LxPOhBJsKNvI6gJMg1VuBLGtR2c1i8dOHGYplN8yeG3GamuhyXuJVDo = X-Sasl-enc: ewAiIly9lcpsjL2e1p6SUqKhHGxTnPRPMG0OvfDooHOU 1419613609 Received: from fgunbin.local (unknown [94.25.218.10]) by mail.messagingengine.com (Postfix) with ESMTPA id 3C7DB6800F1 for ; Fri, 26 Dec 2014 12:06:49 -0500 (EST) From: Filipp Gunbin To: bug-gnu-emacs@gnu.org Subject: 25.0.50; `info-display-manual' could limit the choice to currently visited manuals if given a prefix arg for convenience Date: Fri, 26 Dec 2014 20:06:45 +0300 Message-ID: MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -4.3 (----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -4.3 (----) Here's the patch on the subject. I'll apply it if no one objects. Filipp diff --git a/etc/NEWS b/etc/NEWS index 14933aa..9e0c9c7 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 choice of manual to +currently visited manuals. + --- ** ntlm.el has support for NTLM2. diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a2bee14..3119d80 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-12-26 Filipp Gunbin + + * info.el (info-display-manual): Limit the choice of manuals to + currently visited if prefix argument is non-nil. + 2014-12-25 Helmut Eller Dmitry Gutov diff --git a/lisp/info.el b/lisp/info.el index 7c4d7f3..c5e3b21 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 choice +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) ------------=_1420040703-28056-1--