summaryrefslogtreecommitdiff
path: root/emacs
diff options
context:
space:
mode:
authorAlex Kost <alezost@gmail.com>2016-01-21 10:59:50 +0300
committerAlex Kost <alezost@gmail.com>2016-01-25 22:11:47 +0300
commit0a2a2b3387199c374c23912c0acfdf4156a0a84f (patch)
tree8cab97d3c18eabf84f657542a833e17ea7953ad6 /emacs
parent8581f4c19558199466940bb7cea412fce9a1cfee (diff)
downloadpatches-0a2a2b3387199c374c23912c0acfdf4156a0a84f.tar
patches-0a2a2b3387199c374c23912c0acfdf4156a0a84f.tar.gz
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.
Diffstat (limited to 'emacs')
-rw-r--r--emacs/guix-info.el6
-rw-r--r--emacs/guix-list.el14
-rw-r--r--emacs/guix-ui-generation.el2
-rw-r--r--emacs/guix-ui-system-generation.el2
4 files changed, 12 insertions, 12 deletions
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)))