From: Tino Calancha <tino.calancha@gmail.com>
To: John Wiegley <jwiegley@gmail.com>
Cc: Eli Zaretskii <eliz@gnu.org>,
tino.calancha@gmail.com, drew.adams@oracle.com,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: Ibuffer: w and B default to buffer at current line
Date: Sun, 18 Sep 2016 03:22:09 +0900 (JST) [thread overview]
Message-ID: <alpine.DEB.2.20.1609180318320.6808@calancha-pc> (raw)
In-Reply-To: <m2fup3nfun.fsf@newartisans.com>
On Tue, 13 Sep 2016, John Wiegley wrote:
>>>>>> "TC" == Tino Calancha <tino.calancha@gmail.com> writes:
>
> TC> * lisp/ibuffer.el (ibuffer-get-marked-buffers):
> TC> Add an optional parameter BUFFER-AT-LINE: if non-nil and
> TC> there are no marked buffers, return the buffer at current line.
>
> Hi Tino,
>
> I don't like this part of your proposed change. The name of the function is
> `ibuffer-get-marked-buffers'. Adding a new argument to change the meaning of
> the function is not a good idea.
Hi John,
After Drew comments i realized something useful was still missing in
my previous patch: a non-zero integer ARG should use the next (or previous
if ARG is negative) buffers, regardless if there are marked buffers.
That is the behaviour in `dired-copy-filename-as-kill'. I want to support
the same in `ibuffer-copy-filename-as-kill' (i-c-f-a-k) and
`ibuffer-copy-buffername-as-kill' (i-c-b-a-k).
I have prepared to patches `D' and `W': the former follows DWIM, the later
follows your suggestion.
`D':
* 2 files changed, 65 insertions(+), 58 deletions(-)
`W':
* 2 files changed, 52 insertions(+), 46 deletions(-)
I don't have any preference for one or the other. Both provide the same
behaviour, so i am fine to push the one that people here prefer.
Best regards,
Tino
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
patch `D'
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From a06c406a5cd7da5c645c5365229144525fe55783 Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Sun, 18 Sep 2016 02:40:08 +0900
Subject: [PATCH] Ibuffer: 'w' and 'B' default to buffer at current line
See discussion in:
https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00384.html
* lisp/ibuffer.el (ibuffer--near-buffers): New defun;
return buffers near point.
(ibuffer-get-marked-buffers): Use it.
Add argument ARG; if a non-zero integer, return next ARG files.
Add argument BUFFER-AT-LINE; if non-nil, and there are no
marked files, return the buffer at current line.
(ibuffer-do-view-horizontally): Call ibuffer-get-marked-buffers
with non-nil second argument.
* lisp/ibuf-ext.el (ibuffer-diff-with-file): Idem.
(ibuffer-copy-buffername-as-kill):
Add argument ARG; if an integer, return next ARG files. Otherwise,
return the marked files. If there are not marked buffers, use buffer
at current line without prompting the user.
Use ibuffer-get-marked-buffers instead of ibuffer-map-marked-lines.
Append to kill ring when last command was a kill-region.
(ibuffer-copy-filename-as-kill): Idem.
Simplify the code.
Use ibuffer-buffer-file-name instead of buffer-file-name to
include buffers in Dired mode.
---
lisp/ibuf-ext.el | 84
+++++++++++++++++++++++---------------------------------
lisp/ibuffer.el | 39 ++++++++++++++++++++------
2 files changed, 65 insertions(+), 58 deletions(-)
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index f93957e..ad5298a 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1402,9 +1402,7 @@ ibuffer-diff-with-file
This requires the external program \"diff\" to be in your `exec-path'."
(interactive)
(require 'diff)
- (let ((marked-bufs (ibuffer-get-marked-buffers)))
- (when (null marked-bufs)
- (setq marked-bufs (list (ibuffer-current-buffer t))))
+ (let ((marked-bufs (ibuffer-get-marked-buffers nil 'buffer-at-line)))
(with-current-buffer (get-buffer-create "*Ibuffer Diff*")
(setq buffer-read-only nil)
(buffer-disable-undo (current-buffer))
@@ -1420,7 +1418,7 @@ ibuffer-diff-with-file
;;;###autoload
(defun ibuffer-copy-filename-as-kill (&optional arg)
- "Copy filenames of marked buffers into the kill ring.
+ "Copy filenames of marked (or next ARG) buffers into the kill ring.
The names are separated by a space.
If a buffer has no filename, it is ignored.
@@ -1431,55 +1429,43 @@ ibuffer-copy-filename-as-kill
to `ibuffer-default-directory' if non-nil, otherwise `default-directory'.
You can then feed the file name(s) to other commands with \\[yank]."
- (interactive "p")
- (if (zerop (ibuffer-count-marked-lines))
- (message "No buffers marked; use 'm' to mark a buffer")
- (let ((result "")
- (type (cond ((or (null arg) (zerop arg))
- 'full)
- ((= arg 4)
- 'relative)
- (t
- 'name))))
- (ibuffer-map-marked-lines
- #'(lambda (buf _mark)
- (setq result
- (concat result
- (let ((name (buffer-file-name buf)))
- (cond (name
- (concat
- (pcase type
- (`full
- name)
- (`relative
- (file-relative-name
- name (or ibuffer-default-directory
- default-directory)))
- (_
- (file-name-nondirectory name))) "
"))
- (t "")))))))
- (when (not (zerop (length result)))
- (setq result
- (substring result 0 -1)))
- (kill-new result)
- (message "%s" result))))
+ (interactive "P")
+ (let* ((file-names
+ (mapcar
+ (lambda (buf)
+ (let ((name (with-current-buffer buf
+ (ibuffer-buffer-file-name))))
+ (if (null name)
+ ""
+ (cond ((and (integerp arg) (zerop arg)) name)
+ ((consp arg)
+ (file-relative-name
+ name (or ibuffer-default-directory
+ default-directory)))
+ (t (file-name-nondirectory name))))))
+ (ibuffer-get-marked-buffers arg 'buffer-at-line)))
+ (string
+ (mapconcat 'identity (delete "" file-names) " ")))
+ (unless (string= string "")
+ (if (eq last-command 'kill-region)
+ (kill-append string nil)
+ (kill-new string))
+ (message "%s" string))))
;;;###autoload
-(defun ibuffer-copy-buffername-as-kill ()
- "Copy buffer names of marked buffers into the kill ring.
+(defun ibuffer-copy-buffername-as-kill (&optional arg)
+ "Copy buffer names of marked (or next ARG) buffers into the kill ring.
The names are separated by a space.
You can then feed the file name(s) to other commands with \\[yank]."
- (interactive)
- (if (zerop (ibuffer-count-marked-lines))
- (message "No buffers marked; use 'm' to mark a buffer")
- (let ((res ""))
- (ibuffer-map-marked-lines
- #'(lambda (buf _mark)
- (setq res (concat res (buffer-name buf) " "))))
- (when (not (zerop (length res)))
- (setq res (substring res 0 -1)))
- (kill-new res)
- (message res))))
+ (interactive "P")
+ (let ((string
+ (mapconcat #'buffer-name
+ (ibuffer-get-marked-buffers arg 'buffer-at-line) "
")))
+ (unless (string= string "")
+ (if (eq last-command 'kill-region)
+ (kill-append string nil)
+ (kill-new string))
+ (message "%s" string))))
(defun ibuffer-mark-on-buffer (func &optional ibuffer-mark-on-buffer-mark
group)
(let ((count
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 0336f1d..859b595 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1143,9 +1143,7 @@ ibuffer-do-view-horizontally
(ibuffer-do-view-1 (if other-frame 'other-frame 'horizontally)))
(defun ibuffer-do-view-1 (type)
- (let ((marked-bufs (ibuffer-get-marked-buffers)))
- (when (null marked-bufs)
- (setq marked-bufs (list (ibuffer-current-buffer t))))
+ (let ((marked-bufs (ibuffer-get-marked-buffers nil 'buffer-at-line)))
(unless (and (eq type 'other-frame)
(not ibuffer-expert)
(> (length marked-bufs) 3)
@@ -2022,13 +2020,36 @@ ibuffer-map-lines
(ibuffer-forward-line 0)
(ibuffer-forward-line (1- target-line-offset))))))
-(defun ibuffer-get-marked-buffers ()
- "Return a list of buffer objects currently marked."
+;; Return buffers around current line.
+(defun ibuffer--near-buffers (n)
(delq nil
- (mapcar (lambda (e)
- (when (eq (cdr e) ibuffer-marked-char)
- (car e)))
- (ibuffer-current-state-list))))
+ (mapcar
+ (lambda (x)
+ (car (get-text-property
+ (line-beginning-position (if (natnump n) x (- (1- x))))
+ 'ibuffer-properties)))
+ (number-sequence 1 (abs n)))))
+
+(defun ibuffer-get-marked-buffers (&optional arg buffer-at-line)
+ "Return a list of buffer objects currently marked.
+Optional argument ARG, if non-nil, specifies buffers near
+ point instead of marked buffers. It usually comes from the prefix
+ argument.
+ If ARG is an integer, use the next ARG files.
+If no files are marked, and BUFFER-AT-LINE is non-nil return the buffer
at
+current line."
+ (let ((buffers
+ (cond ((and (integerp arg) (not (zerop arg)))
+ (ibuffer--near-buffers arg))
+ (t
+ (delq nil
+ (mapcar (lambda (e)
+ (when (eq (cdr e) ibuffer-marked-char)
+ (car e)))
+ (ibuffer-current-state-list)))))))
+ (when (and (null buffers)
+ buffer-at-line)
+ (setq buffers (list (ibuffer-current-buffer 'live)))) buffers))
(defun ibuffer-current-state-list (&optional pos)
"Return a list like (BUF . MARK) of all buffers in an ibuffer.
--
2.9.3
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
patch `W'
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
From 179f608832c2de1fbbba11d4bb1b0c9064d73d2f Mon Sep 17 00:00:00 2001
From: Tino Calancha <tino.calancha@gmail.com>
Date: Sun, 18 Sep 2016 02:42:20 +0900
Subject: [PATCH] Ibuffer: 'w' and 'B' default to buffer at current line
See discussion in:
https://lists.gnu.org/archive/html/emacs-devel/2016-09/msg00384.html
* lisp/ibuffer.el (ibuffer--near-buffers): New defun;
return buffers near point.
* lisp/ibuf-ext.el (ibuffer-copy-buffername-as-kill): Use it.
Add argument ARG; if a non-zero integer, return next ARG buffers.
Otherwise return the marked buffers.
If there are not marked buffers, return buffer at current line
without prompting the user.
Use ibuffer-get-marked-buffers instead of ibuffer-map-marked-lines.
Append to kill ring when last command was a kill-region.
(ibuffer-copy-filename-as-kill): Idem.
Simplify the code.
Use ibuffer-buffer-file-name instead of buffer-file-name to
include buffers in Dired mode.
---
lisp/ibuf-ext.el | 88
+++++++++++++++++++++++++++-----------------------------
lisp/ibuffer.el | 10 +++++++
2 files changed, 52 insertions(+), 46 deletions(-)
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index f93957e..1918ce8 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1420,7 +1420,7 @@ ibuffer-diff-with-file
;;;###autoload
(defun ibuffer-copy-filename-as-kill (&optional arg)
- "Copy filenames of marked buffers into the kill ring.
+ "Copy filenames of marked (or next ARG) buffers into the kill ring.
The names are separated by a space.
If a buffer has no filename, it is ignored.
@@ -1431,55 +1431,51 @@ ibuffer-copy-filename-as-kill
to `ibuffer-default-directory' if non-nil, otherwise `default-directory'.
You can then feed the file name(s) to other commands with \\[yank]."
- (interactive "p")
- (if (zerop (ibuffer-count-marked-lines))
- (message "No buffers marked; use 'm' to mark a buffer")
- (let ((result "")
- (type (cond ((or (null arg) (zerop arg))
- 'full)
- ((= arg 4)
- 'relative)
- (t
- 'name))))
- (ibuffer-map-marked-lines
- #'(lambda (buf _mark)
- (setq result
- (concat result
- (let ((name (buffer-file-name buf)))
- (cond (name
- (concat
- (pcase type
- (`full
- name)
- (`relative
- (file-relative-name
- name (or ibuffer-default-directory
- default-directory)))
- (_
- (file-name-nondirectory name))) "
"))
- (t "")))))))
- (when (not (zerop (length result)))
- (setq result
- (substring result 0 -1)))
- (kill-new result)
- (message "%s" result))))
+ (interactive "P")
+ (let* ((buffers (cond ((and (integerp arg) (not (zerop arg)))
+ (ibuffer--near-buffers arg))
+ (t
+ (or (ibuffer-get-marked-buffers)
+ (list (ibuffer-current-buffer))))))
+ (file-names
+ (mapcar
+ (lambda (buf)
+ (let ((name (with-current-buffer buf
+ (ibuffer-buffer-file-name))))
+ (if (null name)
+ ""
+ (cond ((and (integerp arg) (zerop arg)) name)
+ ((consp arg)
+ (file-relative-name
+ name (or ibuffer-default-directory
+ default-directory)))
+ (t (file-name-nondirectory name))))))
+ buffers))
+ (string
+ (mapconcat 'identity (delete "" file-names) " ")))
+ (unless (string= string "")
+ (if (eq last-command 'kill-region)
+ (kill-append string nil)
+ (kill-new string))
+ (message "%s" string))))
;;;###autoload
-(defun ibuffer-copy-buffername-as-kill ()
- "Copy buffer names of marked buffers into the kill ring.
+(defun ibuffer-copy-buffername-as-kill (&optional arg)
+ "Copy buffer names of marked (or next ARG) buffers into the kill ring.
The names are separated by a space.
You can then feed the file name(s) to other commands with \\[yank]."
- (interactive)
- (if (zerop (ibuffer-count-marked-lines))
- (message "No buffers marked; use 'm' to mark a buffer")
- (let ((res ""))
- (ibuffer-map-marked-lines
- #'(lambda (buf _mark)
- (setq res (concat res (buffer-name buf) " "))))
- (when (not (zerop (length res)))
- (setq res (substring res 0 -1)))
- (kill-new res)
- (message res))))
+ (interactive "P")
+ (let* ((buffers (cond ((and (integerp arg) (not (zerop arg)))
+ (ibuffer--near-buffers arg))
+ (t
+ (or (ibuffer-get-marked-buffers)
+ (list (ibuffer-current-buffer))))))
+ (string (mapconcat #'buffer-name buffers " ")))
+ (unless (string= string "")
+ (if (eq last-command 'kill-region)
+ (kill-append string nil)
+ (kill-new string))
+ (message "%s" string))))
(defun ibuffer-mark-on-buffer (func &optional ibuffer-mark-on-buffer-mark
group)
(let ((count
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 0336f1d..fca8ba3 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2022,6 +2022,16 @@ ibuffer-map-lines
(ibuffer-forward-line 0)
(ibuffer-forward-line (1- target-line-offset))))))
+;; Return buffers around current line.
+(defun ibuffer--near-buffers (n)
+ (delq nil
+ (mapcar
+ (lambda (x)
+ (car (get-text-property
+ (line-beginning-position (if (natnump n) x (- (1- x))))
+ 'ibuffer-properties)))
+ (number-sequence 1 (abs n)))))
+
(defun ibuffer-get-marked-buffers ()
"Return a list of buffer objects currently marked."
(delq nil
--
2.9.3
In GNU Emacs 25.1.50.1
Repository revision: d7f0daf7ecaa7b138f7c66796e23fa5982b0a8bb
next prev parent reply other threads:[~2016-09-17 18:22 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-14 5:35 Ibuffer: w and B default to buffer at current line Tino Calancha
2016-09-14 6:41 ` John Wiegley
2016-09-14 7:21 ` Tino Calancha
2016-09-14 14:08 ` Drew Adams
2016-09-15 22:05 ` John Wiegley
2016-09-16 6:40 ` Eli Zaretskii
[not found] ` <<83intw5our.fsf@gnu.org>
2016-09-16 14:53 ` Drew Adams
2016-09-17 16:30 ` John Wiegley
2016-09-17 17:21 ` Eli Zaretskii
2016-09-17 21:35 ` John Wiegley
2016-09-17 23:26 ` Drew Adams
2016-09-17 23:51 ` John Wiegley
2016-09-18 1:45 ` Drew Adams
2016-09-18 2:18 ` John Wiegley
2016-09-18 14:26 ` Eli Zaretskii
2016-09-18 19:35 ` John Wiegley
[not found] ` <<83zin630i9.fsf@gnu.org>
2016-09-17 18:47 ` Drew Adams
2016-09-17 19:25 ` Eli Zaretskii
[not found] ` <<83vaxuib1p.fsf@gnu.org>
2016-09-17 19:33 ` Drew Adams
2016-09-18 14:29 ` Eli Zaretskii
[not found] ` <<d33a60f5-b8b6-4637-b3e6-ea1b09d98f85@default>
[not found] ` <<83poo1i8nf.fsf@gnu.org>
2016-09-18 17:55 ` naming functions [was: Ibuffer: w and B default to buffer at current line] Drew Adams
2016-09-18 19:23 ` John Wiegley
2016-09-18 23:24 ` Drew Adams
2016-09-19 16:35 ` Eli Zaretskii
2016-09-17 18:22 ` Tino Calancha [this message]
2016-09-26 12:08 ` Ibuffer: w and B default to buffer at current line Tino Calancha
2016-10-03 12:28 ` Tino Calancha
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://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.20.1609180318320.6808@calancha-pc \
--to=tino.calancha@gmail.com \
--cc=drew.adams@oracle.com \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=jwiegley@gmail.com \
/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/emacs.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).