diff options
| author | Noam Postavsky | 2018-08-04 11:55:03 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2018-08-04 11:55:03 -0400 |
| commit | 6328d2ff6f4c6c845b610e8011a36d489d9445a2 (patch) | |
| tree | eb816e2a03a93d5e45042449a581ae8f759167c0 /lisp | |
| parent | c27bd469f1a6f962798caaa584c36ccbe5e42936 (diff) | |
| parent | 951c5a127fb6f8b34c23fced0943101a41af74ad (diff) | |
| download | emacs-6328d2ff6f4c6c845b610e8011a36d489d9445a2.tar.gz emacs-6328d2ff6f4c6c845b610e8011a36d489d9445a2.zip | |
Merge from emacs-26
951c5a127f Fix wdired test failure when byte compiled (bug#32318)
0252f7311f * test/lisp/wdired-tests.el (wdired-test-symlink-name): Ne...
dd51434714 Fix url's thing-at-point beginning-op (Bug#32028)
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/thingatpt.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index 4612e95bb0e..7fcb3bc2b73 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el | |||
| @@ -484,7 +484,7 @@ looks like an email address, \"ftp://\" if it starts with | |||
| 484 | 484 | ||
| 485 | (put 'url 'end-op (lambda () (end-of-thing 'url))) | 485 | (put 'url 'end-op (lambda () (end-of-thing 'url))) |
| 486 | 486 | ||
| 487 | (put 'url 'beginning-op (lambda () (end-of-thing 'url))) | 487 | (put 'url 'beginning-op (lambda () (beginning-of-thing 'url))) |
| 488 | 488 | ||
| 489 | ;; The normal thingatpt mechanism doesn't work for complex regexps. | 489 | ;; The normal thingatpt mechanism doesn't work for complex regexps. |
| 490 | ;; This should work for almost any regexp wherever we are in the | 490 | ;; This should work for almost any regexp wherever we are in the |