diff options
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | emacs/guix-info.el | 6 | ||||
| -rw-r--r-- | emacs/guix-list.el | 14 | ||||
| -rw-r--r-- | emacs/guix-ui-generation.el | 2 | ||||
| -rw-r--r-- | emacs/guix-ui-system-generation.el | 2 |
5 files changed, 14 insertions, 13 deletions
diff --git a/NEWS b/NEWS index 0084394941..b27ebc7009 100644 --- a/NEWS +++ b/NEWS @@ -16,7 +16,7 @@ Please send Guix bug reports to bug-guix@gnu.org. *** Emacs interface for system generations *** Emacs interface for hydra.gnu.org -*** Changes in Emacs interface variables +*** Changes in Emacs interface variables and faces In the following names, BUFFER-TYPE means "info" or "list"; ENTRY-TYPE means "package", "output" or "generation". @@ -30,6 +30,7 @@ ENTRY-TYPE means "package", "output" or "generation". - guix-buffer-name-function -> guix-ui-buffer-name-function - guix-update-after-operation -> guix-ui-update-after-operation - guix-search-params -> guix-package-search-params +- guix-BUFFER-TYPE-file-path (face) -> guix-BUFFER-TYPE-file-name **** Replaced - guix-list-column-format, guix-list-column-value-methods -> diff --git a/emacs/guix-info.el b/emacs/guix-info.el index 644533eb29..6aefd2f3f6 100644 --- a/emacs/guix-info.el +++ b/emacs/guix-info.el @@ -42,9 +42,9 @@ "Face used for titles of parameters." :group 'guix-info-faces) -(defface guix-info-file-path +(defface guix-info-file-name '((t :inherit link)) - "Face used for file paths." + "Face used for file names." :group 'guix-info-faces) (defface guix-info-url @@ -337,7 +337,7 @@ BUTTON-OR-FACE is a button type)." (define-button-type 'guix-file :supertype 'guix - 'face 'guix-info-file-path + 'face 'guix-info-file-name 'help-echo "Find file" 'action (lambda (btn) (guix-find-file (button-label btn)))) diff --git a/emacs/guix-list.el b/emacs/guix-list.el index 7e57f42cb2..51eb106d82 100644 --- a/emacs/guix-list.el +++ b/emacs/guix-list.el @@ -33,9 +33,9 @@ (guix-define-buffer-type list) -(defface guix-list-file-path - '((t :inherit guix-info-file-path)) - "Face used for file paths." +(defface guix-list-file-name + '((t :inherit guix-info-file-name)) + "Face used for file names." :group 'guix-list-faces) (defface guix-list-time @@ -214,10 +214,10 @@ VAL may be nil." (guix-get-string (guix-get-time-string seconds) 'guix-list-time)) -(defun guix-list-get-file-path (path &optional _) - "Return PATH button specification for `tabulated-list-entries'." - (list path - 'face 'guix-list-file-path +(defun guix-list-get-file-name (file-name &optional _) + "Return FILE-NAME button specification for `tabulated-list-entries'." + (list file-name + 'face 'guix-list-file-name 'action (lambda (btn) (find-file (button-label btn))) 'follow-link t 'help-echo "Find file")) diff --git a/emacs/guix-ui-generation.el b/emacs/guix-ui-generation.el index 4047850f23..74b8ff2579 100644 --- a/emacs/guix-ui-generation.el +++ b/emacs/guix-ui-generation.el @@ -166,7 +166,7 @@ current profile's GENERATION." :format '((number nil 5 guix-list-sort-numerically-0 :right-align t) (current guix-generation-list-get-current 10 t) (time guix-list-get-time 20 t) - (path guix-list-get-file-path 30 t)) + (path guix-list-get-file-name 30 t)) :titles '((number . "N.")) :sort-key '(number . t) :marks '((delete . ?D))) diff --git a/emacs/guix-ui-system-generation.el b/emacs/guix-ui-system-generation.el index d79f3bceef..7f4d76d489 100644 --- a/emacs/guix-ui-system-generation.el +++ b/emacs/guix-ui-system-generation.el @@ -71,7 +71,7 @@ SEARCH-VALUES." (current guix-generation-list-get-current 10 t) (label nil 40 t) (time guix-list-get-time 20 t) - (path guix-list-get-file-path 30 t)) + (path guix-list-get-file-name 30 t)) :titles guix-generation-list-titles :sort-key '(number . t) :marks '((delete . ?D))) |