From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id vC6LKb5Qk2DtPwAAgWs5BA (envelope-from ) for ; Thu, 06 May 2021 04:13:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id QPCRJL5Qk2AxaQAAB5/wlQ (envelope-from ) for ; Thu, 06 May 2021 02:13:18 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 96D201A462 for ; Thu, 6 May 2021 04:13:17 +0200 (CEST) Received: from localhost ([::1]:50978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leTVr-0001Jz-NF for larch@yhetil.org; Wed, 05 May 2021 22:13:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1leTUC-0001JM-Sc for emacs-orgmode@gnu.org; Wed, 05 May 2021 22:11:33 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:41808) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1leTU8-0000nG-VZ for emacs-orgmode@gnu.org; Wed, 05 May 2021 22:11:32 -0400 Received: by mail-pj1-x102d.google.com with SMTP id x7-20020a17090a5307b02901589d39576eso1691553pjh.0 for ; Wed, 05 May 2021 19:11:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:in-reply-to:references:cc:date:message-id :mime-version; bh=bW7Yaa7ZAODtgQRISzgLUtswnZLI7wi+YBIAC3wrkQk=; b=QkUKWH62Fr3HOVQULsNieiYteYqM7AAYohfuXV1gApUJI5OL4731Gh1jkwURu6KZYm xdGLkp4xGLcsPcunHstUN/w+BMjNgFEieBQ4SRYT76JFjTeWLIfht56Ng0q3sQovT3nz Xn/OTRzlcU/NPkLuhSbQ7kU5bz2uo9SAFFVwEgdE5XCBoW6twGJIVkOX0F6gCkEtJdwR BHAz4FZu0Qmj+LZPcBs7RUHxm6aK3hFw6YEBoxdGtWbQIta4HB5yKX39+Pp0nUPMGASj RKP6w7QPn7BOT5LCaG3oKqTd4PkLssh3tyjvga3M6DtjXGDj2pXEpZCc5r+Ki3vf0lJm 0glQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:in-reply-to:references:cc:date :message-id:mime-version; bh=bW7Yaa7ZAODtgQRISzgLUtswnZLI7wi+YBIAC3wrkQk=; b=PTu+moVwyvOJIjY2fpVjUpgQIz7YKi1q891hsAfPGSro9kCUFb4Tuh9xxP/Uxeux33 67WlPOj1H3VRfAfh2pGg2437tMkwXm9LmcFJNUsXetjslp2BIQC1NuTII6pAR0a5zm2U 7g8/lfgwluRdByF2rcgI9nlUceFlOSNxTXf1gVrKQGkvCqqGArIHo96VUWlmRZWOpXrd obuh1ZogmPL7i4GFxHRfNdA6aoXhv4hD+25p9wQ3G4kAgroGn8mRshZSmtVaskagVKQ5 sywVEvJyd9suL9c5PabdU94hL0/MZoRCo6SYVInwZlNvAAjylIIFRrey2yCDuSFNqLQU gg/A== X-Gm-Message-State: AOAM533nz13sr6vINQ9cgBq82xT/PvlO/x+TINHx+uTd8VGfn/hIyQyR Mt0D82FtyuG8bf4tRaIQk3Q= X-Google-Smtp-Source: ABdhPJwwrisBoLA65UYvwpuII4DmHk1cLz0oFtQ8Or6IgGLEBDdoJ11WxPRCrdrUh8uZ7JeIcCvw2g== X-Received: by 2002:a17:90b:4b11:: with SMTP id lx17mr14333254pjb.130.1620267087490; Wed, 05 May 2021 19:11:27 -0700 (PDT) Received: from localhost ([104.250.131.79]) by smtp.gmail.com with ESMTPSA id i10sm8182170pjj.16.2021.05.05.19.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 05 May 2021 19:11:26 -0700 (PDT) From: Ihor Radchenko To: William Xu Subject: Re: prettify-symbols-mode in org agenda? In-Reply-To: References: <87o8kf81yq.fsf@localhost> <87im474fgy.fsf@gnu.org> <87v98263bg.fsf@localhost> <87mtteo6zq.fsf@localhost> <87h7jl1eds.fsf@localhost> <87k0ofn3er.fsf@gnu.org> <87y2cvyvo9.fsf@localhost> <877dkeeemq.fsf@localhost> <87y2cttdaq.fsf@localhost> Date: Thu, 06 May 2021 10:15:52 +0800 Message-ID: <87pmy4ppyf.fsf@localhost> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=yantar92@gmail.com; helo=mail-pj1-x102d.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: emacs-orgmode@gnu.org Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: "Emacs-orgmode" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1620267197; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=bW7Yaa7ZAODtgQRISzgLUtswnZLI7wi+YBIAC3wrkQk=; b=Yu4fp7WWm+loMOYR3qtW7b2lM4vZYZLWIBz+cmUSAULdoMUJLBXzMcbUAY1qy1cmF5LkJn XJjqq1ijlqKz9rW2spdcb3VfDMnnKysJ4D3jTbLWGhSZxg0NKFDPzkeiRpy35u554xjype LNo0H6z9yZet/AGmcqAlDOaoEyt6ll9dT5GT3JANRa6LgP7gpDRv2CMsN9UcW7Z26P6YZP GyQnqo9W8ttgkIJD2ztfNQ7eBSH3ezktGCXKTaPM3op67PLqWMQxvrOcSV7yVrgOEeB7S9 9k8279OgLcIGpWSaBpZDmX6/OAW9bHhBc/+4853gZO/LPqx1oysOSmq+QjRqfA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1620267197; a=rsa-sha256; cv=none; b=fsoj1UKvib1PTvOP++zvD4kOx73U/XOE0NP2lpHOoE6AZdXKYeZH1YWj0OSo2oNXlQbD3u xX443LOys2WHEIQGkf9tWzH21Uja+/oMwMA7F0gNIYntfum+j0iFS4iqSyF7jnIDu0yZkm jhJsd3JzkSyesemDEYd+QeHyhHIEfZirw45K4Qjql6lu72IvxKTsze+L9VKR1KQV9DoKJX 32liNknV2WpeB8uhNHImraMv/e49sM//42XuJLLUgbKfbB/b/TsINwXZyuLTnia7kjM4eN XelGvlqrFhiniOmjJeNLWeq80hOvPVDlPdT1nozSDKrVx3Od9wfGOkt7vSVuOA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=QkUKWH62; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Spam-Score: -0.16 Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=gmail.com header.s=20161025 header.b=QkUKWH62; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (aspmx1.migadu.com: domain of emacs-orgmode-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=emacs-orgmode-bounces@gnu.org X-Migadu-Queue-Id: 96D201A462 X-Spam-Score: -0.16 X-Migadu-Scanner: scn0.migadu.com X-TUID: ieH4e2gqg4pm --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable William Xu writes: > I think I'm still seeing the issue. For example, if i change (M-x > org-agenda-todo) a TODO item into next state ONGOING, which i have made > prettified: > > (push '("ONGOING" . "=F0=9F=91=B7" ) prettify-symbols-alist) > > So far so good. But as soon as I call org-agenda-redo-all, after the > agenda is refreshed, it changes back to text 'ONGOING'.=20 I was able to reproduce using prettify-symbols-mode (though not using pretty-symbols-mode). Should be fixed now in the attached patch. Best, Ihor --=-=-= Content-Type: text/x-diff Content-Disposition: inline; filename=0001-Make-sure-that-fontification-is-preserved-in-agenda.patch >From 46d6c93cd59d56959e0835c958e3c822aa5308d6 Mon Sep 17 00:00:00 2001 Message-Id: <46d6c93cd59d56959e0835c958e3c822aa5308d6.1620267219.git.yantar92@gmail.com> From: Ihor Radchenko Date: Tue, 4 May 2021 20:33:10 +0800 Subject: [PATCH] Make sure that fontification is preserved in agenda * lisp/org-macs.el (org-string-width): Refactor old code and add optional argument to return pixel width. The old code used manual parsing of text properties to find which parts of string are visible. The new code defers this work to Emacs display engine via `window-text-pixel-size'. The visibility settings of current buffer are taken into account. (org--string-from-props): Removed. It was only used by old `org-string-width' code. (org-buffer-substring-fontified): New function. Like `buffer-substring', but make sure that the substring is fontified. (org-looking-at-fontified): New function. Like `looking-at', but make sure that the match is fontified. * lisp/org.el (org-get-heading): Make sure that heading is fontified. (org--get-local-tags, org-get-tags, org-scan-tags): Add optional argument `fontified'. When non-nil, the returned tags are fontified. * lisp/org-agenda.el (org-agenda-get-todos, org-agenda-get-progress, org-agenda-get-deadlines, org-agenda-get-scheduled, org-agenda-fix-displayed-tags, org-search-view, org-agenda-get-todos, org-agenda-get-timestamps, org-agenda-get-sexps, org-agenda-get-deadlines, org-agenda-get-progress, org-agenda-get-blocks, org-tags-view, org-agenda-list, org-todo-list, org-agenda-highlight-todo): Make sure that fontification is the same with original Org buffers. All the buffer-substring and match-data queries are changed to ensure that region of interest is fontified. Also, preserve composition properties, used i.e. by `prettify-symbols-mode'. The composition is usually set to be removed on text change, so we do the changes inside `with-silent-modifications'. (org-agenda-align-tags): Use pixel width and (space . :align-to) 'display property to align tags in agenda. Preserve fontification and composition of headlines and tags in agenda. If the headlines/tags are not yet fontified when building agenda, make sure that they are fontified in the original Org mode buffers first. In addition, tags alignment is now done pixel-wise to avoid alignment issues with variable-pitch symbols that may appear in fontified Org mode buffers. The alignment is utilising :align-to specification, which means that the alignment will be automatically updated as the agenda buffer is resized. --- lisp/org-agenda.el | 126 +++++++++++++++++++++++++----------------- lisp/org-macs.el | 134 +++++++++++++++++++++++---------------------- lisp/org.el | 36 ++++++++---- 3 files changed, 171 insertions(+), 125 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 4c34ca5fe..546a03bc3 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -3984,7 +3984,7 @@ (defun org-agenda-finalize () (put-text-property (point-at-bol) (point-at-eol) 'tags (org-with-point-at mrk - (org-get-tags)))))))) + (org-get-tags nil nil t)))))))) (setq org-agenda-represented-tags nil org-agenda-represented-categories nil) (when org-agenda-top-headline-filter @@ -4444,9 +4444,12 @@ (defun org-agenda-list (&optional arg start-day span with-hour) (put-text-property s (1- (point)) 'org-today t)) (setq rtnall (org-agenda-add-time-grid-maybe rtnall ndays todayp)) - (when rtnall (insert ;; all entries - (org-agenda-finalize-entries rtnall 'agenda) - "\n")) + (with-silent-modifications + ;; Composition property in entries may be self-destructed + ;; on change. Suppress the self-destruction. + (when rtnall (insert ;; all entries + (org-agenda-finalize-entries rtnall 'agenda) + "\n"))) (put-text-property s (1- (point)) 'day d) (put-text-property s (1- (point)) 'org-day-cnt day-cnt))) (when (and org-agenda-clockreport-mode clocktable-start) @@ -4778,10 +4781,11 @@ (defun org-search-view (&optional todo-only string edit-at) (and (eq org-agenda-show-inherited-tags t) (or (eq org-agenda-use-tag-inheritance t) (memq 'todo org-agenda-use-tag-inheritance)))) - tags (org-get-tags nil (not inherited-tags)) + tags (org-get-tags + nil (not inherited-tags) t) txt (org-agenda-format-item "" - (buffer-substring-no-properties + (org-buffer-substring-fontified beg1 (point-at-eol)) level category tags t)) (org-add-props txt props @@ -4815,8 +4819,11 @@ (defun org-search-view (&optional todo-only string edit-at) (list 'face 'org-agenda-structure))) (buffer-string))) (org-agenda-mark-header-line (point-min)) - (when rtnall - (insert (org-agenda-finalize-entries rtnall 'search) "\n")) + (with-silent-modifications + ;; Composition property in entries may be self-destructed + ;; on change. Suppress the self-destruction. + (when rtnall + (insert (org-agenda-finalize-entries rtnall 'search) "\n"))) (goto-char (point-min)) (or org-agenda-multi (org-agenda-fit-window-to-buffer)) (add-text-properties (point-min) (point-max) @@ -4924,8 +4931,11 @@ (defun org-todo-list (&optional arg) (add-text-properties pos (1- (point)) (list 'face 'org-agenda-structure)) (buffer-string))) (org-agenda-mark-header-line (point-min)) - (when rtnall - (insert (org-agenda-finalize-entries rtnall 'todo) "\n")) + (with-silent-modifications + ;; Composition property in entries may be self-destructed + ;; on change. Suppress the self-destruction. + (when rtnall + (insert (org-agenda-finalize-entries rtnall 'todo) "\n"))) (goto-char (point-min)) (or org-agenda-multi (org-agenda-fit-window-to-buffer)) (add-text-properties (point-min) (point-max) @@ -5001,7 +5011,9 @@ (defun org-tags-view (&optional todo-only match) (widen)) (setq rtn (org-scan-tags 'agenda matcher - org--matcher-tags-todo-only)) + org--matcher-tags-todo-only + nil + 'fontify)) (setq rtnall (append rtnall rtn)))))))) (org-agenda--insert-overriding-header (with-temp-buffer @@ -5023,8 +5035,11 @@ (defun org-tags-view (&optional todo-only match) (list 'face 'org-agenda-structure)) (buffer-string))) (org-agenda-mark-header-line (point-min)) - (when rtnall - (insert (org-agenda-finalize-entries rtnall 'tags) "\n")) + (with-silent-modifications + ;; Composition property in entries may be self-destructed + ;; on change. Suppress the self-destruction. + (when rtnall + (insert (org-agenda-finalize-entries rtnall 'tags) "\n"))) (goto-char (point-min)) (or org-agenda-multi (org-agenda-fit-window-to-buffer)) (add-text-properties @@ -5562,7 +5577,8 @@ (defun org-agenda-get-todos () ts-date-pair (org-agenda-entry-get-agenda-timestamp (point)) ts-date (car ts-date-pair) ts-date-type (cdr ts-date-pair) - txt (org-trim (buffer-substring (match-beginning 2) (match-end 0))) + txt (org-trim (org-buffer-substring-fontified + (match-beginning 2) (match-end 0))) inherited-tags (or (eq org-agenda-show-inherited-tags 'always) (and (listp org-agenda-show-inherited-tags) @@ -5570,7 +5586,7 @@ (defun org-agenda-get-todos () (and (eq org-agenda-show-inherited-tags t) (or (eq org-agenda-use-tag-inheritance t) (memq 'todo org-agenda-use-tag-inheritance)))) - tags (org-get-tags nil (not inherited-tags)) + tags (org-get-tags nil (not inherited-tags) t) level (make-string (org-reduced-level (org-outline-level)) ? ) txt (org-agenda-format-item "" txt level category tags t) priority (1+ (org-get-priority txt))) @@ -5787,10 +5803,10 @@ (defun org-agenda-get-timestamps (&optional deadlines) (or (eq org-agenda-use-tag-inheritance t) (memq 'agenda org-agenda-use-tag-inheritance))))) - (tags (org-get-tags nil (not inherited-tags))) + (tags (org-get-tags nil (not inherited-tags) t)) (level (make-string (org-reduced-level (org-outline-level)) ?\s)) - (head (and (looking-at "\\*+[ \t]+\\(.*\\)") + (head (and (org-looking-at-fontified "\\*+[ \t]+\\(.*\\)") (match-string 1))) (inactive? (= (char-after pos) ?\[)) (habit? (and (fboundp 'org-is-habit-p) (org-is-habit-p))) @@ -5839,7 +5855,7 @@ (defun org-agenda-get-sexps () (setq b (point)) (forward-sexp 1) (setq sexp (buffer-substring b (point))) - (setq sexp-entry (if (looking-at "[ \t]*\\(\\S-.*\\)") + (setq sexp-entry (if (org-looking-at-fontified "[ \t]*\\(\\S-.*\\)") (org-trim (match-string 1)) "")) (setq result (org-diary-sexp-entry sexp sexp-entry date)) @@ -5854,7 +5870,7 @@ (defun org-agenda-get-sexps () (and (eq org-agenda-show-inherited-tags t) (or (eq org-agenda-use-tag-inheritance t) (memq 'agenda org-agenda-use-tag-inheritance)))) - tags (org-get-tags nil (not inherited-tags)) + tags (org-get-tags nil (not inherited-tags) t) todo-state (org-get-todo-state) warntime (get-text-property (point) 'org-appt-warntime) extra nil) @@ -5973,7 +5989,8 @@ (defun org-agenda-get-progress () clockp (not (or closedp statep)) state (and statep (match-string 2)) category (org-get-category (match-beginning 0)) - timestr (buffer-substring (match-beginning 0) (point-at-eol))) + timestr (org-buffer-substring-fontified + (match-beginning 0) (point-at-eol))) (when (string-match "\\]" timestr) ;; substring should only run to end of time stamp (setq rest (substring timestr (match-end 0)) @@ -5990,10 +6007,12 @@ (defun org-agenda-get-progress () (cond ((not org-agenda-log-mode-add-notes) nil) (statep - (and (looking-at ".*\\\\\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$") + (and (org-looking-at-fontified + ".*\\\\\n[ \t]*\\([^-\n \t].*?\\)[ \t]*$") (match-string 1))) (clockp - (and (looking-at ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$") + (and (org-looking-at-fontified + ".*\n[ \t]*-[ \t]+\\([^-\n \t].*?\\)[ \t]*$") (match-string 1))))) (if (not (re-search-backward org-outline-regexp-bol nil t)) (throw :skip nil) @@ -6006,9 +6025,9 @@ (defun org-agenda-get-progress () (and (eq org-agenda-show-inherited-tags t) (or (eq org-agenda-use-tag-inheritance t) (memq 'todo org-agenda-use-tag-inheritance)))) - tags (org-get-tags nil (not inherited-tags)) + tags (org-get-tags nil (not inherited-tags) t) level (make-string (org-reduced-level (org-outline-level)) ? )) - (looking-at "\\*+[ \t]+\\([^\r\n]+\\)") + (org-looking-at-fontified "\\*+[ \t]+\\([^\r\n]+\\)") (setq txt (match-string 1)) (when extra (if (string-match "\\([ \t]+\\)\\(:[^ \n\t]*?:\\)[ \t]*$" txt) @@ -6254,7 +6273,8 @@ (defun org-agenda-get-deadlines (&optional with-hour) (let* ((category (org-get-category)) (level (make-string (org-reduced-level (org-outline-level)) ?\s)) - (head (buffer-substring (point) (line-end-position))) + (head (org-buffer-substring-fontified + (point) (line-end-position))) (inherited-tags (or (eq org-agenda-show-inherited-tags 'always) (and (listp org-agenda-show-inherited-tags) @@ -6263,7 +6283,7 @@ (defun org-agenda-get-deadlines (&optional with-hour) (or (eq org-agenda-use-tag-inheritance t) (memq 'agenda org-agenda-use-tag-inheritance))))) - (tags (org-get-tags nil (not inherited-tags))) + (tags (org-get-tags nil (not inherited-tags) t)) (time (cond ;; No time of day designation if it is only @@ -6466,10 +6486,11 @@ (defun org-agenda-get-scheduled (&optional deadlines with-hour) (or (eq org-agenda-use-tag-inheritance t) (memq 'agenda org-agenda-use-tag-inheritance))))) - (tags (org-get-tags nil (not inherited-tags))) + (tags (org-get-tags nil (not inherited-tags) t)) (level (make-string (org-reduced-level (org-outline-level)) ?\s)) - (head (buffer-substring (point) (line-end-position))) + (head (org-buffer-substring-fontified + (point) (line-end-position))) (time (cond ;; No time of day designation if it is only a @@ -6585,7 +6606,7 @@ (defun org-agenda-get-blocks () (memq 'agenda org-agenda-use-tag-inheritance)))) tags (org-get-tags nil (not inherited-tags))) (setq level (make-string (org-reduced-level (org-outline-level)) ? )) - (looking-at "\\*+[ \t]+\\(.*\\)") + (org-looking-at-fontified "\\*+[ \t]+\\(.*\\)") (setq head (match-string 1)) (let ((remove-re (if org-agenda-remove-timeranges-from-blocks @@ -7119,10 +7140,11 @@ (defun org-agenda-highlight-todo (x) (when (looking-at (concat "[ \t]*\\.*\\(" re "\\) +")) (add-text-properties (match-beginning 0) (match-end 1) (list 'face (org-get-todo-face 1))) - (let ((s (buffer-substring (match-beginning 1) (match-end 1)))) - (delete-region (match-beginning 1) (1- (match-end 0))) - (goto-char (match-beginning 1)) - (insert (format org-agenda-todo-keyword-format s))))) + (let ((s (buffer-substring (match-beginning 1) (match-end 1)))) + (with-silent-modifications + (setf (buffer-substring (match-beginning 1) + (1- (match-end 0))) + (format org-agenda-todo-keyword-format s)))))) (let ((pl (text-property-any 0 (length x) 'org-heading t x))) (setq re (get-text-property 0 'org-todo-regexp x)) (when (and re @@ -9530,33 +9552,39 @@ (defun org-agenda-align-tags (&optional line) When optional argument LINE is non-nil, align tags only on the current line." (let ((inhibit-read-only t) - (org-agenda-tags-column (if (eq 'auto org-agenda-tags-column) - (- (window-text-width)) - org-agenda-tags-column)) (end (and line (line-end-position))) - l c) + l lp c) (save-excursion (goto-char (if line (line-beginning-position) (point-min))) (while (re-search-forward org-tag-group-re end t) (add-text-properties (match-beginning 1) (match-end 1) (list 'face (delq nil (let ((prop (get-text-property - (match-beginning 1) 'face))) - (or (listp prop) (setq prop (list prop))) - (if (memq 'org-tag prop) - prop - (cons 'org-tag prop)))))) - (setq l (string-width (match-string 1)) - c (if (< org-agenda-tags-column 0) - (- (abs org-agenda-tags-column) l) - org-agenda-tags-column)) + (match-beginning 1) 'face))) + (or (listp prop) (setq prop (list prop))) + (if (memq 'org-tag prop) + prop + (cons 'org-tag prop)))))) + (setq l (org-string-width (match-string 1)) + lp (org-string-width (match-string 1) 'pixel) + c (unless (eq org-agenda-tags-column 'auto) + (if (< org-agenda-tags-column 0) + (- (abs org-agenda-tags-column) l) + org-agenda-tags-column))) (goto-char (match-beginning 1)) (delete-region (save-excursion (skip-chars-backward " \t") (point)) (point)) (insert (org-add-props - (make-string (max 1 (- c (current-column))) ?\s) - (plist-put (copy-sequence (text-properties-at (point))) - 'face nil)))) + " " + (copy-sequence (text-properties-at (point))) + 'face nil + 'display + `(space + . + (:align-to + ,(cond + ((eq org-agenda-tags-column 'auto) `(- right (,lp) 1)) + (t `(+ left ,c)))))))) (goto-char (point-min)) (org-font-lock-add-tag-faces (point-max))))) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index dc0c42b6f..79e9012b7 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -868,71 +868,63 @@ (defun org-split-string (string &optional separators) results ;skip trailing separator (cons (substring string i) results))))))) -(defun org--string-from-props (s property beg end) - "Return the visible part of string S. -Visible part is determined according to text PROPERTY, which is -either `invisible' or `display'. BEG and END are 0-indices -delimiting S." - (let ((width 0) - (cursor beg)) - (while (setq beg (text-property-not-all beg end property nil s)) - (let* ((next (next-single-property-change beg property s end)) - (props (text-properties-at beg s)) - (spec (plist-get props property)) - (value - (pcase property - (`invisible - ;; If `invisible' property in PROPS means text is to - ;; be invisible, return 0. Otherwise return nil so - ;; as to resume search. - (and (or (eq t buffer-invisibility-spec) - (assoc-string spec buffer-invisibility-spec)) - 0)) - (`display - (pcase spec - (`nil nil) - (`(space . ,props) - (let ((width (plist-get props :width))) - (and (wholenump width) width))) - (`(image . ,_) - (and (fboundp 'image-size) - (ceiling (car (image-size spec))))) - ((pred stringp) - ;; Displayed string could contain invisible parts, - ;; but no nested display. - (org--string-from-props spec 'invisible 0 (length spec))) - (_ - ;; Un-handled `display' value. Ignore it. - ;; Consider the original string instead. - nil))) - (_ (error "Unknown property: %S" property))))) - (when value - (cl-incf width - ;; When looking for `display' parts, we still need - ;; to look for `invisible' property elsewhere. - (+ (cond ((eq property 'display) - (org--string-from-props s 'invisible cursor beg)) - ((= cursor beg) 0) - (t (string-width (substring s cursor beg)))) - value)) - (setq cursor next)) - (setq beg next))) - (+ width - ;; Look for `invisible' property in the last part of the - ;; string. See above. - (cond ((eq property 'display) - (org--string-from-props s 'invisible cursor end)) - ((= cursor end) 0) - (t (string-width (substring s cursor end))))))) - -(defun org-string-width (string) +(defun org-string-width (string &optional pixels) "Return width of STRING when displayed in the current buffer. -Unlike `string-width', this function takes into consideration -`invisible' and `display' text properties. It supports the -latter in a limited way, mostly for combinations used in Org. -Results may be off sometimes if it cannot handle a given -`display' value." - (org--string-from-props string 'display 0 (length string))) +Return width in pixels when PIXELS is non-nil." + ;; Wrap/line prefix will make `window-text-pizel-size' return too + ;; large value including the prefix. + ;; Face should be removed to make sure that all the string symbols + ;; are using default face with constant width. Constant char width + ;; is critical to get right string width from pixel width. + (remove-text-properties 0 (length string) + '(wrap-prefix t line-prefix t face t) + string) + (let (;; We need to remove the folds to make sure that folded table + ;; alignment is not messed up. + (current-invisibility-spec + (or (and (not (listp buffer-invisibility-spec)) + buffer-invisibility-spec) + (let (result) + (dolist (el buffer-invisibility-spec) + (unless (or (memq el + '(org-fold-drawer + org-fold-block + org-fold-outline)) + (and (listp el) + (memq (car el) + '(org-fold-drawer + org-fold-block + org-fold-outline)))) + (push el result))) + result))) + (current-char-property-alias-alist char-property-alias-alist)) + (with-temp-buffer + (setq-local buffer-invisibility-spec + current-invisibility-spec) + (setq-local char-property-alias-alist + current-char-property-alias-alist) + (let (pixel-width symbol-width) + (with-silent-modifications + (setf (buffer-string) string) + (setq pixel-width + (if (get-buffer-window (current-buffer)) + (car (window-text-pixel-size + nil (line-beginning-position) (point-max))) + (set-window-buffer nil (current-buffer)) + (car (window-text-pixel-size + nil (line-beginning-position) (point-max))))) + (unless pixels + (setf (buffer-string) "a") + (setq symbol-width + (if (get-buffer-window (current-buffer)) + (car (window-text-pixel-size + nil (line-beginning-position) (point-max))) + (set-window-buffer nil (current-buffer)) + (car (window-text-pixel-size + nil (line-beginning-position) (point-max))))))) + (if pixels + pixel-width + (/ pixel-width symbol-width)))))) (defun org-not-nil (v) "If V not nil, and also not the string \"nil\", then return V. @@ -1081,6 +1073,20 @@ (defconst org-rm-props '(invisible t face t keymap t intangible t mouse-face t org-emphasis t) "Properties to remove when a string without properties is wanted.") +(defun org-buffer-substring-fontified (beg end) + "Return fontified region between BEG and END." + (when (bound-and-true-p jit-lock-mode) + (save-match-data (jit-lock-fontify-now beg end))) + (buffer-substring beg end)) + +(defun org-looking-at-fontified (re) + "Call `looking-at' and make sure that the match is fontified." + (prog1 (looking-at re) + (when (bound-and-true-p jit-lock-mode) + (save-match-data + (jit-lock-fontify-now (match-beginning 0) + (match-end 0)))))) + (defsubst org-no-properties (s &optional restricted) "Remove all text properties from string S. When RESTRICTED is non-nil, only remove the properties listed diff --git a/lisp/org.el b/lisp/org.el index 87115b546..7e9db9c17 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -7073,7 +7073,7 @@ (defun org-get-heading (&optional no-tags no-todo no-priority no-comment) (save-excursion (org-back-to-heading t) (let ((case-fold-search nil)) - (looking-at org-complex-heading-regexp) + (org-looking-at-fontified org-complex-heading-regexp) (let ((todo (and (not no-todo) (match-string 2))) (priority (and (not no-priority) (match-string 3))) (headline (pcase (match-string 4) @@ -11372,7 +11372,7 @@ (defvar org-trust-scanner-tags nil (defvar org--matcher-tags-todo-only nil) -(defun org-scan-tags (action matcher todo-only &optional start-level) +(defun org-scan-tags (action matcher todo-only &optional start-level fontify) "Scan headline tags with inheritance and produce output ACTION. ACTION can be `sparse-tree' to produce a sparse tree in the current buffer, @@ -11390,7 +11390,9 @@ (defun org-scan-tags (action matcher todo-only &optional start-level) included in the output. START-LEVEL can be a string with asterisks, reducing the scope to -headlines matching this string." +headlines matching this string. + +When FONTIFY is non-nil, make sure that matches are fontified." (require 'org-agenda) (let* ((re (concat "^" (if start-level @@ -11431,8 +11433,12 @@ (defun org-scan-tags (action matcher todo-only &optional start-level) ;; Ignore closing parts of inline tasks. (when (and (fboundp 'org-inlinetask-end-p) (org-inlinetask-end-p)) (throw :skip t)) + (when (and fontify (bound-and-true-p jit-lock-mode)) + (save-match-data + (jit-lock-fontify-now + (match-beginning 0) (match-end 0)))) (setq todo (and (match-end 1) (match-string-no-properties 1))) - (setq tags (and (match-end 4) (org-trim (match-string-no-properties 4)))) + (setq tags (and (match-end 4) (org-trim (match-string 4)))) (goto-char (setq lspos (match-beginning 0))) (setq level (org-reduced-level (org-outline-level)) category (org-get-category)) @@ -12372,13 +12378,17 @@ (defun org-make-tag-string (tags) (if (null tags) "" (format ":%s:" (mapconcat #'identity tags ":")))) -(defun org--get-local-tags () +(defun org--get-local-tags (&optional fontified) "Return list of tags for the current headline. -Assume point is at the beginning of the headline." - (and (looking-at org-tag-line-re) - (split-string (match-string-no-properties 2) ":" t))) +Assume point is at the beginning of the headline. + +The tags are fontified when FONTIFY is non-nil." + (and (if fontified + (org-looking-at-fontified org-tag-line-re) + (looking-at org-tag-line-re)) + (split-string (match-string 2) ":" t))) -(defun org-get-tags (&optional pos local) +(defun org-get-tags (&optional pos local fontify) "Get the list of tags specified in the current headline. When argument POS is non-nil, retrieve tags for headline at POS. @@ -12393,7 +12403,9 @@ (defun org-get-tags (&optional pos local) However, when optional argument LOCAL is non-nil, only return tags specified at the headline. -Inherited tags have the `inherited' text property." +Inherited tags have the `inherited' text property. + +The tags are fontified when FONTIFY is non-nil." (if (and org-trust-scanner-tags (or (not pos) (eq pos (point))) (not local)) @@ -12401,11 +12413,11 @@ (defun org-get-tags (&optional pos local) (org-with-point-at (or pos (point)) (unless (org-before-first-heading-p) (org-back-to-heading t) - (let ((ltags (org--get-local-tags)) itags) + (let ((ltags (org--get-local-tags fontify)) itags) (if (or local (not org-use-tag-inheritance)) ltags (while (org-up-heading-safe) (setq itags (nconc (mapcar #'org-add-prop-inherited - (org--get-local-tags)) + (org--get-local-tags fontify)) itags))) (setq itags (append org-file-tags itags)) (nreverse -- 2.26.3 --=-=-=--