forked from mirrors/org-mode
Merge branch 'maint'
This commit is contained in:
commit
5417e384eb
|
@ -109,6 +109,14 @@ is nil)."
|
||||||
(newline-and-indent))
|
(newline-and-indent))
|
||||||
(defalias 'org-newline-and-indent #'newline-and-indent))
|
(defalias 'org-newline-and-indent #'newline-and-indent))
|
||||||
|
|
||||||
|
(defun org--set-faces-extend (faces extend-p)
|
||||||
|
"Set the :extend attribute of FACES to EXTEND-P.
|
||||||
|
|
||||||
|
This is a no-op for Emacs versions lower than 27, since face
|
||||||
|
extension beyond end of line was not controllable."
|
||||||
|
(when (fboundp 'set-face-extend)
|
||||||
|
(mapc (lambda (f) (set-face-extend f extend-p)) faces)))
|
||||||
|
|
||||||
|
|
||||||
;;; Emacs < 26.1 compatibility
|
;;; Emacs < 26.1 compatibility
|
||||||
|
|
||||||
|
|
|
@ -408,7 +408,8 @@ follows a #+DATE:, #+AUTHOR: or #+EMAIL: keyword."
|
||||||
"Face for #+TITLE:, #+AUTHOR:, #+EMAIL: and #+DATE: keywords."
|
"Face for #+TITLE:, #+AUTHOR:, #+EMAIL: and #+DATE: keywords."
|
||||||
:group 'org-faces)
|
:group 'org-faces)
|
||||||
|
|
||||||
(defface org-block '((t :inherit shadow))
|
(defface org-block `((t :inherit shadow
|
||||||
|
,@(and (>= emacs-major-version 27) '(:extend t))))
|
||||||
"Face text in #+begin ... #+end blocks.
|
"Face text in #+begin ... #+end blocks.
|
||||||
For source-blocks `org-src-block-faces' takes precedence."
|
For source-blocks `org-src-block-faces' takes precedence."
|
||||||
:group 'org-faces
|
:group 'org-faces
|
||||||
|
|
|
@ -4904,7 +4904,11 @@ The following commands are available:
|
||||||
;; Try to set `org-hide' face correctly.
|
;; Try to set `org-hide' face correctly.
|
||||||
(let ((foreground (org-find-invisible-foreground)))
|
(let ((foreground (org-find-invisible-foreground)))
|
||||||
(when foreground
|
(when foreground
|
||||||
(set-face-foreground 'org-hide foreground))))
|
(set-face-foreground 'org-hide foreground)))
|
||||||
|
;; Set face extension as requested.
|
||||||
|
(org--set-faces-extend '(org-block-begin-line org-block-end-line)
|
||||||
|
org-fontify-whole-block-delimiter-line)
|
||||||
|
(org--set-faces-extend org-level-faces org-fontify-whole-heading-line))
|
||||||
|
|
||||||
;; Update `customize-package-emacs-version-alist'
|
;; Update `customize-package-emacs-version-alist'
|
||||||
(add-to-list 'customize-package-emacs-version-alist
|
(add-to-list 'customize-package-emacs-version-alist
|
||||||
|
@ -18731,7 +18735,7 @@ earliest time on the cursor date that Org treats as that date
|
||||||
(let (date day defd tp hod mod)
|
(let (date day defd tp hod mod)
|
||||||
(when with-time
|
(when with-time
|
||||||
(setq tp (get-text-property (point) 'time))
|
(setq tp (get-text-property (point) 'time))
|
||||||
(when (and tp (string-match "\\([0-9][0-9]\\):\\([0-9][0-9]\\)" tp))
|
(when (and tp (string-match "\\([0-2]?[0-9]\\):\\([0-5][0-9]\\)" tp))
|
||||||
(setq hod (string-to-number (match-string 1 tp))
|
(setq hod (string-to-number (match-string 1 tp))
|
||||||
mod (string-to-number (match-string 2 tp))))
|
mod (string-to-number (match-string 2 tp))))
|
||||||
(or tp (let ((now (decode-time)))
|
(or tp (let ((now (decode-time)))
|
||||||
|
|
Loading…
Reference in New Issue