From cb8fb597e5bf4f14bf091aaa0c984117f4243605 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Wed, 3 Jul 2019 15:55:10 +0300 Subject: * lisp/hi-lock.el (hi-lock-line-face-buffer): Doc fix. (Bug36448) --- lisp/hi-lock.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index b02fbc905b5..ce16c924524 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -409,7 +409,11 @@ versions before 22 use the following in your init file: (defalias 'highlight-lines-matching-regexp 'hi-lock-line-face-buffer) ;;;###autoload (defun hi-lock-line-face-buffer (regexp &optional face) - "Set face of all lines containing a match of REGEXP to FACE. + "Highlight all lines that match REGEXP using FACE. +The lines that match REGEXP will be displayed by merging +the attributes of FACE with any other face attributes +of text in those lines. + Interactively, prompt for REGEXP using `read-regexp', then FACE. Use the global history list for FACE. -- cgit v1.2.1 From f5b48469f18d568f788efe65a4754e73c3404bc9 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Thu, 30 May 2019 08:16:46 -0400 Subject: ; Fix typo, insure -> ensure in ChangeLogs --- lisp/ChangeLog.3 | 4 ++-- lisp/ChangeLog.5 | 2 +- lisp/mh-e/ChangeLog.2 | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3 index 38e684480fb..6265611b104 100644 --- a/lisp/ChangeLog.3 +++ b/lisp/ChangeLog.3 @@ -7321,7 +7321,7 @@ (fortran-setup-tab-format-style): Set `fortran-comment-line-column' and `fortran-minimum-statement-indent' to (max tab-width 6) instead of 8. - The minimum 6 insures legal indenting for lines with line numbers. + The minimum 6 ensures legal indenting for lines with line numbers. 1991-07-13 Jim Blandy (jimb@churchy.gnu.ai.mit.edu) @@ -11436,7 +11436,7 @@ 1989-04-19 Richard Stallman (rms@mole.ai.mit.edu) - * replace.el (occur-mode-goto-occurrence): Insure arg to + * replace.el (occur-mode-goto-occurrence): Ensure arg to count-lines is@start of line. * replace.el (occur): Remove an extraneous save-excursion. diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 5d079756387..ef6caa97042 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 @@ -2676,7 +2676,7 @@ 1995-03-10 Karl Fogel * bookmark.el: - Insure that all entry points call `bookmark-maybe-load-default-file'. + Ensure that all entry points call `bookmark-maybe-load-default-file'. Changed format of bookmark-alist and therefore of bookmark files. Have version stamps in bookmark files. Automatically upgrade old bookmark files to new format. diff --git a/lisp/mh-e/ChangeLog.2 b/lisp/mh-e/ChangeLog.2 index 6d3b8e332b6..1e57969b9b1 100644 --- a/lisp/mh-e/ChangeLog.2 +++ b/lisp/mh-e/ChangeLog.2 @@ -73,10 +73,10 @@ * mh-folder.el (mh-inc-folder): Revert SF #2321115, SF #250 which processed pending deletes and refiles. Call to - mh-process-or-undo-commands to insure that pending changes are + mh-process-or-undo-commands to ensure that pending changes are properly tagged after including new mail (closes SF #271). - * mh-comp.el: Insure that mail-header-separator is set before + * mh-comp.el: Ensure that mail-header-separator is set before invoking any mml functions (closes SF #270). 2013-01-23 Dmitry Antipov @@ -140,7 +140,7 @@ (addresses SF #1916032). * mh-folder.el (mh-inc-folder): Call mh-process-or-undo-commands - before running to insure we do not lose any pending changes. + before running to ensure we do not lose any pending changes. (closes SF #2321115). 2012-11-25 Ted Phelps -- cgit v1.2.1 From e6608010d7187e7801a4b9e6119ffd641fd06986 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Mon, 13 May 2019 08:39:00 -0400 Subject: ; Add thing-at-point-looking-at test (Bug#35708) * test/lisp/thingatpt-tests.el (thing-at-point-looking-at): New test. --- test/lisp/thingatpt-tests.el | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el index 452fcc6895b..f787aa69aad 100644 --- a/test/lisp/thingatpt-tests.el +++ b/test/lisp/thingatpt-tests.el @@ -20,6 +20,7 @@ ;;; Code: (require 'ert) +(require 'thingatpt) (defvar thing-at-point-test-data '(("https://1.gnu.org" 1 url "https://1.gnu.org") @@ -131,4 +132,15 @@ position to retrieve THING.") (goto-char 23) (should (equal (thing-at-point 'url) "http://foo/bar(baz)")))) +(ert-deftest thing-at-point-looking-at () + (with-temp-buffer + (insert "1abcd 2abcd 3abcd") + (goto-char (point-min)) + (let ((m2 (progn (search-forward "2abcd") + (match-data)))) + (goto-char (point-min)) + (search-forward "2ab") + (should (thing-at-point-looking-at "2abcd")) + (should (equal (match-data) m2))))) + ;;; thingatpt.el ends here -- cgit v1.2.1 From e97c0437aa135f9580cd8cc1ec912758e3610ab1 Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Fri, 5 Jul 2019 21:34:16 -0400 Subject: Fix python.el docstring (Bug#36458) * lisp/progmodes/python.el (python-shell--prompt-calculated-output-regexp): python-shell-set-prompt-regexp doesn't exist, presumably python-shell-prompt-set-calculated-regexps was meant. --- lisp/progmodes/python.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 38dcc823d06..8e7d9f23b0e 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2231,7 +2231,7 @@ Do not set this variable directly, instead use (defvar python-shell--prompt-calculated-output-regexp nil "Calculated output prompt regexp for inferior python shell. Do not set this variable directly, instead use -`python-shell-set-prompt-regexp'.") +`python-shell-prompt-set-calculated-regexps'.") (defun python-shell-prompt-detect () "Detect prompts for the current `python-shell-interpreter'. -- cgit v1.2.1