           note-list)
     (setq evernote-note-cands (nreverse evernote-note-cands)
           evernote-note-display-map (nreverse evernote-note-display-map))
-    (setq evernote-note-completion-prompt "Note:")
-    (cdr (assoc (read-from-minibuffer evernote-note-completion-prompt
-                                      nil evernote-read-note-name-map)
+    (cdr (assoc (read-from-minibuffer "Note:"
+                                      nil evernote-minibuffer-read-note-name-map)
                 evernote-note-cands))))
 
 ;;    (setq evernote-note-cands

;; Evernote mode
;;

(defun evernote-mode ()
  "Toggle Evernote mode, a minor mode for using evernote functions."
  (interactive)

;;                                  (cdr (assoc 'updated attr))
;;                                  (cdr (assoc 'name attr)))))
;;                  note-list))
;;    (setq evernote-minibuffer-note-completion-prompt "Note:")
;;    (cdr (assoc (read-from-minibuffer evernote-minibuffer-note-completion-prompt
;;                                      nil evernote-minibuffer-read-note-name-map)
;;                evernote-note-cands))))


(defun evernote-minibuffer-note-completion ()
  "Complete note name and display completion list"
  (interactive)
  (let (word result start)
    (setq start (+ 1 (minibuffer-prompt-width)))
    (setq word (buffer-substring start (point)))
    (setq result (try-completion word evernote-note-cands)) ;; from here.
    ;(evernote-tmp-message (concat "[" word "]"))
    (cond
     ((eq result t) (evernote-tmp-message "[Sole Completion]"))
     ((eq result nil) (ding) (evernote-tmp-message "[No Match]"))
     ((string= result word)
      (let (displayed-name-and-name-map completion-buf)
        (setq displayed-name-and-name-map
              (mapcar (lambda (name)
                        (cons
                         (cdr (assoc name evernote-note-display-map))
                         name))
                      (all-completions word evernote-note-display-map)))
        (setq completion-buf (get-buffer-create "*Evernote-Completions*"))
        (save-excursion
          (set-buffer completion-buf)
          (evernote-display-completion-list displayed-name-and-name-map)
          (setq evernote-search-mode-displayed-name-and-name-map displayed-name-and-name-map)
          (evernote-search-mode))
        (display-buffer completion-buf)))
     (t (delete-region start (point))
        (insert result)
        (if (eq t (try-completion result evernote-note-cands))
            nil
          (evernote-tmp-message "[Complete, but not unique]"))))))


(defun evernote-minibuffer-note-input-finish ()
  "Finish input note name"
  (interactive)
  (if (assoc
       (buffer-substring
        (progn
          (goto-char (+ 1 (minibuffer-prompt-width)))
          (point))
        (progn
          (end-of-line)
          (point)))
       evernote-note-cands)
      (exit-minibuffer)
    (evernote-tmp-message "[No Match]")))


(defun evernote-tmp-message (msg)
