[elpa] externals/consult 7582e99: Update changelog

[ELPA Syncer]

branch: externals/consult
commit 7582e99c17b1c3283d515068d29cb600b9c79f9b
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update changelog
---
 CHANGELOG.org | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.org b/CHANGELOG.org
index c9a3dfd..31bd446 100644
--- a/CHANGELOG.org
+++ b/CHANGELOG.org
@@ -2,6 +2,12 @@
 #+author: Daniel Mendler
 #+language: en
 
+* Development
+
+- Bugfixes
+- Removed obsolete =consult-project-imenu= and =consult-x-command= variables
+- =consult-grep=: Use ~--null~ argument to support file names with colons
+
 * Version 0.11 (2021-08-18)
 
 - Bugfixes only

[elpa] externals/corfu 1281660: Update README

[ELPA Syncer]

branch: externals/corfu
commit 1281660fcae602902c05c1507131595e2ad21166
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update README
---
 README.org | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.org b/README.org
index 6519f79..05b8536 100644
--- a/README.org
+++ b/README.org
@@ -87,7 +87,8 @@
   :init
   (corfu-global-mode))
 
-;; Optionally use the `orderless' completion style.
+;; Optionally use the `orderless' completion style. See 
`+orderless-dispatch'
+;; in the Consult wiki for an advanced Orderless style dispatcher.
 ;; Enable `partial-completion' for files to allow path expansion.
 ;; You may prefer to use `initials' instead of `partial-completion'.
 (use-package orderless

[elpa] externals/vertico 8a546ad: Update README

[ELPA Syncer]

branch: externals/vertico
commit 8a546add5f2ad5370a8d6458bcc6855f48e15907
Author: Daniel Mendler 
Commit: Daniel Mendler 

Update README
---
 README.org | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index 9297975..ba8b2bb 100644
--- a/README.org
+++ b/README.org
@@ -59,11 +59,12 @@
   ;; (setq vertico-cycle t)
   )
 
