From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 20 Apr 2015 01:35:42 +0000 (-0400)
Subject: Merge commit '3db1ea76a02993663d40e90c58da989212b9e81a' into gnorb-1.0.1
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/730d2fe311363fadfe3af1b3f1cfbbbec5cf5790

Merge commit '3db1ea76a02993663d40e90c58da989212b9e81a' into gnorb-1.0.1
---

730d2fe311363fadfe3af1b3f1cfbbbec5cf5790
diff --cc packages/gnorb/gnorb-bbdb.el
index 66be7938d,058011cc5..4d32e20bc
--- a/packages/gnorb/gnorb-bbdb.el
+++ b/packages/gnorb/gnorb-bbdb.el
@@@ -395,15 -391,17 +395,15 @@@ both, use \"C-u\" before the \"*\".
  	 (mapconcat
  	  'identity
  	  (delete-dups
 -	   (cl-mapcan
 -	    (lambda (r)
 -	      (bbdb-record-xfield-split r gnorb-bbdb-org-tag-field))
 -	    records))
 -	  "|")))
 +	   (cl-mapcan (lambda (r)
 +		     (bbdb-record-xfield-split r gnorb-bbdb-org-tag-field))
- 		   records)))
- 	  "|")))
++		   records))
++          "|")))
      (if tag-string
  	;; C-u = all headings, not just todos
 -	(if (equal current-prefix-arg '(4))
 -	    (org-tags-view nil tag-string)
 -	  (org-tags-view t tag-string))
 +	(org-tags-view (not (equal current-prefix-arg '(4)))
 +                       tag-string)
-       (error "No org-tags field present")))
+       (error "No org-tags field present"))))
  
  ;;;###autoload
  (defun gnorb-bbdb-mail-search (records)