X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=emacs%2Fnotmuch-lib.el;h=abcbfa1f99b8b0f3b0e9e9bb2f409a314d39dd94;hb=d064bd696ccc443a7ece9cfc8816999c69943223;hp=3b26aca83f771a9b94add3ff601e50f6dbba7123;hpb=f8e372ebeccff4e2cba323d75ac1278cb22828b9;p=notmuch

diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el
index 3b26aca8..abcbfa1f 100644
--- a/emacs/notmuch-lib.el
+++ b/emacs/notmuch-lib.el
@@ -28,11 +28,6 @@
   "Notmuch mail reader for Emacs."
   :group 'mail)
 
-(defcustom notmuch-folders '(("inbox" . "tag:inbox") ("unread" . "tag:unread"))
-  "List of searches for the notmuch folder view"
-  :type '(alist :key-type (string) :value-type (string))
-  :group 'notmuch)
-
 (defcustom notmuch-search-oldest-first t
   "Show the oldest mail first when searching."
   :type 'boolean
@@ -40,7 +35,26 @@
 
 ;;
 
-(declare-function notmuch-poll ())
+(defcustom notmuch-saved-searches nil
+  "A list of saved searches to display."
+  :type '(alist :key-type string :value-type string)
+  :group 'notmuch)
+
+(defvar notmuch-folders nil
+  "Deprecated name for what is now known as `notmuch-saved-searches'.")
+
+(defun notmuch-saved-searches ()
+  "Common function for querying the notmuch-saved-searches variable.
+
+We do this as a function to support the old name of the
+variable (`notmuch-folders') as well as for the default value if
+the user hasn't set this variable with the old or new value."
+  (if notmuch-saved-searches
+      notmuch-saved-searches
+    (if notmuch-folders
+	notmuch-folders
+      '(("inbox" . "tag:inbox")
+	("unread" . "tag:unread")))))
 
 (defun notmuch-version ()
   "Return a string with the notmuch version number."
@@ -54,6 +68,25 @@
 	(match-string 2 long-string)
       "unknown")))
 
+(defun notmuch-config-get (item)
+  "Return a value from the notmuch configuration."
+  ;; Trim off the trailing newline
+  (substring (shell-command-to-string
+	      (concat notmuch-command " config get " item))
+	      0 -1))
+
+(defun notmuch-database-path ()
+  "Return the database.path value from the notmuch configuration."
+  (notmuch-config-get "database.path"))
+
+(defun notmuch-user-name ()
+  "Return the user.name value from the notmuch configuration."
+  (notmuch-config-get "user.name"))
+
+(defun notmuch-user-primary-email ()
+  "Return the user.primary_email value from the notmuch configuration."
+  (notmuch-config-get "user.primary_email"))
+
 ;;
 
 ;; XXX: This should be a generic function in emacs somewhere, not