From: "Basil L. Contovounesios" <contovob@tcd.ie>
To: David Edmondson <dme@dme.org>
Cc: 33043@debbugs.gnu.org
Subject: bug#33043: [PATCH v1 1/1] Support for the truncation of displayed URLs
Date: Mon, 29 Oct 2018 18:27:54 +0000 [thread overview]
Message-ID: <87tvl4ip5h.fsf@tcd.ie> (raw)
In-Reply-To: <m2y3ag91z3.fsf@dme.org> (David Edmondson's message of "Mon, 29 Oct 2018 16:01:04 +0000")
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: 0001-Add-URL-truncation-support-to-rcirc-bug-33043.patch --]
[-- Type: text/x-diff, Size: 3407 bytes --]
From 41d7f52984e6220123b8ccc7da1b1d56a9a7eb49 Mon Sep 17 00:00:00 2001
From: David Edmondson <dme@dme.org>
Date: Sun, 28 Oct 2018 03:11:21 +0000
Subject: [PATCH] Add URL truncation support to rcirc (bug#33043)
Suggested by David Edmondson <dme@dme.org>.
* lisp/net/rcirc.el (rcirc-url-max-length): New user option
controlling extent of URL truncation, defaulting to none.
(rcirc-markup-urls): Use it.
* etc/NEWS: Announce it.
---
etc/NEWS | 7 +++++++
lisp/net/rcirc.el | 26 ++++++++++++++++++--------
2 files changed, 25 insertions(+), 8 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 226ae1e135..f7fdd0add9 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -758,6 +758,13 @@ Tramp for some look-alike remote file names.
*** For some connection methods, like "su" or "sudo", the host name in
ad-hoc multi-hop file names must match the previous hop.
+** Rcirc
+
+---
+*** New user option 'rcirc-url-max-length'.
+Setting this option to an integer causes URLs displayed in Rcirc
+buffers to be truncated to that many characters.
+
** Register
---
*** The return value of method 'register-val-describe' includes the
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index fe9c71a21c..ca707341be 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -168,6 +168,14 @@ rcirc-fill-prefix
(string :tag "Prefix text"))
:group 'rcirc)
+(defcustom rcirc-url-max-length nil
+ "Maximum number of characters in displayed URLs.
+If nil, no maximum is applied."
+ :version "27.1"
+ :type '(choice (const :tag "No maximum" nil)
+ (integer :tag "Number of characters"))
+ :group 'rcirc)
+
(defvar rcirc-ignore-buffer-activity-flag nil
"If non-nil, ignore activity in this buffer.")
(make-variable-buffer-local 'rcirc-ignore-buffer-activity-flag)
@@ -2485,24 +2493,26 @@ rcirc-markup-my-nick
(rcirc-record-activity (current-buffer) 'nick)))))
(defun rcirc-markup-urls (_sender _response)
- (while (and rcirc-url-regexp ;; nil means disable URL catching
+ (while (and rcirc-url-regexp ; nil means disable URL catching.
(re-search-forward rcirc-url-regexp nil t))
(let* ((start (match-beginning 0))
- (end (match-end 0))
- (url (match-string-no-properties 0))
- (link-text (buffer-substring-no-properties start end)))
+ (url (buffer-substring-no-properties start (point))))
+ (when rcirc-url-max-length
+ ;; Replace match with truncated URL.
+ (delete-region start (point))
+ (insert (url-truncate-url-for-viewing url rcirc-url-max-length)))
;; Add a button for the URL. Note that we use `make-text-button',
;; rather than `make-button', as text-buttons are much faster in
;; large buffers.
- (make-text-button start end
+ (make-text-button start (point)
'face 'rcirc-url
'follow-link t
'rcirc-url url
'action (lambda (button)
(browse-url (button-get button 'rcirc-url))))
- ;; record the url if it is not already the latest stored url
- (when (not (string= link-text (caar rcirc-urls)))
- (push (cons link-text start) rcirc-urls)))))
+ ;; Record the URL if it is not already the latest stored URL.
+ (unless (string= url (caar rcirc-urls))
+ (push (cons url start) rcirc-urls)))))
(defun rcirc-markup-keywords (sender response)
(when (and (string= response "PRIVMSG")
--
2.19.1
[-- Attachment #2: Type: text/plain, Size: 543 bytes --]
David Edmondson <dme@dme.org> writes:
> On Sunday, 2018-10-28 at 03:14:39 +00, Basil L. Contovounesios wrote:
>
>> I attach two patches. The first comprises David's original patch, but
>> with an added :version tag and reworded commit message. The second
>> switches to reusing url-truncate-url-for-viewing. WDYT?
>
> It would be simpler just to smash them together. I don't care about the
> credit or anything.
I don't either. How's the attached patch, which additionally announces
the new user option in etc/NEWS?
Thanks,
--
Basil
next prev parent reply other threads:[~2018-10-29 18:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 10:04 bug#33043: 27.0.50; wishlist: rcirc should allow truncation of visible URLs David Edmondson
2018-10-15 10:06 ` bug#33043: [PATCH v1 1/1] Support for the truncation of displayed URLs David Edmondson
2018-10-17 22:27 ` Basil L. Contovounesios
2018-10-18 9:39 ` David Edmondson
2018-10-18 10:38 ` Basil L. Contovounesios
2018-10-18 10:50 ` David Edmondson
2018-10-27 8:54 ` Eli Zaretskii
2018-10-28 3:14 ` Basil L. Contovounesios
2018-10-29 16:01 ` David Edmondson
2018-10-29 18:27 ` Basil L. Contovounesios [this message]
2018-11-03 9:11 ` Eli Zaretskii
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87tvl4ip5h.fsf@tcd.ie \
--to=contovob@tcd.ie \
--cc=33043@debbugs.gnu.org \
--cc=dme@dme.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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.