From: Juri Linkov <juri@linkov.net>
To: 45147@debbugs.gnu.org
Subject: bug#45147: Org-like cycling in outline-minor-mode
Date: Wed, 09 Dec 2020 22:03:15 +0200 [thread overview]
Message-ID: <87lfe6vjb0.fsf@mail.linkov.net> (raw)
In-Reply-To: <874kkuyhfx.fsf@mail.linkov.net> (Juri Linkov's message of "Wed, 09 Dec 2020 21:15:14 +0200")
[-- Attachment #1: Type: text/plain, Size: 357 bytes --]
> 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:
[-- Attachment #2: outline-minor-mode-cycle.png --]
[-- Type: image/png, Size: 96638 bytes --]
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: outline-minor-mode-cycle-2.patch --]
[-- Type: text/x-diff, Size: 3588 bytes --]
diff --git a/lisp/outline.el b/lisp/outline.el
index 85f9de4e1b..67e1a5dcdc 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -175,10 +175,8 @@ outline-minor-mode-menu-bar-map
outline-mode-menu-bar-map))))))
map))
-(defvar outline-mode-map
+(defvar outline-mode-cycle-map
(let ((map (make-sparse-keymap)))
- (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
@@ -187,11 +185,27 @@ outline-mode-map
(define-key map (kbd "<backtab>") #'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)
+ 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 outline-mode-cycle-map)
+ (list 'face nil 'local-map outline-mode-cycle-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 +319,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 +341,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 +351,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))
next prev parent reply other threads:[~2020-12-09 20:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 19:15 bug#45147: Org-like cycling in outline-minor-mode Juri Linkov
2020-12-09 20:03 ` Juri Linkov [this message]
2020-12-14 20:35 ` Juri Linkov
2020-12-16 20:28 ` Juri Linkov
2021-03-03 19:12 ` Juri Linkov
2021-05-16 15:51 ` Lars Ingebrigtsen
2021-05-16 17:53 ` Juri Linkov
2021-05-17 13:57 ` Lars Ingebrigtsen
2021-05-18 20:12 ` Juri Linkov
2021-05-19 12:10 ` Eli Zaretskii
2021-05-19 16:14 ` Juri Linkov
2021-05-19 17:28 ` Eli Zaretskii
2021-05-20 18:37 ` Juri Linkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87lfe6vjb0.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=45147@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).