martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use expand-file-name to find images for tabs.

Browse Source 
* lisp/tab-bar.el (tab-bar-mode):
* lisp/tab-line.el (tab-line-new-button, tab-line-close-button):
Remove expand-file-name with data-directory.
This commit is contained in:
Juri Linkov
2019-10-15 22:44:10 +03:00
parent 4509aaa5b0
commit ffa9054698
2 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
lisp/tab-bar.el
View File

@@ -102,25 +102,21 @@
(when (and tab-bar-mode (not (get-text-property 0 'display tab-bar-new-button)))
;; This file is pre-loaded so only here we can use the right data-directory:
(let ((file (expand-file-name "images/tabs/new.xpm" data-directory)))
(when (file-exists-p file)
(add-text-properties 0 (length tab-bar-new-button)
`(display (image :type xpm
:file ,file
:margin (2 . 0)
:ascent center))
tab-bar-new-button))))
(add-text-properties 0 (length tab-bar-new-button)
`(display (image :type xpm
:file "tabs/new.xpm"
:margin (2 . 0)
:ascent center))
tab-bar-new-button))
(when (and tab-bar-mode (not (get-text-property 0 'display tab-bar-close-button)))
;; This file is pre-loaded so only here we can use the right data-directory:
(let ((file (expand-file-name "images/tabs/close.xpm" data-directory)))
(when (file-exists-p file)
(add-text-properties 0 (length tab-bar-close-button)
`(display (image :type xpm
:file ,file
:margin (2 . 0)
:ascent center))
tab-bar-close-button))))
(add-text-properties 0 (length tab-bar-close-button)
`(display (image :type xpm
:file "tabs/close.xpm"
:margin (2 . 0)
:ascent center))
tab-bar-close-button))
(when tab-bar-mode
(global-set-key [(control shift iso-lefttab)] 'tab-previous)

8
lisp/tab-line.el
View File

@@ -130,9 +130,7 @@ If nil, don't show the new tab button."
(defvar tab-line-new-button
(propertize " + "
'display `(image :type xpm
:file ,(expand-file-name
"images/tabs/new.xpm"
data-directory)
:file "tabs/new.xpm"
:margin (2 . 0)
:ascent center)
'keymap tab-line-add-map
@@ -160,9 +158,7 @@ If nil, don't show it at all."
(defvar tab-line-close-button
(propertize " x"
'display `(image :type xpm
:file ,(expand-file-name
"images/tabs/close.xpm"
data-directory)
:file "tabs/close.xpm"
:margin (2 . 0)
:ascent center)
'keymap tab-line-tab-close-map