|
83 | 83 | :group 'org-edit-latex
|
84 | 84 | :version "24.4")
|
85 | 85 |
|
| 86 | +;; silence byte compiler |
| 87 | +(defvar TeX-auto-update) |
| 88 | +(defvar latex-mode-hook) |
| 89 | + |
86 | 90 | (defvar-local org-edit-latex--before-type nil
|
87 | 91 | "Element type before wrapping.")
|
88 | 92 |
|
@@ -243,8 +247,7 @@ header."
|
243 | 247 |
|
244 | 248 | (defun org-edit-latex--unwrap-latex (ele)
|
245 | 249 | "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)) |
248 | 251 | (end (org-element-property :end ele))
|
249 | 252 | (pa (org-element-property :post-affiliated ele))
|
250 | 253 | (pb (org-element-property :post-blank ele))
|
@@ -275,15 +278,15 @@ header."
|
275 | 278 |
|
276 | 279 | (defun org-edit-latex--unwrap-maybe (oldfun &rest args)
|
277 | 280 | "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 |
282 | 285 | (goto-char beg)
|
283 | 286 | (eq 'inline-src-block (car (org-element-context))))))
|
284 | 287 | (let ((org-src--remote t))
|
285 |
| - (funcall oldfun)) |
286 |
| - (funcall oldfun)) |
| 288 | + (apply oldfun args)) |
| 289 | + (apply oldfun args)) |
287 | 290 | (when (and org-edit-latex-mode
|
288 | 291 | (memq org-edit-latex--before-type
|
289 | 292 | '(latex-fragment latex-environment)))
|
|
0 commit comments