diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2021-04-17 15:19:41 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2021-04-17 15:19:41 -0400 |
| commit | a02a3bd6aceea9656921dcea282e4ad91eeda714 (patch) | |
| tree | 5bda02395f75e301757442cf8051d3bd88e09195 | |
| parent | 3a7e1c047eff1e8711d5dfa420b054f27f70e9ee (diff) | |
| parent | 7e2eba8cc510c9a43e133ddbd2855981f65f69b4 (diff) | |
| download | org-mode-a02a3bd6aceea9656921dcea282e4ad91eeda714.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | contrib/lisp/org-eldoc.el | 4 | ||||
| -rw-r--r-- | lisp/org-table.el | 42 |
2 files changed, 26 insertions, 20 deletions
diff --git a/contrib/lisp/org-eldoc.el b/contrib/lisp/org-eldoc.el index 7a68851..550f857 100644 --- a/contrib/lisp/org-eldoc.el +++ b/contrib/lisp/org-eldoc.el @@ -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))) diff --git a/lisp/org-table.el b/lisp/org-table.el index 143ed0f..3030751 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -472,25 +472,29 @@ 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." - (when (overlayp org-table-header-overlay) - (delete-overlay org-table-header-overlay)) - (let* ((ws (window-start)) - (beg (save-excursion - (goto-char (org-table-begin)) - (while (or (org-at-table-hline-p) - (looking-at-p ".*|\\s-+<[rcl]?\\([0-9]+\\)?>")) - (move-beginning-of-line 2)) - (point))) - (end (save-excursion (goto-char beg) (point-at-eol)))) - (if (pos-visible-in-window-p beg) - (when (overlayp org-table-header-overlay) - (delete-overlay org-table-header-overlay)) - (setq org-table-header-overlay - (make-overlay ws (+ ws (- end beg)))) - (org-overlay-display - org-table-header-overlay - (org-table-row-get-visible-string beg) - 'org-table-header)))) + (let ((gcol temporary-goal-column)) + (unwind-protect + (progn + (when (overlayp org-table-header-overlay) + (delete-overlay org-table-header-overlay)) + (let* ((ws (window-start)) + (beg (save-excursion + (goto-char (org-table-begin)) + (while (or (org-at-table-hline-p) + (looking-at-p ".*|\\s-+<[rcl]?\\([0-9]+\\)?>")) + (move-beginning-of-line 2)) + (point))) + (end (save-excursion (goto-char beg) (point-at-eol)))) + (if (pos-visible-in-window-p beg) + (when (overlayp org-table-header-overlay) + (delete-overlay org-table-header-overlay)) + (setq org-table-header-overlay + (make-overlay ws (+ ws (- end beg)))) + (org-overlay-display + 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 |