From 7c1fc2348918a1ad8c61c7519a51042d48d7aa8d Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sun, 24 Apr 2022 21:07:40 -0400 Subject: [PATCH] Update to Org 9.5.3-3-gd54104 --- etc/ORG-NEWS | 6 +----- etc/refcards/orgcard.tex | 2 +- lisp/org/org-faces.el | 20 ++++++++------------ lisp/org/org-version.el | 4 ++-- lisp/org/org.el | 26 +++++++++++++++----------- 5 files changed, 27 insertions(+), 31 deletions(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index e4bb706e08c..37a39131d93 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -451,10 +451,6 @@ you can now configure them. (the default) or use the attachment directory of the current node, if it is correctly configured as a Git repository. -*** Some faces now use fixed-pitch - -See [[msg:875z8njaol.fsf@protesilaos.com][this thread]]. - *** New option ~org-attach-sync-delete-empty-dir~ ~org-attach-sync-delete-empty-dir~ controls the deletion of an empty @@ -509,7 +505,7 @@ heading, except return nil. In the past, faces of todo keywords, emphasised text, tags, and priority cookies inherited =default= face. The resulting headline -fontification was not always consistent, as discussed in [[https://lists.gnu.org/archive/html/emacs-orgmode/2020-09/msg00331.html][this bug +fontification was not always consistent, as discussed in [[msg::87h7sawubl.fsf@protesilaos.com][this bug report]]. Now, the relevant faces adapt to face used to fontify the current headline level. diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex index dec4d174c43..2b4718805a6 100644 --- a/etc/refcards/orgcard.tex +++ b/etc/refcards/orgcard.tex @@ -1,5 +1,5 @@ % Reference Card for Org Mode -\def\orgversionnumber{9.5.2} +\def\orgversionnumber{9.5.3} \def\versionyear{2021} % latest update \input emacsver.tex diff --git a/lisp/org/org-faces.el b/lisp/org/org-faces.el index 1db36bc72ba..d96898372f9 100644 --- a/lisp/org/org-faces.el +++ b/lisp/org/org-faces.el @@ -38,8 +38,7 @@ :group 'org-faces) (defface org-hide - '((default :inherit fixed-pitch) - (((background light)) (:foreground "white")) + '((((background light)) (:foreground "white")) (((background dark)) (:foreground "black"))) "Face used to hide leading stars in headlines. The foreground color of this face should be equal to the background @@ -202,8 +201,7 @@ set the properties in the `org-column' face. For example, set :group 'org-faces) (defface org-date - '((default :inherit fixed-pitch) - (((class color) (background light)) (:foreground "Purple" :underline t)) + '((((class color) (background light)) (:foreground "Purple" :underline t)) (((class color) (background dark)) (:foreground "Cyan" :underline t)) (t (:underline t))) "Face for date/time stamps." @@ -379,8 +377,7 @@ changes." (sexp :tag "Face"))))) (defface org-table ;Copied from `font-lock-function-name-face' - '((default :inherit fixed-pitch) - (((class color) (min-colors 88) (background light)) (:foreground "Blue1")) + '((((class color) (min-colors 88) (background light)) (:foreground "Blue1")) (((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue")) (((class color) (min-colors 16) (background light)) (:foreground "Blue")) (((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue")) @@ -396,8 +393,7 @@ changes." :group 'org-faces) (defface org-formula - '((default :inherit fixed-pitch) - (((class color) (min-colors 88) (background light)) (:foreground "Firebrick")) + '((((class color) (min-colors 88) (background light)) (:foreground "Firebrick")) (((class color) (min-colors 88) (background dark)) (:foreground "chocolate1")) (((class color) (min-colors 8) (background light)) (:foreground "red")) (((class color) (min-colors 8) (background dark)) (:foreground "red")) @@ -405,12 +401,12 @@ changes." "Face for formulas." :group 'org-faces) -(defface org-code '((t :inherit (fixed-pitch shadow))) +(defface org-code '((t :inherit shadow)) "Face for fixed-width text like code snippets." :group 'org-faces :version "22.1") -(defface org-meta-line '((t :inherit (fixed-pitch font-lock-comment-face))) +(defface org-meta-line '((t :inherit font-lock-comment-face)) "Face for meta lines starting with \"#+\"." :group 'org-faces :version "22.1") @@ -437,7 +433,7 @@ This face applies to the #+TITLE:, #+SUBTITLE:, #+AUTHOR:, #+EMAIL: and #+DATE: keywords." :group 'org-faces) -(defface org-block `((t :inherit (fixed-pitch shadow) +(defface org-block `((t :inherit shadow ,@(and (>= emacs-major-version 27) '(:extend t)))) "Face used for text inside various blocks. @@ -459,7 +455,7 @@ verse and quote blocks are fontified using the `org-verse' and "Face used for the line delimiting the end of source blocks." :group 'org-faces) -(defface org-verbatim '((t (:inherit (fixed-pitch shadow)))) +(defface org-verbatim '((t (:inherit shadow))) "Face for fixed-with text like code snippets." :group 'org-faces :version "22.1") diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el index 5cc98e38066..dc689662b7d 100644 --- a/lisp/org/org-version.el +++ b/lisp/org/org-version.el @@ -5,13 +5,13 @@ (defun org-release () "The release version of Org. Inserted by installing Org mode or when a release is made." - (let ((org-release "9.5.2")) + (let ((org-release "9.5.3")) org-release)) ;;;###autoload (defun org-git-version () "The Git version of Org mode. Inserted by installing Org or when a release is made." - (let ((org-git-version "release_9.5.2-38-g682ccd")) + (let ((org-git-version "release_9.5.3-3-gd54104")) org-git-version)) (provide 'org-version) diff --git a/lisp/org/org.el b/lisp/org/org.el index 4524812c55f..1fc4251a340 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -9,7 +9,7 @@ ;; Homepage: https://orgmode.org ;; Package-Requires: ((emacs "25.1")) -;; Version: 9.5.2 +;; Version: 9.5.3 ;; This file is part of GNU Emacs. ;; @@ -15012,20 +15012,24 @@ value is equivalent to `inactive'. When at a timestamp, return the position of the point as a symbol among `bracket', `after', `year', `month', `hour', `minute', `day' or a number of character from the last know part of the -time stamp. +time stamp. If diary sexp timestamps, any point inside the timestamp +is considered `day' (i.e. only `bracket', `day', and `after' return +values are possible). When matching, the match groups are the following: - group 1: year - group 2: month - group 3: day number - group 4: day name + group 1: year, if any + group 2: month, if any + group 3: day number, if any + group 4: day name, if any group 5: hours, if any group 6: minutes, if any" - (let* ((regexp (if extended - (if (eq extended 'agenda) - org-element--timestamp-regexp - org-ts-regexp3) - org-ts-regexp2)) + (let* ((regexp + (if extended + (if (eq extended 'agenda) + (rx (or (regexp org-ts-regexp3) + (regexp org-element--timestamp-regexp))) + org-ts-regexp3) + org-ts-regexp2)) (pos (point)) (match? (let ((boundaries (org-in-regexp regexp))) -- 2.39.5