emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Pablo Barraza Cornejo <pbarrazacornejo@gmail.com>
To: Kyle Meyer <kyle@kyleam.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Fix numbering of captioned images
Date: Thu, 29 Apr 2021 23:44:36 -0600	[thread overview]
Message-ID: <87k0okiawr.fsf@gmail.com> (raw)
In-Reply-To: <87k0oks787.fsf@kyleam.com>

[-- Attachment #1: Type: text/plain, Size: 354 bytes --]


Kyle Meyer writes:

> What about returning to the boundp/fboundp combination that was 
> in place
> before ab1ce2a75?
>
>   (and (boundp 'my/foo)
>        (fboundp my/foo))    ; => nil
>   
>   (let ((my/foo #'ignore))
>     (and (boundp 'my/foo)
>          (fboundp my/foo)))  ; => t

Sounds good to me! I've modified the patch to reflect this change.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ox-html.el-inline-image-export-Fix-caption-numbering.patch --]
[-- Type: text/x-patch, Size: 1141 bytes --]

From a8d653efcdbe42e887aba7f8895de413ffaa53c4 Mon Sep 17 00:00:00 2001
From: Pablo Barraza Cornejo <pbarrazacornejo@gmail.com>
Date: Thu, 29 Apr 2021 20:15:08 -0600
Subject: [PATCH] ox-html.el/inline-image export: Fix caption numbering

* lisp/ox-html.el (org-html-standalone-image-p): Remove quote  which
causes `org-html-standalone-image-p' to not check if
`org-html-standalone-image-predicate' is fbound and see if it's
initialized.

TINYCHANGE
---
 lisp/ox-html.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/ox-html.el b/lisp/ox-html.el
index 47122314c..12d511c28 100644
--- a/lisp/ox-html.el
+++ b/lisp/ox-html.el
@@ -3039,7 +3039,8 @@ images, set it to:
 		     (`paragraph element)
 		     (`link (org-export-get-parent element)))))
     (and (eq (org-element-type paragraph) 'paragraph)
-	 (or (not (fboundp 'org-html-standalone-image-predicate))
+	 (or (not (and (boundp 'org-html-standalone-image-predicate)
+                       (fboundp org-html-standalone-image-predicate)))
 	     (funcall org-html-standalone-image-predicate paragraph))
 	 (catch 'exit
 	   (let ((link-count 0))
-- 
2.31.1


  reply	other threads:[~2021-04-30  5:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-30  2:52 Pablo Barraza Cornejo
2021-04-30  4:54 ` Kyle Meyer
2021-04-30  5:44   ` Pablo Barraza Cornejo [this message]
2021-05-01  4:43     ` Kyle Meyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87k0okiawr.fsf@gmail.com \
    --to=pbarrazacornejo@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=kyle@kyleam.com \
    --subject='Re: [PATCH] Fix numbering of captioned images' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).