From d20872d576482d15d632e06c79696b68c45c46fe Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@lico.nl>
Date: Fri, 29 May 2015 14:49:52 +0200
Subject: [PATCH] Fix feedback from #690

---
 misc/userscripts/qutebrowser_viewsource | 2 +-
 qutebrowser/app.py                      | 2 +-
 qutebrowser/misc/editor.py              | 4 ++--
 qutebrowser/utils/urlutils.py           | 2 ++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/misc/userscripts/qutebrowser_viewsource b/misc/userscripts/qutebrowser_viewsource
index 0985297d7..a1e40c67d 100755
--- a/misc/userscripts/qutebrowser_viewsource
+++ b/misc/userscripts/qutebrowser_viewsource
@@ -27,6 +27,6 @@
 path=/tmp/qutebrowser_$(mktemp XXXXXXXX).html
 
 curl "$QUTE_URL" > $path
-urxvt -e vim "$path"
+xterm -e vim "$path"
 
 rm "$path"
diff --git a/qutebrowser/app.py b/qutebrowser/app.py
index 64c277c9f..9b0ab3ba0 100644
--- a/qutebrowser/app.py
+++ b/qutebrowser/app.py
@@ -70,7 +70,7 @@ def run(args):
         sys.exit(usertypes.Exit.ok)
 
     if args.temp_basedir:
-        args.basedir = tempfile.mkdtemp()
+        args.basedir = tempfile.mkdtemp(prefix='qutebrowser-prefix-')
 
     quitter = Quitter(args)
     objreg.register('quitter', quitter)
diff --git a/qutebrowser/misc/editor.py b/qutebrowser/misc/editor.py
index fc27b922c..32e4100ca 100644
--- a/qutebrowser/misc/editor.py
+++ b/qutebrowser/misc/editor.py
@@ -122,8 +122,8 @@ class ExternalEditor(QObject):
             raise ValueError("Already editing a file!")
         self._text = text
         try:
-            self._oshandle, self._filename = tempfile.mkstemp(text=True,
-                    prefix='qutebrowser_editor_')
+            self._oshandle, self._filename = tempfile.mkstemp(
+                text=True, prefix='qutebrowser-editor-')
             if text:
                 encoding = config.get('general', 'editor-encoding')
                 with open(self._filename, 'w', encoding=encoding) as f:
diff --git a/qutebrowser/utils/urlutils.py b/qutebrowser/utils/urlutils.py
index 143e7cfc5..22b84cf2b 100644
--- a/qutebrowser/utils/urlutils.py
+++ b/qutebrowser/utils/urlutils.py
@@ -166,6 +166,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True):
         path = None
 
     stripped = urlstr.strip()
+
     if path is not None and os.path.exists(path):
         log.url.debug("URL is a local file")
         url = QUrl.fromLocalFile(path)
@@ -181,6 +182,7 @@ def fuzzy_url(urlstr, cwd=None, relative=False, do_search=True):
             url = qurl_from_user_input(stripped)
     log.url.debug("Converting fuzzy term {} to URL -> {}".format(
                   urlstr, url.toDisplayString()))
+
     if do_search and config.get('general', 'auto-search'):
         qtutils.ensure_valid(url)
     else: