gptel-org: combine conditions in gptel-org--create-prompt

* gptel-org.el (gptel-org--create-prompt): The warning and
fallback to parsing the entire buffer can happen in the
conditionals.  This change is primarily structural,
non-behavioral.

Author: psionic-k

gptel-org.el

@@ -186,53 +186,53 @@ value of `gptel-org-branching-context', which see."
     (when topic-start
       ;; narrow to GPTEL_TOPIC property scope
       (narrow-to-region topic-start prompt-end))
-    (if gptel-org-branching-context
+    (if (and gptel-org-branching-context
+             (or (fboundp 'org-element-lineage-map)
+                 (prog1 nil
+                   (display-warning
+                    '(gptel org)
+                    "Using `gptel-org-branching-context' requires Org version 9.7 or higher, it will be ignored."))))
         ;; Create prompt from direct ancestors of point
-        (if (fboundp 'org-element-lineage-map)
-            (save-excursion
-              (let* ((org-buf (current-buffer))
-                     (start-bounds (gptel-org--element-lineage-map
-                                       (org-element-at-point) #'gptel-org--element-begin
-                                     '(headline org-data) 'with-self))
-                     (end-bounds
-                      (cl-loop
-                       for (pos . rest) on (cdr start-bounds)
-                       while
-                       (and (>= pos (point-min)) ;respect narrowing
-                            (goto-char pos)
-                            ;; org-element-lineage always returns an extra
-                            ;; (org-data) element at point 1.  If there is also a
-                            ;; heading here, it is either a false positive or we
-                            ;; would be double counting it.  So we reject this node
-                            ;; when also at a heading.
-                            (not (and (eq pos 1) (org-at-heading-p)
-                                      ;; Skip if at the last element of start-bounds,
-                                      ;; since we captured this heading already (#476)
-                                      (null rest))))
-                       do (outline-next-heading)
-                       collect (point) into ends
-                       finally return (cons prompt-end ends))))
-                (with-temp-buffer
-                  (setq-local gptel-backend (buffer-local-value 'gptel-backend org-buf)
-                              gptel--system-message
-                              (buffer-local-value 'gptel--system-message org-buf)
-                              gptel-model (buffer-local-value 'gptel-model org-buf)
-                              gptel-mode (buffer-local-value 'gptel-mode org-buf)
-                              gptel-track-response
-                              (buffer-local-value 'gptel-track-response org-buf)
-                              gptel-track-media
-                              (buffer-local-value 'gptel-track-media org-buf))
-                  (cl-loop for start in start-bounds
-                           for end   in end-bounds
-                           do (insert-buffer-substring org-buf start end)
-                           (goto-char (point-min)))
-                  (goto-char (point-max))
-                  (let ((major-mode 'org-mode))
-                    (gptel--parse-buffer gptel-backend max-entries)))))
-          (display-warning
-             '(gptel org)
-             "Using `gptel-org-branching-context' requires Org version 9.7 or higher, it will be ignored.")
-          (gptel--parse-buffer gptel-backend max-entries))
+        (save-excursion
+          (let* ((org-buf (current-buffer))
+                 (start-bounds (gptel-org--element-lineage-map
+                                   (org-element-at-point) #'gptel-org--element-begin
+                                 '(headline org-data) 'with-self))
+                 (end-bounds
+                  (cl-loop
+                   for (pos . rest) on (cdr start-bounds)
+                   while
+                   (and (>= pos (point-min)) ;respect narrowing
+                        (goto-char pos)
+                        ;; org-element-lineage always returns an extra
+                        ;; (org-data) element at point 1.  If there is also a
+                        ;; heading here, it is either a false positive or we
+                        ;; would be double counting it.  So we reject this node
+                        ;; when also at a heading.
+                        (not (and (eq pos 1) (org-at-heading-p)
+                                  ;; Skip if at the last element of start-bounds,
+                                  ;; since we captured this heading already (#476)
+                                  (null rest))))
+                   do (outline-next-heading)
+                   collect (point) into ends
+                   finally return (cons prompt-end ends))))
+            (with-temp-buffer
+              (setq-local gptel-backend (buffer-local-value 'gptel-backend org-buf)
+                          gptel--system-message
+                          (buffer-local-value 'gptel--system-message org-buf)
+                          gptel-model (buffer-local-value 'gptel-model org-buf)
+                          gptel-mode (buffer-local-value 'gptel-mode org-buf)
+                          gptel-track-response
+                          (buffer-local-value 'gptel-track-response org-buf)
+                          gptel-track-media
+                          (buffer-local-value 'gptel-track-media org-buf))
+              (cl-loop for start in start-bounds
+                       for end   in end-bounds
+                       do (insert-buffer-substring org-buf start end)
+                       (goto-char (point-min)))
+              (goto-char (point-max))
+              (let ((major-mode 'org-mode))
+                (gptel--parse-buffer gptel-backend max-entries)))))
       ;; Create prompt the usual way
       (gptel--parse-buffer gptel-backend max-entries))))