mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-05 19:59:38 +00:00
Update to Org 9.6.1-23-gc45a05
This commit is contained in:
parent
9058601308
commit
8360e12f0e
5 changed files with 11 additions and 6 deletions
|
@ -3474,13 +3474,17 @@ This ensures the export commands can easily use it."
|
||||||
(when (setq tmp (plist-get props 'date))
|
(when (setq tmp (plist-get props 'date))
|
||||||
(when (integerp tmp) (setq tmp (calendar-gregorian-from-absolute tmp)))
|
(when (integerp tmp) (setq tmp (calendar-gregorian-from-absolute tmp)))
|
||||||
(let ((calendar-date-display-form
|
(let ((calendar-date-display-form
|
||||||
'(year "-" (string-pad month 2 ?0 'left) "-" (string-pad day 2 ?0 'left))))
|
'((format "%s-%.2d-%.2d" year
|
||||||
|
(string-to-number month)
|
||||||
|
(string-to-number day)))))
|
||||||
(setq tmp (calendar-date-string tmp)))
|
(setq tmp (calendar-date-string tmp)))
|
||||||
(setq props (plist-put props 'date tmp)))
|
(setq props (plist-put props 'date tmp)))
|
||||||
(when (setq tmp (plist-get props 'day))
|
(when (setq tmp (plist-get props 'day))
|
||||||
(when (integerp tmp) (setq tmp (calendar-gregorian-from-absolute tmp)))
|
(when (integerp tmp) (setq tmp (calendar-gregorian-from-absolute tmp)))
|
||||||
(let ((calendar-date-display-form
|
(let ((calendar-date-display-form
|
||||||
'(year "-" (string-pad month 2 ?0 'left) "-" (string-pad day 2 ?0 'left))))
|
'((format "%s-%.2d-%.2d" year
|
||||||
|
(string-to-number month)
|
||||||
|
(string-to-number day)))))
|
||||||
(setq tmp (calendar-date-string tmp)))
|
(setq tmp (calendar-date-string tmp)))
|
||||||
(setq props (plist-put props 'day tmp))
|
(setq props (plist-put props 'day tmp))
|
||||||
(setq props (plist-put props 'agenda-day tmp)))
|
(setq props (plist-put props 'agenda-day tmp)))
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
;; `org-git-version' check because the generated Org version strings
|
;; `org-git-version' check because the generated Org version strings
|
||||||
;; will not match.
|
;; will not match.
|
||||||
`(unless (equal (org-release) ,(org-release))
|
`(unless (equal (org-release) ,(org-release))
|
||||||
(warn "Org version mismatch. Make sure that correct `load-path' is set early in init.el
|
(warn "Org version mismatch. Org loading aborted.
|
||||||
This warning usually appears when a built-in Org version is loaded
|
This warning usually appears when a built-in Org version is loaded
|
||||||
prior to the more recent Org version.
|
prior to the more recent Org version.
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ Inserted by installing Org mode or when a release is made."
|
||||||
(defun org-git-version ()
|
(defun org-git-version ()
|
||||||
"The Git version of Org mode.
|
"The Git version of Org mode.
|
||||||
Inserted by installing Org or when a release is made."
|
Inserted by installing Org or when a release is made."
|
||||||
(let ((org-git-version "release_9.6.1-16-ge37e9b"))
|
(let ((org-git-version "release_9.6.1-23-gc45a05"))
|
||||||
org-git-version))
|
org-git-version))
|
||||||
|
|
||||||
(provide 'org-version)
|
(provide 'org-version)
|
||||||
|
|
|
@ -8608,6 +8608,7 @@ or to another Org file, automatically push the old position onto the ring."
|
||||||
(defvar org-agenda-buffer-name)
|
(defvar org-agenda-buffer-name)
|
||||||
(defun org-follow-timestamp-link ()
|
(defun org-follow-timestamp-link ()
|
||||||
"Open an agenda view for the time-stamp date/range at point."
|
"Open an agenda view for the time-stamp date/range at point."
|
||||||
|
(require 'org-agenda)
|
||||||
;; Avoid changing the global value.
|
;; Avoid changing the global value.
|
||||||
(let ((org-agenda-buffer-name org-agenda-buffer-name))
|
(let ((org-agenda-buffer-name org-agenda-buffer-name))
|
||||||
(cond
|
(cond
|
||||||
|
|
|
@ -6600,14 +6600,14 @@ see.
|
||||||
Optional argument POST-PROCESS is a function which should accept
|
Optional argument POST-PROCESS is a function which should accept
|
||||||
no argument. It is always called within the current process,
|
no argument. It is always called within the current process,
|
||||||
from BUFFER, with point at its beginning. Export back-ends can
|
from BUFFER, with point at its beginning. Export back-ends can
|
||||||
use it to set a major mode there, e.g,
|
use it to set a major mode there, e.g.,
|
||||||
|
|
||||||
(defun org-latex-export-as-latex
|
(defun org-latex-export-as-latex
|
||||||
(&optional async subtreep visible-only body-only ext-plist)
|
(&optional async subtreep visible-only body-only ext-plist)
|
||||||
(interactive)
|
(interactive)
|
||||||
(org-export-to-buffer \\='latex \"*Org LATEX Export*\"
|
(org-export-to-buffer \\='latex \"*Org LATEX Export*\"
|
||||||
async subtreep visible-only body-only ext-plist
|
async subtreep visible-only body-only ext-plist
|
||||||
#'LaTeX-mode))
|
#\\='LaTeX-mode))
|
||||||
|
|
||||||
When expressed as an anonymous function, using `lambda',
|
When expressed as an anonymous function, using `lambda',
|
||||||
POST-PROCESS needs to be quoted.
|
POST-PROCESS needs to be quoted.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue