fix issue #1 and #2

README.md

@@ -1,13 +1,13 @@
 # What's this?
-It's an Emacs extension, with it you can just use one key to save clipboard image to disk file, and at the same time insert the file link(org-mode/markdown-mode) or file path(other mode) to current point.
+It's an Emacs extension, using it you can just use one key to save clipboard image to disk file, and at the same time insert the file link(org-mode/markdown-mode) or file path(other mode) to current point.
 
 ![](./img/pasteex_screenshot_README_20190902191736.png)
 
 ![](./img/pasteex_screenshot_README_20190902191801.png)
 
 ![](./img/pasteex_screenshot_README_20190902191656.png)
 
-Based on the ability of PasteEx, only support Windows platform.
+Based on PasteEx, only support Windows.
 
 # Prerequisite
 - [PasteEx](https://github.com/huiyadanli/PasteEx/releases)
@@ -20,21 +20,32 @@ Put `pasteex-mode.el` to your `load-path`. The `load-path` is usually `~/elisp/`
 (require 'pasteex-mode)
 ```
 
+<<<<<<< HEAD
 # Basic Usage
 - Set `PasteEx.exe` executable file path to environment PATH, or set the variable `pasteex-executable-path` in your config file, like this:
+=======
+# Usage
+- Add `PasteEx.exe` executable to environment PATH, or set the variable `pasteex-executable-path` in your config file, like this:
+>>>>>>> c920b1de315d961787def2a25f72bfe6ba69175a
 
 ```emacs-lisp
 (setq pasteex-executable-path "D:/program/PasteEx/PasteEx.exe")
 ```
 
-- Bind your favority key to function `pasteex-image`, like this:
+- Bind your favorite key to function `pasteex-image`, like this:
 
 ```emacs-lisp
 (global-set-key (kbd "C-x p i") 'pasteex-image)
 ```
 
 - After you make a screenshot to clipboard, or copy a PNG image file to clipboard, then just press `C-x p i` shortcut, and the file link or path will be inserted to your buffer immediately, the screenshot image file is saved to `./img/` directory by default. 
 
+<<<<<<< HEAD
 # Other Tips
 - Only support Windows platform, because PasteEx only support Windows now.
 - That's all, enjoy it ;)
+=======
+# Tips
+- Only support Windows, because PasteEx only support Windows now.
+- That's all, enjoy it :)
+>>>>>>> c920b1de315d961787def2a25f72bfe6ba69175a

auto-commit.bat

@@ -1,3 +1,5 @@
+:: pull latest code
+git pull origin master
 :: input commit message
 set /p commit_msg=Please input commit message:
 :: show git status

pasteex-mode.el

@@ -70,7 +70,7 @@
 ;;; Customize:
 ;;
 ;; `pasteex-executable-path' can customize by:
-;;      M-x customize-group RET pasteex-mode RET
+;;      M-x customize-group RET pasteex RET
 ;;
 
 ;;; Change log: