From: Alex Branham <branham@utexas.edu>
To: npostavs@users.sourceforge.net
Cc: 27341@debbugs.gnu.org
Subject: bug#27341: updated patch to fix docstring
Date: Fri, 30 Jun 2017 08:25:58 +0200 [thread overview]
Message-ID: <87bmp63sax.fsf@utexas.edu> (raw)
In-Reply-To: <874luymh1x.fsf@users.sourceforge.net>
[-- Attachment #1: Type: text/plain, Size: 1179 bytes --]
On Fri 30 Jun 2017 at 00:54, npostavs@users.sourceforge.net wrote:
> Could you add a ChangeLog entry to the commit message as described in
> CONTRIBUTE, please?
Yes, I have done so. Let me know if it's not right.
>
>> (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."
>
> Doc strings shouldn't be indented like that, and there should be a
> double space between sentences.
Fixed.
>
>> (interactive "r")
>> - (eww (buffer-substring beg end)))
>> + (if (use-region-p)
>> + (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: "))))
>
> This silently does nothing if the region is active but just blanks, did
> you mean to fallback to querying in that case?
Fixed, thanks
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-Make-eww-search-words-prompt-for-query-if-nothing-se.patch --]
[-- Type: text/x-diff, Size: 1513 bytes --]
From 1d036b16903dd18268c499c4617d430172b08ffe Mon Sep 17 00:00:00 2001
From: Alex Branham <branham@utexas.edu>
Date: Fri, 30 Jun 2017 08:16:13 +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 | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index fe31657914..757e738a18 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."
+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)))
+ (if (use-region-p)
+ (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: "))))
+ (eww (read-string "Query: "))))
(defun eww-open-in-new-buffer ()
"Fetch link at point in a new EWW buffer."
--
2.13.2
next prev parent reply other threads:[~2017-06-30 6:25 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-12 11:21 bug#27341: eww-search-words should prompt if region inactive Alex Branham
2017-06-13 9:24 ` bug#27341: updated patch to fix docstring Alex Branham
2017-06-25 14:29 ` npostavs
2017-06-26 14:00 ` Alex Branham
2017-06-26 23:50 ` npostavs
2017-06-27 5:32 ` Alex Branham
2017-06-27 13:23 ` Alex Branham
2017-06-30 0:54 ` npostavs
2017-06-30 6:25 ` Alex Branham [this message]
2017-07-02 18:32 ` npostavs
2017-07-02 18:45 ` Alex Branham
2017-07-02 19:13 ` npostavs
2017-07-02 19:25 ` Alex Branham
2017-07-02 20:23 ` npostavs
2017-06-27 14:40 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87bmp63sax.fsf@utexas.edu \
--to=branham@utexas.edu \
--cc=27341@debbugs.gnu.org \
--cc=npostavs@users.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.