From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: "Basil L. Contovounesios" Newsgroups: gmane.emacs.bugs Subject: bug#28998: 27.0.50; Man--sections is in reverse order Date: Tue, 07 Nov 2017 15:07:09 +0000 Message-ID: <87inemm8ki.fsf@gmail.com> References: <87zi8f18yw.fsf@gmail.com> <87tvy66hf5.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1510067625 27047 195.159.176.226 (7 Nov 2017 15:13:45 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 7 Nov 2017 15:13:45 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 28998@debbugs.gnu.org To: Noam Postavsky Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 07 16:13:37 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eC5ZI-0006eJ-5T for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Nov 2017 16:13:36 +0100 Original-Received: from localhost ([::1]:53891 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5ZP-0003vt-8Q for geb-bug-gnu-emacs@m.gmane.org; Tue, 07 Nov 2017 10:13:43 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35362) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eC5Tz-0007Dx-16 for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 10:08:12 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eC5Tu-0000xo-Vw for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 10:08:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:48034) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eC5Tu-0000xe-OM for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 10:08:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1eC5Tu-0003vc-BX for bug-gnu-emacs@gnu.org; Tue, 07 Nov 2017 10:08:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "Basil L. Contovounesios" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 07 Nov 2017 15:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 28998 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 28998-submit@debbugs.gnu.org id=B28998.151006724015049 (code B ref 28998); Tue, 07 Nov 2017 15:08:02 +0000 Original-Received: (at 28998) by debbugs.gnu.org; 7 Nov 2017 15:07:20 +0000 Original-Received: from localhost ([127.0.0.1]:56715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eC5TD-0003uf-PV for submit@debbugs.gnu.org; Tue, 07 Nov 2017 10:07:20 -0500 Original-Received: from mail-wm0-f44.google.com ([74.125.82.44]:48510) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eC5TB-0003uS-QM for 28998@debbugs.gnu.org; Tue, 07 Nov 2017 10:07:18 -0500 Original-Received: by mail-wm0-f44.google.com with SMTP id p75so4409604wmg.3 for <28998@debbugs.gnu.org>; Tue, 07 Nov 2017 07:07:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tcd-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=x5QjyfYpkEOCWxLDZai3AZG3ZdHDRaCHptRkUaI/uX0=; b=ZIx+bh65NiZ9Plfjjntm/UHSPgwfnwVGF3H2feJfC+douiF0/sRAarhkbqSlXRH1XR NkZdOOuFNEAI7SHI61MWPPhYXbKmIqnuhNpcJouO4pxuB0/WShOuUiz0pqNXbYJrmNhd 0yKKxc+o1i1bVIADhEDCQ0HwIDHnjt8HXw/Ws2wlt1P+FWE6/3q4hn6y3dRajDiti6PC nrXi49lepBsyp1IhAx+DjY+9NWd9zm1ExBJKhaV/XxwyJwEWi3HkV+Uvc6B9q7KoIq+j nO26QPRFHmaNzVxpfwwd/O72t2lV3BCqr6cE0CeorF9GXn7uMSdSwlAIQceVRbTkrq3E VBTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=x5QjyfYpkEOCWxLDZai3AZG3ZdHDRaCHptRkUaI/uX0=; b=fEGuNOIZOMdOvYdvJTkZ+8b96BmqQVxvB7MUfEQghJaCFJ+oDum69aKtqjvpasyHUd UN62qx73uC4JQC7/0/Gm6sIYEfgfE3TG5QoWnH0AtuZi27z6rSwL0cElQUy+P4KVQ15N 8QIdo4uwk3H18JU4yONxfJHEo9ISqbc+1hPWDO7fgqtKINMekVquH+RflgLj+/6pIJ79 xrFshyPbYc9LwRPNfWl4lsJ8tOlP1yaGrnR7OuckXGqw3eIg560EdGGyKQ3W/0YK7CfM fYCQ+noDHB1hJ3XqN7Iih2TTTypWzjpqSVD03FUGspmnpdUFJUf87tAW46IJFd3IFeiC l7lw== X-Gm-Message-State: AMCzsaXJrpfTD8Pz+nEolOzWcGuoR/RKsdKj3UGivmXF99K7G3xwgEwT OUWgQNwKL8O+fcpnr/FTWFvaDA== X-Google-Smtp-Source: ABhQp+TltdePbccnWZWrjallhV+Ko8whQrRRWQ4SR1oMvLazIuzN0ZHmzjxJlEPqqLBIBV3C+8yRbQ== X-Received: by 10.80.151.21 with SMTP id c21mr24369474edb.47.1510067232211; Tue, 07 Nov 2017 07:07:12 -0800 (PST) Original-Received: from localhost ([89.101.18.86]) by smtp.gmail.com with ESMTPSA id 34sm1690550eds.17.2017.11.07.07.07.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Nov 2017 07:07:11 -0800 (PST) In-Reply-To: <87tvy66hf5.fsf@users.sourceforge.net> (Noam Postavsky's message of "Mon, 06 Nov 2017 19:50:22 -0500") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:139563 Archived-At: --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Keep-Man-sections-in-natural-order-bug-28998.patch >From 6bc6f316f4bd3dc80b96d2d894bce66487cb9127 Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Wed, 25 Oct 2017 16:57:43 +0100 Subject: [PATCH 1/2] Keep Man sections in natural order (bug#28998) * lisp/man.el (Man-build-section-alist): Reverse sections. --- lisp/man.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/man.el b/lisp/man.el index 7a892c6e88..f7b1609c92 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1522,7 +1522,8 @@ Man-build-section-alist (let ((section (match-string 1))) (unless (member section Man--sections) (push section Man--sections))) - (forward-line 1)))) + (forward-line 1))) + (setq Man--sections (nreverse Man--sections))) (defsubst Man-build-references-alist () "Build the list of references (in the SEE ALSO section)." -- 2.14.2 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-Rename-Man-build-section-alist-bug-28998.patch >From f96f95b830825681fb618f1727fcc3e0f488102f Mon Sep 17 00:00:00 2001 From: "Basil L. Contovounesios" Date: Tue, 7 Nov 2017 14:51:37 +0000 Subject: [PATCH 2/2] Rename Man-build-section-alist (bug#28998) The defsubst Man-build-section-alist builds and returns a list of strings, so rename it to Man-build-section-list and make it a defun. * lisp/man.el (Man-build-section-alist): Do it and reduce syntax. (Man-goto-page): * lisp/woman.el (woman-find-file): Use it. --- lisp/man.el | 10 +++++----- lisp/woman.el | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/man.el b/lisp/man.el index f7b1609c92..798e78bbe7 100644 --- a/lisp/man.el +++ b/lisp/man.el @@ -1513,16 +1513,16 @@ Man-mode (set (make-local-variable 'bookmark-make-record-function) 'Man-bookmark-make-record)) -(defsubst Man-build-section-alist () +(defun Man-build-section-list () "Build the list of manpage sections." - (setq Man--sections nil) + (setq Man--sections ()) (goto-char (point-min)) (let ((case-fold-search nil)) - (while (re-search-forward Man-heading-regexp (point-max) t) + (while (re-search-forward Man-heading-regexp nil t) (let ((section (match-string 1))) (unless (member section Man--sections) (push section Man--sections))) - (forward-line 1))) + (forward-line))) (setq Man--sections (nreverse Man--sections))) (defsubst Man-build-references-alist () @@ -1803,7 +1803,7 @@ Man-goto-page (widen) (goto-char page-start) (narrow-to-region page-start page-end) - (Man-build-section-alist) + (Man-build-section-list) (Man-build-references-alist) (goto-char (point-min))))) diff --git a/lisp/woman.el b/lisp/woman.el index 111086e362..1edf6e34c3 100644 --- a/lisp/woman.el +++ b/lisp/woman.el @@ -1619,7 +1619,7 @@ woman-find-file (setq woman-buffer-alist (cons (cons file-name bufname) woman-buffer-alist) woman-buffer-number 0))))) - (Man-build-section-alist) + (Man-build-section-list) (Man-build-references-alist) (goto-char (point-min))) -- 2.14.2 --=-=-= Content-Type: text/plain Noam Postavsky writes: >> -(defsubst Man-build-section-alist () >> +(defsubst Man-build-section-list () > > Perhaps we should switch to defun while we're at it? > >> - (let ((case-fold-search nil)) >> + (let (case-fold-search) > > Personally, I like the more explicit version here. I attach slightly reworded patches updated with your two suggestions. Thanks, -- Basil --=-=-=--