From: Stefan Kangas <stefan@marxist.se>
Date: Tue, 23 Nov 2021 07:49:49 +0000 (+0100)
Subject: Merge from origin/emacs-28
X-Git-Tag: emacs-29.0.90~2852^2~91
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4c5efda8d33e582c53a0d7a1d3dfabecaca038bd;p=emacs.git

Merge from origin/emacs-28

d791cd556d Fix '(space :relative-width N)' display spec w/non-ASCII c...
712898210f * lisp/proced.el (proced-sort-header): Fix event positions...

# Conflicts:
#	lisp/proced.el
---

4c5efda8d33e582c53a0d7a1d3dfabecaca038bd
diff --cc lisp/proced.el
index e959e91c6e2,3b754c24c5f..9e9793abece
--- a/lisp/proced.el
+++ b/lisp/proced.el
@@@ -1332,12 -1329,13 +1332,13 @@@ EVENT is a mouse event with starting po
  It is converted to the corresponding attribute key.
  This command updates the variable `proced-sort'.
  Prefix ARG controls sort order, see `proced-sort-interactive'."
 -  (interactive (list last-input-event (or last-prefix-arg 'no-arg)))
 +  (interactive (list last-input-event (or last-prefix-arg 'no-arg)) proced-mode)
-   (let ((start (event-start event))
-         col key)
+   (let* ((start (event-start event))
+          (obj (posn-object start))
+          col key)
      (save-selected-window
        (select-window (posn-window start))
-       (setq col (+ (1- (car (posn-actual-col-row start)))
+       (setq col (+ (if obj (cdr obj) (posn-point start))
                     (window-hscroll)))
        (when (and (<= 0 col) (< col (length proced-header-line)))
          (setq key (get-text-property col 'proced-key proced-header-line))