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 21:25:56 +0200 Message-ID: <87shie7i9n.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> <87tw2u7k4i.fsf@utexas.edu> <87wp7qk5ye.fsf@users.sourceforge.net> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1499023636 12136 195.159.176.226 (2 Jul 2017 19:27:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 2 Jul 2017 19:27:16 +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 21:27:12 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 1dRkWS-0002p9-Ch for geb-bug-gnu-emacs@m.gmane.org; Sun, 02 Jul 2017 21:27:08 +0200 Original-Received: from localhost ([::1]:59007 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRkWX-0005zG-Qn for geb-bug-gnu-emacs@m.gmane.org; Sun, 02 Jul 2017 15:27:13 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48555) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dRkWQ-0005zB-A3 for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 15:27:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dRkWN-00051I-3n for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 15:27:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:46345) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dRkWM-00050q-Rx for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 15:27:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dRkWM-0002jR-Iu for bug-gnu-emacs@gnu.org; Sun, 02 Jul 2017 15:27: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 19:27: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.149902356610427 (code B ref 27341); Sun, 02 Jul 2017 19:27:02 +0000 Original-Received: (at 27341) by debbugs.gnu.org; 2 Jul 2017 19:26:06 +0000 Original-Received: from localhost ([127.0.0.1]:49022 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRkVS-0002i7-9J for submit@debbugs.gnu.org; Sun, 02 Jul 2017 15:26:06 -0400 Original-Received: from mail-lf0-f52.google.com ([209.85.215.52]:34497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dRkVQ-0002hd-7M for 27341@debbugs.gnu.org; Sun, 02 Jul 2017 15:26:05 -0400 Original-Received: by mail-lf0-f52.google.com with SMTP id l13so92470519lfl.1 for <27341@debbugs.gnu.org>; Sun, 02 Jul 2017 12:26:04 -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=A2iKWIxGNS85AfA4ecS/BKIx3THsAISDdCl05nV+yUM=; b=o3CRdGYn5+0nzVqRNKw7LACGvIf+PihbTPMF8K6R6/aUOK+ClAVLhZHvb1lxjKAiOw 0/oNQLWW8yftJJG4whYeYwoFRsWEoOLCb6bvveYwDDMeDCocyhPUWUayRLrp2IIPKPgW lE8W+L/viNgswkHj0DGHsULoHEadARfgrg3u1rmebf6Xc64XbOTjeXlSe2yYuFL68TsY rypjFHAhCvveiv91XK8j3JbovSJofpj8YmTkY5wl2vQhKK3MG59lMHtONBMeFK2pkemS 914Hli+osRVFhbFCroqqrXyOsV6pdewlSdTnSscqkM+EYW2im8Ht2WTkOYBR8bs7csVg a62A== 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=A2iKWIxGNS85AfA4ecS/BKIx3THsAISDdCl05nV+yUM=; b=ueSqzLdJQ7sTUlHKYbbltRlAiGctABtKmjaofYOVurbrOPCHfFl5ja0FW7p/XzqHjm VtW6fg/nSpljxSTbvQVnwi9KGBbUsNyEtYkrNTXFvI0dCz9H9rOsX8pQgY73hvIERTGh lC4iRiQRXvDo6xBms2SUSP4VIy3c1pX7QB2pv+9pGawdQDiqWIo/csIBbhyKS/tYNvbR PvdEz9yNGgzmYr0rYrDTpqgUOJ7xLfliihCrrBG+PKT5lTDYZK97/axTXUOBtCFwHo98 Vb4A83YfhRMAgeb5QSxhODNejdqybI4rfrL64htFJr8/tVVvcBQmqnCUIwVD7pK/kvmP UhAg== X-Gm-Message-State: AKS2vOyxl1vFCTeZjHAqg0q7FIU/q8fXRJkZlmldAj6u3uiUMSCUksLP +Qbp/rVUg7c+L5zbmmA= X-Received: by 10.46.92.137 with SMTP id q131mr9131110ljb.124.1499023557774; Sun, 02 Jul 2017 12:25:57 -0700 (PDT) Original-Received: from mars (edu220107.eduroam.gu.se. [130.241.220.107]) by smtp.gmail.com with ESMTPSA id d203sm3051175lfg.59.2017.07.02.12.25.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 02 Jul 2017 12:25:56 -0700 (PDT) In-reply-to: <87wp7qk5ye.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:134102 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit On Sun 02 Jul 2017 at 19:13, npostavs@users.sourceforge.net wrote: > Alex Branham writes: > >>> You missed the double spacing before the "Else,". >> >> D'oh! Fixed this time, sorry! > > Oh, the funny indentation came back, do you have some Emacs setting > that's doing that? Ugh. Fixed. I think it has to do with how I'm copy/pasting from my own init file. >> Ok, now I don't use "r" and just get the region directly. I think that'll do the trick? > > Oh yeah, that works. We should try not to add compiler warnings though: > > ELC net/eww.elc > > In toplevel form: > ../../emacs-master/lisp/net/eww.el:315:1:Warning: Unused lexical argument > ‘end’ > ../../emacs-master/lisp/net/eww.el:315:1:Warning: Unused lexical argument > ‘beg’ > > I think we can just drop the arguments as well, lisp programs can always > do (eww (buffer-substring BEG END)) instead. Dropped. > Do you think the prompt string should be a bit more detailed? "Query" > seems a bit vague (e.g., consider if you hit M-s M-w by accident). > Maybe we should just do (call-interactively 'eww) and then we'll get the > prompt from there. Yes, that's much better. Done, thanks. --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0007-Make-eww-search-words-prompt-for-query-if-nothing-se.patch >From 71e4329943541325f59a224b494e5ca82f07fdef Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Sun, 2 Jul 2017 21:18:47 +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 | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index fe31657914..2fc36e180e 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -312,11 +312,19 @@ word(s) will be searched for via `eww-search-prefix'." (expand-file-name file)))) ;;;###autoload -(defun eww-search-words (&optional beg end) +(defun eww-search-words () "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) + (call-interactively 'eww))) + (call-interactively 'eww))) (defun eww-open-in-new-buffer () "Fetch link at point in a new EWW buffer." -- 2.13.2 --=-=-=--