[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master f5498a6: Merge from origin/emacs-28
From: |
Stefan Kangas |
Subject: |
master f5498a6: Merge from origin/emacs-28 |
Date: |
Sun, 28 Nov 2021 09:16:37 -0500 (EST) |
branch: master
commit f5498a608fe85b66a4068a5ccf88c9b3d3b88f98
Merge: 1272a2c 1fffe9a
Author: Stefan Kangas <stefan@marxist.se>
Commit: Stefan Kangas <stefan@marxist.se>
Merge from origin/emacs-28
1fffe9a210 ; * lisp/org/org.el: Fix version header.
2a4de5e5e5 Fix Subject when forwarding message with 2-line From
b8b2dd17c5 Update to Org 9.5.1-11-g96d91b
a937f536b3 * doc/lispref/commands.texi (Click Events): Fix wording (b...
---
doc/lispref/commands.texi | 6 ++++--
doc/misc/org.org | 12 ++++++++++++
etc/refcards/orgcard.tex | 2 +-
lisp/mh-e/mh-comp.el | 2 ++
lisp/org/oc-csl.el | 3 ++-
lisp/org/oc.el | 43 ++++++++++++++++++++++---------------------
lisp/org/org-table.el | 2 +-
lisp/org/org-version.el | 4 ++--
lisp/org/org.el | 2 +-
lisp/org/ox.el | 3 +++
10 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/doc/lispref/commands.texi b/doc/lispref/commands.texi
index 86f8468..581183a 100644
--- a/doc/lispref/commands.texi
+++ b/doc/lispref/commands.texi
@@ -1559,8 +1559,10 @@ corner of @var{object}, which is @code{(0 . 0)}. If
@var{object} is
the top left corner of the character glyph clicked on.
@item @var{width}, @var{height}
-These are the pixel width and height of @var{object} or, if this is
-@code{nil}, those of the character glyph clicked on.
+If the click is on a character, either from buffer text or from
+overlay or display string, these are the pixel width and height of
+that character's glyph; otherwise they are dimensions of @var{object}
+clicked on.
@end table
For clicks on a scroll bar, @var{position} has this form:
diff --git a/doc/misc/org.org b/doc/misc/org.org
index df2724d..8511771 100644
--- a/doc/misc/org.org
+++ b/doc/misc/org.org
@@ -10811,6 +10811,18 @@ To turn off fontification for marked up text, you can
set
~org-fontify-emphasized-text~ to ~nil~. To narrow down the list of
available markup syntax, you can customize ~org-emphasis-alist~.
+Sometimes, when marked text also contains the marker character itself,
+the result may be unsettling. For example,
+
+#+begin_example
+/One may expect this whole sentence to be italicized, but the
+following ~user/?variable~ contains =/= character, which effectively
+stops emphasis there./
+#+end_example
+
+You can use zero width space to help Org sorting out the ambiguity.
+See [[*Escape Character]] for more details.
+
** Subscripts and Superscripts
:PROPERTIES:
:DESCRIPTION: Simple syntax for raising/lowering text.
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index d371594..1815161 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{9.5}
+\def\orgversionnumber{9.5.1}
\def\versionyear{2021} % latest update
\input emacsver.tex
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index 130d378..a47a6f9 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -624,6 +624,8 @@ See also `mh-compose-forward-as-mime-flag',
(defun mh-forwarded-letter-subject (from subject)
"Return a Subject suitable for a forwarded message.
Original message has headers FROM and SUBJECT."
+ ;; Join continued lines.
+ (setq from (replace-regexp-in-string "\\s *\n\\s +" " " from))
(let ((addr-start (string-search "<" from))
(comment (string-search "(" from)))
(cond ((and addr-start (> addr-start 0))
diff --git a/lisp/org/oc-csl.el b/lisp/org/oc-csl.el
index 7cd63c3..7f078d1 100644
--- a/lisp/org/oc-csl.el
+++ b/lisp/org/oc-csl.el
@@ -283,7 +283,8 @@ Label is in match group 1.")
;;; Internal functions
(defun org-cite-csl--barf-without-citeproc ()
"Raise an error if Citeproc library is not loaded."
- (unless (featurep 'citeproc) "Citeproc library is not loaded"))
+ (unless (featurep 'citeproc)
+ (error "Citeproc library is not loaded")))
(defun org-cite-csl--note-style-p (info)
"Non-nil when bibliography style implies wrapping citations in footnotes.
diff --git a/lisp/org/oc.el b/lisp/org/oc.el
index 41fd688..427c087 100644
--- a/lisp/org/oc.el
+++ b/lisp/org/oc.el
@@ -1141,17 +1141,14 @@ and must return either a string, an object, or a
secondary string."
;;; Internal interface with fontification (activate capability)
-(defun org-cite-fontify-default (datum)
- "Fontify DATUM with `org-cite' and `org-cite-key' face.
-DATUM is a citation object, or a citation reference. In any case, apply
-`org-cite' face on the whole citation, and `org-cite-key' face on each key."
- (let* ((cite (if (eq 'citation-reference (org-element-type datum))
- (org-element-property :parent datum)
- datum))
- (beg (org-element-property :begin cite))
- (end (org-with-point-at (org-element-property :end cite)
- (skip-chars-backward " \t")
- (point))))
+(defun org-cite-fontify-default (cite)
+ "Fontify CITE with `org-cite' and `org-cite-key' faces.
+CITE is a citation object. The function applies `org-cite' face
+on the whole citation, and `org-cite-key' face on each key."
+ (let ((beg (org-element-property :begin cite))
+ (end (org-with-point-at (org-element-property :end cite)
+ (skip-chars-backward " \t")
+ (point))))
(add-text-properties beg end '(font-lock-multiline t))
(add-face-text-property beg end 'org-cite)
(dolist (reference (org-cite-get-references cite))
@@ -1163,16 +1160,20 @@ DATUM is a citation object, or a citation reference.
In any case, apply
"Activate citations from up to LIMIT buffer position.
Each citation encountered is activated using the appropriate function
from the processor set in `org-cite-activate-processor'."
- (let ((name org-cite-activate-processor))
- (let ((activate
- (or (and name
- (org-cite-processor-has-capability-p name 'activate)
- (org-cite-processor-activate (org-cite--get-processor
name)))
- #'org-cite-fontify-default)))
- (while (re-search-forward org-element-citation-prefix-re limit t)
- (let ((cite (org-with-point-at (match-beginning 0)
- (org-element-citation-parser))))
- (when cite (save-excursion (funcall activate cite))))))))
+ (let* ((name org-cite-activate-processor)
+ (activate
+ (or (and name
+ (org-cite-processor-has-capability-p name 'activate)
+ (org-cite-processor-activate (org-cite--get-processor
name)))
+ #'org-cite-fontify-default)))
+ (when (re-search-forward org-element-citation-prefix-re limit t)
+ (let ((cite (org-with-point-at (match-beginning 0)
+ (org-element-citation-parser))))
+ (when cite
+ (funcall activate cite)
+ ;; Move after cite object and make sure to return
+ ;; a non-nil value.
+ (goto-char (org-element-property :end cite)))))))
;;; Internal interface with Org Export library (export capability)
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index 89c57fb..e34872f 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -4436,7 +4436,7 @@ Optional argument NEW may specify text to replace the
current field content."
(col (org-table-current-column)))
(when (> col 0)
(skip-chars-backward "^|")
- (if (not (looking-at " *\\([^|\n]*?\\) *\\(|\\|$\\)"))
+ (if (not (looking-at " *\\(?:\\([^|\n]*?\\) *\\(|\\)\\|\\([^|\n]+?\\)
*\\($\\)\\)"))
(setq org-table-may-need-update t)
(let* ((align (nth (1- col) org-table-last-alignment))
(width (nth (1- col) org-table-last-column-widths))
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 77b1cf4..212069e 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"))
+ (let ((org-release "9.5.1"))
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-72-gc5d6656"))
+ (let ((org-git-version "release_9.5.1-11-g96d91b"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 83b3d79..1a13754 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
+;; Version: 9.5.1
;; This file is part of GNU Emacs.
;;
diff --git a/lisp/org/ox.el b/lisp/org/ox.el
index 9ab813a..b27ec56 100644
--- a/lisp/org/ox.el
+++ b/lisp/org/ox.el
@@ -1048,6 +1048,7 @@ BACKEND is a structure with `org-export-backend' type."
(unless (org-export-backend-p backend)
(error "Unknown \"%s\" back-end: Aborting export" backend)))
+;;;###autoload
(defun org-export-derived-backend-p (backend &rest backends)
"Non-nil if BACKEND is derived from one of BACKENDS.
BACKEND is an export back-end, as returned by, e.g.,
@@ -1858,6 +1859,7 @@ INFO is a plist containing export directives."
(let ((transcoder (cdr (assq type (plist-get info :translate-alist)))))
(and (functionp transcoder) transcoder)))))
+;;;###autoload
(defun org-export-data (data info)
"Convert DATA into current back-end format.
@@ -4586,6 +4588,7 @@ objects of the same type."
;; `org-export-raw-string' builds a pseudo-object out of a string
;; that any export back-end returns as-is.
+;;;###autoload
(defun org-export-raw-string (s)
"Return a raw object containing string S.
A raw string is exported as-is, with no additional processing