diff --git a/README.md b/README.md index 36ece64..454e529 100644 --- a/README.md +++ b/README.md @@ -128,7 +128,7 @@ Packages listed as **Core** are mandatory for EAF to work, whereas other package | Airshare | `M-x eaf-open-airshare` | | RSS Reader | `M-x eaf-open-rss-reader` | | Mindmap | `M-x eaf-create-mindmap` or `M-x eaf-open-mindmap` | -| Doc Viewer | `M-x eaf-open-doc` | +| Doc Viewer | `M-x eaf-open-office` | | Demo | `M-x eaf-open-demo` to verify basic functionality | - To open the file under the cursor in `dired` using appropriate EAF Application, use `eaf-open-this-from-dired` instead. diff --git a/README.zh-CN.md b/README.zh-CN.md index b9d3599..75cf2c4 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -126,7 +126,7 @@ echo 'export LANG=zh_CN.UTF-8' >> ~/.bashrc | 无线分享 | `M-x eaf-open-airshare` 输入要分享给手机的字符串 | | RSS新闻阅读器 | `M-x eaf-open-rss-reader` | | 思维导图 | `M-x eaf-create-mindmap` or `M-x eaf-open-mindmap` | -| 办公文档阅读器 | `M-x eaf-open-doc` | +| 办公文档阅读器 | `M-x eaf-open-office` | | 演示程序 | `M-x eaf-open-demo` | - 在`dired`文件管理器中,建议绑定按键到命令 `eaf-open-this-from-dired` ,它会自动用合适的EAF应用来打开文件。 diff --git a/eaf.el b/eaf.el index 9be0e15..41c7b9b 100644 --- a/eaf.el +++ b/eaf.el @@ -506,9 +506,9 @@ Try not to modify this alist directly. Use `eaf-setq' to modify instead." "The extension list of mindmap application." :type 'cons) -(defcustom eaf-doc-extension-list - '("docx" "doc") - "The extension list of doc application." +(defcustom eaf-office-extension-list + '("docx" "doc" "ppt" "pptx" "xlsx") + "The extension list of office application." :type 'cons) (defcustom eaf-mua-get-html @@ -1422,8 +1422,8 @@ Other files will open normally with `dired-find-file' or `dired-find-alternate-f (interactive) (dolist (file (dired-get-marked-files)) (cond - ((member (eaf-get-file-name-extension file) eaf-doc-extension-list) - (eaf-open-doc file)) + ((member (eaf-get-file-name-extension file) eaf-office-extension-list) + (eaf-open-office file)) ((eaf--get-app-for-extension (eaf-get-file-name-extension file)) (eaf-open file)) @@ -1586,20 +1586,20 @@ Make sure that your smartphone is connected to the same WiFi network as this com (interactive "fOpen EAF Mind Map: ") (eaf-open file "mindmap")) -(defun eaf-open-doc (file) - (interactive "fOpen doc: ") +(defun eaf-open-office (file) + (interactive "fOpen office file: ") (if (executable-find "libreoffice") (progn (message "Converting %s to PDF format, EAF will start after convert finish." file) (make-process :name "" - :buffer " *eaf-open-doc*" + :buffer " *eaf-open-office*" :command (list "libreoffice" "--headless" "--convert-to" "pdf" (file-truename file) "--outdir" "/tmp") :sentinel (lambda (process event) (when (string= (substring event 0 -1) "finished") (eaf-open (format "%s/%s.pdf" "/tmp" (file-name-base file)) "pdf-viewer" "temp_pdf_file") )))) - (message "Please install libreoffice to convert doc to pdf."))) + (message "Please install libreoffice to convert office file to pdf."))) (dbus-register-signal :session "com.lazycat.eaf" "/com/lazycat/eaf"