-;; Use the `orderless' completion style. Additionally enable
-;; `partial-completion' for file path expansion. `partial-completion' is
-;; important for wildcard support. Multiple files can be opened at once
-;; with `find-file' if you enter a wildcard. You may also give the
-;; `initials' completion style a try.
+;; Optionally use the `orderless' completion style. See
+;; `+orderless-dispatch' in the Consult wiki for an advanced Orderless 
style
+;; dispatcher. Additionally enable `partial-completion' for file path
+;; expansion. `partial-completion' is important for wildcard support.
+;; Multiple files can be opened at once with `find-file' if you enter a
+;; wildcard. You may also give the `initials' completion style a try.
 (use-package orderless
   :init
   (setq completion-styles '(orderless)

[elpa] externals/ebdb 9050ed2 3/4: Do a better job of displaying German phone numbers; add parsing

[Eric Abrahamsen]

branch: externals/ebdb
commit 9050ed2c8d4c97ef1af16bd88fc6ca0ed6f03c4d
Author: Eric Abrahamsen 
Commit: Eric Abrahamsen 

Do a better job of displaying German phone numbers; add parsing

* ebdb-i18n-basic.el (ebdb-string-i18n): This wasn't working quite
right; change it to generally handle any length of number.
(ebdb-parse-i18n): Parse German phone numbers.
---
 ebdb-i18n-basic.el | 62 +-
 1 file changed, 52 insertions(+), 10 deletions(-)

diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index 9d65a19..15da8ac 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -186,16 +186,58 @@ number, and any remaining as an extension."
 
 (cl-defmethod ebdb-string-i18n ((phone ebdb-field-phone)
 (_cc (eql 49)))
-  (with-slots (area-code number extension) phone
-(concat
- (unless (eql ebdb-default-phone-country 49)
-   "+49 ")
- (when area-code
-   (format "%02d" area-code))
- (apply #'format "%s%s%s %s%s%s"
-(split-string number "" t))
- (when extension
-   (format "-%d" extension)
+  "Display a German phone number."
+  (let ((is-default (eql ebdb-default-phone-country 49))
+   num-len)
+(with-slots (area-code number extension) phone
+  (setq num-len (length number))
+  (concat
+   (unless is-default
+"+49 ")
+   (when area-code
+(format (if is-default "(%03d) " "%d ") area-code))
+   (if (>= 4 num-len)
+  number
+(mapconcat #'identity
+   (seq-partition number
+  (if (= 0 (mod num-len 3))
+  3 4))
+ " "))
+   (when extension
+(format "-%d" extension))
+
+(cl-defmethod ebdb-parse-i18n ((_class (subclass ebdb-field-phone))
+  (str string)
+  (_cc (eql 49))
+  &optional slots)
+  "Parse a German phone number.
+Uses first block of digits as the area code, anything following a
+hyphen as the extension, and everything in between as the number
+itself."
+  (let ((area-code-regexp "^(?\\([[:digit:]]+\\))? +")
+   (extension-regexp "-\\([[:digit:]]+\\)\\'"))
+(setq slots
+ (plist-put slots :area-code
+(when (string-match area-code-regexp str)
+  (prog1
+  (string-to-number (match-string 1 str))
+(setq str (replace-regexp-in-string
+   area-code-regexp "" str)
+ slots
+ (plist-put slots :extension
+(when (string-match extension-regexp str)
+  (prog1
+  (string-to-number (match-string 1 str))
+(setq str (replace-regexp-in-string
+   extension-regexp "" str))
+
+(condition-case nil
+   (setq slots (plist-put
+slots
+:number
+(replace-regexp-in-string
+ "[^[:digit:]]" "" str
+slots))
 
 (cl-defmethod ebdb-string-i18n ((address ebdb-field-address)
 (_cc (eql deu)))

[elpa] externals/ebdb b08a526 4/4: Add ebdb-i18n-german-states variable, use in reading, bump version

[Eric Abrahamsen]

branch: externals/ebdb
commit b08a5264ef2609b5cc789dcfe9452b02db384f0f
Author: Eric Abrahamsen 
Commit: Eric Abrahamsen 

Add ebdb-i18n-german-states variable, use in reading, bump version

* ebdb-i18n-basic.el (ebdb-i18n-german-states): New variable.
(ebdb-read-i18n): Use when reading German addresses.
---
 ebdb-i18n-basic.el | 36 +++-
 ebdb.el|  2 +-
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/ebdb-i18n-basic.el b/ebdb-i18n-basic.el
index 15da8ac..1bd6c1f 100644
--- a/ebdb-i18n-basic.el
+++ b/ebdb-i18n-basic.el
@@ -239,6 +239,40 @@ itself."
  "[^[:digit:]]" "" str
 slots))
 
+(defvar ebdb-i18n-german-states
+ '(("Baden-Württemberg" . "BW")
+   ("Bayern" . "BY")
+   ("Berlin" . "BE")
+   ("Brandenburg" . "BB")
+   ("Bremen" . "HB")
+   ("Hamburg" . "HH")
+   ("Hessen" . "HE")
+   ("Mecklenburg-Vorpommern" . "MV")
+   ("Niedersachsen" . "NI")
+   ("Nordrhein-Westfalen" . "NW")
+   ("Rheinland-Pfalz" . "RP")
+   ("Saarland" . "SL")
+   ("Sachsen" . "SN")
+   ("Sachsen-Anhalt" . "ST")
+   ("Schleswig-Holstein" . "SH")
+   ("Thüringen" . "TH"))
+ "All the states in Germany, for use with completion.")
+
+(cl-defmethod ebdb-read-i18n ((_class (subclass ebdb-field-address))
+ (_cc (eql deu))
+ &optional slots obj)
+  (unless (plist-member slots :region)
+(setq slots
+ (plist-put
+  slots :region
+  (cdr (assoc-string
+(ebdb-read-string
+ "State"
+ (when obj (ebdb-address-region obj))
+ ebdb-i18n-german-states t)
+ebdb-i18n-german-states)
+  slots)
+
 (cl-defmethod ebdb-string-i18n ((address ebdb-field-address)
 (_cc (eql deu)))
   (with-slots (streets neighborhood locality region postcode) address
@@ -248,7 +282,7 @@ itself."
  (ebdb-concat ", " (ebdb-address-locality address)
  (ebdb-address-neighborhood address)
   (ebdb-concat " " (ebdb-address-region address)
-   (ebdb-address-postcode address)))
+  (ebdb-address-postcode address)))
  "\n"
  (car-safe (rassq 'deu (ebdb-i18n-countries))
 
diff --git a/ebdb.el b/ebdb.el
index 753f3e6..c7ff946 100644
--- a/ebdb.el
+++ b/ebdb.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 2016-2021  Free Software Foundation, Inc.
 
-;; Version: 0.8.4
+;; Version: 0.8.5
 ;; Package-Requires: ((emacs "25.1") (seq "2.15"))
 
 ;; Maintainer: Eric Abrahamsen 

[elpa] externals/ebdb updated (7a280d6 -> b08a526)

[Eric Abrahamsen]

girzel pushed a change to branch externals/ebdb.

  from  7a280d6   Menu option for saving the database should call 
`ebdb-save-ebdb'
   new  491152b   Use ebdb-default-phone-country as default for i18n phone 
parsing
   new  bcab2b6   Always ignore "undisclosed recipients" string in message 
headers
   new  9050ed2   Do a better job of displaying German phone numbers; add 
parsing
   new  b08a526   Add ebdb-i18n-german-states variable, use in reading, 
bump version


Summary of changes:
 ebdb-i18n-basic.el | 98 --
 ebdb-i18n.el   |  3 +-
 ebdb-mua.el|  4 ++-
 ebdb.el|  2 +-
 4 files changed, 93 insertions(+), 14 deletions(-)

[elpa] externals/ebdb 491152b 1/4: Use ebdb-default-phone-country as default for i18n phone parsing

[Eric Abrahamsen]

branch: externals/ebdb
commit 491152b6747e6f04ff7931ffe4d141fa736eea99
Author: Eric Abrahamsen 
Commit: Eric Abrahamsen 

Use ebdb-default-phone-country as default for i18n phone parsing

* ebdb-i18n.el (ebdb-parse): If it's the default for non-i18n phone
parsing, it should be the default here, too.
---
 ebdb-i18n.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ebdb-i18n.el b/ebdb-i18n.el
index 5aa16d8..783bbca 100644
--- a/ebdb-i18n.el
+++ b/ebdb-i18n.el
@@ -785,7 +785,8 @@ for their symbol representations."
   (let* ((cc-reg "\\`(?\\+(?\\([0-9]\\{1,3\\}\\))?[ \t]+")
 (cc (or (plist-get slots :country-code)
 (and (string-match cc-reg str)
- (string-to-number (match-string 1 str))
+ (string-to-number (match-string 1 str)))
+ebdb-default-phone-country)))
 (when cc
   (condition-case nil
  (setq slots

[elpa] externals/ebdb bcab2b6 2/4: Always ignore "undisclosed recipients" string in message headers

[Eric Abrahamsen]

branch: externals/ebdb
commit bcab2b61a4f762a1889e29ef2ff7e691504e8003
Author: Eric Abrahamsen 
Commit: Eric Abrahamsen 

Always ignore "undisclosed recipients" string in message headers

* ebdb-mua.el (ebdb-get-address-components): No one's going to create
a record for that.
---
 ebdb-mua.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ebdb-mua.el b/ebdb-mua.el
index e72a2fd..5fc4002 100644
--- a/ebdb-mua.el
+++ b/ebdb-mua.el
@@ -720,7 +720,9 @@ are discarded as appropriate."
  "@"
  (nth 1 (split-string mail "@"
mail-list))
-  (ebdb-mua-test-headers (car headers) address 
ignore-address))
+  (not (string-match-p "undisclosed recipients" mail))
+  (ebdb-mua-test-headers
+   (car headers) address ignore-address))
  ;; Add each address only once. (Use MAIL-LIST for book 
keeping.)
  ;; Thus if we care about whether an address gets associated 
with
  ;; one or another header, the order of elements in

[elpa] externals/org updated (8b78d48 -> 6cb9d2f)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  8b78d48   Fix email addresses in some *.el headers
   new  4b346e5   oc: Fix typo in docstring
   new  6cb9d2f   Merge branch 'bugfix'


Summary of changes:
 lisp/oc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[elpa] externals-release/org 4b346e5: oc: Fix typo in docstring

[ELPA Syncer]

branch: externals-release/org
commit 4b346e515726e5a37820fbe2d2acbc7bf7ae98f1
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

oc: Fix typo in docstring

* lisp/oc.el (org-cite-adjust-note): Fix typo.
---
 lisp/oc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/oc.el b/lisp/oc.el
index bbf2195..fd80ba9 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -883,7 +883,7 @@ When nil, it defaults to `org-cite-punctuation-marks'.
 Parse tree is modified by side-effect.
 
 Note: when calling both `org-cite-adjust-note' and `org-cite-wrap-citation' on
-the same object, call `org-cite-adjust-punctuation' first."
+the same object, call `org-cite-adjust-note' first."
   (when org-cite-adjust-note-numbers
 (pcase-let* ((rule (or rule (org-cite--get-note-rule info)))
  (punct-re (regexp-opt (or punct org-cite-punctuation-marks)))

[elpa] externals/org 6cb9d2f: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 6cb9d2ffeaa746f052b1fa38e9418ba5f2b9db78
Merge: 8b78d48 4b346e5
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

Merge branch 'bugfix'
---
 lisp/oc.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/oc.el b/lisp/oc.el
index bbf2195..fd80ba9 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -883,7 +883,7 @@ When nil, it defaults to `org-cite-punctuation-marks'.
 Parse tree is modified by side-effect.
 
 Note: when calling both `org-cite-adjust-note' and `org-cite-wrap-citation' on
-the same object, call `org-cite-adjust-punctuation' first."
+the same object, call `org-cite-adjust-note' first."
   (when org-cite-adjust-note-numbers
 (pcase-let* ((rule (or rule (org-cite--get-note-rule info)))
  (punct-re (regexp-opt (or punct org-cite-punctuation-marks)))

[nongnu] elpa/geiser d5cdad7: Version bump (0.18)

[ELPA Syncer]

branch: elpa/geiser
commit d5cdad7f3eb44cec434610846cf78f2ad272089b
Author: jao 
Commit: jao 

Version bump (0.18)
---
 elisp/geiser.el | 2 +-
 news.org| 4 
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/elisp/geiser.el b/elisp/geiser.el
index 703abef..a559c68 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -13,7 +13,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/
 ;; Package-Requires: ((emacs "24.4"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.17
+;; Version: 0.18
 
 ;;; Commentary:
 
diff --git a/news.org b/news.org
index 5f88fa5..5642019 100644
--- a/news.org
+++ b/news.org
@@ -1,3 +1,7 @@
+* Version 0.18 (October, 2021)
+
+  - Documentation fix
+
 * Version 0.17 (August, 2021)
 
   - Package available in NonGNU ELPA (doc update)

[elpa] externals-release/org d6f0e9e 1/2: oc: Be stricter when introducing spaces before citations

[ELPA Syncer]

branch: externals-release/org
commit d6f0e9e105009fd197f52dc5b755d59748d6f986
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

oc: Be stricter when introducing spaces before citations

* lisp/oc.el (org-cite-process-citations): Add a space before citation
only if it is preceded by a quotation mark.
* testing/lisp/test-oc.el (test-org-cite/export-capability): Add
tests.

Reported-by: Denis Maier 

---
 lisp/oc.el  | 10 ++
 testing/lisp/test-oc.el | 25 -
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/lisp/oc.el b/lisp/oc.el
index fd80ba9..ac8cafb 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -1274,11 +1274,13 @@ by side-effect."
   ;; Before removing the citation, transfer its `:post-blank'
   ;; property to the object before, if any.
   (org-cite--set-previous-post-blank cite blanks info)
-;; We want to be sure any non-note citation is preceded by
-;; a space.  This is particularly important when using
+;; Make sure there is a space between a quotation mark and
+;; a citation.  This is particularly important when using
 ;; `adaptive' note rule.  See `org-cite-note-rules'.
-(unless (org-cite-inside-footnote-p cite t)
-  (org-cite--set-previous-post-blank cite 1 info))
+(let ((previous (org-export-get-previous-element cite info)))
+  (when (and (org-string-nw-p previous)
+ (string-suffix-p "\"" previous))
+(org-cite--set-previous-post-blank cite 1 info)))
 (pcase replacement
   ;; String.
   ((pred stringp)
diff --git a/testing/lisp/test-oc.el b/testing/lisp/test-oc.el
index fc90a21..995559b 100644
--- a/testing/lisp/test-oc.el
+++ b/testing/lisp/test-oc.el
@@ -1273,7 +1273,7 @@ arguments.  Replace citation with \"@\" character in the 
output."
   (list "b" (org-element-create 'bold nil "c"))) " ")
 
 
-;;; TEST capabilities.
+;;; Test capabilities.
 (ert-deftest test-org-cite/activate-capability ()
   "Test \"activate\" capability."
   ;; Standard test.
@@ -1393,6 +1393,29 @@ arguments.  Replace citation with \"@\" character in the 
output."
   '((section . (lambda (_ c _) c))
 (paragraph . (lambda (_ c _) c))
 (bold . (lambda (&rest _) "bold")
+  ;; Make sure to have a space between a quote and a citation.
+  (should
+   (equal "\"quotation\" citation\n"
+  (org-test-with-temp-text "\"quotation\"[cite:@key]"
+(let ((org-cite--processors nil)
+  (org-cite-export-processors '((t . (foo nil nil)
+  (org-cite-register-processor 'foo
+:export-citation (lambda (&rest _) "citation"))
+  (org-export-as (org-export-create-backend
+  :transcoders
+  '((section . (lambda (_ c _) c))
+(paragraph . (lambda (_ c _) c)
+  (should
+   (equal "\"quotation\"  citation\n"
+  (org-test-with-temp-text "\"quotation\"  [cite:@key]"
+(let ((org-cite--processors nil)
+  (org-cite-export-processors '((t . (foo nil nil)
+  (org-cite-register-processor 'foo
+:export-citation (lambda (&rest _) "citation"))
+  (org-export-as (org-export-create-backend
+  :transcoders
+  '((section . (lambda (_ c _) c))
+(paragraph . (lambda (_ c _) c)
   ;; Regular bibliography export.
   (should
(eq 'success

[elpa] externals-release/org updated (4b346e5 -> d68d8bc)

[ELPA Syncer]

elpasync pushed a change to branch externals-release/org.

  from  4b346e5   oc: Fix typo in docstring
   new  d6f0e9e   oc: Be stricter when introducing spaces before citations
   new  d68d8bc   oc: Pacify checkdoc


Summary of changes:
 lisp/oc.el  | 28 +---
 testing/lisp/test-oc.el | 25 -
 2 files changed, 41 insertions(+), 12 deletions(-)

[elpa] externals-release/org d68d8bc 2/2: oc: Pacify checkdoc

[ELPA Syncer]

branch: externals-release/org
commit d68d8bc1f8d513f535b32383ef98f174b3573223
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

oc: Pacify checkdoc

* lisp/oc.el (org-cite-export-processors):
(org-cite--move-punct-before):
(org-cite-adjust-note):
(org-cite--allowed-p): Add missing argument.
---
 lisp/oc.el | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/lisp/oc.el b/lisp/oc.el
index ac8cafb..17b5775 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -152,10 +152,10 @@ triplet following the pattern
   (NAME BIBLIOGRAPHY-STYLE CITATION-STYLE)
 
 There, NAME is the name of a registered citation processor providing export
-functionality, as a symbol.  BIBLIOGRAPHY-STYLE (resp. CITATION-STYLE) is the
-desired default style to use when printing a bibliography (resp. exporting a
-citation), as a string or nil.  Both BIBLIOGRAPHY-STYLE and CITATION-STYLE are
-optional.  NAME is mandatory.
+functionality, as a symbol.  BIBLIOGRAPHY-STYLE (respectively CITATION-STYLE)
+is the desired default style to use when printing a bibliography (respectively
+exporting a citation), as a string or nil.  Both BIBLIOGRAPHY-STYLE and
+CITATION-STYLE are optional.  NAME is mandatory.
 
 The export process selects the citation processor associated to the current
 export back-end, or the most specific back-end the current one is derived from,
@@ -502,8 +502,8 @@ This function assumes S precedes CITATION."
 
 (defun org-cite--move-punct-before (punct citation s info)
   "Move punctuation PUNCT before CITATION object.
-String S contains PUNCT.  The function assumes S follows CITATION.
-Parse tree is modified by side-effect."
+String S contains PUNCT.  INFO is the export state, as a property list.
+The function assumes S follows CITATION.  Parse tree is modified by 
side-effect."
   (if (equal s punct)
   (org-element-extract-element s)   ;it would be empty anyway
 (org-element-set-element s (substring s (length punct
@@ -877,6 +877,9 @@ modified by side-effect."
 
 INFO is the export state, as a property list.
 
+Optional argument RULE is the punctuation rule used, as a triplet.  When nil,
+rule is determined according to `org-cite-note-rules', which see.
+
 Optional argument PUNCT is a list of punctuation marks to be considered.
 When nil, it defaults to `org-cite-punctuation-marks'.
 
@@ -1386,7 +1389,8 @@ ARG is the prefix argument received when calling 
`org-open-at-point', or nil."
 
 ;;; Meta-command for citation insertion (insert capability)
 (defun org-cite--allowed-p (context)
-  "Non-nil when a citation can be inserted at point."
+  "Non-nil when a citation can be inserted at point.
+CONTEXT is the element or object at point, as returned by 
`org-element-context'."
   (let ((type (org-element-type context)))
 (cond
  ;; No citation in attributes, except in parsed ones.

[elpa] externals/org 1acacd6: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 1acacd604938b673cef2f86c6fc361df5b63a2a3
Merge: 6cb9d2f d68d8bc
Author: Nicolas Goaziou 
Commit: Nicolas Goaziou 

Merge branch 'bugfix'
---
 lisp/oc.el  | 28 +---
 testing/lisp/test-oc.el | 25 -
 2 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/lisp/oc.el b/lisp/oc.el
index fd80ba9..17b5775 100644
--- a/lisp/oc.el
+++ b/lisp/oc.el
@@ -152,10 +152,10 @@ triplet following the pattern
   (NAME BIBLIOGRAPHY-STYLE CITATION-STYLE)
 
 There, NAME is the name of a registered citation processor providing export
-functionality, as a symbol.  BIBLIOGRAPHY-STYLE (resp. CITATION-STYLE) is the
-desired default style to use when printing a bibliography (resp. exporting a
-citation), as a string or nil.  Both BIBLIOGRAPHY-STYLE and CITATION-STYLE are
-optional.  NAME is mandatory.
+functionality, as a symbol.  BIBLIOGRAPHY-STYLE (respectively CITATION-STYLE)
+is the desired default style to use when printing a bibliography (respectively
+exporting a citation), as a string or nil.  Both BIBLIOGRAPHY-STYLE and
+CITATION-STYLE are optional.  NAME is mandatory.
 
 The export process selects the citation processor associated to the current
 export back-end, or the most specific back-end the current one is derived from,
@@ -502,8 +502,8 @@ This function assumes S precedes CITATION."
 
 (defun org-cite--move-punct-before (punct citation s info)
   "Move punctuation PUNCT before CITATION object.
-String S contains PUNCT.  The function assumes S follows CITATION.
-Parse tree is modified by side-effect."
+String S contains PUNCT.  INFO is the export state, as a property list.
+The function assumes S follows CITATION.  Parse tree is modified by 
side-effect."
   (if (equal s punct)
   (org-element-extract-element s)   ;it would be empty anyway
 (org-element-set-element s (substring s (length punct
@@ -877,6 +877,9 @@ modified by side-effect."
 
 INFO is the export state, as a property list.
 
+Optional argument RULE is the punctuation rule used, as a triplet.  When nil,
+rule is determined according to `org-cite-note-rules', which see.
+
 Optional argument PUNCT is a list of punctuation marks to be considered.
 When nil, it defaults to `org-cite-punctuation-marks'.
 
@@ -1274,11 +1277,13 @@ by side-effect."
   ;; Before removing the citation, transfer its `:post-blank'
   ;; property to the object before, if any.
   (org-cite--set-previous-post-blank cite blanks info)
-;; We want to be sure any non-note citation is preceded by
-;; a space.  This is particularly important when using
+;; Make sure there is a space between a quotation mark and
+;; a citation.  This is particularly important when using
 ;; `adaptive' note rule.  See `org-cite-note-rules'.
-(unless (org-cite-inside-footnote-p cite t)
-  (org-cite--set-previous-post-blank cite 1 info))
+(let ((previous (org-export-get-previous-element cite info)))
+  (when (and (org-string-nw-p previous)
+ (string-suffix-p "\"" previous))
+(org-cite--set-previous-post-blank cite 1 info)))
 (pcase replacement
   ;; String.
   ((pred stringp)
@@ -1384,7 +1389,8 @@ ARG is the prefix argument received when calling 
`org-open-at-point', or nil."
 
 ;;; Meta-command for citation insertion (insert capability)
 (defun org-cite--allowed-p (context)
-  "Non-nil when a citation can be inserted at point."
+  "Non-nil when a citation can be inserted at point.
+CONTEXT is the element or object at point, as returned by 
`org-element-context'."
   (let ((type (org-element-type context)))
 (cond
  ;; No citation in attributes, except in parsed ones.
diff --git a/testing/lisp/test-oc.el b/testing/lisp/test-oc.el
index fc90a21..995559b 100644
--- a/testing/lisp/test-oc.el
+++ b/testing/lisp/test-oc.el
@@ -1273,7 +1273,7 @@ arguments.  Replace citation with \"@\" character in the 
output."
   (list "b" (org-element-create 'bold nil "c"))) " ")
 
 
-;;; TEST capabilities.
+;;; Test capabilities.
 (ert-deftest test-org-cite/activate-capability ()
   "Test \"activate\" capability."
   ;; Standard test.
@@ -1393,6 +1393,29 @@ arguments.  Replace citation with \"@\" character in the 
output."
   '((section . (lambda (_ c _) c))
 (paragraph . (lambda (_ c _) c))
 (bold . (lambda (&rest _) "bold")
+  ;; Make sure to have a space between a quote and a citation.
+  (should
+   (equal "\"quotation\" citation\n"
+  (org-test-with-temp-text "\"quotation\"[cite:@key]"
+(let ((org-cite--processors nil)
+  (org-cite-export-processors '((t . (foo nil nil)
+  (org-cite-register-processor 'foo
+:export-citation (lambda (&rest _) "citation"))
+  (org-e

[elpa] externals/org updated (6cb9d2f -> 1acacd6)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  6cb9d2f   Merge branch 'bugfix'
   new  d6f0e9e   oc: Be stricter when introducing spaces before citations
   new  d68d8bc   oc: Pacify checkdoc
   new  1acacd6   Merge branch 'bugfix'


Summary of changes:
 lisp/oc.el  | 28 +---
 testing/lisp/test-oc.el | 25 -
 2 files changed, 41 insertions(+), 12 deletions(-)

[elpa] externals-release/org bd0493e: org-lint: Do not require space after : in keywords

[ELPA Syncer]

branch: externals-release/org
commit bd0493eda18c834077a514372aac3fed35fe589a
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-lint: Do not require space after : in keywords

* lisp/org-lint.el (org-lint-duplicate-name): Update regexp to conform
with org-element parsers.

Fixes https://list.orgmode.org/orgmode/87h7ee5q8u@gmail.com/
---
 lisp/org-lint.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 5c64c5a..da5e6ae 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -350,7 +350,7 @@ called with one argument, the key used for comparison."
(lambda (datum name)
  (goto-char (org-element-property :begin datum))
  (re-search-forward
-  (format "^[ \t]*#\\+[A-Za-z]+: +%s *$" (regexp-quote name)))
+  (format "^[ \t]*#\\+[A-Za-z]+:[ \t]*%s[ \t]*$" (regexp-quote name)))
  (match-beginning 0))
(lambda (key) (format "Duplicate NAME \"%s\"" key
 

[elpa] externals/org 0ae701f: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit 0ae701f7fdd8b510dc266c289fd4437e1fca1d06
Merge: 1acacd6 bd0493e
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Merge branch 'bugfix'
---
 lisp/org-lint.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-lint.el b/lisp/org-lint.el
index 5c64c5a..da5e6ae 100644
--- a/lisp/org-lint.el
+++ b/lisp/org-lint.el
@@ -350,7 +350,7 @@ called with one argument, the key used for comparison."
(lambda (datum name)
  (goto-char (org-element-property :begin datum))
  (re-search-forward
-  (format "^[ \t]*#\\+[A-Za-z]+: +%s *$" (regexp-quote name)))
+  (format "^[ \t]*#\\+[A-Za-z]+:[ \t]*%s[ \t]*$" (regexp-quote name)))
  (match-beginning 0))
(lambda (key) (format "Duplicate NAME \"%s\"" key
 

[elpa] externals/org updated (1acacd6 -> 0ae701f)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  1acacd6   Merge branch 'bugfix'
   new  bd0493e   org-lint: Do not require space after : in keywords
   new  0ae701f   Merge branch 'bugfix'


Summary of changes:
 lisp/org-lint.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)