[elpa] externals-release/org 399481b 09/22: Do not ignore user-defined display-buffer-alist in org-insert-link

[ELPA Syncer]

branch: externals-release/org
commit 399481bad10845a77f210c9320ff1efee9a312c8
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Bastien <bzg@gnu.org>

    Do not ignore user-defined display-buffer-alist in org-insert-link
    
    * lisp/ol.el (org-insert-link): Handle case when *Org Links* window is
    not created.
    * lisp/org-macs.el (org-no-popups): Do not override
    `display-buffer-alist'. Use `pop-up-windows' instead.
---
 lisp/ol.el       | 13 +++++++------
 lisp/org-macs.el |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lisp/ol.el b/lisp/ol.el
index 60c1bbe..de03c1b 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -1819,12 +1819,13 @@ Use TAB to complete link prefixes, then RET for 
type-specific completion support
                             (reverse org-stored-links)
                             "\n")))
        (goto-char (point-min)))
-      (let ((cw (selected-window)))
-       (select-window (get-buffer-window "*Org Links*" 'visible))
-       (with-current-buffer "*Org Links*" (setq truncate-lines t))
-       (unless (pos-visible-in-window-p (point-max))
-         (org-fit-window-to-buffer))
-       (and (window-live-p cw) (select-window cw)))
+      (when (get-buffer-window "*Org Links*" 'visible)
+        (let ((cw (selected-window)))
+         (select-window (get-buffer-window "*Org Links*" 'visible))
+         (with-current-buffer "*Org Links*" (setq truncate-lines t))
+         (unless (pos-visible-in-window-p (point-max))
+           (org-fit-window-to-buffer))
+         (and (window-live-p cw) (select-window cw))))
       (setq all-prefixes (append (mapcar #'car abbrevs)
                                 (mapcar #'car org-link-abbrev-alist)
                                 (org-link-types)))
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index d40ed1a..42935b3 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -208,7 +208,7 @@ because otherwise all these markers will point to nowhere."
 
 (defmacro org-no-popups (&rest body)
   "Suppress popup windows and evaluate BODY."
-  `(let (pop-up-frames display-buffer-alist)
+  `(let (pop-up-frames pop-up-windows)
      ,@body))