diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-01-02 17:07:42 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2022-01-02 17:07:42 -0500 |
| commit | 04c0245d36a7face6a4f4b45a56f65f3a282790f (patch) | |
| tree | 88b00f6c47d0764c2348ced40adc6d1544182227 /lisp/tab-line.el | |
| parent | 9e7191048b56368a2d8bf3792f67f7b468d18eca (diff) | |
| parent | 6e53178a37d65218818fac3da1beac33db6ab5eb (diff) | |
| download | emacs-04c0245d36a7face6a4f4b45a56f65f3a282790f.tar.gz | |
Merge remote-tracking branch 'origin/emacs-28' into trunk
Diffstat (limited to 'lisp/tab-line.el')
| -rw-r--r-- | lisp/tab-line.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/tab-line.el b/lisp/tab-line.el index 90eb84cfacd..1c1217cdf6e 100644 --- a/lisp/tab-line.el +++ b/lisp/tab-line.el @@ -618,10 +618,10 @@ the selected tab visible." (defvar tab-line-auto-hscroll-buffer (generate-new-buffer " *tab-line-hscroll*")) (defun tab-line--get-tab-property (prop string) - (or (get-text-property 1 prop string) ;; for 99% cases of 1-char separator - (get-text-property 0 prop string) ;; for empty separator + (or (get-pos-property 1 prop string) ;; for most cases of 1-char separator + (get-pos-property 0 prop string) ;; for empty separator (let ((pos (next-single-property-change 0 prop string))) ;; long separator - (and pos (get-text-property pos prop string))))) + (and pos (get-pos-property pos prop string))))) (defun tab-line-auto-hscroll (strings hscroll) (with-current-buffer tab-line-auto-hscroll-buffer @@ -658,9 +658,9 @@ the selected tab visible." (if (> (vertical-motion 1) 0) (let* ((point (previous-single-property-change (point) 'tab)) (tab-prop (when point - (or (get-text-property point 'tab) + (or (get-pos-property point 'tab) (and (setq point (previous-single-property-change point 'tab)) - (get-text-property point 'tab))))) + (get-pos-property point 'tab))))) (new-hscroll (when tab-prop (seq-position strings tab-prop (lambda (str tab) @@ -685,9 +685,9 @@ the selected tab visible." (when (> (vertical-motion 1) 0) (let* ((point (previous-single-property-change (point) 'tab)) (tab-prop (when point - (or (get-text-property point 'tab) + (or (get-pos-property point 'tab) (and (setq point (previous-single-property-change point 'tab)) - (get-text-property point 'tab))))) + (get-pos-property point 'tab))))) (new-hscroll (when tab-prop (seq-position strings tab-prop (lambda (str tab) |