From 0132bea42bb023139b773c331115ac00ad93f081 Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Thu, 4 Jun 2015 12:20:43 +0200
Subject: [PATCH 1/2] Add --domain to yank to yank only the domain

... As I want to copy only the domain fairly frequently.

I also changed the message in the statusline to show the actual text being
copied, which I find helpful. But if you disagree, then just undo it (it's not
that important or anything).
---
 doc/help/commands.asciidoc       |  3 ++-
 qutebrowser/browser/commands.py  | 13 ++++++++++---
 qutebrowser/config/configdata.py |  2 ++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index 6cc2ee9db..e3dd81e62 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -642,13 +642,14 @@ Save open pages and quit.
 
 [[yank]]
 === yank
-Syntax: +:yank [*--title*] [*--sel*]+
+Syntax: +:yank [*--title*] [*--sel*] [*--domain*]+
 
 Yank the current URL/title to the clipboard or primary selection.
 
 ==== optional arguments
 * +*-t*+, +*--title*+: Yank the title instead of the URL.
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
+* +*-d*+, +*--domain*+: Yank only the scheme & domain.
 
 [[zoom]]
 === zoom
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 6585abed6..9cb2a9991 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -696,19 +696,26 @@ class CommandDispatcher:
         frame.scroll(dx, dy)
 
     @cmdutils.register(instance='command-dispatcher', scope='window')
-    def yank(self, title=False, sel=False):
+    def yank(self, title=False, sel=False, domain=False):
         """Yank the current URL/title to the clipboard or primary selection.
 
         Args:
             sel: Use the primary selection instead of the clipboard.
             title: Yank the title instead of the URL.
+            domain: Yank only the scheme & domain.
         """
         clipboard = QApplication.clipboard()
         if title:
             s = self._tabbed_browser.page_title(self._current_index())
+            what = 'title'
+        elif domain:
+            s = '{}://{}'.format(self._current_url().scheme(),
+                                 self._current_url().host())
+            what = 'domain'
         else:
             s = self._current_url().toString(
                 QUrl.FullyEncoded | QUrl.RemovePassword)
+            what = 'URL'
         if sel and clipboard.supportsSelection():
             mode = QClipboard.Selection
             target = "primary selection"
@@ -717,8 +724,8 @@ class CommandDispatcher:
             target = "clipboard"
         log.misc.debug("Yanking to {}: '{}'".format(target, s))
         clipboard.setText(s, mode)
-        what = 'Title' if title else 'URL'
-        message.info(self._win_id, "{} yanked to {}".format(what, target))
+        message.info(self._win_id, "Yanked {} to {}: {}".format(
+                     what, target, s))
 
     @cmdutils.register(instance='command-dispatcher', scope='window',
                        count='count')
diff --git a/qutebrowser/config/configdata.py b/qutebrowser/config/configdata.py
index a3bbe2d48..ad269d212 100644
--- a/qutebrowser/config/configdata.py
+++ b/qutebrowser/config/configdata.py
@@ -1204,6 +1204,8 @@ KEY_DATA = collections.OrderedDict([
         ('yank -s', ['yY']),
         ('yank -t', ['yt']),
         ('yank -ts', ['yT']),
+        ('yank -d', ['yd']),
+        ('yank -ds', ['yD']),
         ('paste', ['pp']),
         ('paste -s', ['pP']),
         ('paste -t', ['Pp']),

From d60d4d756ce4e5cb45908d9940372e771d0b37dd Mon Sep 17 00:00:00 2001
From: Martin Tournoij <martin@arp242.net>
Date: Thu, 4 Jun 2015 13:20:39 +0200
Subject: [PATCH 2/2] Also yank port number

---
 doc/help/commands.asciidoc      | 2 +-
 qutebrowser/browser/commands.py | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/doc/help/commands.asciidoc b/doc/help/commands.asciidoc
index e3dd81e62..104478c10 100644
--- a/doc/help/commands.asciidoc
+++ b/doc/help/commands.asciidoc
@@ -649,7 +649,7 @@ Yank the current URL/title to the clipboard or primary selection.
 ==== optional arguments
 * +*-t*+, +*--title*+: Yank the title instead of the URL.
 * +*-s*+, +*--sel*+: Use the primary selection instead of the clipboard.
-* +*-d*+, +*--domain*+: Yank only the scheme & domain.
+* +*-d*+, +*--domain*+: Yank only the scheme, domain, and port number.
 
 [[zoom]]
 === zoom
diff --git a/qutebrowser/browser/commands.py b/qutebrowser/browser/commands.py
index 9cb2a9991..9bfe81a10 100644
--- a/qutebrowser/browser/commands.py
+++ b/qutebrowser/browser/commands.py
@@ -702,15 +702,17 @@ class CommandDispatcher:
         Args:
             sel: Use the primary selection instead of the clipboard.
             title: Yank the title instead of the URL.
-            domain: Yank only the scheme & domain.
+            domain: Yank only the scheme, domain, and port number.
         """
         clipboard = QApplication.clipboard()
         if title:
             s = self._tabbed_browser.page_title(self._current_index())
             what = 'title'
         elif domain:
-            s = '{}://{}'.format(self._current_url().scheme(),
-                                 self._current_url().host())
+            port = self._current_url().port()
+            s = '{}://{}{}'.format(self._current_url().scheme(),
+                                   self._current_url().host(),
+                                   ':' + str(port) if port > -1 else '')
             what = 'domain'
         else:
             s = self._current_url().toString(