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: Sun, 02 Jul 2017 21:25:56 +0200 [thread overview]
Message-ID: <87shie7i9n.fsf@utexas.edu> (raw)
In-Reply-To: <87wp7qk5ye.fsf@users.sourceforge.net>
[-- Attachment #1: Type: text/plain, Size: 1197 bytes --]
On Sun 02 Jul 2017 at 19:13, npostavs@users.sourceforge.net wrote:
> Alex Branham <branham@utexas.edu> 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.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0007-Make-eww-search-words-prompt-for-query-if-nothing-se.patch --]
[-- Type: text/x-diff, Size: 1617 bytes --]
From 71e4329943541325f59a224b494e5ca82f07fdef Mon Sep 17 00:00:00 2001
From: Alex Branham <branham@utexas.edu>
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
next prev parent reply other threads:[~2017-07-02 19: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
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 [this message]
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87shie7i9n.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 public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).