Merge remote-tracking branch 'origin/emacs-30'

8 files changed, 25 insertions, 11 deletions

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index e30d1c99820..bc2d6b07ae8 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -427,7 +427,12 @@ Name of the physical monitor as @var{string}.
 
 @item source
 Source of the multi-monitor information as @var{string};
-e.g., @samp{XRandR 1.5}, @samp{XRandr} or @samp{Xinerama}.
+on X, it could be @samp{XRandR 1.5}, @samp{XRandr}, @samp{Xinerama},
+@samp{Gdk}, or @samp{fallback}.  The last value of @samp{source} means
+that Emacs was built without GTK and without XRandR or Xinerama
+extensions, in which case the information about multiple physical
+monitors will be provided as if they all as a whole formed a single
+monitor.
 @end table
 
 @var{x}, @var{y}, @var{width}, and @var{height} are integers.
diff --git a/doc/misc/org.org b/doc/misc/org.org
index 363a95fa65c..26cb46cf13c 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -3403,7 +3403,7 @@ options:
 
 | Link Type  | Example                                                            |
 |------------+--------------------------------------------------------------------|
-| http       | =https://staff.science.uva.nl/c.dominik/=                          |
+| http       | =http://orgmode.org/=                                              |
 | https      | =https://orgmode.org/=                                             |
 | doi        | =doi:10.1000/182=                                                  |
 | file       | =file:/home/dominik/images/jupiter.jpg=                            |
diff --git a/lisp/emacs-lisp/track-changes.el b/lisp/emacs-lisp/track-changes.el
index 25c9ad7c859..125314fa814 100644
--- a/lisp/emacs-lisp/track-changes.el
+++ b/lisp/emacs-lisp/track-changes.el
@@ -372,7 +372,9 @@ and re-enable the TRACKER corresponding to ID."
                              track-changes--state))
               ;; Nothing to do.
               nil)
-          (cl-assert (not (memq id track-changes--clean-trackers)))
+          ;; ID may still be in `track-changes--clean-trackers' if
+          ;; `after-change-functions' was skipped.
+          ;;(cl-assert (not (memq id track-changes--clean-trackers)))
           (cl-assert (<= (point-min) beg end (point-max)))
           ;; Update the tracker's state *before* running `func' so we don't risk
           ;; mistakenly replaying the changes in case `func' exits non-locally.
diff --git a/lisp/frame.el b/lisp/frame.el
index a55fcb41ce1..e66270130d2 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -2543,6 +2543,10 @@ details depend on the platform and environment.
 The `source' attribute describes the source from which the
 information was obtained.  On X, this may be one of: \"Gdk\",
 \"XRandR 1.5\", \"XRandr\", \"Xinerama\", or \"fallback\".
+If it is \"fallback\", it means Emacs was built without GTK
+and without XrandR or Xinerama extensions, in which case the
+information about multiple physical monitors will be provided
+as if they all as a whole formed a single monitor.
 
 A frame is dominated by a physical monitor when either the
 largest area of the frame resides in the monitor, or the monitor
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 89982f0b1ca..5b16e82fc48 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -981,11 +981,11 @@ be controlled by `gnus-treat-body-boundary'."
                                   "/usr/share/picons")
   "Defines the location of the faces database.
 For information on obtaining this database of pretty pictures, please
-see http://www.cs.indiana.edu/picons/ftp/index.html"
+see https://kinzler.com/ftp/faces/picons/"
   :version "22.1"
   :type '(repeat directory)
   :link '(url-link :tag "download"
-                   "http://www.cs.indiana.edu/picons/ftp/index.html")
+                   "https://kinzler.com/ftp/faces/picons/")
   :link '(custom-manual "(gnus)Picons")
   :group 'gnus-picon)
 
diff --git a/lisp/which-key.el b/lisp/which-key.el
index 45a02955e11..bfeb9da7422 100644
--- a/lisp/which-key.el
+++ b/lisp/which-key.el
@@ -2038,7 +2038,7 @@ that width."
           (mapcar (pcase-lambda (`(,key ,sep ,desc ,_doc))
                     (concat
                      (format col-format key sep desc)
-                     (make-string (- col-desc-width (string-width desc)) ?\s)))
+                     (make-string (max (- col-desc-width (string-width desc)) 0) ?\s)))
                   col-keys))))
 
 (defun which-key--partition-list (n list)
diff --git a/src/fileio.c b/src/fileio.c
index 1832a4c7759..cdf57618af1 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -2050,7 +2050,9 @@ the value of this function.
 
 If `/~' appears, all of FILENAME through that `/' is discarded.
 If `//' appears, everything up to and including the first of
-those `/' is discarded.  */)
+those `/' is discarded.  More generally, if a variable substitution
+produces an absolute file name, everything before that file name
+is discarded.  */)
   (Lisp_Object filename)
 {
   char *nm, *p, *x, *endp;
diff --git a/test/lisp/proced-tests.el b/test/lisp/proced-tests.el
index e24163c3884..ecf23c5d037 100644
--- a/test/lisp/proced-tests.el
+++ b/test/lisp/proced-tests.el
@@ -38,10 +38,10 @@
 (defun proced--cpu-at-point ()
   "Return as an integer the current CPU value at point."
   (if (string-suffix-p "nan" (thing-at-point 'sexp))
-      (let ((pid (proced-pid-at-point)))
-        (ert-skip
-         (format
-          "Found NaN value for %%CPU at point for process with PID %d" pid)))
+      (ert-skip
+       (format
+        "Found NaN value for %%CPU at point for process with PID %s"
+        (substring-no-properties (thing-at-point 'sexp))))
     (thing-at-point 'number)))
 
 (defun proced--assert-emacs-pid-in-buffer ()
@@ -61,6 +61,7 @@
   (proced--move-to-column "%CPU")
   (condition-case err
       (>= (proced--cpu-at-point) cpu)
+    (ert-test-skipped (signal (car err) (cdr err)))
     (error
      (ert-fail
       (list err (proced--assert-process-valid-cpu-refinement-explainer cpu))))))