mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 22:37:47 +00:00
Merge branch 'maint'
This commit is contained in:
commit
a02a3bd6ac
|
@ -144,7 +144,9 @@
|
||||||
(cond ((or
|
(cond ((or
|
||||||
(string= lang "emacs-lisp")
|
(string= lang "emacs-lisp")
|
||||||
(string= lang "elisp"))
|
(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
|
(let ((eldoc-documentation-functions
|
||||||
'(elisp-eldoc-var-docstring elisp-eldoc-funcall)))
|
'(elisp-eldoc-var-docstring elisp-eldoc-funcall)))
|
||||||
(eldoc-print-current-symbol-info)))
|
(eldoc-print-current-symbol-info)))
|
||||||
|
|
|
@ -472,25 +472,29 @@ This may be useful when columns have been shrunk."
|
||||||
(defvar-local org-table-header-overlay nil)
|
(defvar-local org-table-header-overlay nil)
|
||||||
(defun org-table-header-set-header ()
|
(defun org-table-header-set-header ()
|
||||||
"Display the header of the table at point."
|
"Display the header of the table at point."
|
||||||
(when (overlayp org-table-header-overlay)
|
(let ((gcol temporary-goal-column))
|
||||||
(delete-overlay org-table-header-overlay))
|
(unwind-protect
|
||||||
(let* ((ws (window-start))
|
(progn
|
||||||
(beg (save-excursion
|
(when (overlayp org-table-header-overlay)
|
||||||
(goto-char (org-table-begin))
|
(delete-overlay org-table-header-overlay))
|
||||||
(while (or (org-at-table-hline-p)
|
(let* ((ws (window-start))
|
||||||
(looking-at-p ".*|\\s-+<[rcl]?\\([0-9]+\\)?>"))
|
(beg (save-excursion
|
||||||
(move-beginning-of-line 2))
|
(goto-char (org-table-begin))
|
||||||
(point)))
|
(while (or (org-at-table-hline-p)
|
||||||
(end (save-excursion (goto-char beg) (point-at-eol))))
|
(looking-at-p ".*|\\s-+<[rcl]?\\([0-9]+\\)?>"))
|
||||||
(if (pos-visible-in-window-p beg)
|
(move-beginning-of-line 2))
|
||||||
(when (overlayp org-table-header-overlay)
|
(point)))
|
||||||
(delete-overlay org-table-header-overlay))
|
(end (save-excursion (goto-char beg) (point-at-eol))))
|
||||||
(setq org-table-header-overlay
|
(if (pos-visible-in-window-p beg)
|
||||||
(make-overlay ws (+ ws (- end beg))))
|
(when (overlayp org-table-header-overlay)
|
||||||
(org-overlay-display
|
(delete-overlay org-table-header-overlay))
|
||||||
org-table-header-overlay
|
(setq org-table-header-overlay
|
||||||
(org-table-row-get-visible-string beg)
|
(make-overlay ws (+ ws (- end beg))))
|
||||||
'org-table-header))))
|
(org-overlay-display
|
||||||
|
org-table-header-overlay
|
||||||
|
(org-table-row-get-visible-string beg)
|
||||||
|
'org-table-header))))
|
||||||
|
(setq temporary-goal-column gcol))))
|
||||||
|
|
||||||
;;;###autoload
|
;;;###autoload
|
||||||
(define-minor-mode org-table-header-line-mode
|
(define-minor-mode org-table-header-line-mode
|
||||||
|
|
Loading…
Reference in a new issue