 (define-key evernote-mode-map "\C-cer"   'evernote-rename-note)
 (define-key evernote-mode-map "\C-ced"   'evernote-delete-note)
 
-(defvar evernote-read-note-name-map
+(defvar evernote-minibuffer-read-note-name-map
   (copy-keymap minibuffer-local-completion-map))
 
-(define-key evernote-read-note-name-map [tab] 'evernote-note-completion)
-(define-key evernote-read-note-name-map "\C-i" 'evernote-note-completion)
+(define-key evernote-minibuffer-read-note-name-map [tab] 'evernote-minibuffer-note-completion)
+(define-key evernote-minibuffer-read-note-name-map "\C-i" 'evernote-minibuffer-note-completion)
+(define-key evernote-minibuffer-read-note-name-map "\C-m" 'evernote-minibuffer-note-input-finish)
+
+
+(defvar evernote-search-mode-map (copy-keymap global-map)
+  "Keymap used in evernote search mode.")
+(define-key evernote-search-mode-map "\C-m" 'evernote-select-note-in-search-mode)
+
+(defvar evernote-search-mode-displayed-name-and-name-map nil
+  "Formatted name list variable used only in evernote-search-mode buffer")
+(make-variable-buffer-local 'evernote-search-mode-displayed-name-and-name-map)
 
 
 ;;(defvar evernote-browsing-mode-map (copy-keymap global-map)

    (save-excursion (insert " " msg))
    (sit-for 1)
    (delete-region (point) (point-max))))


;;

         (lambda ()
           (evernote-open-note-common
            (evernote-command-get-note-list-from-tags
             (evernote-completing-read-multiple
              "Tags used for search (comma separated form. default search all tags):"
              (evernote-get-tag-cands (evernote-command-get-tag-list))
              nil t))))))
    (evernote-command-with-auth open-note-func)))


