branch: externals/compat
commit 68f99b6970296295b83408ef7cb13c6e688b96b0
Merge: 89d77c8fe4 187f4954c8
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Merge branch 'main' into emacs-30
---
NEWS.org | 2 ++
README.md | 4 ++--
compat-28.el | 2 +-
compat-tests.el | 12 ++++++------
4 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/NEWS.org b/NEWS.org
index eb12d6dccc..cdf5cb41b9 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -15,6 +15,8 @@
- compat-30: New functions =find-buffer= and =get-truename-buffer=.
- compat-30: Add extended =completion-metadata-get= with support for
=completion-category-overrides= and =completion-extra-properties=.
+- Minor optimization of ~plist-get~ and ~plist-put~.
+- Minor compatibility adjustments for the Emacs 30 development version.
- A minimal version of =compat.el= will be part of Emacs 30. Emacs :core
packages
can directly ~(require 'compat)~ without the ~NOERROR~ flag. Furthermore
Compat
will not be installed unnecessarily. If a package depending on Emacs 25.1 and
diff --git a/README.md b/README.md
index 53090509bd..8c1eff2487 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ builds].
[GNU ELPA repository]:
https://git.savannah.gnu.org/cgit/emacs/elpa.git/tree/?h=externals/compat
[GNU ELPA package builds]:
- http://elpa.gnu.org/packages/compat.html
+ https://elpa.gnu.org/packages/compat.html
Bug and patches
---------------
@@ -43,7 +43,7 @@ As compat.el is distributed as part of [GNU ELPA], and
therefore requires a
[copyright assignment] to the [FSF], for all non-trivial code contributions.
[GNU ELPA]:
- http://elpa.gnu.org/packages/compat.html
+ https://elpa.gnu.org/packages/compat.html
[copyright assignment]:
https://www.gnu.org/software/emacs/manual/html_node/emacs/Copyright-Assignment.html
[FSF]:
diff --git a/compat-28.el b/compat-28.el
index a2b9f4ca3f..b5730b11f4 100644
--- a/compat-28.el
+++ b/compat-28.el
@@ -190,7 +190,7 @@ and BLUE, is normalized to have its value in [0,65535]."
;; The "RGBi" (RGB Intensity) specification is defined by
;; XCMS[0], see [1] for the implementation in Xlib.
;;
- ;; [0] http://www.nic.funet.fi/pub/X11/X11R4/DOCS/color/Xcms.text
+ ;; [0] https://www.nic.funet.fi/pub/X11/X11R4/DOCS/color/Xcms.text
;; [1]
https://gitlab.freedesktop.org/xorg/lib/libx11/-/blob/master/src/xcms/LRGB.c#L1392
((string-match
;; (rx bos "rgbi:" (* space)
diff --git a/compat-tests.el b/compat-tests.el
index 57a849327d..57a707746d 100644
--- a/compat-tests.el
+++ b/compat-tests.el
@@ -133,18 +133,18 @@
(with-temp-buffer
(let ((event `(mouse-1 (,(selected-window) 1 (0 . 0) 0))))
(set-window-buffer nil (current-buffer))
- (insert "http://emacs.org/";)
+ (insert "https://emacs.org/";)
(goto-char (point-min))
- (should-equal "http://emacs.org/"; (thing-at-mouse event 'url))
- (should-equal '(1 . 18) (bounds-of-thing-at-mouse event 'url))
+ (should-equal "https://emacs.org/"; (thing-at-mouse event 'url))
+ (should-equal '(1 . 19) (bounds-of-thing-at-mouse event 'url))
(should-not (region-active-p))
(mark-thing-at-mouse event 'url)
- (should-equal (point) 18)
- (should-equal '((1 . 18)) (region-bounds))
+ (should-equal (point) 19)
+ (should-equal '((1 . 19)) (region-bounds))
(let ((mouse-select-region-move-to-beginning t))
(mark-thing-at-mouse event 'url))
(should-equal (point) 1)
- (should-equal '((1 . 18)) (region-bounds))))))
+ (should-equal '((1 . 19)) (region-bounds))))))
(ert-deftest compat-dolist-with-progress-reporter ()
(let (y)
