[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/el-search f1ebc2e 201/332: * el-search/el-search.el: Ge
From: |
Stefan Monnier |
Subject: |
[elpa] externals/el-search f1ebc2e 201/332: * el-search/el-search.el: Get rid of orgstruct-mode |
Date: |
Tue, 1 Dec 2020 15:48:45 -0500 (EST) |
branch: externals/el-search
commit f1ebc2e2ec82b8ba1dd36c5a8f72e2efb6d28341
Author: Michael Heerdegen <michael_heerdegen@web.de>
Commit: Michael Heerdegen <michael_heerdegen@web.de>
* el-search/el-search.el: Get rid of orgstruct-mode
orgstruct-mode will probably be obsoleted soon. Replace its usage
in *El Occur* buffers with similar functions offered by outline.el.
(el-search-occur-cycle): Reimplement to use functions from outline.el;
add docstring.
(el-search-occur-tab-command): New command.
(el-search-occur-mode-map): Bind TAB to `el-search-occur-tab-command'.
(el-search-occur-mode): Enable `outline-minor-mode' instead of
`orgstruct-mode'.
---
el-search.el | 36 +++++++++++++++++++++++-------------
1 file changed, 23 insertions(+), 13 deletions(-)
diff --git a/el-search.el b/el-search.el
index 6c56c32..106e126 100644
--- a/el-search.el
+++ b/el-search.el
@@ -7,7 +7,7 @@
;; Created: 29 Jul 2015
;; Keywords: lisp
;; Compatibility: GNU Emacs 25
-;; Version: 1.4.0.13
+;; Version: 1.4.0.14
;; Package-Requires: ((emacs "25") (stream "2.2.4"))
@@ -399,6 +399,7 @@
(require 'help-fns) ;el-search--make-docstring
(require 'ring) ;el-search-history
(require 'hideshow) ;folding in *El Occur*
+(eval-when-compile (require 'outline)) ;folding in *El Occur*
;;;; Configuration stuff
@@ -2319,11 +2320,6 @@ Use the normal search commands to seize the search."
(defvar-local el-search-occur-search-object nil)
-(defvar orgstruct-heading-prefix-regexp)
-(declare-function org-back-to-heading 'org)
-(declare-function org-global-cycle 'org)
-(declare-function orgstruct-mode 'org)
-
(defun el-search-occur-revert-function (&rest _)
(el-search--occur el-search-occur-search-object t))
@@ -2464,16 +2460,31 @@ Prompt for a new pattern and revert."
(interactive)
(el-search-occur--next-match 'backwards))
-(declare-function orgstruct-hijacker-org-shifttab-2 'org)
+
+(defvar el-search-occur--outline-visible t)
+
(defun el-search-occur-cycle ()
+ "Cycle between showing an outline and everything."
+ (interactive)
+ (save-excursion
+ (goto-char (point-min))
+ (if el-search-occur--outline-visible
+ (outline-hide-leaves)
+ (outline-show-all)))
+ (cl-callf not el-search-occur--outline-visible))
+
+(defun el-search-occur-tab-command ()
+ "Hide or unhide heading or sexp at point."
(interactive)
- (cl-letf (((symbol-function 'org-context-p) #'el-search-true))
- (call-interactively #'orgstruct-hijacker-org-shifttab-2)))
+ (call-interactively
+ (if (not (outline-on-heading-p))
+ #'hs-toggle-hiding
+ #'outline-toggle-children)))
(defvar el-search-occur-mode-map
(let ((map (make-sparse-keymap)))
- (define-key map [tab] #'hs-toggle-hiding)
- (define-key map "\t" #'hs-toggle-hiding)
+ (define-key map [tab] #'el-search-occur-tab-command)
+ (define-key map "\t" #'el-search-occur-tab-command)
(define-key map [return] #'el-search-occur-jump-to-match)
(define-key map "\r" #'el-search-occur-jump-to-match)
(define-key map [S-iso-lefttab] #'el-search-occur-cycle)
@@ -2494,9 +2505,8 @@ Prompt for a new pattern and revert."
(setq-local hs-hide-comments-when-hiding-all nil)
(hs-minor-mode +1)
(hs-hide-all)
- (setq orgstruct-heading-prefix-regexp ";;; ")
(setq outline-regexp "^;;;\\ \\*+")
- (orgstruct-mode +1))
+ (outline-minor-mode +1))
(put 'el-search-occur-mode 'mode-class 'special)
- [elpa] externals/el-search 5c903d9 292/332: [el-search] Small fix for my last commit, (continued)
- [elpa] externals/el-search 5c903d9 292/332: [el-search] Small fix for my last commit, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search be0324a 301/332: [el-search] Some minor tweaks and bump version to 1.10.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 3b4b95b 304/332: [el-search] Small fix in el-search--changed-files-in-repo, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 2f427dd 318/332: [el-search] Query-replace: Change skip keys, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a5dd88c 322/332: [el-search] Minor fix in el-search-query-replace--read-args, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1939340 324/332: [el-search] Harmonize search and qu-replace prefix arg, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 43779b9 329/332: [el-search] Improve "New command el-search-repository", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0c25a34 331/332: Update copyright years of some packages, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search cd535ba 194/332: packages/el-search: Some minor tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 368a5dd 195/332: * el-search/el-search.el: Declare doc-string in el-search-defpattern, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f1ebc2e 201/332: * el-search/el-search.el: Get rid of orgstruct-mode,
Stefan Monnier <=
- [elpa] externals/el-search 5eb7614 206/332: Tweak el-search--get-search-description-string, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 179aa59 209/332: * el-search/el-search.el: Bump version to 1.5, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search b5b35ef 232/332: * el-search/el-search-x.el: Some more tweaks, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 63172a4 222/332: Treat inserted replacements as potential to-replace candidates, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search e0e2994 111/332: Some details, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search f26277b 117/332: Rewrite of el-search for version 1.0, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 1ef4266 114/332: Make el-search--make-docstring require a NAME argument, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 278a930 125/332: Speed up multi searching; version 1.1, Stefan Monnier, 2020/12/01
- [elpa] externals/el-search 0c2f0e5 127/332: Don't use the non-word "heuristical", Stefan Monnier, 2020/12/01
- [elpa] externals/el-search a38665c 115/332: Add section "Patterns for stylistic rewriting" and pattern `iffy-if', Stefan Monnier, 2020/12/01