From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alex Branham Newsgroups: gmane.emacs.bugs Subject: bug#27341: updated patch to fix docstring Date: Mon, 26 Jun 2017 16:00:46 +0200 Message-ID: <87lgoedf1t.fsf@utexas.edu> References: <8760g1xxhw.fsf@utexas.edu> <8737b4grzq.fsf@utexas.edu> <8737aop2d9.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1498485689 13678 195.159.176.226 (26 Jun 2017 14:01:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Mon, 26 Jun 2017 14:01:29 +0000 (UTC) User-Agent: mu4e 0.9.18; emacs 25.2.1 Cc: 27341@debbugs.gnu.org To: npostavs@users.sourceforge.net Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Jun 26 16:01:13 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPUZk-0002lh-D9 for geb-bug-gnu-emacs@m.gmane.org; Mon, 26 Jun 2017 16:01:12 +0200 Original-Received: from localhost ([::1]:46845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPUZo-0001af-2X for geb-bug-gnu-emacs@m.gmane.org; Mon, 26 Jun 2017 10:01:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPUZf-0001aO-0F for bug-gnu-emacs@gnu.org; Mon, 26 Jun 2017 10:01:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPUZa-0003JM-VF for bug-gnu-emacs@gnu.org; Mon, 26 Jun 2017 10:01:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36534) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPUZa-0003Iy-Ll for bug-gnu-emacs@gnu.org; Mon, 26 Jun 2017 10:01:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dPUZa-0007Ig-7z for bug-gnu-emacs@gnu.org; Mon, 26 Jun 2017 10:01:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Alex Branham Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 26 Jun 2017 14:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27341 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 27341-submit@debbugs.gnu.org id=B27341.149848565728045 (code B ref 27341); Mon, 26 Jun 2017 14:01:02 +0000 Original-Received: (at 27341) by debbugs.gnu.org; 26 Jun 2017 14:00:57 +0000 Original-Received: from localhost ([127.0.0.1]:39211 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPUZV-0007IH-FB for submit@debbugs.gnu.org; Mon, 26 Jun 2017 10:00:57 -0400 Original-Received: from mail-lf0-f52.google.com ([209.85.215.52]:34417) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dPUZS-0007I1-K7 for 27341@debbugs.gnu.org; Mon, 26 Jun 2017 10:00:55 -0400 Original-Received: by mail-lf0-f52.google.com with SMTP id l13so1310427lfl.1 for <27341@debbugs.gnu.org>; Mon, 26 Jun 2017 07:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=utexas-edu.20150623.gappssmtp.com; s=20150623; h=references:user-agent:from:to:cc:subject:in-reply-to:date :message-id:mime-version; bh=6H0mnrFhoV9MHtO8CE1194SIaV/l95Ka5Wfa0CfjEzI=; b=WxzEUoC7fXL1b/ubIEuvPcfZ+uaHNljrTginQprLAX5bPH43zTgAIxzEQtm1xFqVxs eVILhdHnKXCqeTjfdL3aMk054Y+VXwzaK+vFVabrCHHOtLAJJ3zjGfrZa9x+jFOgktQc 6fl6wZdR5jX71+++RDQjBI8OSVSq01uHJS+EIX07lYFy1Cm6UbwRBGUXJSkElKtIF2HO HPf+C1u8riE5OgeGqrRHyQq54lNNWdfrXPDcUgWTc0dnLFOQrlbYoApwcdOo3dym3Bhn wI/coWLf2js/2lz1ql9PwEGN0hAOzPi2+e5Z2g49f68Np3A1goY+Pdy2/TYajagvsKbu RahA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:references:user-agent:from:to:cc:subject :in-reply-to:date:message-id:mime-version; bh=6H0mnrFhoV9MHtO8CE1194SIaV/l95Ka5Wfa0CfjEzI=; b=DdVjRSs6NaF7hcYqxnrtYM2Y7znohSWSN5YLXbfoNFxqu1aa3n2XvmMYuVjvCuoZCb iBkLbuCrgy98AFA3xDRE8p5NKTRfUiJYNjIVKjatdDbcYNtcl2pFJ7n29H7i/3SKN4P3 ebGlETo/4+FnyVbmZgpKVLmM47AylOIZPiNP3hlvd6Pv9Vpt2c9R9ON0BlxUF8uu6eth l9yqbYnRtU3H8Lm3nXWzrDcOPVhz2X/3uOlHE6U5xzDBX+m0qApc+D9cUo1UHnu3BLks NW7+OQ6L3tOOf1e9OB51D79+s1vDiA0I3zHn14rbteHesMTQlug2ofr4vKTHUUQOscwR KGTg== X-Gm-Message-State: AKS2vOyRzOqL3QKy0tQpYBqqzpmg49ZiMARy270645lPCdCZh7rtJM6j NyrbBfisW5QDwUM/pUc= X-Received: by 10.25.218.9 with SMTP id r9mr106448lfg.149.1498485647902; Mon, 26 Jun 2017 07:00:47 -0700 (PDT) Original-Received: from mars (edu220107.eduroam.gu.se. [130.241.220.107]) by smtp.gmail.com with ESMTPSA id g39sm51145lfi.15.2017.06.26.07.00.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 26 Jun 2017 07:00:46 -0700 (PDT) In-reply-to: <8737aop2d9.fsf@users.sourceforge.net> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:133924 Archived-At: --=-=-= Content-Type: text/plain Here's a new patch that checks the region directly, ignoring `use-empty-active-region'. >From c3babb73d8f29ff3f27aacbac99c7226ef4b32a0 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Mon, 26 Jun 2017 15:57:15 +0200 Subject: [PATCH] eww-search-words prompt user for query if region active and not empty --- lisp/net/eww.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index fe31657914..cf46530d35 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -314,9 +314,15 @@ word(s) will be searched for via `eww-search-prefix'." ;;;###autoload (defun eww-search-words (&optional beg end) "Search the web for the text between BEG and END. -See the `eww-search-prefix' variable for the search engine used." + If region is active (and not whitespace), search the web for +the text between BEG and END. Else, prompt the user for a search +string. See the `eww-search-prefix' variable for the search +engine used." (interactive "r") - (eww (buffer-substring beg end))) + (let ((region-string (buffer-substring beg end))) + (if (not (string-match-p "\\`[ \n\t\r\v\f]*\\'" region-string)) + (eww region-string) + (eww (read-string "Query: "))))) (defun eww-open-in-new-buffer () "Fetch link at point in a new EWW buffer." -- 2.13.1 On Sun 25 Jun 2017 at 14:29, npostavs@users.sourceforge.net wrote: > Alex Branham writes: > >> - (eww (buffer-substring beg end))) >> + (if (region-active-p) > > If think we should use `use-region-p' instead. Or perhaps just check > directly if region is empty? I guess searching for an empty string > doesn't make much sense even if `use-empty-active-region' is t. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0003-eww-search-words-prompt-user-for-query-if-region-act.patch >From c3babb73d8f29ff3f27aacbac99c7226ef4b32a0 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Mon, 26 Jun 2017 15:57:15 +0200 Subject: [PATCH] eww-search-words prompt user for query if region active and not empty --- lisp/net/eww.el | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index fe31657914..cf46530d35 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -314,9 +314,15 @@ word(s) will be searched for via `eww-search-prefix'." ;;;###autoload (defun eww-search-words (&optional beg end) "Search the web for the text between BEG and END. -See the `eww-search-prefix' variable for the search engine used." + If region is active (and not whitespace), search the web for +the text between BEG and END. Else, prompt the user for a search +string. See the `eww-search-prefix' variable for the search +engine used." (interactive "r") - (eww (buffer-substring beg end))) + (let ((region-string (buffer-substring beg end))) + (if (not (string-match-p "\\`[ \n\t\r\v\f]*\\'" region-string)) + (eww region-string) + (eww (read-string "Query: "))))) (defun eww-open-in-new-buffer () "Fetch link at point in a new EWW buffer." -- 2.13.1 --=-=-=--