[elpa] master 3f21650: Update copyrights of some packages
branch: master commit 3f21650a7e1395847c5bb6316878b6d433d16e1b Author: Michael Heerdegen Commit: Michael Heerdegen Update copyrights of some packages Update copyrights of el-search, iterators, on-screen and smart-yank. --- packages/el-search/el-search-x.el | 2 +- packages/el-search/el-search.el | 2 +- packages/iterators/iterators.el | 2 +- packages/on-screen/on-screen.el | 2 +- packages/smart-yank/smart-yank.el | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/el-search/el-search-x.el b/packages/el-search/el-search-x.el index 09a43fe..cae166c 100644 --- a/packages/el-search/el-search-x.el +++ b/packages/el-search/el-search-x.el @@ -1,6 +1,6 @@ ;;; el-search-x.el --- Additional pattern definitions for el-search-*- lexical-binding: t -*- -;; Copyright (C) 2016, 2017 Free Software Foundation, Inc +;; Copyright (C) 2016-2018 Free Software Foundation, Inc ;; Author: Michael Heerdegen ;; Maintainer: Michael Heerdegen diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index 6ea435f..782afa8 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -1,6 +1,6 @@ ;;; el-search.el --- Expression based interactive search for Emacs Lisp -*- lexical-binding: t -*- -;; Copyright (C) 2015-2017 Free Software Foundation, Inc +;; Copyright (C) 2015-2018 Free Software Foundation, Inc ;; Author: Michael Heerdegen ;; Maintainer: Michael Heerdegen diff --git a/packages/iterators/iterators.el b/packages/iterators/iterators.el index 83f5907..ca3cb03 100644 --- a/packages/iterators/iterators.el +++ b/packages/iterators/iterators.el @@ -1,6 +1,6 @@ ;;; iterators.el --- Functions for working with iterators -*- lexical-binding: t -*- -;; Copyright (C) 2015-2017 Free Software Foundation, Inc +;; Copyright (C) 2015-2018 Free Software Foundation, Inc ;; Author: Michael Heerdegen ;; Maintainer: Michael Heerdegen diff --git a/packages/on-screen/on-screen.el b/packages/on-screen/on-screen.el index 2cad3ca..6e9df0b 100644 --- a/packages/on-screen/on-screen.el +++ b/packages/on-screen/on-screen.el @@ -1,6 +1,6 @@ ;;; on-screen.el --- guide your eyes while scrolling -*- lexical-binding: t -*- -;; Copyright (C) 2013-2017 Free Software Foundation, Inc +;; Copyright (C) 2013-2018 Free Software Foundation, Inc ;; Author: Michael Heerdegen ;; Maintainer: Michael Heerdegen diff --git a/packages/smart-yank/smart-yank.el b/packages/smart-yank/smart-yank.el index eaf0d43..0c64c08 100644 --- a/packages/smart-yank/smart-yank.el +++ b/packages/smart-yank/smart-yank.el @@ -1,6 +1,6 @@ ;;; smart-yank.el --- A different approach of yank pointer handling -*- lexical-binding: t -*- -;; Copyright (C) 2016, 2017 Free Software Foundation, Inc +;; Copyright (C) 2016-2018 Free Software Foundation, Inc ;; Author: Michael Heerdegen ;; Maintainer: Michael Heerdegen
[elpa] master 7f92a93: Allow `string' and `symbol' el-search patterns to set match data
branch: master commit 7f92a9302ea189c68377aba20ab846c3b6781590 Author: Michael Heerdegen Commit: Michael Heerdegen Allow `string' and `symbol' el-search patterns to set match data The rationale is to allow to use the match data when replacing symbols and strings via `el-search-query-replace'. * packages/el-search/el-search.el (el-search--string-matcher): Use `string-match' instead of `string-match-p. (symbol): Add to documentation an example of using match data with query-replace. --- packages/el-search/el-search.el | 13 ++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index 782afa8..6c56c32 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/el-search.el @@ -7,7 +7,7 @@ ;; Created: 29 Jul 2015 ;; Keywords: lisp ;; Compatibility: GNU Emacs 25 -;; Version: 1.4.0.12 +;; Version: 1.4.0.13 ;; Package-Requires: ((emacs "25") (stream "2.2.4")) @@ -1497,7 +1497,7 @@ argument (that should be a string)." (byte-compile regexp-like)) (byte-compile (let ((string (make-symbol "string"))) - `(lambda (,string) (let ,match-bindings (string-match-p ,regexp ,string + `(lambda (,string) (let ,match-bindings (string-match ,regexp ,string (el-search-defpattern string (&rest regexps) "Matches any string that is matched by all REGEXPS. @@ -1518,7 +1518,14 @@ Any of the REGEXPS is `el-search-regexp-like-p'." (el-search-defpattern symbol (&rest regexps) "Matches any symbol whose name is matched by all REGEXPS. -Any of the REGEXPS is `el-search-regexp-like-p'." +Any of the REGEXPS is `el-search-regexp-like-p'. + +Example: to replace all symbols with names starting with \"foo-\" +to start with \"bar-\" instead, you would use +`el-search-query-replace' with a rule like this: + + (and (symbol \"`foo-(.*)\") s) > + (intern (concat \"bar-\" (match-string 1 (symbol-name s" (declare (heuristic-matcher (lambda (&rest regexps) (let ((matchers (mapcar #'el-search--string-matcher regexps)))
[elpa] master 499f734: * el-search/el-search.el: Get rid of orgstruct-mode
branch: master commit 499f7340590a78ff11c48d726b59942ef5e3779f Author: Michael Heerdegen Commit: Michael Heerdegen * 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'. --- packages/el-search/el-search.el | 36 +++- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/packages/el-search/el-search.el b/packages/el-search/el-search.el index 6c56c32..106e126 100644 --- a/packages/el-search/el-search.el +++ b/packages/el-search/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)
