From 58c9041beb2758e632ba5ae5d0b1cfac20e7ac9d Mon Sep 17 00:00:00 2001
From: Doug Kearns <dougkearns@gmail.com>
Date: Sun, 9 Aug 2009 01:54:30 +1000
Subject: [PATCH] Fill the :bmark command line generated by <a> with any
 existing data.

Fixes #237 (The "a" key should fill command line with existing data on
bookmarked).
---
 common/content/bookmarks.js | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js
index 3a4ae730..e8c5985c 100644
--- a/common/content/bookmarks.js
+++ b/common/content/bookmarks.js
@@ -277,9 +277,26 @@ function Bookmarks() //{{{
         function ()
         {
             let title = "";
-            if (buffer.title != buffer.URL)
-                title = " -title=\"" + buffer.title + "\"";
-            commandline.open(":", "bmark " + buffer.URL + title, modes.EX);
+            let keyword = "";
+            let tags = "";
+
+            let bmark = bookmarks.get(buffer.URL)[0];
+            if (bmark)
+            {
+                title = " -title=\"" + bmark.title + "\"";
+                if (bmark.keyword)
+                    keyword = " -keyword=\"" + bmark.keyword + "\"";
+                if (bmark.tags.length > 0)
+                    tags = " -tags=\"" + bmark.tags.join(", ") + "\"";
+
+            }
+            else
+            {
+                if (buffer.title != buffer.URL)
+                    title = " -title=\"" + buffer.title + "\"";
+            }
+
+            commandline.open(":", "bmark " + buffer.URL + title + keyword + tags, modes.EX);
         });
 
     mappings.add(myModes, ["A"],
@@ -524,6 +541,7 @@ function Bookmarks() //{{{
         },
 
         // if starOnly = true it is saved in the unfiledBookmarksFolder, otherwise in the bookmarksMenuFolder
+        // FIXME: tags are not updated differentially
         add: function add(starOnly, title, url, keyword, tags, force)
         {
             try
@@ -552,7 +570,11 @@ function Bookmarks() //{{{
                 if (keyword)
                     bookmarksService.setKeywordForBookmark(id, keyword);
                 if (tags)
+                {
+                    // TODO: presumably this needs to be done in two Places transactions *double yawn* --djk
+                    //taggingService.untagURI(uri, null);
                     taggingService.tagURI(uri, tags);
+                }
             }
             catch (e)
             {