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: Sun, 02 Jul 2017 20:45:49 +0200 Message-ID: <87tw2u7k4i.fsf@utexas.edu> References: <8760g1xxhw.fsf@utexas.edu> <8737b4grzq.fsf@utexas.edu> <8737aop2d9.fsf@users.sourceforge.net> <87lgoedf1t.fsf@utexas.edu> <87efu6nwa2.fsf@users.sourceforge.net> <878tkdy37e.fsf@utexas.edu> <87zicmk7u5.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1499021181 32138 195.159.176.226 (2 Jul 2017 18:46:21 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 2 Jul 2017 18:46:21 +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 Sun Jul 02 20:46:14 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 1dRjsl-0007fP-OT for geb-bug-gnu-emacs@m.gmane.org; Sun, 02 Jul 2017 20:46:08 +0200 Original-Received: from localhost ([::1]:58919 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRjsq-00069u-G9 for geb-bug-gnu-emacs@m.gmane.org; Sun, 02 Jul 2017 14:46:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRjsl-00069p-DX for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 14:46:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRjsg-0004sR-Hn for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 14:46:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dRjsg-0004sH-Cn for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 14:46:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dRjsg-0001n7-4A for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 14:46: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: Sun, 02 Jul 2017 18:46: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.14990211606876 (code B ref 27341); Sun, 02 Jul 2017 18:46:02 +0000 Original-Received: (at 27341) by debbugs.gnu.org; 2 Jul 2017 18:46:00 +0000 Original-Received: from localhost ([127.0.0.1]:49005 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRjse-0001mp-8i for submit@debbugs.gnu.org; Sun, 02 Jul 2017 14:46:00 -0400 Original-Received: from mail-lf0-f44.google.com ([209.85.215.44]:35523) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRjsc-0001mc-45 for 27341@debbugs.gnu.org; Sun, 02 Jul 2017 14:45:58 -0400 Original-Received: by mail-lf0-f44.google.com with SMTP id b207so92100874lfg.2 for <27341@debbugs.gnu.org>; Sun, 02 Jul 2017 11:45:57 -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=SGPqo9wpVa34hw5p6ElGDV+31R3qJfkB5HZQ/HnjcTE=; b=L8A3LnSYuumBq3UX/zArp6KVXfz3kPNrt6QvjBvsBZ9e5cangS09Xyx1EU4JGLlvtJ uDYiKQPHcmVYKzDA+mQtAQRLxroACRgdNnZfjWBDELf2k2M3qUiza+U5yZCd5sEOfVr2 p9c4xng5b8C/iSJ0khCHCrl/1bCl2CLqUNjFTzFjr/thH/FJ5l7Rf/KLPMacPnCEKURr 2HqSVgelM74nlN2Ur/d7D5QxDjGiYGgc6wI8mHObLTEkDcTHvx8yvHR/lZerhhPvgiwf 9hzHTsd7W6l27YOGhbbrnAGnRbl7AKwkGypoA4w6ePwdTLNNP2I5WgNAOx3Ua+7MZo/1 1ZJA== 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=SGPqo9wpVa34hw5p6ElGDV+31R3qJfkB5HZQ/HnjcTE=; b=uHaxfDig3ADeSvfEo0Rvk66vJryAUISezFyF/BXoklmm3O5pGzzIIsoPKPVZkwwmMG c4QsMuXy9Fxe9bXyEzOeihtErPUdrD6C20ZQ3ThEyGt/AP34+b+zh9BVRLFRt0QY1aD+ TJhQ/8wTXo4daNB9zWHfq8wrEpFXkbSjGXlrU2kCcdTzzG/3N+E/a5waJGk3F7N9lZS2 iOnr30pUbMHHRqHd6Wsg7GkrIDSU3IGEsXoEOKkNMxF37ktaQHQzOJC/JNuGHOZ/CJlx yvazhF5xpjdsCUHeilME0Yg+/gVOuNWmaKPOniuwxDH3NjAI674nZmxxXY2NNBnHC5Ia r4cw== X-Gm-Message-State: AKS2vOwOFneSotNvpYb/et7laJg2JZlw+8X3FSN0s93QKi6AsulQpcNk GPrfQAg254cLGpGNF5A= X-Received: by 10.25.209.20 with SMTP id i20mr8747623lfg.41.1499021151608; Sun, 02 Jul 2017 11:45:51 -0700 (PDT) Original-Received: from mars (edu220107.eduroam.gu.se. [130.241.220.107]) by smtp.gmail.com with ESMTPSA id h74sm2013281lfh.31.2017.07.02.11.45.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 02 Jul 2017 11:45:50 -0700 (PDT) In-reply-to: <87zicmk7u5.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:134100 Archived-At: --=-=-= Content-Type: text/plain On Sun 02 Jul 2017 at 18:32, npostavs@users.sourceforge.net wrote: > Alex Branham writes: > >> On Fri 30 Jun 2017 at 00:54, npostavs@users.sourceforge.net wrote: > >>> Doc strings shouldn't be indented like that, and there should be a >>> double space between sentences. >> >> Fixed. > > You missed the double spacing before the "Else,". D'oh! Fixed this time, sorry! >> Actually, we need to check (use-region-p) anyway in case the mark >> hasn't been activated yet in the buffer: > > Hmm, I just tried this and it doesn't quite do the job. I believe the > problem is that the (interactive "r") form throws an error when the mark > hasn't been activated yet. To handle this case correctly you need to > replace the "r" with some lisp code that produces the argument list. Ok, now I don't use "r" and just get the region directly. I think that'll do the trick? Thanks, Alex --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0006-Make-eww-search-words-prompt-for-query-if-nothing-se.patch >From 9dc5deec743d827e6d099f0f46b257ab8e7142c1 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Sun, 2 Jul 2017 20:43:12 +0200 Subject: [PATCH] Make eww-search-words prompt for query if nothing selected * lisp/net/eww.el (eww-search-words): Make eww-search-words prompt the user for a search query if the region is inactive or if the region is just whitespace. Copyright-paperwork-exempt: yes --- lisp/net/eww.el | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index fe31657914..438f635c5e 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -314,9 +314,17 @@ 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." - (interactive "r") - (eww (buffer-substring beg end))) + 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) + (if (use-region-p) + (let ((region-string (buffer-substring (region-beginning) (region-end)))) + (if (not (string-match-p "\\`[ \n\t\r\v\f]*\\'" region-string)) + (eww region-string) + (eww (read-string "Query: ")))) + (eww (read-string "Query: ")))) (defun eww-open-in-new-buffer () "Fetch link at point in a new EWW buffer." -- 2.13.2 --=-=-=--