[Emacs-diffs] master bb856d1 3/5: Merge from origin/emacs-26

[Glenn Morris]

branch: master
commit bb856d12dc34a56be7a95ca5e55ddb1a78535d07
Merge: ef389fd e97c043
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>

    Merge from origin/emacs-26
    
    e97c043 Fix python.el docstring (Bug#36458)
    e660801 ; Add thing-at-point-looking-at test (Bug#35708)
    f5b4846 ; Fix typo, insure -> ensure in ChangeLogs
    cb8fb59 * lisp/hi-lock.el (hi-lock-line-face-buffer): Doc fix.  (Bug3...
---
 lisp/ChangeLog.3             |  4 ++--
 lisp/ChangeLog.5             |  2 +-
 lisp/hi-lock.el              |  6 +++++-
 lisp/mh-e/ChangeLog.2        |  6 +++---
 lisp/progmodes/python.el     |  2 +-
 test/lisp/thingatpt-tests.el | 12 ++++++++++++
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 38e6844..6265611 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  (address@hidden)
 
@@ -11436,7 +11436,7 @@
 
 1989-04-19  Richard Stallman  (address@hidden)
 
-       * 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 0976a15..749e7f6 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -2676,7 +2676,7 @@
 1995-03-10  Karl Fogel  <address@hidden>
 
        * 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/hi-lock.el b/lisp/hi-lock.el
index c2568a5..f790546 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -426,7 +426,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.
 
diff --git a/lisp/mh-e/ChangeLog.2 b/lisp/mh-e/ChangeLog.2
index 6d3b8e3..1e57969 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  <address@hidden>
@@ -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  <address@hidden>
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index e1f9a33..14b6566 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2274,7 +2274,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'.
diff --git a/test/lisp/thingatpt-tests.el b/test/lisp/thingatpt-tests.el
index 347cc7f..c851a7c 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";)
@@ -134,4 +135,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