[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/pyim-basedict 0d00da0 27/32: Merge patch of Stefan
From: |
Feng Shu |
Subject: |
[elpa] externals/pyim-basedict 0d00da0 27/32: Merge patch of Stefan |
Date: |
Wed, 10 Mar 2021 20:56:23 -0500 (EST) |
branch: externals/pyim-basedict
commit 0d00da0edc2ecd4e0b473b7a6dc437a6b803863d
Author: Feng Shu <tumashu@163.com>
Commit: Feng Shu <tumashu@163.com>
Merge patch of Stefan
---
pyim-basedict.el | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/pyim-basedict.el b/pyim-basedict.el
index 42048a3..f6a8e8e 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -1,4 +1,4 @@
-;;; pyim-basedict.el --- The default pinyin dict of pyim
+;;; pyim-basedict.el --- The default pinyin dict of pyim -*- lexical-binding:
t; -*-
;; * Header
;; Copyright (C) 2015 Feng Shu <tumashu@163.com>
@@ -42,9 +42,8 @@
;; ** 安装和使用
;; 1. 配置melpa源,参考:http://melpa.org/#/getting-started
;; 2. M-x package-install RET pyim-basedict RET
-;; 3. 在emacs配置文件中(比如: ~/.emacs)添加如下代码:
+;; 3. 在Emacs配置文件中(比如: ~/.emacs)添加如下代码:
;; #+BEGIN_EXAMPLE
-;; (require 'pyim-basedict)
;; (pyim-basedict-enable)
;; #+END_EXAMPLE
@@ -73,17 +72,23 @@
(defun pyim-basedict-enable ()
"Add basedict to pyim."
(interactive)
- (let* ((file (concat (file-name-directory
- (locate-library "pyim-basedict.el"))
- "pyim-basedict.pyim")))
+ (let* ((file (expand-file-name "pyim-basedict.pyim"
+ (file-name-directory
+ (locate-library "pyim-basedict.el")))))
(when (file-exists-p file)
+ ;; FIXME: If `pyim-basedict-enable' is called early enough, pyim
+ ;; won't be loaded yet and this (featurep 'pyim) will return nil.
+ ;; Maybe we should just (require 'pyim) and call
+ ;; `pyim-extra-dicts-add-dict' unconditionally, or maybe we should
+ ;; use `with-eval-after-load'.
(if (featurep 'pyim)
(pyim-extra-dicts-add-dict
- `(:name "Basedict-elpa"
- :file ,file
- :coding utf-8-unix
- :dict-type pinyin-dict
- :elpa t))
+ `(;; Make Indent beautiful :-)
+ :name "Basedict-elpa"
+ :file ,file
+ :coding utf-8-unix
+ :dict-type pinyin-dict
+ :elpa t))
(message "pyim 没有安装,pyim-basedict 启用失败。")))))
- [elpa] externals/pyim-basedict 687a996 06/32: Update, (continued)
- [elpa] externals/pyim-basedict 687a996 06/32: Update, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 3bca276 10/32: Delete useless pyim files, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict c08ec89 14/32: Use pyim-basedict.pyim, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict b2b3e2d 28/32: Add pyim-basedict-libpinyin-tarball-url and use it., Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict f13b6d2 07/32: update README, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict a819eed 01/32: Init commit, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 7a054e6 02/32: Update README, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 45931a0 04/32: Add section: How to contribute, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict e2df78f 03/32: Update README, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict f71d0ff 15/32: Update README, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 0d00da0 27/32: Merge patch of Stefan,
Feng Shu <=
- [elpa] externals/pyim-basedict 958199d 29/32: * pyim-basedict.el (pyim-extra-dicts-add-dict): declare-function., Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict bfb3cbe 30/32: Add libpinyin-*.tar.gz's url., Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 6a86a31 21/32: 回退到最初的版本,以消除合并个人词库带来的多音字污染, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 06a191c 31/32: Update pyim-basedict.el header., Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 7b3bbd1 24/32: remove dups, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 6c1eeb1 26/32: Add pyim-basedict-libpinyin-data-files, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict d499104 20/32: Merge pull request #3 from redguardtoo/master, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 8650be8 19/32: 按照新华字典统计的词频重排单字, 2字词, 3字词, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict e69e734 18/32: Merge pull request #2 from redguardtoo/master, Feng Shu, 2021/03/10
- [elpa] externals/pyim-basedict 5c654cd 23/32: v0.4.0, Feng Shu, 2021/03/10