unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH] 0001-Add-icomplete-count-format
@ 2021-06-10  7:51 tumashu
  2021-06-10  9:53 ` 0001-Add-icomplete-count-format tumashu
  2021-06-10 16:23 ` [PATCH] 0001-Add-icomplete-count-format Philip Kaludercic
  0 siblings, 2 replies; 4+ messages in thread
From: tumashu @ 2021-06-10  7:51 UTC (permalink / raw)
  To: emacs-devel


[-- Attachment #1.1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #1.2: Type: text/html, Size: 111 bytes --]

[-- Attachment #2: 0001-Add-icomplete-count-format.patch --]
[-- Type: application/octet-stream, Size: 1926 bytes --]

From 6074e1f4c5564e5d9e56041cc7db6fd7125571cb Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Thu, 10 Jun 2021 15:48:51 +0800
Subject: [PATCH] Add icomplete-count-format.

* lisp/icomplete.el (icomplete-count-format): New variable.
(icomplete-exhibit): Use icomplete-count-format.
---
 lisp/icomplete.el | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 08b4ef2030..0881bade98 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -70,6 +70,10 @@ icomplete-hide-common-prefix
   :type 'boolean
   :version "24.4")
 
+(defcustom icomplete-count-format (cons "%-7s" "%s/%s ")
+  "Format string used for the candidate count."
+  :type '(choice (const nil) (cons string string)))
+
 (defvar icomplete-tidy-shadowed-file-names nil
   "If non-nil, automatically delete superfluous parts of file names.
 For example, if the user types ~/ after a long path name,
@@ -696,12 +700,13 @@ icomplete-exhibit
               (overlay-put
                icomplete-overlay 'before-string
                (and icomplete-scroll
-                    (let ((past (length icomplete--scrolled-past)))
-                      (format
-                       "%s/%s "
-                       (1+ past)
-                       (+ past
-                          (safe-length completion-all-sorted-completions))))))
+                    (format (car icomplete-count-format)
+                            (let ((past (length icomplete--scrolled-past)))
+                              (format
+                               (cdr icomplete-count-format)
+                               (1+ past)
+                               (+ past
+                                  (safe-length completion-all-sorted-completions)))))))
               (overlay-put icomplete-overlay 'after-string text))))))))
 
 (defun icomplete--affixate (md prospects)
-- 
2.30.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re:[PATCH] 0001-Add-icomplete-count-format
  2021-06-10  7:51 [PATCH] 0001-Add-icomplete-count-format tumashu
@ 2021-06-10  9:53 ` tumashu
  2021-06-10 16:23 ` [PATCH] 0001-Add-icomplete-count-format Philip Kaludercic
  1 sibling, 0 replies; 4+ messages in thread
From: tumashu @ 2021-06-10  9:53 UTC (permalink / raw)
  To: emacs-devel

Hello:

I have added icomplete-count-format to icomplete-mode, like vertio, please comment, thanks :-)

Feng shu.
    














在 2021-06-10 15:51:32,"tumashu" <tumashu@163.com> 写道:




^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] 0001-Add-icomplete-count-format
  2021-06-10  7:51 [PATCH] 0001-Add-icomplete-count-format tumashu
  2021-06-10  9:53 ` 0001-Add-icomplete-count-format tumashu
@ 2021-06-10 16:23 ` Philip Kaludercic
  2021-06-11  0:09   ` tumashu
  1 sibling, 1 reply; 4+ messages in thread
From: Philip Kaludercic @ 2021-06-10 16:23 UTC (permalink / raw)
  To: tumashu; +Cc: emacs-devel

tumashu <tumashu@163.com> writes:

> From 6074e1f4c5564e5d9e56041cc7db6fd7125571cb Mon Sep 17 00:00:00 2001
> From: Feng Shu <tumashu@163.com>
> Date: Thu, 10 Jun 2021 15:48:51 +0800
> Subject: [PATCH] Add icomplete-count-format.
>
> * lisp/icomplete.el (icomplete-count-format): New variable.
> (icomplete-exhibit): Use icomplete-count-format.
> ---
>  lisp/icomplete.el | 17 +++++++++++------
>  1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/lisp/icomplete.el b/lisp/icomplete.el
> index 08b4ef2030..0881bade98 100644
> --- a/lisp/icomplete.el
> +++ b/lisp/icomplete.el
> @@ -70,6 +70,10 @@ icomplete-hide-common-prefix
>    :type 'boolean
>    :version "24.4")
>  
> +(defcustom icomplete-count-format (cons "%-7s" "%s/%s ")
> +  "Format string used for the candidate count."
> +  :type '(choice (const nil) (cons string string)))

You need a

    :version "28.1"

here.

>  (defvar icomplete-tidy-shadowed-file-names nil
>    "If non-nil, automatically delete superfluous parts of file names.
>  For example, if the user types ~/ after a long path name,
> @@ -696,12 +700,13 @@ icomplete-exhibit
>                (overlay-put
>                 icomplete-overlay 'before-string
>                 (and icomplete-scroll
> -                    (let ((past (length icomplete--scrolled-past)))
> -                      (format
> -                       "%s/%s "
> -                       (1+ past)
> -                       (+ past
> -                          (safe-length completion-all-sorted-completions))))))
> +                    (format (car icomplete-count-format)

Does this really have to be another format string? Or would this always
just be used for justification?

> +                            (let ((past (length icomplete--scrolled-past)))
> +                              (format
> +                               (cdr icomplete-count-format)
> +                               (1+ past)
> +                               (+ past
> +                                  (safe-length completion-all-sorted-completions)))))))
>                (overlay-put icomplete-overlay 'after-string text))))))))
>  
>  (defun icomplete--affixate (md prospects)

-- 
	Philip K.



^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re:Re: [PATCH] 0001-Add-icomplete-count-format
  2021-06-10 16:23 ` [PATCH] 0001-Add-icomplete-count-format Philip Kaludercic
@ 2021-06-11  0:09   ` tumashu
  0 siblings, 0 replies; 4+ messages in thread
From: tumashu @ 2021-06-11  0:09 UTC (permalink / raw)
  To: Philip Kaludercic; +Cc: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 2579 bytes --]

















At 2021-06-11 00:23:19, "Philip Kaludercic" <philipk@posteo.net> wrote:
>tumashu <tumashu@163.com> writes:
>
>> From 6074e1f4c5564e5d9e56041cc7db6fd7125571cb Mon Sep 17 00:00:00 2001
>> From: Feng Shu <tumashu@163.com>
>> Date: Thu, 10 Jun 2021 15:48:51 +0800
>> Subject: [PATCH] Add icomplete-count-format.
>>
>> * lisp/icomplete.el (icomplete-count-format): New variable.
>> (icomplete-exhibit): Use icomplete-count-format.
>> ---
>>  lisp/icomplete.el | 17 +++++++++++------
>>  1 file changed, 11 insertions(+), 6 deletions(-)
>>
>> diff --git a/lisp/icomplete.el b/lisp/icomplete.el
>> index 08b4ef2030..0881bade98 100644
>> --- a/lisp/icomplete.el
>> +++ b/lisp/icomplete.el
>> @@ -70,6 +70,10 @@ icomplete-hide-common-prefix
>>    :type 'boolean
>>    :version "24.4")
>>  
>> +(defcustom icomplete-count-format (cons "%-7s" "%s/%s ")
>> +  "Format string used for the candidate count."
>> +  :type '(choice (const nil) (cons string string)))
>
>You need a
>
>    :version "28.1"

Added.

>
>here.
>
>>  (defvar icomplete-tidy-shadowed-file-names nil
>>    "If non-nil, automatically delete superfluous parts of file names.
>>  For example, if the user types ~/ after a long path name,
>> @@ -696,12 +700,13 @@ icomplete-exhibit
>>                (overlay-put
>>                 icomplete-overlay 'before-string
>>                 (and icomplete-scroll
>> -                    (let ((past (length icomplete--scrolled-past)))
>> -                      (format
>> -                       "%s/%s "
>> -                       (1+ past)
>> -                       (+ past
>> -                          (safe-length completion-all-sorted-completions))))))
>> +                    (format (car icomplete-count-format)
>
>Does this really have to be another format string? Or would this always
>just be used for justification?

This is mainly used for justification, but, maybe someone can do other eye candy things, for example:

1/1000      =>  M-x:
100/1000 =>  M-x:

by the way,  icomplete-count-format is *copy* from vertico-count-format :-)



>
>> +                            (let ((past (length icomplete--scrolled-past)))
>> +                              (format
>> +                               (cdr icomplete-count-format)
>> +                               (1+ past)
>> +                               (+ past
>> +                                  (safe-length completion-all-sorted-completions)))))))
>>                (overlay-put icomplete-overlay 'after-string text))))))))
>>  
>>  (defun icomplete--affixate (md prospects)
>
>-- 
>	Philip K.

[-- Attachment #2: 0001-Add-icomplete-count-format.patch --]
[-- Type: application/octet-stream, Size: 1946 bytes --]

From 63ca72047ec6fd7adff041278260ba00f09f61e8 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu@163.com>
Date: Thu, 10 Jun 2021 15:48:51 +0800
Subject: [PATCH] Add icomplete-count-format.

* lisp/icomplete.el (icomplete-count-format): New variable.
(icomplete-exhibit): Use icomplete-count-format.
---
 lisp/icomplete.el | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 08b4ef2030..3572eff93d 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -70,6 +70,11 @@ icomplete-hide-common-prefix
   :type 'boolean
   :version "24.4")
 
+(defcustom icomplete-count-format (cons "%-7s" "%s/%s ")
+  "Format string used for the candidate count."
+  :type '(choice (const nil) (cons string string))
+  :version "28.1")
+
 (defvar icomplete-tidy-shadowed-file-names nil
   "If non-nil, automatically delete superfluous parts of file names.
 For example, if the user types ~/ after a long path name,
@@ -696,12 +701,13 @@ icomplete-exhibit
               (overlay-put
                icomplete-overlay 'before-string
                (and icomplete-scroll
-                    (let ((past (length icomplete--scrolled-past)))
-                      (format
-                       "%s/%s "
-                       (1+ past)
-                       (+ past
-                          (safe-length completion-all-sorted-completions))))))
+                    (format (car icomplete-count-format)
+                            (let ((past (length icomplete--scrolled-past)))
+                              (format
+                               (cdr icomplete-count-format)
+                               (1+ past)
+                               (+ past
+                                  (safe-length completion-all-sorted-completions)))))))
               (overlay-put icomplete-overlay 'after-string text))))))))
 
 (defun icomplete--affixate (md prospects)
-- 
2.30.2


^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-06-11  0:09 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-10  7:51 [PATCH] 0001-Add-icomplete-count-format tumashu
2021-06-10  9:53 ` 0001-Add-icomplete-count-format tumashu
2021-06-10 16:23 ` [PATCH] 0001-Add-icomplete-count-format Philip Kaludercic
2021-06-11  0:09   ` tumashu

unofficial mirror of emacs-devel@gnu.org 

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://yhetil.org/emacs-devel/0 emacs-devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 emacs-devel emacs-devel/ https://yhetil.org/emacs-devel \
		emacs-devel@gnu.org
	public-inbox-index emacs-devel

Example config snippet for mirrors.
Newsgroups are available over NNTP:
	nntp://news.yhetil.org/yhetil.emacs.devel
	nntp://news.gmane.io/gmane.emacs.devel


code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs.git

AGPL code for this site: git clone http://ou63pmih66umazou.onion/public-inbox.git