mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 22:07:49 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Kyle Meyer 2021-04-17 15:19:41 -04:00
parent 3a7e1c047e 7e2eba8cc5
commit a02a3bd6ac
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/lisp/org-eldoc.el
View file

@ -144,7 +144,9 @@
(cond ((or
(string= lang "emacs-lisp")
(string= lang "elisp"))
(cond ((boundp 'eldoc-documentation-functions) ; Emacs>=28
(cond ((and (boundp 'eldoc-documentation-functions) ; Emacs>=28
(fboundp 'elisp-eldoc-var-docstring)
(fboundp 'elisp-eldoc-funcall))
(let ((eldoc-documentation-functions
'(elisp-eldoc-var-docstring elisp-eldoc-funcall)))
(eldoc-print-current-symbol-info)))

4
lisp/org-table.el
View file

@ -472,6 +472,9 @@ This may be useful when columns have been shrunk."
(defvar-local org-table-header-overlay nil)
(defun org-table-header-set-header ()
"Display the header of the table at point."
(let ((gcol temporary-goal-column))
(unwind-protect
(progn
(when (overlayp org-table-header-overlay)
(delete-overlay org-table-header-overlay))
(let* ((ws (window-start))
@ -491,6 +494,7 @@ This may be useful when columns have been shrunk."
org-table-header-overlay
(org-table-row-get-visible-string beg)
'org-table-header))))
(setq temporary-goal-column gcol))))
;;;###autoload
(define-minor-mode org-table-header-line-mode