aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Carl Worth <cworth@cworth.org>2010-10-22 17:41:40 -0700
committerGravatar Carl Worth <cworth@cworth.org>2010-10-22 17:41:40 -0700
commit4606ea60a76c11a97e913f87b97d76e64b4bcf0c (patch)
tree229008b890d4129a2a94fa41b078d9106adfcecb
parent4c998189b73077aa4a03aca77f1de38ccf6e4ca3 (diff)
emacs: Fix quoting of Message-Id to fix test case of Id containing ".."
If Xapian sees unquoted ".." as in id:123..456 then it thinks that's a range specification. We avoid this problem by instead passing id:"123..456" to Xapian.
-rw-r--r--emacs/notmuch-show.el2
-rwxr-xr-xtest/emacs5
2 files changed, 3 insertions, 4 deletions
diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 98d25ef4..3fc3787c 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -726,7 +726,7 @@ All currently available key bindings:
(defun notmuch-show-get-message-id ()
"Return the message id of the current message."
- (concat "id:" (notmuch-show-get-prop :id)))
+ (concat "id:\"" (notmuch-show-get-prop :id) "\""))
;; dme: Would it make sense to use a macro for many of these?
diff --git a/test/emacs b/test/emacs
index ee25f9b5..38effd0e 100755
--- a/test/emacs
+++ b/test/emacs
@@ -50,11 +50,10 @@ test_emacs '(notmuch-show "thread:0000000000000001") (notmuch-show-remove-tag "t
output=$(notmuch search thread:0000000000000001)
test_expect_equal "$output" "thread:0000000000000001 2009-11-18 [4/4] Jjgod Jiang, Alexander Botero-Lowry; [notmuch] Mac OS X/Darwin compatibility issues (inbox unread)"
-test_begin_subtest "Message with .. in Message-Id
- [XXX:Tag manipulation from show view doesn't work with .. in Message-Id]"
+test_begin_subtest "Message with .. in Message-Id:"
add_message [id]=123..456@example '[subject]="Message with .. in Message-Id"'
test_emacs '(notmuch-search "id:\"123..456@example\"") (notmuch-test-wait) (notmuch-search-add-tag "search-add") (notmuch-search-add-tag "search-remove") (notmuch-search-remove-tag "search-remove") (notmuch-show "id:\"123..456@example\"") (notmuch-test-wait) (notmuch-show-add-tag "show-add") (notmuch-show-add-tag "show-remove") (notmuch-show-remove-tag "show-remove")'
output=$(notmuch search 'id:"123..456@example"' | notmuch_search_sanitize)
-test_expect_equal_failure "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Message with .. in Message-Id (inbox search-add show-add)"
+test_expect_equal "$output" "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Message with .. in Message-Id (inbox search-add show-add)"
test_done