From 5b535761f616f01277111cfbb9c635e7a417afad Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sat, 14 Apr 2018 20:32:05 +0200 Subject: [PATCH] Rename url-button-google-url * lisp/erc/erc-button.el (erc-button-search-url): Renamed from url-button-google-url (bug#25717). Suggested by Andrew Robbins. (erc-button-alist): Use it. --- etc/NEWS | 6 ++++++ lisp/erc/erc-button.el | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 0bf5ba80b38..0c4daee9acf 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -210,6 +210,12 @@ concept index in the Gnus manual for the `match-list' entry. +++ *** nil is no longer an allowed value for `mm-text-html-renderer'. +** erc + +--- +*** `erc-button-google-url' has been renamed `erc-button-search-url' +and its value has been changed to Duck Duck Go. + ** eww/shr *** When opening external links in eww/shr (typically with the diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el index 8269e5c1634..8e1be30f352 100644 --- a/lisp/erc/erc-button.el +++ b/lisp/erc/erc-button.el @@ -121,12 +121,16 @@ longer than `erc-fill-column'." :group 'erc-button :type 'string) -(defcustom erc-button-google-url "http://www.google.com/search?q=%s" +(defcustom erc-button-search-url "http://duckduckgo.com/?q=%s" "URL used to browse Google search references. %s is replaced by the search string." + :version "27.1" :group 'erc-button :type 'string) +(define-obsolete-variable-alias 'erc-button-google-url + 'erc-button-search-url "27.1") + (defcustom erc-button-alist ;; Since the callback is only executed when the user is clicking on ;; a button, it makes no sense to optimize performance by @@ -148,7 +152,7 @@ longer than `erc-fill-column'." ("Lisp:\\([a-zA-Z.+-]+\\)" 0 t erc-browse-emacswiki-lisp 1) ("\\bGoogle:\\([^ \t\n\r\f]+\\)" 0 t (lambda (keywords) - (browse-url (format erc-button-google-url keywords))) + (browse-url (format erc-button-search-url keywords))) 1) ("\\brfc[#: ]?\\([0-9]+\\)" 0 t (lambda (num) -- 2.39.5