Skip to content

Commit 02eb958

Browse files
committed
Silence byte compiler
and make version check explicit
1 parent 01b4254 commit 02eb958

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

org-edit-latex.el

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,10 @@
8383
:group 'org-edit-latex
8484
:version "24.4")
8585

86+
;; silence byte compiler
87+
(defvar TeX-auto-update)
88+
(defvar latex-mode-hook)
89+
8690
(defvar-local org-edit-latex--before-type nil
8791
"Element type before wrapping.")
8892

@@ -243,8 +247,7 @@ header."
243247

244248
(defun org-edit-latex--unwrap-latex (ele)
245249
"Unwrap latex fragment."
246-
(let* ((lang (org-element-property :language ele))
247-
(beg (org-element-property :begin ele))
250+
(let* ((beg (org-element-property :begin ele))
248251
(end (org-element-property :end ele))
249252
(pa (org-element-property :post-affiliated ele))
250253
(pb (org-element-property :post-blank ele))
@@ -275,15 +278,15 @@ header."
275278

276279
(defun org-edit-latex--unwrap-maybe (oldfun &rest args)
277280
"Unwrap latex fragment only if it meets certain predicates."
278-
(if (and (boundp 'org-src--beg-marker)
279-
(let ((beg org-src--beg-marker))
280-
(save-excursion
281-
(set-buffer (marker-buffer beg))
281+
(if (and (not (version< org-version "9.0"))
282+
(let* ((beg org-src--beg-marker)
283+
(buf (marker-buffer beg)))
284+
(with-current-buffer buf
282285
(goto-char beg)
283286
(eq 'inline-src-block (car (org-element-context))))))
284287
(let ((org-src--remote t))
285-
(funcall oldfun))
286-
(funcall oldfun))
288+
(apply oldfun args))
289+
(apply oldfun args))
287290
(when (and org-edit-latex-mode
288291
(memq org-edit-latex--before-type
289292
'(latex-fragment latex-environment)))

0 commit comments

Comments
 (0)