From 6d7e7899d84600de3aa4bb5e4cb4013e48f7a8b5 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 2 Feb 2025 15:58:18 +0200 Subject: [PATCH 1/7] Improve documentation of 'display-monitor-attributes- * doc/lispref/frames.texi (Multiple Terminals): * lisp/frame.el (display-monitor-attributes-list): Better documentation of what the 'source' key means on X. (Bug#75936) --- doc/lispref/frames.texi | 7 ++++++- lisp/frame.el | 4 ++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 2426c9c890f..39bfed48e4e 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi @@ -420,7 +420,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/lisp/frame.el b/lisp/frame.el index 64b9f6acff8..ec3d38fa3fa 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -2465,6 +2465,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 From a7f34a532cf7d99dac58bd7187f7ad82c1e4d789 Mon Sep 17 00:00:00 2001 From: Robert Pluim Date: Sun, 2 Feb 2025 13:33:37 +0100 Subject: [PATCH 2/7] Fix padding when using which-key-setup-side-window-right * lisp/which-key.el (which-key--pad-column): Insert zero padding spaces when the description string is longer than the column width. (Bug#75765) --- lisp/which-key.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/which-key.el b/lisp/which-key.el index d33e8b1a3bb..6ae8dcbb1f0 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) From fbc13ba9ccf4590ccd15dafa35d3872807af9cbd Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 3 Feb 2025 12:51:48 +0100 Subject: [PATCH 3/7] Better NaN handling in proced-tests.el * test/lisp/proced-tests.el (proced--cpu-at-point): Make it more robust. (proced--assert-process-valid-cpu-refinement): Handle `ert-test-skipped' signal. --- test/lisp/proced-tests.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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)))))) From a3b3083081299049b2ac2333d078c9cac62f2be4 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 3 Feb 2025 12:37:06 +0100 Subject: [PATCH 4/7] ; Don't use HTTPS in HTTP-specific example * doc/misc/org.org (External Links): Change HTTP example to use HTTP. Changing it to HTTPS has been done before, but it's a mistake. To avoid making this mistake again, change the URL to orgmode.org to make it more similar to the example on the next line, thereby contrasting the two. --- doc/misc/org.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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= | From 1c3a8bc9b51cf89fc1eff181d39941d7f0c7b2e2 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 3 Feb 2025 15:50:36 -0500 Subject: [PATCH 5/7] * lisp/emacs-lisp/track-changes.el (track-changes-fetch): Fix bug#75906 --- lisp/emacs-lisp/track-changes.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/emacs-lisp/track-changes.el b/lisp/emacs-lisp/track-changes.el index 3f3b8d7bed9..1aac53b5f33 100644 --- a/lisp/emacs-lisp/track-changes.el +++ b/lisp/emacs-lisp/track-changes.el @@ -364,7 +364,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. From 73a45ce7206a107695b2b4d9761e249edd7502e9 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 3 Feb 2025 23:51:15 +0100 Subject: [PATCH 6/7] ; Update link to picons database * lisp/gnus/gnus-art.el (gnus-picon-databases): Fix broken link. --- lisp/gnus/gnus-art.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index 218cf319448..eb4263812ea 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) From 5c36b4126533764bb8b90413f274d766e1a6f0d6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 4 Feb 2025 16:06:36 +0200 Subject: [PATCH 7/7] * src/fileio.c (Fsubstitute_in_file_name): Doc fix (bug#76023). --- src/fileio.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/fileio.c b/src/fileio.c index e522dd93cd6..7042dbca258 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;