[elpa] externals/hyperbole e85b09bef4: Use messages-buffer, run test case only interactively (#205)
branch: externals/hyperbole commit e85b09bef4bad29c3b9bad3bad1d5604c360791b Author: Mats Lidell Commit: GitHub Use messages-buffer, run test case only interactively (#205) --- ChangeLog| 8 test/hui-select-tests.el | 3 ++- test/hy-test-helpers.el | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 19b7a3cc4c..60ae35aa04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2022-07-11 Mats Lidell + +* test/hy-test-helpers.el (hy-test-helpers:should-last-message): Use +function messages-buffer for getting the *Messages* buffer. + +* test/hui-select-tests.el (hui-select--thing): Limit test case to run in +interactive mode, i.e. make test-all. + 2022-06-19 Bob Weiner * test/demo-tests.el (fast-demo-key-series-shell-apropos): Allow optional space diff --git a/test/hui-select-tests.el b/test/hui-select-tests.el index c8e76cfc8f..93d30636e7 100644 --- a/test/hui-select-tests.el +++ b/test/hui-select-tests.el @@ -3,7 +3,7 @@ ;; Author: Mats Lidell ;; ;; Orig-Date:14-Apr-22 at 23:45:52 -;; Last-Mod: 15-Apr-22 at 23:53:52 by Mats Lidell +;; Last-Mod: 11-Jul-22 at 23:29:45 by Mats Lidell ;; ;; Copyright (C) 2021 Free Software Foundation, Inc. ;; See the "../HY-COPY" file for license information. @@ -80,6 +80,7 @@ (ert-deftest hui-select--thing () "`hui-select-thing' selects bigger sections of text when called repeatedly." + (skip-unless (not noninteractive)) (hui-select-reset) (with-temp-buffer (insert "Buffer\n\nParagraph\nline. One word.\n") diff --git a/test/hy-test-helpers.el b/test/hy-test-helpers.el index 952b425cad..18c6d84bd5 100644 --- a/test/hy-test-helpers.el +++ b/test/hy-test-helpers.el @@ -3,7 +3,7 @@ ;; Author: Mats Lidell ;; ;; Orig-Date:30-Jan-21 at 12:00:00 -;; Last-Mod: 24-Jan-22 at 00:40:54 by Bob Weiner +;; Last-Mod: 11-Jul-22 at 23:23:08 by Mats Lidell ;; ;; Copyright (C) 2021-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -27,7 +27,7 @@ (defun hy-test-helpers:should-last-message (msg) "Verify last message is MSG." - (with-current-buffer "*Messages*" + (with-current-buffer (messages-buffer) (should (save-excursion (goto-char (point-max)) (search-backward msg (- (point-max) 350))
[elpa] externals/consult 53e78c6be5: consult-grep/git-grep/ripgrep: Add -F, --fixed-strings support (Fix #608)
branch: externals/consult commit 53e78c6be5c64f9fdeb61c55cbec9a4f56f46adc Author: Daniel Mendler Commit: Daniel Mendler consult-grep/git-grep/ripgrep: Add -F, --fixed-strings support (Fix #608) --- CHANGELOG.org | 1 + consult.el| 108 -- 2 files changed, 61 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 907ac4851e..b1c3103e30 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -7,6 +7,7 @@ - Bugfixes - Allow =consult-flymake= to work across all buffers in a project - Remove deprecated =consult-completing-read-multiple= +- =consult-grep/git-grep/ripgrep=: Add =--fixed-strings= support * Version 0.18 (2022-05-25) diff --git a/consult.el b/consult.el index e37641fcd7..fe6f252244 100644 --- a/consult.el +++ b/consult.el @@ -547,21 +547,23 @@ pairs." ;; split-string-and-unquote fails if the quotes are invalid. Ignore it. (cons str (and opts (ignore-errors (split-string-and-unquote opts))) -(defun consult--highlight-regexps (regexps str) +(defun consult--highlight-regexps (regexps ignore-case str) "Highlight REGEXPS in STR. If a regular expression contains capturing groups, only these are highlighted. -If no capturing groups are used highlight the whole match." - (dolist (re regexps) -(when (string-match re str) - ;; Unfortunately there is no way to avoid the allocation of the match - ;; data, since the number of capturing groups is unknown. - (let ((m (match-data))) -(setq m (or (cddr m) m)) -(while m - (when (car m) -(add-face-text-property (car m) (cadr m) -'consult-preview-match nil str)) - (setq m (cddr m))) +If no capturing groups are used highlight the whole match. Case is ignored +if IGNORE-CASE is non-nil." + (let ((case-fold-search ignore-case)) +(dolist (re regexps) + (when (string-match re str) +;; Unfortunately there is no way to avoid the allocation of the match +;; data, since the number of capturing groups is unknown. +(let ((m (match-data))) + (setq m (or (cddr m) m)) + (while m +(when (car m) + (add-face-text-property (car m) (cadr m) + 'consult-preview-match nil str)) +(setq m (cddr m (defconst consult--convert-regexp-table (append @@ -619,9 +621,7 @@ matches case insensitively." (setq input (consult--split-escaped input)) (cons (mapcar (lambda (x) (consult--convert-regexp x type)) input) (when-let (regexps (seq-filter #'consult--valid-regexp-p input)) - (lambda (str) -(let ((case-fold-search ignore-case)) - (consult--highlight-regexps regexps str)) + (apply-partially #'consult--highlight-regexps regexps ignore-case (defun consult--split-escaped (str) "Split STR at spaces, which can be escaped with backslash." @@ -4386,17 +4386,22 @@ INITIAL is inital input." (defun consult--grep-builder (input) "Build command line given INPUT." (pcase-let* ((cmd (split-string-and-unquote consult-grep-args)) - (type (consult--grep-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg type - (member "--ignore-case" cmd -(when re - (list :command -(append cmd -(list (if (eq type 'pcre) "--perl-regexp" "--extended-regexp") - "-e" (consult--join-regexps re type)) -opts) -:highlight hl + (flags (append cmd opts)) + (ignore-case (or (member "-i" flags) (member "--ignore-case" flags +(if (or (member "-F" flags) (member "--fixed-strings" flags)) +`(:command (,@cmd "-e" ,arg ,@opts) :highlight + ,(apply-partially #'consult--highlight-regexps + (list (regexp-quote arg)) ignore-case)) + (pcase-let* ((type (consult--grep-regexp-type (car cmd))) + (`(,re . ,hl) (funcall consult--regexp-compiler arg type ignore-case))) +(when re + `(:command +(,@cmd + ,(if (eq type 'pcre) "--perl-regexp" "--extended-regexp") + "-e" ,(consult--join-regexps re type) + ,@opts) +:highlight ,hl)) ;;;###autoload (defun consult-grep (&optional dir initial) @@ -4445,14 +4450,17 @@ Otherwise the `default-directory' is searched." "Build command line given CONFIG and INPUT." (pcase-let* ((cmd (split-string-and-unquote consult-git-grep-args)) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended - (member "--ign
[nongnu] elpa/dracula-theme 4fe715fa82 1/2: Update README configure section with correct names.
branch: elpa/dracula-theme commit 4fe715fa82ba8b7a116b363702fcdba440bf187d Author: Greg Heiman Commit: Greg Heiman Update README configure section with correct names. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b239a8d6b..4aea766fb0 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ need to be set before `load-theme` is invoked for Dracula. (setq dracula-height-title-1 1.25) ;; Adjust font size of titles level 2 (default 1.1) -(setq dracula-height-title-1 1.15) +(setq dracula-height-title-2 1.15) ;; Adjust font size of titles level 3 (default 1.0) -(setq dracula-height-title-1 1.05) +(setq dracula-height-title-3 1.05) ;; Adjust font size of document titles (default 1.44) (setq dracula-height-doc-title 1.4)
[nongnu] elpa/dracula-theme 60f4e0c67a 2/2: Merge pull request #93 from Ushrio/update-readme
branch: elpa/dracula-theme commit 60f4e0c67aeeaeb1632cd82b96f4ff5ee83bd1f4 Merge: e725c9e790 4fe715fa82 Author: Étienne Deparis Commit: GitHub Merge pull request #93 from Ushrio/update-readme Update README configure section with correct names. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1b239a8d6b..4aea766fb0 100644 --- a/README.md +++ b/README.md @@ -27,10 +27,10 @@ need to be set before `load-theme` is invoked for Dracula. (setq dracula-height-title-1 1.25) ;; Adjust font size of titles level 2 (default 1.1) -(setq dracula-height-title-1 1.15) +(setq dracula-height-title-2 1.15) ;; Adjust font size of titles level 3 (default 1.0) -(setq dracula-height-title-1 1.05) +(setq dracula-height-title-3 1.05) ;; Adjust font size of document titles (default 1.44) (setq dracula-height-doc-title 1.4)
[elpa] externals/vcard 28b88fd8ed: Fix parsing vcards with quoted-printable elements
branch: externals/vcard commit 28b88fd8ed53ca12d9499175217af81f5ea161fc Author: Lars Ingebrigtsen Commit: Lars Ingebrigtsen Fix parsing vcards with quoted-printable elements * vcard.el (vcard-parse-string): We need a unibyte buffer, because we might have encoded utf-8 elements. (vcard-parse-region-value): All elements in the vCard format 4.0 (rfc6350) are utf-8, according to Roland Winkler (bug#56513). --- vcard.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vcard.el b/vcard.el index 53ca373582..f7dc30857e 100644 --- a/vcard.el +++ b/vcard.el @@ -7,7 +7,7 @@ ;; Keywords: vcard, mail, news ;; Created: 1997-09-27 -;; Version: 0.2.1 +;; Version: 0.2.2 ;; Package-Requires: ((emacs "27.1")) ;; $Id: vcard.el,v 1.11 2000/06/29 17:07:55 friedman Exp $ @@ -210,6 +210,7 @@ would be returned." (buf (generate-new-buffer " *vcard parser work*"))) (unwind-protect (with-current-buffer buf + (set-buffer-multibyte nil) ;; Make sure last line is newline-terminated. ;; An extra trailing newline is harmless. (insert raw "\n") @@ -299,7 +300,10 @@ Note: this function modifies the buffer!" (set-marker match-beg (point-max)) (set-marker match-end (point-max (funcall decoder pos match-beg) - (setq result (cons (buffer-substring pos match-beg) result)) + (setq result (cons (decode-coding-string + (buffer-substring pos match-beg) + 'utf-8) +result)) (set-marker pos (marker-position match-end (setq result (nreverse result)) (vcard-set-property proplist "encoding" nil))
[elpa] externals/eglot c558fd6a24: Fix #965: Update link for Fortran language server fortls
branch: externals/eglot commit c558fd6a244207ea58de0120f80509beabafb018 Author: ssnnoo <43703153+ssn...@users.noreply.github.com> Commit: GitHub Fix #965: Update link for Fortran language server fortls README.md (fortls): update link Copyright-paperwork-exempt: yes --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c31df8de5..1df8a81dce 100644 --- a/README.md +++ b/README.md @@ -527,7 +527,7 @@ for the request form, and we'll send it to you. [dart-analysis-server]: https://github.com/dart-lang/sdk/blob/master/pkg/analysis_server/tool/lsp_spec/README.md [elixir-ls]: https://github.com/elixir-lsp/elixir-ls [elm-language-server]: https://github.com/elm-tooling/elm-language-server -[fortls]: https://github.com/hansec/fortran-language-server +[fortls]: https://github.com/gnikit/fortls [futhark-lsp]: https://futhark-lang.org [gopls]: https://github.com/golang/tools/tree/master/gopls [godot]: https://godotengine.org
