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: Tue, 13 Jun 2017 11:24:25 +0200 Message-ID: <8737b4grzq.fsf@utexas.edu> References: <8760g1xxhw.fsf@utexas.edu> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Trace: blaine.gmane.org 1497345925 640 195.159.176.226 (13 Jun 2017 09:25:25 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 13 Jun 2017 09:25:25 +0000 (UTC) User-Agent: mu4e 0.9.18; emacs 25.2.1 To: 27341@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 13 11:25:16 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 1dKi4Z-00083a-30 for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Jun 2017 11:25:15 +0200 Original-Received: from localhost ([::1]:41958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKi4e-0000mT-Bo for geb-bug-gnu-emacs@m.gmane.org; Tue, 13 Jun 2017 05:25:20 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50100) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dKi4R-0000d8-80 for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2017 05:25:13 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dKi4M-0002Fe-9s for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2017 05:25:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41680) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dKi4M-0002FY-3o for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2017 05:25:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1dKi4L-0006lB-QV for bug-gnu-emacs@gnu.org; Tue, 13 Jun 2017 05:25:01 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: <8760g1xxhw.fsf@utexas.edu> Resent-From: Alex Branham Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 13 Jun 2017 09:25:01 +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.149734588325956 (code B ref 27341); Tue, 13 Jun 2017 09:25:01 +0000 Original-Received: (at 27341) by debbugs.gnu.org; 13 Jun 2017 09:24:43 +0000 Original-Received: from localhost ([127.0.0.1]:44357 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKi3z-0006kW-Oq for submit@debbugs.gnu.org; Tue, 13 Jun 2017 05:24:43 -0400 Original-Received: from mail-lf0-f50.google.com ([209.85.215.50]:36295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKi3u-0006kG-7V for 27341@debbugs.gnu.org; Tue, 13 Jun 2017 05:24:38 -0400 Original-Received: by mail-lf0-f50.google.com with SMTP id o83so65692734lff.3 for <27341@debbugs.gnu.org>; Tue, 13 Jun 2017 02:24:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=utexas-edu.20150623.gappssmtp.com; s=20150623; h=user-agent:from:to:subject:date:message-id:mime-version; bh=8IX2E6izvISK8VJrcYxu6bgdwKqp5roexEaEDiNTvs0=; b=bhG4LVJVnCKd5KdB16lR1hJC4jJWVbctbYL+cH9i4nB843CXZe6S+Nd5wL03xD3RFj TI/HstVvnFZEV/j6bXtWmtusw6ciyDWb/uWxA58SxSFfRHR1VrG0jMRGxb3od2TQPrBc xecOPHXWNhBIzI7uQVEB/1f8iDrzuZChOm1D95NVc4bO5FF7DPftMD7iVXSuqqg6aOKs oF6gTB3gAEeiR/hsJ40YsPcbjE80rY2nsHmnroYstLQvN+MaRUTS0L18pt0ektXSd4gQ YOodAAKvR8Sdwl+iWCtL3ioGSdZpfeEzvK9b655KfaOYonDnkldStXTQBhg4tX0VVcXR 57jA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:user-agent:from:to:subject:date:message-id :mime-version; bh=8IX2E6izvISK8VJrcYxu6bgdwKqp5roexEaEDiNTvs0=; b=H+UHqeU0pTkRZ9IuhHR+y9NkPov+K3TWXmd4BImCPoXySzneIkUIHCmFEvzbT30JFt MRTPQLmce4LzZpQJlvSNiI0FGcIPXSgEOZJvZvwfs8wecD2nZ92LlqyjLQ0TDBfba2qn ApAuEShqydtqzFGH7dbEmnXpsN4y5YhH85LwoOCnJfML65JZ4c4VSt0rViTbmba9jIHO QTQcv5NtfhewSGh5MnS6i31B+zdbaD8D0KmbEb+kb/EjaUMBLIQ8X/DhuJ1WZetuPXVx 1RMkO8e6k/xpPdUsez+4Av+hfuRD2EsVSo3FCtVr8XdRU+DD1mJpXRPr2rQ/VVadynC7 keSg== X-Gm-Message-State: AKS2vOyZh+oMXOJhgvqzwrbMx96gM4LfRerQ4sVodzU8vSbdPflcfyvc +jmI/OAeoPC86+QFpvE= X-Received: by 10.46.97.18 with SMTP id v18mr1782213ljb.134.1497345867790; Tue, 13 Jun 2017 02:24:27 -0700 (PDT) Original-Received: from mars (edu221103.eduroam.gu.se. [130.241.221.103]) by smtp.gmail.com with ESMTPSA id 184sm3263247ljf.8.2017.06.13.02.24.26 for <27341@debbugs.gnu.org> (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 13 Jun 2017 02:24:26 -0700 (PDT) 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:133551 Archived-At: --=-=-= Content-Type: text/plain Hi - I realized I forgot to update the docstring; this patch incorporates that change as well Alex >From 4545b2fb1d6f047b05cbb1e19a50fb09809d5a31 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 13 Jun 2017 11:21:35 +0200 Subject: [PATCH] eww-search-words prompts user for search if region inactive --- lisp/net/eww.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index fe31657914..aa358dce0f 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -313,10 +313,13 @@ 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. + "If region is active, 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))) + (if (region-active-p) + (eww (buffer-substring beg end)) + (eww (read-string "Query: ")))) (defun eww-open-in-new-buffer () "Fetch link at point in a new EWW buffer." -- 2.13.1 --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0002-eww-search-words-prompt-user-for-search-if-region.patch >From 4545b2fb1d6f047b05cbb1e19a50fb09809d5a31 Mon Sep 17 00:00:00 2001 From: Alex Branham Date: Tue, 13 Jun 2017 11:21:35 +0200 Subject: [PATCH] eww-search-words prompts user for search if region inactive --- lisp/net/eww.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/net/eww.el b/lisp/net/eww.el index fe31657914..aa358dce0f 100644 --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@ -313,10 +313,13 @@ 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. + "If region is active, 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))) + (if (region-active-p) + (eww (buffer-substring beg end)) + (eww (read-string "Query: ")))) (defun eww-open-in-new-buffer () "Fetch link at point in a new EWW buffer." -- 2.13.1 --=-=-=--