Browse Source

emacs: Rename 'file-path' to 'file-name'.

* emacs/guix-info.el (guix-info-file-path): Rename to...
  (guix-info-file-name): ... this.
* emacs/guix-list.el (guix-list-file-path): Rename to...
  (guix-list-file-name): ... this.
  (guix-list-get-file-path): Rename to...
  (guix-list-get-file-name): ... this.
* emacs/guix-ui-generation.el (guix-generation-list-format): Adjust
  accordingly.
* emacs/guix-ui-system-generation.el (guix-system-generation-list-format):
  Likewise.
* NEWS: Mention faces renaming.
gn-latest-20200428
Alex Kost 6 years ago
parent
commit
0a2a2b3387
  1. 3
      NEWS
  2. 6
      emacs/guix-info.el
  3. 14
      emacs/guix-list.el
  4. 2
      emacs/guix-ui-generation.el
  5. 2
      emacs/guix-ui-system-generation.el

3
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 ->

6
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))))

14
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"))

2
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)))

2
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)))

Loading…
Cancel
Save