From: Alex Kost <alezost@gmail.com>
To: guix-devel@gnu.org
Subject: [PATCH 1/7] emacs: Rename 'file-path' to 'file-name'.
Date: Fri, 22 Jan 2016 11:19:29 +0300 [thread overview]
Message-ID: <1453450775-594-2-git-send-email-alezost@gmail.com> (raw)
In-Reply-To: <1453450775-594-1-git-send-email-alezost@gmail.com>
* 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.
---
NEWS | 3 ++-
emacs/guix-info.el | 6 +++---
emacs/guix-list.el | 14 +++++++-------
emacs/guix-ui-generation.el | 2 +-
emacs/guix-ui-system-generation.el | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/NEWS b/NEWS
index 0084394..b27ebc7 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 644533e..6aefd2f 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 7e57f42..51eb106 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 4047850..74b8ff2 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 d79f3bc..7f4d76d 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)))
--
2.7.0
next prev parent reply other threads:[~2016-01-22 8:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-22 8:19 [PATCH 0/7]: Add "M-x guix-licenses" and friends Alex Kost
2016-01-22 8:19 ` Alex Kost [this message]
2016-01-23 17:06 ` [PATCH 1/7] emacs: Rename 'file-path' to 'file-name' Ludovic Courtès
2016-01-22 8:19 ` [PATCH 2/7] licenses: Add a list of licenses Alex Kost
2016-01-23 17:08 ` Ludovic Courtès
2016-01-23 22:37 ` Alex Kost
2016-01-24 20:59 ` Ludovic Courtès
2016-01-22 8:19 ` [PATCH 3/7] emacs: Add 'guix-browse-license-url' command Alex Kost
2016-01-23 17:13 ` Ludovic Courtès
2016-01-25 19:18 ` Alex Kost
2016-01-23 17:18 ` Ludovic Courtès
2016-01-23 22:49 ` Alex Kost
2016-01-24 21:00 ` Ludovic Courtès
2016-01-22 8:19 ` [PATCH 4/7] emacs: Buttonize licenses in "Package Info" Alex Kost
2016-01-23 17:14 ` Ludovic Courtès
2016-01-22 8:19 ` [PATCH 5/7] emacs: Add 'guix-packages-by-license' command Alex Kost
2016-01-23 17:15 ` Ludovic Courtès
2016-01-22 8:19 ` [PATCH 6/7] emacs: list: Support displaying URL links Alex Kost
2016-01-23 17:15 ` Ludovic Courtès
2016-01-22 8:19 ` [PATCH 7/7] emacs: Add interface for licenses Alex Kost
2016-01-23 17:17 ` Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1453450775-594-2-git-send-email-alezost@gmail.com \
--to=alezost@gmail.com \
--cc=guix-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).