From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#45147: Org-like cycling in outline-minor-mode Date: Mon, 14 Dec 2020 22:35:44 +0200 Organization: LINKOV.NET Message-ID: <87zh2gyvkv.fsf@mail.linkov.net> References: <874kkuyhfx.fsf@mail.linkov.net> <87lfe6vjb0.fsf@mail.linkov.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27658"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) To: 45147@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Dec 14 21:47:17 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1koukX-00076H-8Z for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 14 Dec 2020 21:47:17 +0100 Original-Received: from localhost ([::1]:34522 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1koukW-00020x-9P for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 14 Dec 2020 15:47:16 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:47750) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1koucY-0000WF-VB for bug-gnu-emacs@gnu.org; Mon, 14 Dec 2020 15:39:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:43122) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1koucY-0008Pt-Mr for bug-gnu-emacs@gnu.org; Mon, 14 Dec 2020 15:39:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1koucY-0002w0-LG for bug-gnu-emacs@gnu.org; Mon, 14 Dec 2020 15:39:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 14 Dec 2020 20:39:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45147 X-GNU-PR-Package: emacs Original-Received: via spool by 45147-submit@debbugs.gnu.org id=B45147.160797828411189 (code B ref 45147); Mon, 14 Dec 2020 20:39:02 +0000 Original-Received: (at 45147) by debbugs.gnu.org; 14 Dec 2020 20:38:04 +0000 Original-Received: from localhost ([127.0.0.1]:54663 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koubb-0002uO-QG for submit@debbugs.gnu.org; Mon, 14 Dec 2020 15:38:04 -0500 Original-Received: from relay10.mail.gandi.net ([217.70.178.230]:51203) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1koubZ-0002tR-B4; Mon, 14 Dec 2020 15:38:02 -0500 Original-Received: from mail.gandi.net (m91-129-99-98.cust.tele2.ee [91.129.99.98]) (Authenticated sender: juri@linkov.net) by relay10.mail.gandi.net (Postfix) with ESMTPSA id 4DEFE240003; Mon, 14 Dec 2020 20:37:53 +0000 (UTC) In-Reply-To: <87lfe6vjb0.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 09 Dec 2020 22:03:15 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:196110 Archived-At: --=-=-= Content-Type: text/plain severity 45147 wishlist tags 45147 + patch quit >> As suggested in bug#41198, here is a patch that adds >> two new options (disabled by default): > > Here is a better patch. It makes possible to enable > outline-minor-mode in any buffer, e.g. in prog mode, > when outline-minor-mode-cycle is set to non-nil. > Then typing S-TAB will collapse all headings, and > TAB will expand the current function body, like this: This patch also allows using only outline-minor-mode-cycle without highlighting heading with outline-minor-mode-font-lock that is useful in prog-mode buffers: --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=outline-minor-mode-cycle-3.patch diff --git a/lisp/outline.el b/lisp/outline.el index 85f9de4e1b..db10e2667f 100644 --- a/lisp/outline.el +++ b/lisp/outline.el @@ -175,23 +175,43 @@ outline-minor-mode-menu-bar-map outline-mode-menu-bar-map)))))) map)) +(defvar outline-mode-cycle-map + (let ((map (make-sparse-keymap))) + (let ((binding `(menu-item + "" outline-cycle + ;; Only takes effect if point is on a heading. + :filter ,(lambda (cmd) + (when (outline-on-heading-p) cmd))))) + (define-key map (kbd "TAB") binding) + (define-key map [tab] binding) + (define-key map (kbd "") #'outline-cycle-buffer)) + map)) + (defvar outline-mode-map (let ((map (make-sparse-keymap))) + (set-keymap-parent map outline-mode-cycle-map) (define-key map "\C-c" outline-mode-prefix-map) (define-key map [menu-bar] outline-mode-menu-bar-map) - ;; Only takes effect if point is on a heading. - (define-key map (kbd "TAB") - `(menu-item "" outline-cycle - :filter ,(lambda (cmd) - (when (outline-on-heading-p) cmd)))) - (define-key map (kbd "") #'outline-cycle-buffer) map)) (defvar outline-font-lock-keywords '( ;; Highlight headings according to the level. (eval . (list (concat "^\\(?:" outline-regexp "\\).+") - 0 '(outline-font-lock-face) nil t))) + 0 '(if outline-minor-mode-cycle + (if outline-minor-mode-font-lock + (list 'face (outline-font-lock-face) + 'local-map (make-composed-keymap + outline-mode-cycle-map + (current-local-map))) + (list 'face nil 'local-map (make-composed-keymap + outline-mode-cycle-map + (current-local-map)))) + (outline-font-lock-face)) + nil + (if (or outline-minor-mode-font-lock outline-minor-mode-cycle) + 'append + t)))) "Additional expressions to highlight in Outline mode.") (defface outline-1 @@ -305,6 +325,19 @@ outline-minor-mode-prefix (define-key outline-minor-mode-map val outline-mode-prefix-map) (set-default sym val))) +(defvar outline-minor-mode-font-lock nil + "Enable outline font-lock in `outline-minor-mode'. +Non-nil value works well only when outline font-lock keywords +don't conflict with the major mode's font-lock keywords.") +;;;###autoload(put 'outline-minor-mode-font-lock 'safe-local-variable 'booleanp) +(defvar outline-minor-mode-cycle nil + "Enable heading cycle in `outline-minor-mode'. +When point is on a heading line, then typing 'TAB' cycles between `hide all', +`headings only' and `show all' (`outline-cycle'). Typing 'S-TAB' on +a heading line cycles the whole buffer (`outline-cycle-buffer'). +Typing these keys anywhere outside heading lines uses their default bindings.") +;;;###autoload(put 'outline-minor-mode-cycle 'safe-local-variable 'booleanp) + ;;;###autoload (define-minor-mode outline-minor-mode "Toggle Outline minor mode. @@ -314,6 +347,9 @@ outline-minor-mode (cons outline-minor-mode-prefix outline-mode-prefix-map)) (if outline-minor-mode (progn + (when (or outline-minor-mode-font-lock outline-minor-mode-cycle) + (font-lock-add-keywords nil outline-font-lock-keywords) + (font-lock-flush)) ;; Turn off this mode if we change major modes. (add-hook 'change-major-mode-hook (lambda () (outline-minor-mode -1)) @@ -321,6 +357,9 @@ outline-minor-mode (setq-local line-move-ignore-invisible t) ;; Cause use of ellipses for invisible text. (add-to-invisibility-spec '(outline . t))) + (when (or outline-minor-mode-font-lock outline-minor-mode-cycle) + (font-lock-remove-keywords nil outline-font-lock-keywords) + (font-lock-flush)) (setq line-move-ignore-invisible nil) ;; Cause use of ellipses for invisible text. (remove-from-invisibility-spec '(outline . t)) --=-=-=--