From 9f6a4bbcc96bef451c75a8a78e442dec87a0ddf0 Mon Sep 17 00:00:00 2001 From: Mattias Engdegård Date: Thu, 13 Feb 2020 20:06:48 +0100 Subject: Remove the optional KEEP-ORDER argument to regexp-opt This argument was added for the 'or' clause in rx, but it turned out to be a bad idea (bug#37659), and there seems to be little other use for it. * lisp/emacs-lisp/regexp-opt.el (regexp-opt): Remove KEEP-ORDER. * doc/lispref/searching.texi (Regexp Functions): * etc/NEWS: Remove it from the documentation. * test/lisp/emacs-lisp/regexp-opt-tests.el (regexp-opt-test--match-all) (regexp-opt-test--check-perm, regexp-opt-test--explain-perm) (regexp-opt-keep-order, regexp-opt-longest-match): Simplify test. --- lisp/emacs-lisp/regexp-opt.el | 43 +++++++++---------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el index 2cce4e63539..35a5fda184f 100644 --- a/lisp/emacs-lisp/regexp-opt.el +++ b/lisp/emacs-lisp/regexp-opt.el @@ -84,7 +84,7 @@ ;;; Code: ;;;###autoload -(defun regexp-opt (strings &optional paren keep-order) +(defun regexp-opt (strings &optional paren) "Return a regexp to match a string in the list STRINGS. Each member of STRINGS is treated as a fixed string, not as a regexp. Optional PAREN specifies how the returned regexp is surrounded by @@ -114,11 +114,8 @@ nil necessary to ensure that a postfix operator appended to it will apply to the whole expression. -The optional argument KEEP-ORDER, if non-nil, forces the match to -be performed in the order given, as if the strings were made into -a regexp by joining them with the `\\|' operator. If nil or -omitted, the returned regexp is will always match the longest -string possible. +The returned regexp is ordered in such a way that it will always +match the longest string possible. Up to reordering, the resulting regexp is equivalent to but usually more efficient than that of a simplified version: @@ -140,34 +137,12 @@ usually more efficient than that of a simplified version: (completion-ignore-case nil) (completion-regexp-list nil) (open (cond ((stringp paren) paren) (paren "\\("))) - (re - (cond - ;; No strings: return an unmatchable regexp. - ((null strings) - (concat (or open "\\(?:") regexp-unmatchable "\\)")) - - ;; The algorithm will generate a pattern that matches - ;; longer strings in the list before shorter. If the - ;; list order matters, then no string must come after a - ;; proper prefix of that string. To check this, verify - ;; that a straight or-pattern matches each string - ;; entirely. - ((and keep-order - (let* ((case-fold-search nil) - (alts (mapconcat #'regexp-quote strings "\\|"))) - (and (let ((s strings)) - (while (and s - (string-match alts (car s)) - (= (match-end 0) (length (car s)))) - (setq s (cdr s))) - ;; If we exited early, we found evidence that - ;; regexp-opt-group cannot be used. - s) - (concat (or open "\\(?:") alts "\\)"))))) - (t - (regexp-opt-group - (delete-dups (sort (copy-sequence strings) 'string-lessp)) - (or open t) (not open)))))) + (re (if strings + (regexp-opt-group + (delete-dups (sort (copy-sequence strings) 'string-lessp)) + (or open t) (not open)) + ;; No strings: return an unmatchable regexp. + (concat (or open "\\(?:") regexp-unmatchable "\\)")))) (cond ((eq paren 'words) (concat "\\<" re "\\>")) ((eq paren 'symbols) -- cgit v1.2.3 From faada7ca42661aff403a51a9003983369e68874e Mon Sep 17 00:00:00 2001 From: Pieter van Oostrum Date: Sun, 9 Feb 2020 21:22:55 +0100 Subject: Remove obsolete menu entry "Redisplay buffer" * lisp/emacs-lisp/package.el (package-menu-mode-menu): Remove obsolete menu entry "Redisplay buffer". (package-menu-mode-menu): Menu entry "Refresh Package List": make the doc string more accurate. (Bug#39436) --- lisp/emacs-lisp/package.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index 64d2001646f..e2eba5afe11 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -2714,9 +2714,8 @@ either a full name or nil, and EMAIL is a valid email address." ["Help" package-menu-quick-help :help "Show short key binding help for package-menu-mode"] "--" ["Refresh Package List" revert-buffer - :help "Redownload the ELPA archive" + :help "Redownload the package archive(s)" :active (not package--downloads-in-progress)] - ["Redisplay buffer" revert-buffer :help "Update the buffer with current list of packages"] ["Execute Marked Actions" package-menu-execute :help "Perform all the marked actions"] "--" -- cgit v1.2.3 From 7448834f738b243d67f0bb2c9e8b531fc64d9064 Mon Sep 17 00:00:00 2001 From: Pieter van Oostrum Date: Sun, 9 Feb 2020 16:55:29 +0100 Subject: Correct default regexp in 'package-menu-hide-package' * lisp/emacs-lisp/package.el (package-menu-mode-menu): Correct default regexp, so it only selects the package at point. (Bug#39436) --- lisp/emacs-lisp/package.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lisp/emacs-lisp') diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index e2eba5afe11..10ce19525a0 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -3194,7 +3194,8 @@ The default regexp will hide only the package whose name is at point." (declare (interactive-only "change `package-hidden-regexps' instead.")) (let* ((name (when (derived-mode-p 'package-menu-mode) (concat "\\`" (regexp-quote (symbol-name (package-desc-name - (tabulated-list-get-id))))))) + (tabulated-list-get-id)))) + "\\'"))) (re (read-string "Hide packages matching regexp: " name))) ;; Test if it is valid. (string-match re "") -- cgit v1.2.3