[elpa] externals/ivy 3595d5a: Bump version to point release 0.13.4

[Basil L. Contovounesios]

branch: externals/ivy
commit 3595d5a24efb86e4484ad64a760555f14c4e8efc
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Bump version to point release 0.13.4

The last version bump was introduced in elpa.git via a git-merge,
which isn't supported by its version change detection scripts.  This
version bump is introduced without any merges, to finally bring the
packages on elpa.gnu.org up to speed.  See the following discussion:
https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html
https://lists.gnu.org/r/emacs-devel/2021-03/msg00490.html

* ivy.el:
* doc/ivy.org: Bump version to point release 0.13.4.
* doc/ivy.texi: Regenerate.
---
 doc/ivy.org  | 2 +-
 doc/ivy.texi | 2 +-
 ivy.el   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/ivy.org b/doc/ivy.org
index d37ba36..dd67060 100644
--- a/doc/ivy.org
+++ b/doc/ivy.org
@@ -58,7 +58,7 @@ ivy-ox.el then ~C-c C-e i t~ in the ivy.org buffer.
 :CUSTOM_ID: copying
 :END:
 #+TEXINFO: @ifnottex
-Ivy manual, version 0.13.3
+Ivy manual, version 0.13.4
 
 Ivy is an interactive interface for completion in Emacs. Emacs uses
 completion mechanism in a variety of contexts: code, menus, commands,
diff --git a/doc/ivy.texi b/doc/ivy.texi
index fa1d21c..815fac2 100644
--- a/doc/ivy.texi
+++ b/doc/ivy.texi
@@ -8,7 +8,7 @@
 
 @copying
 @ifnottex
-Ivy manual, version 0.13.3
+Ivy manual, version 0.13.4
 
 Ivy is an interactive interface for completion in Emacs. Emacs uses
 completion mechanism in a variety of contexts: code, menus, commands,
diff --git a/ivy.el b/ivy.el
index 36188e1..48ffa66 100644
--- a/ivy.el
+++ b/ivy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
+;; Version: 0.13.4
 ;; Package-Requires: ((emacs "24.5"))
 ;; Keywords: matching
 

[elpa] externals/ivy-avy 0116a92: Bump version to point release 0.13.4

[Basil L. Contovounesios]

branch: externals/ivy-avy
commit 0116a92fb7e4f017830a0a39baacf1eed4a64178
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Bump version to point release 0.13.4

The last version bump was introduced in elpa.git via a git-merge,
which isn't supported by its version change detection scripts.  This
version bump is introduced without any merges, to finally bring the
packages on elpa.gnu.org up to speed.  See the following discussion:
https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html
https://lists.gnu.org/r/emacs-devel/2021-03/msg00490.html

* ivy-avy.el: Bump version to point release 0.13.4.
---
 ivy-avy.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ivy-avy.el b/ivy-avy.el
index 282d9bc..e4c97b4 100644
--- a/ivy-avy.el
+++ b/ivy-avy.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3") (avy "0.5.0"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4") (avy "0.5.0"))
 ;; Keywords: convenience
 
 ;; This program is free software; you can redistribute it and/or modify

[elpa] externals/ivy-hydra 4c415df: Bump version to point release 0.13.4

[Basil L. Contovounesios]

branch: externals/ivy-hydra
commit 4c415df348df063686b049ab6f92ad94fb8fd524
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Bump version to point release 0.13.4

The last version bump was introduced in elpa.git via a git-merge,
which isn't supported by its version change detection scripts.  This
version bump is introduced without any merges, to finally bring the
packages on elpa.gnu.org up to speed.  See the following discussion:
https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html
https://lists.gnu.org/r/emacs-devel/2021-03/msg00490.html

* ivy-hydra.el: Bump version to point release 0.13.4.
---
 ivy-hydra.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ivy-hydra.el b/ivy-hydra.el
index 30b2c17..8f7b34b 100644
--- a/ivy-hydra.el
+++ b/ivy-hydra.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3") (hydra "0.15.0"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4") (hydra "0.15.0"))
 ;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.

[elpa] externals/swiper 3fb29c7: Bump version to point release 0.13.4

[Basil L. Contovounesios]

branch: externals/swiper
commit 3fb29c78619d89748234b47db493d1a33d7c1858
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Bump version to point release 0.13.4

The last version bump was introduced in elpa.git via a git-merge,
which isn't supported by its version change detection scripts.  This
version bump is introduced without any merges, to finally bring the
packages on elpa.gnu.org up to speed.  See the following discussion:
https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html
https://lists.gnu.org/r/emacs-devel/2021-03/msg00490.html

* swiper.el: Bump version to point release 0.13.4.
---
 swiper.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swiper.el b/swiper.el
index afbc365..39f6bfc 100644
--- a/swiper.el
+++ b/swiper.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4"))
 ;; Keywords: matching
 
 ;; This file is part of GNU Emacs.

[elpa] externals/counsel e5e3110: Bump version to point release 0.13.4

[Basil L. Contovounesios]

branch: externals/counsel
commit e5e31103627c8dfea04a8ee49e2fc480c524363c
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Bump version to point release 0.13.4

The last version bump was introduced in elpa.git via a git-merge,
which isn't supported by its version change detection scripts.  This
version bump is introduced without any merges, to finally bring the
packages on elpa.gnu.org up to speed.  See the following discussion:
https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html
https://lists.gnu.org/r/emacs-devel/2021-03/msg00490.html

* counsel.el: Bump version to point release 0.13.4.
---
 counsel.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/counsel.el b/counsel.el
index 42beae4..68246ef 100644
--- a/counsel.el
+++ b/counsel.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3") (swiper "0.13.3"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4") (swiper "0.13.4"))
 ;; Keywords: convenience, matching, tools
 
 ;; This file is part of GNU Emacs.

[elpa] externals/counsel 8cf3f18 1/3: Bump version to point release 0.13.4

[Basil L. Contovounesios]

branch: externals/counsel
commit 8cf3f1821cbd1c266296bbd5e59582ae6b8b90a6
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Bump version to point release 0.13.4

The last version bump was introduced in elpa.git via a git-merge,
which isn't supported by its version change detection scripts.  This
version bump is introduced without any merges, to finally bring the
packages on elpa.gnu.org up to speed.  See the following discussion:
https://lists.gnu.org/r/emacs-devel/2021-02/msg01935.html
https://lists.gnu.org/r/emacs-devel/2021-03/msg00490.html

* counsel.el:
* ivy-avy.el:
* ivy-hydra.el:
* ivy.el:
* swiper.el:
* doc/ivy.org: Bump version to point release 0.13.4.
* doc/ivy.texi: Regenerate.
---
 counsel.el   | 4 ++--
 doc/ivy.org  | 2 +-
 doc/ivy.texi | 2 +-
 ivy-avy.el   | 4 ++--
 ivy-hydra.el | 4 ++--
 ivy.el   | 2 +-
 swiper.el| 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/counsel.el b/counsel.el
index 42beae4..68246ef 100644
--- a/counsel.el
+++ b/counsel.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3") (swiper "0.13.3"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4") (swiper "0.13.4"))
 ;; Keywords: convenience, matching, tools
 
 ;; This file is part of GNU Emacs.
diff --git a/doc/ivy.org b/doc/ivy.org
index d37ba36..dd67060 100644
--- a/doc/ivy.org
+++ b/doc/ivy.org
@@ -58,7 +58,7 @@ ivy-ox.el then ~C-c C-e i t~ in the ivy.org buffer.
 :CUSTOM_ID: copying
 :END:
 #+TEXINFO: @ifnottex
-Ivy manual, version 0.13.3
+Ivy manual, version 0.13.4
 
 Ivy is an interactive interface for completion in Emacs. Emacs uses
 completion mechanism in a variety of contexts: code, menus, commands,
diff --git a/doc/ivy.texi b/doc/ivy.texi
index fa1d21c..815fac2 100644
--- a/doc/ivy.texi
+++ b/doc/ivy.texi
@@ -8,7 +8,7 @@
 
 @copying
 @ifnottex
-Ivy manual, version 0.13.3
+Ivy manual, version 0.13.4
 
 Ivy is an interactive interface for completion in Emacs. Emacs uses
 completion mechanism in a variety of contexts: code, menus, commands,
diff --git a/ivy-avy.el b/ivy-avy.el
index 282d9bc..e4c97b4 100644
--- a/ivy-avy.el
+++ b/ivy-avy.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3") (avy "0.5.0"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4") (avy "0.5.0"))
 ;; Keywords: convenience
 
 ;; This program is free software; you can redistribute it and/or modify
diff --git a/ivy-hydra.el b/ivy-hydra.el
index 30b2c17..8f7b34b 100644
--- a/ivy-hydra.el
+++ b/ivy-hydra.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3") (hydra "0.15.0"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4") (hydra "0.15.0"))
 ;; Keywords: convenience
 
 ;; This file is part of GNU Emacs.
diff --git a/ivy.el b/ivy.el
index 36188e1..48ffa66 100644
--- a/ivy.el
+++ b/ivy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
+;; Version: 0.13.4
 ;; Package-Requires: ((emacs "24.5"))
 ;; Keywords: matching
 
diff --git a/swiper.el b/swiper.el
index afbc365..39f6bfc 100644
--- a/swiper.el
+++ b/swiper.el
@@ -4,8 +4,8 @@
 
 ;; Author: Oleh Krehel 
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.13.3
-;; Package-Requires: ((emacs "24.5") (ivy "0.13.3"))
+;; Version: 0.13.4
+;; Package-Requires: ((emacs "24.5") (ivy "0.13.4"))
 ;; Keywords: matching
 
 ;; This file is part of GNU Emacs.

[elpa] externals/counsel 3911717 3/3: Merge branch 'master' into externals/counsel

[Basil L. Contovounesios]

branch: externals/counsel
commit 3911717a4bd0f15b076b54a8263f2573d4326326
Merge: e5e3110 fb1ef15
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Merge branch 'master' into externals/counsel
---
 counsel.el | 59 +--
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/counsel.el b/counsel.el
index 68246ef..e0c3510 100644
--- a/counsel.el
+++ b/counsel.el
@@ -2940,14 +2940,24 @@ INITIAL-DIRECTORY, if non-nil, is used as the root 
directory for search."
 (define-key map (kbd "C-x C-d") 'counsel-cd)
 map))
 
-(defcustom counsel-ag-base-command "ag --vimgrep %s"
-  "Format string to use in `counsel-ag-function' to construct the command.
-The %s will be replaced by optional extra ag arguments followed by the
-regex string."
-  :type '(radio
-  (const "ag --vimgrep %s")
-  (const "ag --nocolor --nogroup %s")
-  (string :tag "custom")))
+(defcustom counsel-ag-base-command (list "ag" "--vimgrep" "%s")
+  "Template for default `counsel-ag' command.
+The value should be either a list of strings, starting with the
+`ag' executable file name and followed by its arguments, or a
+single string describing a full `ag' shell command.
+
+If the command is specified as a list, `ag' is called directly
+using `process-file'; otherwise, it is called as a shell command.
+Calling `ag' directly avoids various shell quoting pitfalls, so
+it is generally recommended.
+
+If the string \"%s\" appears as an element of the list, or as a
+substring of the command string, it is replaced by any optional
+`ag' arguments followed by the search regexp specified during the
+`counsel-ag' session."
+  :package-version '(counsel . "0.14.0")
+  :type '(choice (repeat :tag "Command list to call directly" string)
+ (string :tag "Shell command")))
 
 (defvar counsel-ag-command nil)
 
@@ -3020,9 +3030,10 @@ NEEDLE is the search string."
 ;;;###autoload
 (cl-defun counsel-ag (&optional initial-input initial-directory extra-ag-args 
ag-prompt
   &key caller)
-  "Grep for a string in a root directory using ag.
+  "Grep for a string in a root directory using `ag'.
 
-By default, the root directory is the first directory containing a .git 
subdirectory.
+By default, the root directory is the first directory containing
+a .git subdirectory.
 
 INITIAL-INPUT can be given as the initial minibuffer input.
 INITIAL-DIRECTORY, if non-nil, is used as the root directory for search.
@@ -3190,19 +3201,23 @@ This uses `counsel-ag' with `counsel-ack-base-command' 
replacing
  initial-input nil nil nil
  :caller 'counsel-ack)))
 
-
 ;;** `counsel-rg'
 (defcustom counsel-rg-base-command
-  (split-string
-   (if (memq system-type '(ms-dos windows-nt))
-   "rg -M 240 --with-filename --no-heading --line-number --color never %s 
--path-separator / ."
- "rg -M 240 --with-filename --no-heading --line-number --color never %s"))
-  "Alternative to `counsel-ag-base-command' using ripgrep.
-
-Note: don't use single quotes for the regex."
-  :type '(choice
-  (repeat :tag "List to be used in `process-file'." string)
-  (string :tag "String to be used in `shell-command-to-string'.")))
+  `("rg"
+"--max-columns" "240"
+"--with-filename"
+"--no-heading"
+"--line-number"
+"--color" "never"
+"%s"
+,@(and (memq system-type '(ms-dos windows-nt))
+   (list "--path-separator" "/" ".")))
+  "Like `counsel-ag-base-command', but for `counsel-rg'.
+
+Note: don't use single quotes for the regexp."
+  :package-version '(counsel . "0.14.0")
+  :type '(choice (repeat :tag "Command list to call directly" string)
+ (string :tag "Shell command")))
 
 (defun counsel--rg-targets ()
   "Return a list of files to operate on, based on `dired-mode' marks."
@@ -3219,7 +3234,7 @@ Note: don't use single quotes for the regex."
 
 ;;;###autoload
 (defun counsel-rg (&optional initial-input initial-directory extra-rg-args 
rg-prompt)
-  "Grep for a string in the current directory using rg.
+  "Grep for a string in the current directory using `rg'.
 INITIAL-INPUT can be given as the initial minibuffer input.
 INITIAL-DIRECTORY, if non-nil, is used as the root directory for search.
 EXTRA-RG-ARGS string, if non-nil, is appended to `counsel-rg-base-command'.

[elpa] externals/counsel updated (e5e3110 -> 3911717)

[Basil L. Contovounesios]

blc pushed a change to branch externals/counsel.

  from  e5e3110   Bump version to point release 0.13.4
   new  8cf3f18   Bump version to point release 0.13.4
   new  fb1ef15   Call ag with process-file by default
   new  3911717   Merge branch 'master' into externals/counsel


Summary of changes:
 counsel.el | 59 +--
 1 file changed, 37 insertions(+), 22 deletions(-)

[elpa] externals/counsel fb1ef15 2/3: Call ag with process-file by default

[Basil L. Contovounesios]

branch: externals/counsel
commit fb1ef155578b4642e37b9856f1f9e3ba1f90a367
Author: Basil L. Contovounesios 
Commit: Basil L. Contovounesios 

Call ag with process-file by default

* counsel.el (counsel-ag-base-command): Default to a list rather
than a shell command.
(counsel-rg-base-command): Consistently use long options.
Improve docstring and defcustom tags.
(counsel-ag, counsel-rg): Minor doc touch ups.

Re: #2819.
---
 counsel.el | 59 +--
 1 file changed, 37 insertions(+), 22 deletions(-)

diff --git a/counsel.el b/counsel.el
index 68246ef..e0c3510 100644
--- a/counsel.el
+++ b/counsel.el
@@ -2940,14 +2940,24 @@ INITIAL-DIRECTORY, if non-nil, is used as the root 
directory for search."
 (define-key map (kbd "C-x C-d") 'counsel-cd)
 map))
 
-(defcustom counsel-ag-base-command "ag --vimgrep %s"
-  "Format string to use in `counsel-ag-function' to construct the command.
-The %s will be replaced by optional extra ag arguments followed by the
-regex string."
-  :type '(radio
-  (const "ag --vimgrep %s")
-  (const "ag --nocolor --nogroup %s")
-  (string :tag "custom")))
+(defcustom counsel-ag-base-command (list "ag" "--vimgrep" "%s")
+  "Template for default `counsel-ag' command.
+The value should be either a list of strings, starting with the
+`ag' executable file name and followed by its arguments, or a
+single string describing a full `ag' shell command.
+
+If the command is specified as a list, `ag' is called directly
+using `process-file'; otherwise, it is called as a shell command.
+Calling `ag' directly avoids various shell quoting pitfalls, so
+it is generally recommended.
+
+If the string \"%s\" appears as an element of the list, or as a
+substring of the command string, it is replaced by any optional
+`ag' arguments followed by the search regexp specified during the
+`counsel-ag' session."
+  :package-version '(counsel . "0.14.0")
+  :type '(choice (repeat :tag "Command list to call directly" string)
+ (string :tag "Shell command")))
 
 (defvar counsel-ag-command nil)
 
@@ -3020,9 +3030,10 @@ NEEDLE is the search string."
 ;;;###autoload
 (cl-defun counsel-ag (&optional initial-input initial-directory extra-ag-args 
ag-prompt
   &key caller)
-  "Grep for a string in a root directory using ag.
+  "Grep for a string in a root directory using `ag'.
 
-By default, the root directory is the first directory containing a .git 
subdirectory.
+By default, the root directory is the first directory containing
+a .git subdirectory.
 
 INITIAL-INPUT can be given as the initial minibuffer input.
 INITIAL-DIRECTORY, if non-nil, is used as the root directory for search.
@@ -3190,19 +3201,23 @@ This uses `counsel-ag' with `counsel-ack-base-command' 
replacing
  initial-input nil nil nil
  :caller 'counsel-ack)))
 
-
 ;;** `counsel-rg'
 (defcustom counsel-rg-base-command
-  (split-string
-   (if (memq system-type '(ms-dos windows-nt))
-   "rg -M 240 --with-filename --no-heading --line-number --color never %s 
--path-separator / ."
- "rg -M 240 --with-filename --no-heading --line-number --color never %s"))
-  "Alternative to `counsel-ag-base-command' using ripgrep.
-
-Note: don't use single quotes for the regex."
-  :type '(choice
-  (repeat :tag "List to be used in `process-file'." string)
-  (string :tag "String to be used in `shell-command-to-string'.")))
+  `("rg"
+"--max-columns" "240"
+"--with-filename"
+"--no-heading"
+"--line-number"
+"--color" "never"
+"%s"
+,@(and (memq system-type '(ms-dos windows-nt))
+   (list "--path-separator" "/" ".")))
+  "Like `counsel-ag-base-command', but for `counsel-rg'.
+
+Note: don't use single quotes for the regexp."
+  :package-version '(counsel . "0.14.0")
+  :type '(choice (repeat :tag "Command list to call directly" string)
+ (string :tag "Shell command")))
 
 (defun counsel--rg-targets ()
   "Return a list of files to operate on, based on `dired-mode' marks."
@@ -3219,7 +3234,7 @@ Note: don't use single quotes for the regex."
 
 ;;;###autoload
 (defun counsel-rg (&optional initial-input initial-directory extra-rg-args 
rg-prompt)
-  "Grep for a string in the current directory using rg.
+  "Grep for a string in the current directory using `rg'.
 INITIAL-INPUT can be given as the initial minibuffer input.
 INITIAL-DIRECTORY, if non-nil, is used as the root directory for search.
 EXTRA-RG-ARGS string, if non-nil, is appended to `counsel-rg-base-command'.

[elpa] elpa-admin fa18a66: * elpa-admin.el: Improve doc build for the :core packages

[Stefan Monnier]

branch: elpa-admin
commit fa18a667c03adfaf72d8e39151e8d0f05bea3e73
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Improve doc build for the :core packages

(elpaa--select-revision): Update in the target of symlinks
(elpaa--insert-repolinks): Fix problem for :core packages with files in
completely different directories.
(elpaa--build-Info-1): Add the surrounding dir (including the `emacs`
subdir) to the sandbox, and don't follow symlinks when opening an Org
file so we don't try to output the texi in the `emacs` subtree.
---
 elpa-admin.el | 33 -
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 5810924..82e8e5c 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -245,21 +245,21 @@ Assumes that the current worktree holds a snapshot 
version."
 (defun elpaa--select-revision (dir pkg-spec rev)
   "Checkout revision REV in DIR of PKG-SPEC.
 Do it without leaving the current branch."
-  (let ((cur-rev
+  (let* ((ftn (file-truename
+   (expand-file-name (elpaa--main-file pkg-spec) dir)))
  ;; FIXME: Emacs-26's `vc-git-working-revision' ignores its arg and
  ;; uses uses the `default-directory' to get the revision.
- (let* ((ftn (file-truename
-  (expand-file-name (elpaa--main-file pkg-spec) dir)))
-(default-directory (file-name-directory ftn)))
-   (vc-working-revision ftn
+ (default-directory (file-name-directory ftn))
+ (cur-rev (vc-working-revision ftn)))
 ;; Don't fail in case `rev' is not known.
 (if (or (not rev) (equal rev cur-rev))
 (elpaa--message "Current revision is already desired revision!")
   (with-temp-buffer
-(let ((default-directory (elpaa--dirname dir)))
-  (elpaa--call t "git" "reset" "--merge" rev)
-  (elpaa--message "Reverted to release revision %s\n%s"
-  rev (buffer-string)))
+;; Run it within the true-filename directory holding the mainfile,
+;; so that for :core packages we properly affect the Emacs tree.
+(elpaa--call t "git" "reset" "--merge" rev)
+(elpaa--message "Reverted to release revision %s\n%s"
+rev (buffer-string))
 
 (defun elpaa--make-tar-transform (pkgname r)
   (let ((from (nth 0 r)) (to (nth 1 r)))
@@ -1044,8 +1044,9 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
   (let* ((files (nth 2 pkg-spec))
  (file (if (listp files)
(directory-file-name
-(file-name-directory
- (try-completion "" files)))
+(or (file-name-directory
+ (try-completion "" files))
+""))
  files)))
 (mapcar (lambda (s) (concat s file))
 `("cgit/emacs.git/tree/"
@@ -1588,13 +1589,19 @@ More at " (elpaa--default-url pkgname))
   (elpaa--build-Info-1 f dir
 
 (defun elpaa--build-Info-1 (docfile dir)
-  (let* ((default-directory (elpaa--dirname dir))
+  (let* ((elpaa--sandboxed-ro-binds
+  (cons default-directory elpaa--sandboxed-ro-binds))
+ (default-directory (elpaa--dirname dir))
  (tmpfiles '()))
 (when (and docfile (file-readable-p docfile)
(string-match "\\.org\\'" docfile))
   (with-temp-buffer
 (elpaa--call-sandboxed
- t "emacs" "--batch" "-l" "ox-texinfo" docfile
+ t "emacs" "--batch" "-l" "ox-texinfo"
+ ;; When building :core packages, don't follow the symlink,
+ ;; otherwise Org will want to export into the Emacs tree!
+ "--eval" "(setq vc-follow-symlinks nil)"
+ docfile
  "--eval" "(message \"ELPATEXI=%s\" (org-texinfo-export-to-texinfo))")
 (message "%s" (buffer-string))
 (goto-char (point-max))

[elpa] externals/pyim-basedict 687a996 06/32: Update

[Feng Shu]

branch: externals/pyim-basedict
commit 687a99600b8e7d57b317ef4b71d302c8392f2520
Author: Feng Shu 
Commit: Feng Shu 

Update
---
 README.md| 65 
 chinese-pyim-basedict.el |  5 +---
 2 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index 557326c..b6b88fc 100644
--- a/README.md
+++ b/README.md
@@ -1,32 +1,33 @@
-- [chinese-pyim-basedict README](#chinese-pyim-basedict-readme)
-  - [简介](#简介)
-  - [安装和使用](#安装和使用)
-  - [如何为这个项目贡献词条](#如何为这个项目贡献词条)
-
-# chinese-pyim-basedict README
-
-## 简介
-
-Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
-
-1.  libpinyin 项目的内置词库
-2.  chinese-pyim 用户贡献的个人词库
-
-注意：这个词库的词条量大概在1万左右，是一个 **非常小** 得词库，只能确保 Chinese-pyim
-可以正常工作，如果用户想让 chinese-pyim 更加顺手，需要添加附加的词库，一个比较好的选择是安装 chinese-pyim-greatdict, 
不过这个词库非常庞大，词条量超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式添加词库，具体请参考 chinese-pyim 
README 中的相关章节：
-
-
-
-## 安装和使用
-
-1.  配置melpa源，参考：
-2.  M-x package-install RET chinese-pyim-basedict RET
-3.  在emacs配置文件中（比如: ~/.emacs）添加如下代码：
-
-(require 'chinese-pyim-basedict)
-
-## 如何为这个项目贡献词条
-
-Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，可以将您的 \`pyim-personal-file' 
个人文件清理一下（主要清理与隐私相关的词条），然后用 email 以附件的形式发给我，并在正文中 **明确** 说明这个文件所使用的协议，我负责合并。
-
-注：除了使用 email，用户也可以使用 Github 的 issue 系统提交需求。
+- [chinese-pyim-basedict README](#chinese-pyim-basedict-readme)
+  - [简介](#简介)
+  - [安装和使用](#安装和使用)
+  - [如何为这个项目贡献词条](#如何为这个项目贡献词条)
+
+# chinese-pyim-basedict README
+
+## 简介
+
+Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
+
+1.  libpinyin 项目的内置词库
+2.  chinese-pyim 用户贡献的个人词库
+
+注意：这个词库的词条量大概在1万左右，是一个 **非常小** 得词库，只能确保 Chinese-pyim
+可以正常工作，如果用户想让 chinese-pyim 更加顺手，需要添加附加的词库，一个比较好的选择是安装 chinese-pyim-greatdict, 
不过这个词库非常庞大，词条量超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式添加词库，具体请参考 chinese-pyim 
README 中的相关章节：
+
+
+
+## 安装和使用
+
+1.  配置melpa源，参考：
+2.  M-x package-install RET chinese-pyim-basedict RET
+3.  在emacs配置文件中（比如: ~/.emacs）添加如下代码：
+
+(require 'chinese-pyim-basedict)
+(chinese-pyim-basedict-enable)
+
+## 如何为这个项目贡献词条
+
+Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，可以将您的 \`pyim-personal-file' 
个人文件清理一下（主要清理与隐私相关的词条），然后用 email 以附件的形式发给我，并在正文中 **明确** 说明这个文件所使用的协议，我负责合并。
+
+注：除了使用 email，用户也可以使用 Github 的 issue 系统提交需求。
diff --git a/chinese-pyim-basedict.el b/chinese-pyim-basedict.el
index 325ab79..b9ff30f 100644
--- a/chinese-pyim-basedict.el
+++ b/chinese-pyim-basedict.el
@@ -50,6 +50,7 @@
 ;; 3. 在emacs配置文件中（比如: ~/.emacs）添加如下代码：
 ;;#+BEGIN_EXAMPLE
 ;;(require 'chinese-pyim-basedict)
+;;(chinese-pyim-basedict-enable)
 ;;#+END_EXAMPLE
 
 ;; ** 如何为这个项目贡献词条
@@ -80,10 +81,6 @@
:dict-type pinyin-dict
:elpa t))
 (message "Chinese-pyim 没有安装，chinese-pyim-basedict 启用失败。")
-
-;; Enable pyim-basedict
-(chinese-pyim-basedict-enable)
-
 ;; #+END_SRC
 
 ;; * Footer

[elpa] externals/pyim-basedict 33523f5 08/32: Add Xunchen Liu's contribute words

[Feng Shu]

branch: externals/pyim-basedict
commit 33523f515b2d3aac07eb92c3feb7a2d35d06c150
Author: Feng Shu 
Commit: Feng Shu 

Add Xunchen Liu's contribute words

\#+Author: Xunchen Liu
\#+Email: liuxunc...@sjtu.edu.cn
\#+License: GPLv2

\#+BEGIN_COMMENT
ban-fa  办法
ban-li  办理
ban-zhu-ren  班主任
bang-mang  帮忙
bao-hu  保护
bao-kuo  包括
bi-jiao  比较
bie-ren  别人
bo-chang  波长
bo-duan  波段
bo-hou  博后
bo-zhang  波长
bu-da  不大
bu-guo  不过
bu-hui  不回
bu-tong  不同
cai-liao  材料
ce-shi  测试
ceng-ci  层次
chong-yao  重要
chu-li  处理
cong-er  从而
da-qiu  打球
dan-chun  单纯
dan-shi  但是
dao-wei  到位
di-tie  地铁
di-wen  提问
dian-shi  电视
fa-hui  发挥
fa-la  法拉
fa-xian  发现
fa-zhan  发展
fan-wei  范围
fang-fa  方法
fen-zhong  分钟
gao-wen  高温
ge-zhong  各种
gen-ju  根据
guan-jian  关键
guang-pu  光谱
guo-cheng  过程
guo-le  过了
guo-liao  过了
hai-zi  孩子
hao-hao  好好
he-xin  核心
hong-qiao  虹桥
hong-wai  红外
hua-tu  画图
hui-jia  回家
huo-yan  火焰
ji-ge  几个
ji-guang-qi  激光器
ji-hua  计划
ji-ke  即可
ji-nan  济南
ji-xian  基线
ji-xu  继续
jia-gong  加工
jia-wan  甲烷
jia-zhao  驾照
jian-ti  间体
jiao-gong  教工
jiao-liu  交流
jiao-xue  教学
jie-duan  阶段
jie-jue  解决
jie-shou  接受
jin-ru  进入
jing-guo  经过
jiu-shi  就是
ju-xian  局限
kai-hui  开会
kai-kuai  开会
kao-lv  考虑
ke-yi  可以
kong-qi  空气
lai-yuan  来源
lao-shi  老师
leng-que  冷却
leng-shui  冷水
li-fang  立方
li-jie  理解
li-lun  理论
li-xiang  理想
ling-yi-ge  另一个
liu-liang  流量
lu-zi  炉子
lv-shi  律师
ma-hao  马昊
ma-ma  麻麻
mei-you  没有
mo-xing  模型
na-bian  那边
nan-jing-lu  南京路
nei-rong  内容
ni-he  拟合
pa-pa  趴趴
qi-ti  气体
ran-hou  然后
ran-liao  燃料
ran-qi  燃气
ran-shao  燃烧
ren-wei  认为
shang-hai  上海
shen-qing  申请
shi-jian  时间
shi-yan  实验
shi-yan-shi  实验室
shi-zhong-xin  市中心
shu-ju  数据
si-kao  思考
si-xiang  思想
suo-yi  所以
suo-you  所有
ta-men  他们
tao-lun  讨论
ti-wen  提问
tong-guo  通过
tuan-liu  湍流
wan-quan  完全
wei-zhi  位置
wen-ti  问题
wo-men  我们
xi-shou  吸收
xia-wu  下午
xia-yi  下一
xin-xi  信息
xu-yao  需要
xue-jiao  学校
xue-sheng  学生
xue-xi  学习
xue-xiao  学校
ya-li  压力
ye-shi  也是
yi-ge  一个
yi-hou  以后
yi-jing  已经
yi-qi  一起
yi-tao  一套
yi-xia  一下
yi-yuan  医院
yin-dao  引导
yin-hang  银行
yin-wei  因为
yin-xing  银行
ying-gai  应该
ying-wen  应问
ying-yong  应用
zhe-zhong  这种
zhen-duan  诊断
zheng-li  整理
zhi-dao  知道
zhi-jie  直接
zhi-liang  质量
zhi-zao  制造
zhong-yao  重要
zhong-yu  终于
zhu-dong  主动
zhu-guan  主观
zhuan-jie  转接
zhuang-xiu  装修
zhun-bei  准备
zi-ji  自己
zi-you-ji  自由基
zu-he  组合
zu-zhuang  组装
zui-da  最大
\#+END_COMMENT
---
 pyim-basedict.pyim.gz | Bin 964305 -> 964379 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pyim-basedict.pyim.gz b/pyim-basedict.pyim.gz
index 595f5da..8f31464 100644
Binary files a/pyim-basedict.pyim.gz and b/pyim-basedict.pyim.gz differ

[elpa] externals/pyim-basedict 7a054e6 02/32: Update README

[Feng Shu]

branch: externals/pyim-basedict
commit 7a054e6b2bbf1c6467db0e0f32df425fd6944c99
Author: Feng Shu 
Commit: Feng Shu 

Update README
---
 README.md| 1 -
 chinese-pyim-basedict.el | 1 -
 2 files changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 6a6295d..7e410b3 100644
--- a/README.md
+++ b/README.md
@@ -18,4 +18,3 @@ Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来
 3.  在emacs配置文件中（比如: ~/.emacs）添加如下代码：
 
 (require 'chinese-pyim-basedict)
-(chinese-pyim-basedict-enable)
diff --git a/chinese-pyim-basedict.el b/chinese-pyim-basedict.el
index a6b236a..02f2a91 100644
--- a/chinese-pyim-basedict.el
+++ b/chinese-pyim-basedict.el
@@ -42,7 +42,6 @@
 ;; 3. 在emacs配置文件中（比如: ~/.emacs）添加如下代码：
 ;;#+BEGIN_EXAMPLE
 ;;(require 'chinese-pyim-basedict)
-;;(chinese-pyim-basedict-enable)
 ;;#+END_EXAMPLE
 
 ;;; Code:

[elpa] externals/pyim-basedict f13b6d2 07/32: update README

[Feng Shu]

branch: externals/pyim-basedict
commit f13b6d20629a0b691ead626cca249b227622fa83
Author: Feng Shu 
Commit: Feng Shu 

update README
---
 README.md| 12 +---
 chinese-pyim-basedict.el |  6 +-
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index b6b88fc..6b57e5a 100644
--- a/README.md
+++ b/README.md
@@ -3,9 +3,9 @@
   - [安装和使用](#安装和使用)
   - [如何为这个项目贡献词条](#如何为这个项目贡献词条)
 
-# chinese-pyim-basedict README
+# chinese-pyim-basedict README
 
-## 简介
+## 简介
 
 Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
 
@@ -17,7 +17,7 @@ Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来
 
 
 
-## 安装和使用
+## 安装和使用
 
 1.  配置melpa源，参考：
 2.  M-x package-install RET chinese-pyim-basedict RET
@@ -26,8 +26,6 @@ Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来
 (require 'chinese-pyim-basedict)
 (chinese-pyim-basedict-enable)
 
-## 如何为这个项目贡献词条
+## 如何为这个项目贡献词条
 
-Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，可以将您的 \`pyim-personal-file' 
个人文件清理一下（主要清理与隐私相关的词条），然后用 email 以附件的形式发给我，并在正文中 **明确** 说明这个文件所使用的协议，我负责合并。
-
-注：除了使用 email，用户也可以使用 Github 的 issue 系统提交需求。
+Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，可以运行 
\`pyim-contribute-words' , 然后按照它的提示操作就可以了。
diff --git a/chinese-pyim-basedict.el b/chinese-pyim-basedict.el
index b9ff30f..0042560 100644
--- a/chinese-pyim-basedict.el
+++ b/chinese-pyim-basedict.el
@@ -55,11 +55,7 @@
 
 ;; ** 如何为这个项目贡献词条
 ;; Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，
-;; 可以将您的 `pyim-personal-file' 个人文件清理一下（主要清理与隐私相关的词条），
-;; 然后用 email 以附件的形式发给我，并在正文中 *明确* 说明这个文件所使用的协议，
-;; 我负责合并。
-
-;; 注：除了使用 email，用户也可以使用 Github 的 issue 系统提交需求。
+;; 可以运行 `pyim-contribute-words' , 然后按照它的提示操作就可以了。
 
 ;;; Code:
 ;; * 代码   :code:

[elpa] externals/pyim-basedict 59ea301 09/32: Remove useless space, Fix #1

[Feng Shu]

branch: externals/pyim-basedict
commit 59ea301585ef832022f92e2d75dec7e000611301
Author: Feng Shu 
Commit: Feng Shu 

Remove useless space, Fix #1
---
 pyim-basedict.pyim.gz | Bin 964379 -> 964368 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/pyim-basedict.pyim.gz b/pyim-basedict.pyim.gz
index 8f31464..52a9a9e 100644
Binary files a/pyim-basedict.pyim.gz and b/pyim-basedict.pyim.gz differ

[elpa] externals/pyim-basedict e2df78f 03/32: Update README

[Feng Shu]

branch: externals/pyim-basedict
commit e2df78fcb9353fc7be78ea871a95b1ea19023edb
Author: Feng Shu 
Commit: Feng Shu 

Update README
---
 README.md|  7 ++-
 chinese-pyim-basedict.el | 10 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7e410b3..1de39ae 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,14 @@
 
 Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
 
-1.  libpinyin 项目内置的词库
+1.  libpinyin 项目的内置词库
 2.  chinese-pyim 用户贡献的个人词库
 
+注意：这个词库的词条量大概在1万左右，是一个 **非常小** 得词库，只能确保 Chinese-pyim
+可以正常工作，如果用户想让 chinese-pyim 更加顺手，需要添加附加的词库，一个比较好的选择是安装 chinese-pyim-greatdict, 
不过这个词库非常庞大，词条量超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式添加词库，具体请参考 chinese-pyim 
README 中的相关章节：
+
+
+
 ## 安装和使用
 
 1.  配置melpa源，参考：
diff --git a/chinese-pyim-basedict.el b/chinese-pyim-basedict.el
index 02f2a91..c988ff5 100644
--- a/chinese-pyim-basedict.el
+++ b/chinese-pyim-basedict.el
@@ -33,9 +33,17 @@
 ;; ** 简介
 ;; Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
 
-;; 1. libpinyin 项目内置的词库
+;; 1. libpinyin 项目的内置词库
 ;; 2. chinese-pyim 用户贡献的个人词库
 
+;; 注意：这个词库的词条量大概在1万左右，是一个 *非常小* 得词库，只能确保 Chinese-pyim
+;; 可以正常工作，如果用户想让 chinese-pyim 更加顺手，需要添加附加的词库，
+;; 一个比较好的选择是安装 chinese-pyim-greatdict, 不过这个词库非常庞大，词条量
+;; 超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式
+;; 添加词库，具体请参考 chinese-pyim README 中的相关章节：
+
+;; https://github.com/tumashu/chinese-pyim
+
 ;; ** 安装和使用
 ;; 1. 配置melpa源，参考：http://melpa.org/#/getting-started
 ;; 2. M-x package-install RET chinese-pyim-basedict RET

[elpa] externals/pyim-basedict 82b26fe 11/32: chinese-pyim- -> pyim-

[Feng Shu]

branch: externals/pyim-basedict
commit 82b26fee72c00e2674fb25440285e3078053aae3
Author: Feng Shu 
Commit: Feng Shu 

chinese-pyim- -> pyim-
---
 chinese-pyim-basedict.el => pyim-basedict.el | 184 +--
 1 file changed, 92 insertions(+), 92 deletions(-)

diff --git a/chinese-pyim-basedict.el b/pyim-basedict.el
similarity index 60%
rename from chinese-pyim-basedict.el
rename to pyim-basedict.el
index 0042560..9da7302 100644
--- a/chinese-pyim-basedict.el
+++ b/pyim-basedict.el
@@ -1,92 +1,92 @@
-;;; chinese-pyim-basedict.el --- The default pinyin dict of chinese-pyim
-
-;; * Header
-;; Copyright (C) 2015 Feng Shu 
-
-;; Author: Feng Shu 
-;; URL: https://github.com/tumashu/chinese-pyim-basedict
-;; Version: 0.0.1
-;; Keywords: convenience, Chinese, pinyin, input-method, complete
-
-;;; License:
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 3
-;; of the License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-
-;;; Commentary:
-;; * chinese-pyim-basedict README :README:doc:
-
-;; ** 简介
-;; Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
-
-;; 1. libpinyin 项目的内置词库
-;; 2. chinese-pyim 用户贡献的个人词库
-
-;; 注意：这个词库的词条量大概在1万左右，是一个 *非常小* 得词库，只能确保 Chinese-pyim
-;; 可以正常工作，如果用户想让 chinese-pyim 更加顺手，需要添加附加的词库，
-;; 一个比较好的选择是安装 chinese-pyim-greatdict, 不过这个词库非常庞大，词条量
-;; 超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式
-;; 添加词库，具体请参考 chinese-pyim README 中的相关章节：
-
-;; https://github.com/tumashu/chinese-pyim
-
-;; ** 安装和使用
-;; 1. 配置melpa源，参考：http://melpa.org/#/getting-started
-;; 2. M-x package-install RET chinese-pyim-basedict RET
-;; 3. 在emacs配置文件中（比如: ~/.emacs）添加如下代码：
-;;#+BEGIN_EXAMPLE
-;;(require 'chinese-pyim-basedict)
-;;(chinese-pyim-basedict-enable)
-;;#+END_EXAMPLE
-
-;; ** 如何为这个项目贡献词条
-;; Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，
-;; 可以运行 `pyim-contribute-words' , 然后按照它的提示操作就可以了。
-
-;;; Code:
-;; * 代码   :code:
-;; #+BEGIN_SRC emacs-lisp
-
-;;;###autoload
-(defun chinese-pyim-basedict-enable ()
-  "Add basedict to chinese-pyim."
-  (interactive)
-  (let* ((file (concat (file-name-directory
-(locate-library "chinese-pyim-basedict.el"))
-   "pyim-basedict.pyim.gz")))
-(when (file-exists-p file)
-  (if (featurep 'chinese-pyim)
-  (pyim-extra-dicts-add-dict
-   `(:name "Basedict-elpa"
-   :file ,file
-   :coding utf-8-unix
-   :dict-type pinyin-dict
-   :elpa t))
-(message "Chinese-pyim 没有安装，chinese-pyim-basedict 启用失败。")
-;; #+END_SRC
-
-;; * Footer
-
-;; #+BEGIN_SRC emacs-lisp
-(provide 'chinese-pyim-basedict)
-
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
-
-;;; chinese-pyim-basedict.el ends here
-;; #+END_SRC
+;;; pyim-basedict.el --- The default pinyin dict of pyim
+
+;; * Header
+;; Copyright (C) 2015 Feng Shu 
+
+;; Author: Feng Shu 
+;; URL: https://github.com/tumashu/pyim-basedict
+;; Version: 0.0.1
+;; Keywords: convenience, Chinese, pinyin, input-method, complete
+
+;;; License:
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; * pyim-basedict README :README:doc:
+
+;; ** 简介
+;; pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
+
+;; 1. libpinyin 项目的内置词库
+;; 2. pyim 用户贡献的个人词库
+
+;; 注意：这个词库的词条量大概在1万左右，是一个 *非常小* 得词库，只能确保 pyim
+;; 可以正常工作，如果用户想让 pyim 更加顺手，需要添加附加的词库，
+;; 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量
+;; 超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式
+;; 添加词库，具体请参考 pyim README 中的相关章节：
+
+;;   

[elpa] externals/pyim-basedict a819eed 01/32: Init commit

[Feng Shu]

branch: externals/pyim-basedict
commit a819eedd9404ff59979378271dcae4ce06d1a287
Author: Feng Shu 
Commit: Feng Shu 

Init commit
---
 .gitignore   |   2 ++
 README.md|  21 
 chinese-pyim-basedict.el |  84 +++
 pyim-basedict.pyim.gz| Bin 0 -> 896099 bytes
 4 files changed, 107 insertions(+)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..4b7d2ca
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/*~
+/chinese-pyim-basedict.org
diff --git a/README.md b/README.md
new file mode 100644
index 000..6a6295d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,21 @@
+- [chinese-pyim-basedict README](#chinese-pyim-basedict-readme)
+  - [简介](#简介)
+  - [安装和使用](#安装和使用)
+
+# chinese-pyim-basedict README
+
+## 简介
+
+Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
+
+1.  libpinyin 项目内置的词库
+2.  chinese-pyim 用户贡献的个人词库
+
+## 安装和使用
+
+1.  配置melpa源，参考：
+2.  M-x package-install RET chinese-pyim-basedict RET
+3.  在emacs配置文件中（比如: ~/.emacs）添加如下代码：
+
+(require 'chinese-pyim-basedict)
+(chinese-pyim-basedict-enable)
diff --git a/chinese-pyim-basedict.el b/chinese-pyim-basedict.el
new file mode 100644
index 000..a6b236a
--- /dev/null
+++ b/chinese-pyim-basedict.el
@@ -0,0 +1,84 @@
+;;; chinese-pyim-basedict.el --- The default pinyin dict of chinese-pyim
+
+;; * Header
+;; Copyright (C) 2015 Feng Shu 
+
+;; Author: Feng Shu 
+;; URL: https://github.com/tumashu/chinese-pyim-basedict
+;; Version: 0.0.1
+;; Keywords: convenience, Chinese, pinyin, input-method, complete
+
+;;; License:
+
+;; This file is not part of GNU Emacs.
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License
+;; as published by the Free Software Foundation; either version 3
+;; of the License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+;; * chinese-pyim-basedict README :README:doc:
+
+;; ** 简介
+;; Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
+
+;; 1. libpinyin 项目内置的词库
+;; 2. chinese-pyim 用户贡献的个人词库
+
+;; ** 安装和使用
+;; 1. 配置melpa源，参考：http://melpa.org/#/getting-started
+;; 2. M-x package-install RET chinese-pyim-basedict RET
+;; 3. 在emacs配置文件中（比如: ~/.emacs）添加如下代码：
+;;#+BEGIN_EXAMPLE
+;;(require 'chinese-pyim-basedict)
+;;(chinese-pyim-basedict-enable)
+;;#+END_EXAMPLE
+
+;;; Code:
+;; * 代码   :code:
+;; #+BEGIN_SRC emacs-lisp
+
+;;;###autoload
+(defun chinese-pyim-basedict-enable ()
+  "Add basedict to chinese-pyim."
+  (interactive)
+  (let* ((file (concat (file-name-directory
+(locate-library "chinese-pyim-basedict.el"))
+   "pyim-basedict.pyim.gz")))
+(when (file-exists-p file)
+  (if (featurep 'chinese-pyim)
+  (pyim-extra-dicts-add-dict
+   `(:name "Basedict-elpa"
+   :file ,file
+   :coding utf-8-unix
+   :dict-type pinyin-dict
+   :elpa t))
+(message "Chinese-pyim 没有安装，chinese-pyim-basedict 启用失败。")
+
+;; Enable pyim-basedict
+(chinese-pyim-basedict-enable)
+
+;; #+END_SRC
+
+;; * Footer
+
+;; #+BEGIN_SRC emacs-lisp
+(provide 'chinese-pyim-basedict)
+
+;; Local Variables:
+;; no-byte-compile: t
+;; End:
+
+;;; chinese-pyim-basedict.el ends here
+;; #+END_SRC
diff --git a/pyim-basedict.pyim.gz b/pyim-basedict.pyim.gz
new file mode 100644
index 000..49e69c3
Binary files /dev/null and b/pyim-basedict.pyim.gz differ

[elpa] externals/pyim-basedict 958199d 29/32: * pyim-basedict.el (pyim-extra-dicts-add-dict): declare-function.

[Feng Shu]

branch: externals/pyim-basedict
commit 958199dfba861fb564145af139d6961c6bed15ef
Author: Feng Shu 
Commit: Feng Shu 

* pyim-basedict.el (pyim-extra-dicts-add-dict): declare-function.
---
 pyim-basedict.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index a3d172b..52d1802 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -72,6 +72,8 @@
 "gbk_char.table")
   "Libpinyin data files")
 
+(declare-function 'pyim-extra-dicts-add-dict "pyim")
+
 ;;;###autoload
 (defun pyim-basedict-enable ()
   "Add basedict to pyim."

[elpa] externals/pyim-basedict f71d0ff 15/32: Update README

[Feng Shu]

branch: externals/pyim-basedict
commit f71d0ffd9d2421f2b51cd0ccb89fd9eb43c09585
Author: Feng Shu 
Commit: Feng Shu 

Update README
---
 README.md| 18 +-
 pyim-basedict.el |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 8a00814..6e0d754 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
-- [pyim-basedict README](#org9c0ad64)
-  - [简介](#org9738d87)
-  - [安装和使用](#orgad28538)
-  - [如何为这个项目贡献词条](#org4bcc69d)
+- [pyim-basedict README](#orgb5c90ef)
+  - [简介](#org41b325a)
+  - [安装和使用](#org0e84c6c)
+  - [如何为这个项目贡献词条](#org1a19be7)
 
 
-
+
 
 # pyim-basedict README
 
 
-
+
 
 ## 简介
 
@@ -18,12 +18,12 @@ pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
 1.  libpinyin 项目的内置词库
 2.  pyim 用户贡献的个人词库
 
-注意：这个词库的词条量大概在1万左右，是一个 **非常小** 得词库，只能确保 pyim 可以正常工作，如果用户想让 pyim 
更加顺手，需要添加附加的词库， 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量 超过300万，不适合计算机 cpu 
和内存不足的用户。另外，用户也可以使用其它方式 添加词库，具体请参考 pyim README 中的相关章节：
+注意：这个词库的词条量大概在 10 万左右，是一个 **相对小** 的词库，只能确保 pyim 可以正常工作，如果用户想让 pyim 
更加顺手，需要添加附加的词库， 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量 超过300万，不适合计算机 cpu 
和内存不足的用户。另外，用户也可以使用其它方式 添加词库，具体请参考 pyim README 中的相关章节：
 
 
 
 
-
+
 
 ## 安装和使用
 
@@ -35,7 +35,7 @@ pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
 (pyim-basedict-enable)
 
 
-
+
 
 ## 如何为这个项目贡献词条
 
diff --git a/pyim-basedict.el b/pyim-basedict.el
index d7cbc21..92b5fec 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -36,7 +36,7 @@
 ;; 1. libpinyin 项目的内置词库
 ;; 2. pyim 用户贡献的个人词库
 
-;; 注意：这个词库的词条量大概在1万左右，是一个 *非常小* 得词库，只能确保 pyim
+;; 注意：这个词库的词条量大概在 10 万左右，是一个 *相对小* 的词库，只能确保 pyim
 ;; 可以正常工作，如果用户想让 pyim 更加顺手，需要添加附加的词库，
 ;; 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量
 ;; 超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式

[elpa] externals/pyim-basedict c08ec89 14/32: Use pyim-basedict.pyim

[Feng Shu]

branch: externals/pyim-basedict
commit c08ec89bfde21bb17b44b4cc1b6e4e408ac484c8
Author: Feng Shu 
Commit: Feng Shu 

Use pyim-basedict.pyim
---
 pyim-basedict.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index bcb08a8..d7cbc21 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -66,7 +66,7 @@
   (interactive)
   (let* ((file (concat (file-name-directory
 (locate-library "pyim-basedict.el"))
-   "pyim-basedict.pyim.gz")))
+   "pyim-basedict.pyim")))
 (when (file-exists-p file)
   (if (featurep 'pyim)
   (pyim-extra-dicts-add-dict

[elpa] externals/pyim-basedict 0d00da0 27/32: Merge patch of Stefan

[Feng Shu]

branch: externals/pyim-basedict
commit 0d00da0edc2ecd4e0b473b7a6dc437a6b803863d
Author: Feng Shu 
Commit: Feng Shu 

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 
@@ -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 45931a0 04/32: Add section: How to contribute

[Feng Shu]

branch: externals/pyim-basedict
commit 45931a00a879be243999c758e203aae46cfdd8e5
Author: Feng Shu 
Commit: Feng Shu 

Add section: How to contribute
---
 README.md| 9 -
 chinese-pyim-basedict.el | 8 
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1de39ae..557326c 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,9 @@
 - [chinese-pyim-basedict README](#chinese-pyim-basedict-readme)
   - [简介](#简介)
   - [安装和使用](#安装和使用)
+  - [如何为这个项目贡献词条](#如何为这个项目贡献词条)
 
-# chinese-pyim-basedict README
+# chinese-pyim-basedict README
 
 ## 简介
 
@@ -23,3 +24,9 @@ Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来
 3.  在emacs配置文件中（比如: ~/.emacs）添加如下代码：
 
 (require 'chinese-pyim-basedict)
+
+## 如何为这个项目贡献词条
+
+Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，可以将您的 \`pyim-personal-file' 
个人文件清理一下（主要清理与隐私相关的词条），然后用 email 以附件的形式发给我，并在正文中 **明确** 说明这个文件所使用的协议，我负责合并。
+
+注：除了使用 email，用户也可以使用 Github 的 issue 系统提交需求。
diff --git a/chinese-pyim-basedict.el b/chinese-pyim-basedict.el
index c988ff5..325ab79 100644
--- a/chinese-pyim-basedict.el
+++ b/chinese-pyim-basedict.el
@@ -52,6 +52,14 @@
 ;;(require 'chinese-pyim-basedict)
 ;;#+END_EXAMPLE
 
+;; ** 如何为这个项目贡献词条
+;; Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，
+;; 可以将您的 `pyim-personal-file' 个人文件清理一下（主要清理与隐私相关的词条），
+;; 然后用 email 以附件的形式发给我，并在正文中 *明确* 说明这个文件所使用的协议，
+;; 我负责合并。
+
+;; 注：除了使用 email，用户也可以使用 Github 的 issue 系统提交需求。
+
 ;;; Code:
 ;; * 代码   :code:
 ;; #+BEGIN_SRC emacs-lisp

[elpa] externals/pyim-basedict b2b3e2d 28/32: Add pyim-basedict-libpinyin-tarball-url and use it.

[Feng Shu]

branch: externals/pyim-basedict
commit b2b3e2d928fa332267359b5d8c17953cd2334e54
Author: Feng Shu 
Commit: Feng Shu 

Add pyim-basedict-libpinyin-tarball-url and use it.

(pyim-basedict-libpinyin-tarball-url): New variable.
(pyim-basedict-build-file): Use pyim-basedict-libpinyin-tarball-url
---
 pyim-basedict.el | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index f6a8e8e..a3d172b 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -33,7 +33,7 @@
 ;; ** 简介
 ;; pyim-basedict 是 pyim 输入法的默认词库，词库数据来源为 libpinyin 项目。
 
-;;   https://github.com/libpinyin/libpinyin
+;;  https://github.com/libpinyin/libpinyin/releases (Data files we need is in 
release tarball)
 
 ;; 注意：这个词库的词条量大概在 10 万左右，是一个 *比较小* 的词库，只能确保 pyim
 ;; 可以正常工作，如果用户想让 pyim 更加顺手，需要添加其它附加词库，具体添加词库的
@@ -49,6 +49,10 @@
 
 ;;; Code:
 ;; * 代码   :code:
+(defvar pyim-basedict-libpinyin-tarball-url
+  
"https://github.com/libpinyin/libpinyin/releases/download/2.6.0/libpinyin-2.6.0.tar.gz";
+  "The source of libpinyin data.")
+
 (defvar pyim-basedict-libpinyin-data-files
   (list "society.table"
 "life.table"
@@ -127,6 +131,8 @@
   (sort-lines nil (point-min) (point-max))
   (goto-char (point-min))
   (insert ";; -*- coding: utf-8 -*--\n")
+  (insert (format ";; Convert from data of %S with the help of 
`pyim-basedict-build-file'.\n"
+  pyim-basedict-libpinyin-tarball-url))
   (write-file "pyim-basedict.pyim" t
 
 ;; * Footer

[elpa] branch externals/pyim-basedict created (now 79f5d2d)

[Feng Shu]

tumashu pushed a change to branch externals/pyim-basedict.

at  79f5d2d   Update pyim-basedict.pyim.

This branch includes the following new commits:

   new  a819eed   Init commit
   new  7a054e6   Update README
   new  e2df78f   Update README
   new  45931a0   Add section: How to contribute
   new  9f9e1ab   Update dict
   new  687a996   Update
   new  f13b6d2   update README
   new  33523f5   Add Xunchen Liu's contribute words
   new  59ea301   Remove useless space, Fix #1
   new  3bca276   Delete useless pyim files
   new  82b26fe   chinese-pyim- -> pyim-
   new  6b6eea5   Update README
   new  7c0e368   Use pyim-basedict.pyim instead pyim-basedict.pyim.gz
   new  c08ec89   Use pyim-basedict.pyim
   new  f71d0ff   Update README
   new  3196cb2   Update README
   new  355058f   sort single characters with xinhua dictionary
   new  e69e734   Merge pull request #2 from redguardtoo/master
   new  8650be8   按照新华字典统计的词频重排单字, 2字词, 3字词
   new  d499104   Merge pull request #3 from redguardtoo/master
   new  6a86a31   回退到最初的版本，以消除合并个人词库带来的多音字污染
   new  d1648cb   Import pyim-basedict.pyim from libpinyin-data again.
   new  5c654cd   v0.4.0
   new  7b3bbd1   remove dups
   new  20f8aa7   remove no-byte-compile: t
   new  6c1eeb1   Add pyim-basedict-libpinyin-data-files
   new  0d00da0   Merge patch of Stefan
   new  b2b3e2d   Add pyim-basedict-libpinyin-tarball-url and use it.
   new  958199d   * pyim-basedict.el (pyim-extra-dicts-add-dict): 
declare-function.
   new  bfb3cbe   Add libpinyin-*.tar.gz's url.
   new  06a191c   Update pyim-basedict.el header.
   new  79f5d2d   Update pyim-basedict.pyim.

[elpa] externals/pyim-basedict bfb3cbe 30/32: Add libpinyin-*.tar.gz's url.

[Feng Shu]

branch: externals/pyim-basedict
commit bfb3cbe1b63bcd2846cb76aadcc188dd435aa55b
Author: Feng Shu 
Commit: Feng Shu 

Add libpinyin-*.tar.gz's url.
---
 pyim-basedict.pyim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pyim-basedict.pyim b/pyim-basedict.pyim
index 29e8075..9ee975f 100644
--- a/pyim-basedict.pyim
+++ b/pyim-basedict.pyim
@@ -1,4 +1,5 @@
 ;; -*- coding: utf-8 -*--
+;; Convert from data of 
"https://github.com/libpinyin/libpinyin/releases/download/2.6.0/libpinyin-2.6.0.tar.gz";
 with the help of `pyim-basedict-build-file'.
 a 阿 啊 呵 腌 嗄 吖 锕 錒
 a-a 啊啊
 a-a-a 啊啊啊

[elpa] externals/pyim-basedict 20f8aa7 25/32: remove no-byte-compile: t

[Feng Shu]

branch: externals/pyim-basedict
commit 20f8aa72c758f362d4dc39231c7dd3f8c043bdf0
Author: Feng Shu 
Commit: Feng Shu 

remove no-byte-compile: t
---
 pyim-basedict.el | 5 -
 1 file changed, 5 deletions(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index 1460cd7..6c6ea40 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -125,11 +125,6 @@
   (write-file "pyim-basedict.pyim"
 
 ;; * Footer
-
 (provide 'pyim-basedict)
 
-;; Local Variables:
-;; no-byte-compile: t
-;; End:
-
 ;;; pyim-basedict.el ends here

[elpa] externals/pyim-basedict 3196cb2 16/32: Update README

[Feng Shu]

branch: externals/pyim-basedict
commit 3196cb210e056702c5a4ea1dac1d8e1e27740fab
Author: Feng Shu 
Commit: Feng Shu 

Update README
---
 README.md| 24 
 pyim-basedict.el | 16 ++--
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/README.md b/README.md
index 6e0d754..788c7d8 100644
--- a/README.md
+++ b/README.md
@@ -1,29 +1,28 @@
-- [pyim-basedict README](#orgb5c90ef)
-  - [简介](#org41b325a)
-  - [安装和使用](#org0e84c6c)
-  - [如何为这个项目贡献词条](#org1a19be7)
+- [pyim-basedict README](#org16c7a9d)
+  - [简介](#org1b462a9)
+  - [安装和使用](#orgadfdd6f)
 
 
-
+
 
 # pyim-basedict README
 
 
-
+
 
 ## 简介
 
-pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
+pyim-basedict 是 pyim 输入法的默认词库，词库来源:
 
 1.  libpinyin 项目的内置词库
 2.  pyim 用户贡献的个人词库
 
-注意：这个词库的词条量大概在 10 万左右，是一个 **相对小** 的词库，只能确保 pyim 可以正常工作，如果用户想让 pyim 
更加顺手，需要添加附加的词库， 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量 超过300万，不适合计算机 cpu 
和内存不足的用户。另外，用户也可以使用其它方式 添加词库，具体请参考 pyim README 中的相关章节：
+注意：这个词库的词条量大概在 10 万左右，是一个 **比较小** 的词库，只能确保 pyim 可以正常工作，如果用户想让 pyim 
更加顺手，需要添加其它附加词库， 一个比较好的选择是安装 pyim-greatdict（不过这个词库非常庞大，词条量 超过300万，不适合计算机 cpu 
和内存不足的用户）。用户也可以使用其它方式 添加词库，具体请阅读 pyim README：
 
 
 
 
-
+
 
 ## 安装和使用
 
@@ -35,11 +34,4 @@ pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
 (pyim-basedict-enable)
 
 
-
-
-## 如何为这个项目贡献词条
-
-pyim 的用户，如果想让自己常用词条进入 pyim 默认词库的话， 可以运行 \`pyim-contribute-words' , 
然后按照它的提示操作就可以了。
-
-
 Converted from pyim-basedict.el by [el2org](https://github.com/tumashu/el2org) 
.
\ No newline at end of file
diff --git a/pyim-basedict.el b/pyim-basedict.el
index 92b5fec..e958689 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -31,16 +31,16 @@
 ;; * pyim-basedict README :README:doc:
 
 ;; ** 简介
-;; pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
+;; pyim-basedict 是 pyim 输入法的默认词库，词库来源:
 
 ;; 1. libpinyin 项目的内置词库
 ;; 2. pyim 用户贡献的个人词库
 
-;; 注意：这个词库的词条量大概在 10 万左右，是一个 *相对小* 的词库，只能确保 pyim
-;; 可以正常工作，如果用户想让 pyim 更加顺手，需要添加附加的词库，
-;; 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量
-;; 超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式
-;; 添加词库，具体请参考 pyim README 中的相关章节：
+;; 注意：这个词库的词条量大概在 10 万左右，是一个 *比较小* 的词库，只能确保 pyim
+;; 可以正常工作，如果用户想让 pyim 更加顺手，需要添加其它附加词库，
+;; 一个比较好的选择是安装 pyim-greatdict（不过这个词库非常庞大，词条量
+;; 超过300万，不适合计算机 cpu 和内存不足的用户）。用户也可以使用其它方式
+;; 添加词库，具体请阅读 pyim README：
 
 ;; https://github.com/tumashu/pyim
 
@@ -53,10 +53,6 @@
 ;;(pyim-basedict-enable)
 ;;#+END_EXAMPLE
 
-;; ** 如何为这个项目贡献词条
-;; pyim 的用户，如果想让自己常用词条进入 pyim 默认词库的话，
-;; 可以运行 `pyim-contribute-words' , 然后按照它的提示操作就可以了。
-
 ;;; Code:
 ;; * 代码   :code:
 

[elpa] externals/pyim-basedict 5c654cd 23/32: v0.4.0

[Feng Shu]

branch: externals/pyim-basedict
commit 5c654cd05ba60ff161f6d1ff9e806e746ddb2762
Author: Feng Shu 
Commit: Feng Shu 

v0.4.0
---
 pyim-basedict.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index 652a882..4a5477f 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -5,7 +5,7 @@
 
 ;; Author: Feng Shu 
 ;; URL: https://github.com/tumashu/pyim-basedict
-;; Version: 0.0.1
+;; Version: 0.4.0
 ;; Keywords: convenience, Chinese, pinyin, input-method, complete
 
 ;;; License:

[elpa] externals/pyim-basedict 06a191c 31/32: Update pyim-basedict.el header.

[Feng Shu]

branch: externals/pyim-basedict
commit 06a191ce95cb81459839d7a32becceea50a79384
Author: Feng Shu 
Commit: Feng Shu 

Update pyim-basedict.el header.
---
 pyim-basedict.el | 20 
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index 52d1802..9007cf1 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -1,31 +1,27 @@
 ;;; pyim-basedict.el --- The default pinyin dict of pyim  -*- lexical-binding: 
t; -*-
 
 ;; * Header
-;; Copyright (C) 2015 Feng Shu 
+;; Copyright (C) 2015-2021 Free Software Foundation, Inc.
 
 ;; Author: Feng Shu 
 ;; URL: https://github.com/tumashu/pyim-basedict
 ;; Version: 0.4.0
 ;; Keywords: convenience, Chinese, pinyin, input-method, complete
 
-;;; License:
+;; This file is part of GNU Emacs.
 
-;; This file is not part of GNU Emacs.
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
 
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License
-;; as published by the Free Software Foundation; either version 3
-;; of the License, or (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
+;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see .
 
 ;;; Commentary:
 ;; * pyim-basedict README :README:doc:

[elpa] externals/pyim-basedict 6c1eeb1 26/32: Add pyim-basedict-libpinyin-data-files

[Feng Shu]

branch: externals/pyim-basedict
commit 6c1eeb1050be622a18ba17f455f5bc63be725805
Author: Feng Shu 
Commit: Feng Shu 

Add pyim-basedict-libpinyin-data-files

* pyim-basedict.el (pyim-basedict-libpinyin-table-files): Removed.
(pyim-basedict-libpinyin-data-files): New variable.
(pyim-basedict-build-file): Ask user libpinyin data dir.
---
 pyim-basedict.el | 60 
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index 6c6ea40..42048a3 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -50,25 +50,23 @@
 
 ;;; Code:
 ;; * 代码   :code:
-(defvar pyim-basedict-libpinyin-table-files
-  (mapcar (lambda (x)
-(concat "libpinyin-data/" x))
-  (list "society.table"
-"life.table"
-"people.table"
-"culture.table"
-"economy.table"
-"technology.table"
-"science.table"
-"nature.table"
-"history.table"
-"art.table"
-"sport.table"
-"geology.table"
-"merged.table"
-"opengram.table"
-"gb_char.table"
-"gbk_char.table"))
+(defvar pyim-basedict-libpinyin-data-files
+  (list "society.table"
+"life.table"
+"people.table"
+"culture.table"
+"economy.table"
+"technology.table"
+"science.table"
+"nature.table"
+"history.table"
+"art.table"
+"sport.table"
+"geology.table"
+"merged.table"
+"opengram.table"
+"gb_char.table"
+"gbk_char.table")
   "Libpinyin data files")
 
 ;;;###autoload
@@ -95,12 +93,13 @@
 (defun pyim-basedict-build-file ()
   "使用 libpinyin 自带的 data 文件创建 pyim-basedict.pyim."
   (interactive)
-  (let ((hash-table (make-hash-table :test #'equal)))
+  (let ((dir (read-directory-name "请选择 libpinyin data 所在的目录："))
+(hash-table (make-hash-table :test #'equal)))
 (with-temp-buffer
   (erase-buffer)
-  (dolist (file pyim-basedict-libpinyin-table-files)
-(when (file-exists-p file)
-  (insert-file-contents file)
+  (dolist (filename pyim-basedict-libpinyin-data-files)
+(when (file-exists-p (expand-file-name filename dir))
+  (insert-file-contents (expand-file-name filename dir))
   (goto-char (point-max
   (goto-char (point-min))
   (while (not (eobp))
@@ -113,16 +112,17 @@
hash-table))
 (forward-line 1)))
 (with-temp-buffer
-  (maphash (lambda (key value)
- (setq value (delete-dups (reverse value)))
- (unless (string-match-p "-" key)
-   (setq value (sort value #'pyim-pymap-cchar<)))
- (insert (format "%s %s\n" key (mapconcat #'identity value " 
"
-   hash-table)
+  (maphash
+   (lambda (key value)
+ (setq value (delete-dups (reverse value)))
+ (unless (string-match-p "-" key)
+   (setq value (sort value #'pyim-pymap-cchar<)))
+ (insert (format "%s %s\n" key (mapconcat #'identity value " "
+   hash-table)
   (sort-lines nil (point-min) (point-max))
   (goto-char (point-min))
   (insert ";; -*- coding: utf-8 -*--\n")
-  (write-file "pyim-basedict.pyim"
+  (write-file "pyim-basedict.pyim" t
 
 ;; * Footer
 (provide 'pyim-basedict)

[elpa] externals/pyim-basedict 6b6eea5 12/32: Update README

[Feng Shu]

branch: externals/pyim-basedict
commit 6b6eea5375d2e0b4b6374fbf766ebb209ece86af
Author: Feng Shu 
Commit: Feng Shu 

Update README
---
 README.md| 48 +++-
 pyim-basedict.el |  4 
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index 6b57e5a..8a00814 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +1,45 @@
-- [chinese-pyim-basedict README](#chinese-pyim-basedict-readme)
-  - [简介](#简介)
-  - [安装和使用](#安装和使用)
-  - [如何为这个项目贡献词条](#如何为这个项目贡献词条)
+- [pyim-basedict README](#org9c0ad64)
+  - [简介](#org9738d87)
+  - [安装和使用](#orgad28538)
+  - [如何为这个项目贡献词条](#org4bcc69d)
 
-# chinese-pyim-basedict README
 
-## 简介
+
 
-Chinese-pyim-basedict 是 chinese-pyim 的默认词库，词库的内容的来源:
+# pyim-basedict README
+
+
+
+
+## 简介
+
+pyim-basedict 是 pyim 的默认词库，词库的内容的来源:
 
 1.  libpinyin 项目的内置词库
-2.  chinese-pyim 用户贡献的个人词库
+2.  pyim 用户贡献的个人词库
+
+注意：这个词库的词条量大概在1万左右，是一个 **非常小** 得词库，只能确保 pyim 可以正常工作，如果用户想让 pyim 
更加顺手，需要添加附加的词库， 一个比较好的选择是安装 pyim-greatdict, 不过这个词库非常庞大，词条量 超过300万，不适合计算机 cpu 
和内存不足的用户。另外，用户也可以使用其它方式 添加词库，具体请参考 pyim README 中的相关章节：
 
-注意：这个词库的词条量大概在1万左右，是一个 **非常小** 得词库，只能确保 Chinese-pyim
-可以正常工作，如果用户想让 chinese-pyim 更加顺手，需要添加附加的词库，一个比较好的选择是安装 chinese-pyim-greatdict, 
不过这个词库非常庞大，词条量超过300万，不适合计算机 cpu 和内存不足的用户。另外，用户也可以使用其它方式添加词库，具体请参考 chinese-pyim 
README 中的相关章节：
+
 
-
 
-## 安装和使用
+
+
+## 安装和使用
 
 1.  配置melpa源，参考：
-2.  M-x package-install RET chinese-pyim-basedict RET
+2.  M-x package-install RET pyim-basedict RET
 3.  在emacs配置文件中（比如: ~/.emacs）添加如下代码：
 
-(require 'chinese-pyim-basedict)
-(chinese-pyim-basedict-enable)
+(require 'pyim-basedict)
+(pyim-basedict-enable)
+
+
+
+
+## 如何为这个项目贡献词条
+
+pyim 的用户，如果想让自己常用词条进入 pyim 默认词库的话， 可以运行 \`pyim-contribute-words' , 
然后按照它的提示操作就可以了。
 
-## 如何为这个项目贡献词条
 
-Chinese-pyim 的用户，如果想让自己常用词条进入 chinese-pyim 默认词库的话，可以运行 
\`pyim-contribute-words' , 然后按照它的提示操作就可以了。
+Converted from pyim-basedict.el by [el2org](https://github.com/tumashu/el2org) 
.
\ No newline at end of file
diff --git a/pyim-basedict.el b/pyim-basedict.el
index 9da7302..bcb08a8 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -59,7 +59,6 @@
 
 ;;; Code:
 ;; * 代码   :code:
-;; #+BEGIN_SRC emacs-lisp
 
 ;;;###autoload
 (defun pyim-basedict-enable ()
@@ -77,11 +76,9 @@
:dict-type pinyin-dict
:elpa t))
 (message "pyim 没有安装，pyim-basedict 启用失败。")
-;; #+END_SRC
 
 ;; * Footer
 
-;; #+BEGIN_SRC emacs-lisp
 (provide 'pyim-basedict)
 
 ;; Local Variables:
@@ -89,4 +86,3 @@
 ;; End:
 
 ;;; pyim-basedict.el ends here
-;; #+END_SRC

[elpa] main eb74fe0: * elpa-packages ("pyim-basedict"): New package.

[Feng Shu]

branch: main
commit eb74fe05a9f25e1c4a874a96740806ae70928d31
Author: Feng Shu 
Commit: Feng Shu 

* elpa-packages ("pyim-basedict"): New package.
---
 elpa-packages | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index a37e196..65dde2e 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -270,6 +270,9 @@
  ("pyim"
   :url "https://github.com/tumashu/pyim.git";
   :auto-sync t)
+ ("pyim-basedict"
+  :url "https://github.com/tumashu/pyim-basedict.git";
+  :auto-sync t)
  ("python" :core "lisp/progmodes/python.el")
  ("quarter-plane"  :url nil)
  ("queue"  :url "http://www.dr-qubit.org/git/predictive.git";)

[elpa] externals/pyim-basedict 7495c97: v0.5.0

[Feng Shu]

branch: externals/pyim-basedict
commit 7495c974ada99f9fed96d8e85d8b97dabce9532c
Author: Feng Shu 
Commit: Feng Shu 

v0.5.0
---
 pyim-basedict.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim-basedict.el b/pyim-basedict.el
index be18ac7..a88dd69 100644
--- a/pyim-basedict.el
+++ b/pyim-basedict.el
@@ -5,7 +5,7 @@
 
 ;; Author: Feng Shu 
 ;; URL: https://github.com/tumashu/pyim-basedict
-;; Version: 0.4.0
+;; Version: 0.5.0
 ;; Keywords: convenience, Chinese, pinyin, input-method, complete
 
 ;; This file is part of GNU Emacs.

[elpa] externals/pyim 4b3a4cf 2/2: v3.3

[ELPA Syncer]

branch: externals/pyim
commit 4b3a4cf21f62c343f4f01133a3ff5cf943853799
Author: Feng Shu 
Commit: Feng Shu 

v3.3
---
 pyim.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyim.el b/pyim.el
index 73caa50..03264cd 100644
--- a/pyim.el
+++ b/pyim.el
@@ -7,7 +7,7 @@
 ;; Feng Shu 
 ;; Maintainer: Feng Shu 
 ;; URL: https://github.com/tumashu/pyim
-;; Version: 3.2
+;; Version: 3.3
 ;; Keywords: convenience, Chinese, pinyin, input-method
 ;; Package-Requires: ((emacs "24.4") (async "1.6") (xr "1.13"))
 

[elpa] externals/pyim 67411a5 1/2: Import Chinese Chars from libpinyin data.

[ELPA Syncer]

branch: externals/pyim
commit 67411a50f27d5902a8aa78b1e7b7e79051272b87
Author: Feng Shu 
Commit: Feng Shu 

Import Chinese Chars from libpinyin data.

* pyim-pymap.el (pyim-pymap): Update.
(pyim-pymap-build-pymap): New function.
---
 pyim-pymap.el | 857 ++
 1 file changed, 449 insertions(+), 408 deletions(-)

diff --git a/pyim-pymap.el b/pyim-pymap.el
index a3c2c8a..2a018ef 100644
--- a/pyim-pymap.el
+++ b/pyim-pymap.el
@@ -27,9 +27,12 @@
 
 ;; * 说明文档  :doc:
 
-;; 
这个文件源自：[[http://git.savannah.gnu.org/cgit/emacs.git/tree/leim/MISC-DIC/pinyin.map][pinyin.map]]
-;; 这个文件是 pyim 内部使用的 "拼音-汉字" 对照表，
-;; 这个对照表用来实现拼音查询功能，即，查询某个汉字对应的拼音代码。
+;; 这个文件中变量 `pyim-pymap' 由
+;; 
[[https://github.com/libpinyin/libpinyin/releases/download/2.6.0/libpinyin-2.6.0.tar.gz][libpinyin-2.6.0.tar.gz]]
+;; 的 data 文件使用 `pyim-pymap-build-pymap' 函数转换得到。
+
+;; 这个文件是 pyim 内部使用的 "拼音-汉字" 对照表，这个对照表用来实现拼音查询功能，
+;; 即，查询某个汉字对应的拼音代码。
 
 ;; 注意： 这个文件 *不用于* 输入法自定义词库！！！
 
@@ -37,412 +40,411 @@
 ;;; Code:
 ;; * 代码 :code:
 (defvar pyim-pymap
-  '(("a" "阿啊呵腌嗄吖锕")
-("ai" "爱埃艾碍癌哀挨矮隘蔼唉皑哎霭捱暧嫒嗳瑷嗌锿砹")
-("an" "安案按岸暗鞍氨俺胺铵谙庵黯鹌桉埯犴揞")
-("ang" "昂盎肮")
-("ao" "奥澳傲熬凹鳌敖遨鏖袄坳翱嗷拗懊岙螯骜獒鏊媪廒聱")
-("ba" "把八巴拔吧坝爸霸罢芭跋扒叭靶疤笆耙鲅粑岜灞钯捌菝魃茇")
-("bai" "百白败摆伯拜柏佰掰呗捭稗")
-("ban" "办版半班般板颁伴搬斑扮拌扳瓣坂阪绊钣瘢舨癍")
-("bang" "帮邦榜棒膀镑绑傍磅蚌谤梆浜蒡")
-("bao" "报保包宝暴胞薄爆饱抱堡鲍曝葆豹刨褒雹孢苞煲褓趵鸨龅")
-("bei" "北被备倍背杯贝辈悲碑卑悖惫蓓陂钡狈呗焙碚褙埤鞴孛鹎萆邶鐾")
-("ben" "本奔苯笨夯贲锛畚坌")
-("beng" "泵崩蚌蹦迸绷甭嘣甏")
-("bi" "比必币笔毕避闭壁弊彼逼碧鼻臂蔽璧庇痹毙弼匕鄙陛裨贲敝蓖吡篦俾铋毖筚荸薜婢哔跸埤濞秕荜愎妣芘箅庳髀畀滗狴萆嬖襞舭")
-("bian" "变便边编遍辩鞭辨贬匾扁卞汴辫砭苄蝙鳊弁窆笾煸褊碥忭缏")
-("biao" "表标彪镖裱飚膘飙镳婊骠飑杓髟鳔瘭")
-("bie" "别鳖憋瘪蹩")
-("bin" "宾滨斌彬濒殡缤鬓槟摈膑玢镔豳髌傧")
-("bing" "并病兵冰饼炳秉丙摒柄禀邴")
-("bo" "波博播勃拨薄伯玻搏柏泊舶剥渤卜驳脖膊簸菠礴箔掰铂亳钵帛擘饽跛钹趵檗啵鹁孛踣")
-("bu" "不部步布补捕埔卜埠簿哺怖钚卟瓿逋晡醭钸")
-("ca" "擦嚓礤")
-("cai" "才采财材菜彩裁蔡猜踩睬")
-("can" "参残餐灿惨蚕掺璨惭粲孱骖黪")
-("cang" "藏仓苍沧舱伧")
-("cao" "草操曹槽糙嘈漕螬艚")
-("ce" "策测册侧厕恻")
-("cen" "参岑涔")
-("ceng" "层曾蹭噌")
-("cha" "查察差茶插叉刹茬楂岔诧碴嚓喳姹杈汊衩搽槎镲檫馇锸猹")
-("chai" "差拆柴钗豺侪虿瘥")
-("chan" "产阐缠掺禅颤铲蝉搀潺蟾馋忏婵孱觇廛谄谗澶骣羼镡躔蒇冁")
-("chang" "场长厂常偿昌唱畅倡尝肠敞倘猖娼徜昶怅嫦菖鲳阊伥苌氅惝鬯")
-("chao" "超朝潮炒钞抄巢吵绰嘲晁焯耖怊")
-("che" "车彻撤扯澈掣坼砗")
-("chen" "称陈沉晨琛臣尘辰衬趁忱郴宸谌碜嗔抻榇伧谶龀")
-("cheng" "成程城承称盛乘诚呈惩撑澄秤橙骋逞瞠丞铛埕塍噌蛏柽铖酲裎枨")
-("chi" "持吃池迟赤驰尺斥齿翅匙痴耻炽侈弛叱啻坻嗤墀哧茌豉敕笞饬踟蚩媸魑篪褫彳鸱螭瘛眵傺")
-("chong" "重充冲崇虫宠忡憧舂茺铳艟")
-("chou" "筹抽绸酬愁丑臭仇畴稠瞅踌惆俦瘳雠帱")
-("chu" "出处础初除储畜触楚厨雏矗橱锄褚滁躇怵绌搐刍蜍黜杵蹰亍樗憷楮")
-("chuai" "揣踹啜嘬搋膪")
-("chuan" "传川船穿串喘椽舛钏遄氚巛舡")
-("chuang" "创床窗闯幢疮怆")
-("chui" "吹垂锤炊陲槌捶棰")
-("chun" "春纯醇淳唇椿蠢鹑莼蝽")
-("chuo" "辍绰戳啜龊踔")
-("ci" "次此差词辞刺瓷磁兹慈茨赐祠雌疵鹚糍呲茈")
-("cong" "从丛匆聪葱囱琮淙枞骢苁璁")
-("cou" "凑辏腠楱")
-("cu" "促粗簇醋卒蹴猝蹙酢蔟殂徂")
-("cuan" "窜攒篡蹿撺爨汆镩")
-("cui" "催崔脆翠萃粹摧璀瘁悴淬啐隹毳榱")
-("cun" "村存寸忖皴")
-("cuo" "措错磋挫搓撮蹉锉厝嵯痤矬瘥脞鹾")
-("da" "大达打答搭沓瘩嗒哒耷鞑疸靼褡笪怛妲")
-("dai" "代带待贷戴袋歹呆逮岱傣怠殆黛甙埭绐玳呔迨骀")
-("dan" "但单担丹胆旦弹蛋淡诞氮郸耽殚惮儋眈疸澹掸啖箪聃萏瘅赕")
-("dang" "当党档荡挡宕砀铛裆凼菪谠")
-("dao" "到道导岛倒刀盗稻蹈悼捣叨祷氘纛帱忉")
-("de" "的得德锝")
-("deng" "等登邓灯凳瞪蹬噔磴嶝镫簦戥")
-("di" "地第提低底抵弟迪递帝敌堤蒂缔滴涤翟娣笛棣荻谛狄邸嘀砥坻诋嫡镝碲骶氐柢绨籴羝睇觌")
+  '(("a" "阿啊呵腌嗄吖锕錒")
+("ai" 
"爱埃艾碍癌呆哀挨矮隘蔼唉皑哎霭捱暧嫒嗳瑷嗌锿砹诶乂欸叆毐佁烠堨㤅嘊伌礙䨠嬡娭鴱䀳䬵㘷䠹昹䔽娾䑂靄硋㕌呝嵦塧譪鱫䅬㱯噯敱㝶㑸䝽鎄㢊誒皚䶣馤璦皧銰躷瞹㿄㗒凒懓曖懝㗨濭藹賹阸㝵閡絠鯦譺㾢䔇㾨焥諰溰醷謁騃愛啀鑀靉敳薆厓僾餲愒壒溾")
+("an" 
"厂广安案按岸暗鞍氨俺胺铵谙庵黯鹌桉埯犴揞唵匼垵垾盦錌匎儑䬓堓䜙㜝洝阥㸩堷䅁葊荌䅖㱘㽢腤婩鵪罯晻厈貋隌䎏侒鶕䮗誝鮟䎨銨玵㟁峖䯥盫黬蓭諳痷雸韽㡋咹頇屽䤃遃㭺裺䤶萻豻啽広鞌媕闇菴馣")
+("ang" "昂盎肮卬䬓䀚㼜昻䩕䍩䭹䭺㭿岇枊醠䒢骯㦹軮䇦")
+("ao" 
"奥澳傲熬凹嚣鳌敖遨鏖袄坳翱嗷拗懊岙螯骜獒鏊艹媪廒聱璈奡嶅隩鴁㠂㤇䴈爊䜒㠗㜜蔜簢㜩㘬㘭鰲謸䐿驁㑃䵅詏獓襖䥝慠㕭䁱扷镺㥿垇䦋梎澚䞝抝隞䚫厫䮯芺媼囂鷔擙䯠䫨柪軪嫯㿰滶翶嗸翺㟼礉䆟熝鏕㩠墽郩岰䉛蝹鼇謷奧摮嶴墺磝眑鴢泑")
+("ba" 
"把八巴拔吧坝爸霸罢芭跋扒叭靶疤笆耙杷鲅粑岜灞钹钯捌菝魃茇朳妭胈蚆羓鲃鲌鈀欛㔜鼥紦笩鈸䰾夿䩗詙䱝魞䥯罷坺䩻鮁䆉鮊㞎玐㶚馛㖠墢炦䎬犮颰䎱垻䳁㧊䳊叐䇑釟秡䟦壩哵䃻矲䮂柭䈈㭭釛皅䶕䯲㭛癹抪騃猈弝茷豝覇抜仈軷峇跁")
+("bai" "百白败摆伯拜柏佰掰呗擘捭稗鞁䥯贁唄㠔㼟栢㼣䴽䙓絔敗兡庍䒔䢙薭䳆㗑㗗㿟矲擺蛽韛挀㧳䠋䪹㔥竡猈襬粨粺拝")
+("ban" 
"办版半班般板颁伴搬斑扮拌扳瓣坂阪绊钣瘢舨癍柈昄攽湴靽朌怑鈑㸞褩䬳蝂絆鉡虨㩯䕰䉽粄岅螌㚘㺜肦辦辬㪵闆秚瓪賁㻞䛀埿䰉搫䈲坢䃑跘螁頒斒姅籓魬鳻")
+("bang" "帮邦旁榜棒膀镑绑傍磅蚌谤梆浜蒡氆甏玤蚄棓塝搒縍稖謗㔙蜯䰷挷幇㭋幚捠幫綁㮄鎊䂜鞤㾦䎧䖫邫垹㯁髈䧛䟺埲硥蛖騯嫎牓艕")
+("bao" 
"报保包宝暴胞薄爆炮饱抱堡剥鲍曝葆瀑豹刨褒雹孢苞煲褓趵鸨龅勹枹鴇怉䨌䈏䴐䨔䤖堢笣報襃㙅䭋鉋靌蕔齙㵡䥤㙸䎂窇袌㲏鮑㲒嚗犦䪨蚫宲骲忁闁駂㻄铇䳈嫑曓寚瓝珤緥㫧䳰賲鳵寶㿺勽飽鸔䭸䯽靤髱儤虣鑤媬菢寳扢嘐")
+("bei" 
"北被备倍背杯贝辈悲碑臂卑悖惫蓓裨陂钡狈呗焙俾碚褙埤鞴孛鹎萆邶鐾哱琲椑棓鞁糒㱯䱝䥯垻唄㗗䟺昁鄁愂錃㰆㼎䔒伓䠙㸢㔨㸬㤳紴鐴㸽䰽䩀䁅牬杮鵯鉳䡶偹禆憊㶔犕梖誖備貝㾱綼㣁僃鋇㓈㻗韛㛝藣郥軰䋳㷶揹俻珼狽䟛箄骳㔗㭭萯䣙苝㫲諀輩偝桮奰盃柸")
+("ben" "本奔苯笨夯贲锛畚坌栟坋倴犇渀㤓錛㨧逩䬱夲輽楍獖奙桳㱵㡷捹撪㮺賁燌泍軬蟦鐼炃㮥喯翉")
+("beng" "泵崩蚌蹦迸绷甭嘣甏堋琫镚玤祊洴弸搒㔙蜯挷㛝逬䨻䙀繃㑟奟䩬嵭䭰塴㱶誁閍鞛熢綳䳞㷯槰跰鏰埲䋽㧍漨琣錋㼞傰埄蠯伻絣菶偪痭")
+("bi" 
"比必币笔毕秘避闭辟壁弊彼逼碧鼻臂蔽泌璧庇痹毙弼匕鄙陛裨贲敝蓖吡篦纰俾铋毖筚荸薜婢哔跸埤濞秕荜愎睥妣芘蚍箅庳髀畀滗狴萆嬖襞擗鐾舭坒佖沘邲诐苾咇珌祕椑皕赑鞁馝觱鲾皦䐿㕭㿰㗉㮄紴鐴䁅綼㷶賁繴鮩䨆朇鼊䠋蜌鰏䬛堛䌟㘠䘡䀣鄨㘩縪鄪稫㠲䄶夶弻朼㡀畁㹃彃㙄䵄筆饆佊豍鉍煏畐襒魓蹕鵖䕗㡙啚䩛聛畢幣襣幤㵥㵨䭮魮潷腷㱸䁹罼悂斃躃箄鮅箆閇枈閉粊㪏貏䪐袐螕䦘檘熚䮡㪤䊧䖩疪㚰㢰㮰貱骳䎵㢶㢸鞸妼㮿柀䫁䟆㯇鏎䋔㓖䧗䯗㧙鷝韠䏢闢䟤䣥廦㻫㿫柫滭嫳篳毴㻶䏶嗶䇷㳼蓽䃾䫾䏟㵒胇踾䵗鶝䌘䉾鴓娝鸊笓紕崥怶睤肶㯅旇翍奰蘗愊贔怭屄楅驆払詖獘獙湢偪皀粃躄梐疕鎞閟駜鷩柲飶痺閈俛髲")
+("bian" 
"变便边编遍辩鞭辨贬匾扁卞汴辫砭苄蝙鳊弁窆笾煸褊碥髟忭缏抃昪萹䐔鶣豍甂鴘㴜稨猵楄牑㭓䡢籩獱䁵㵷㝸䉸鍽邉覍㦚炞閞辡㲢玣辧䒪辮辯貶㺹䪻糄柉藊㳎㣐㳒䛒揙㻞編緶惼鯾鯿䟍疺匥㺕臱頨鞕変艑汳變邊徧箯辺釆")
+("biao" 
"表标彪镖裱飚膘飙镳婊骠嘌飑杓髟鳔灬瘭俵摽骉脿蔈幖熛儦藨瀌䙳爂贆㠒標謤䔸褾鰾驃鑣墂䞄羆檦颩颮徱颷飆飇飈飍諘鏢磦㯱㯹㧼㟽淲䅺膔篻猋錶驫穮麃僄臕滮")
+("bie" "别鳖憋瘪蹩咇㜩柭縪襒㱸㓖㧙䟤䇷㲢鼈䠥別彆鱉虌癟䭱䉲莂龞徶㢼蛂㿜蟞䏟䋢穪㭭䌘柲")
+("bin" "宾滨斌彬濒殡缤鬓槟摈膑玢镔豳髌傧邠䳁虨鬂儐䐔椕瀕鬢霦汃鑌驞穦豩顮瑸繽鶣馪殯檳梹矉臏賓賔髕髩擯濱濵濹㻞砏訜蠙璸贇")
+("bing" 
"并病兵冰屏饼炳秉丙摒柄槟禀廪邴冫栟昺蛃㓈誁檳梹㨀䈂倂餅琕昞稟餠

[elpa] externals/pyim updated (a142f82 -> 4b3a4cf)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  a142f82   * pyim.el (pyim-cregexp-build-1): Better handle "'".
   new  67411a5   Import Chinese Chars from libpinyin data.
   new  4b3a4cf   v3.3


Summary of changes:
 pyim-pymap.el | 857 ++
 pyim.el   |   2 +-
 2 files changed, 450 insertions(+), 409 deletions(-)

[elpa] externals/pyim 783b138: * pyim-pymap.el (pyim-dline-parse): declare-function.

[ELPA Syncer]

branch: externals/pyim
commit 783b13819b37cf37a5965f1b467f39e1d6050e38
Author: Feng Shu 
Commit: Feng Shu 

* pyim-pymap.el (pyim-dline-parse): declare-function.
---
 pyim-pymap.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pyim-pymap.el b/pyim-pymap.el
index 2a018ef..002ec54 100644
--- a/pyim-pymap.el
+++ b/pyim-pymap.el
@@ -725,6 +725,8 @@
 pymap))
 (reverse pymap)))
 
+(declare-function 'pyim-dline-parse "pyim")
+
 (defun pyim-pymap-build-pymap ()
   "使用 libpinyin 自带的 data 文件创建 `pyim-pymap'."
   (interactive)

[elpa] externals/phps-mode ff28d3c: Fixed bug in incremental lex-analyzer related to heredoc and nesting stack

[Christian Johansson]

branch: externals/phps-mode
commit ff28d3c3910233135b42a78c821f8f33e12a157d
Author: Christian Johansson 
Commit: Christian Johansson 

Fixed bug in incremental lex-analyzer related to heredoc and nesting stack
---
 Makefile |   9 +-
 admin/phps-mode-automation-header.wy | 312 ---
 admin/phps-mode-automation.el| 117 ++---
 phps-mode-lex-analyzer.el|  38 -
 phps-mode-lexer.el   |  20 ++-
 phps-mode.el |   4 +-
 test/phps-mode-test-integration.el   | 153 ++---
 test/phps-mode-test-lexer.el |  48 +++---
 8 files changed, 152 insertions(+), 549 deletions(-)

diff --git a/Makefile b/Makefile
index 2a6e1ee..9c1b246 100644
--- a/Makefile
+++ b/Makefile
@@ -2,15 +2,19 @@ EMACS = emacs
 ifdef emacs
EMACS = $(emacs)
 endif
-EMACS_CMD := $(EMACS) -Q -batch -L . -L test/
+EMACS_CMD := $(EMACS) -Q -batch -L . -L test/ -L admin/
 
-EL  := admin/phps-mode-automation.el phps-mode-flymake.el 
phps-mode-lex-analyzer.el phps-mode-lexer.el phps-mode-macros.el 
phps-mode-syntax-table.el  phps-mode-parser-grammar-macro.el phps-mode.el 
phps-mode-test.el test/phps-mode-test-lex-analyzer.el 
test/phps-mode-test-integration.el test/phps-mode-test-lexer.el 
test/phps-mode-test-parser.el test/phps-mode-test-syntax-table.el
+EL  := admin/phps-mode-automation.el admin/phps-mode-automation-grammar.el 
phps-mode-flymake.el phps-mode-lex-analyzer.el phps-mode-lexer.el 
phps-mode-macros.el phps-mode-syntax-table.el  
phps-mode-parser-grammar-macro.el phps-mode.el phps-mode-test.el 
test/phps-mode-test-lex-analyzer.el test/phps-mode-test-integration.el 
test/phps-mode-test-lexer.el test/phps-mode-test-parser.el 
test/phps-mode-test-syntax-table.el
 ELC := $(EL:.el=.elc)
 
 .PHONY: clean
 clean:
rm -f $(ELC)
 
+.PHONY: generate-parser
+generate-parser:
+   $(EMACS_CMD) -L ~/.emacs.d/emacs-parser-generator/ -l 
phps-mode-lexer.el -l admin/phps-mode-automation.el
+
 .PHONY: compile
 compile:
$(EMACS_CMD) -f batch-byte-compile $(EL)
@@ -26,7 +30,6 @@ test-integration:
 test-lex-analyzer:
$(EMACS_CMD) -l test/phps-mode-test-lex-analyzer.el
 
-
 .PHONY: test-lexer
 test-lexer:
$(EMACS_CMD) -l test/phps-mode-test-lexer.el -f "phps-mode-test-lexer"
diff --git a/admin/phps-mode-automation-header.wy 
b/admin/phps-mode-automation-header.wy
deleted file mode 100644
index 17c4b33..000
--- a/admin/phps-mode-automation-header.wy
+++ /dev/null
@@ -1,312 +0,0 @@
-;;; phps.wy --- Semantic LALR grammar for PHP -*- lexical-binding: t -*-
-
-;; Copyright (C) 2018-2020  Free Software Foundation, Inc.
-
-;; This file is not part of GNU Emacs.
-
-;; This program is free software; you can redistribute it and/or
-;; modify it under the terms of the GNU General Public License as
-;; published by the Free Software Foundation; either version 2, or (at
-;; your option) any later version.
-
-;; This program is distributed in the hope that it will be useful, but
-;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;; General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs.  If not, see .
-
-
-;;; Commentary:
-
-;; Run `(wisent-make-parsers)' or "C-c C-c" to generate grammar-file in Emacs 
Lisp.
-;;
-;; To debug (setq wisent-verbose-flag t) and check buffer *wisent-log*
-;;
-;; Based on the Zend PHP Parser YACC 
https://github.com/php/php-src/blob/master/Zend/zend_language_parser.y
-
-;; Create macros for all macros uses in original YACC, base macro structure on 
semantic-php-wy-macro.el
-
-;; Don't edit phps.wy because it's generated by phps-automation.el and 
phps-automation-header.wy
-
-;; Check semantic/wisent/grammar.el for macro definitions
-
-;; To force compile grammar use: (semantic-grammar-create-package t)
-
-
-;;; Code:
-
-%package phps-mode
-%provide phps-mode-wy
-
-%languagemode phps-mode
-
-%{
-  (setq max-specpdl-size 16)
-}
-
-%use-macros phps-mode-parser-grammar-macro
-{
- ZEND_AST_CREATE
- ZEND_AST_CREATE_ASSIGN_OP
- ZEND_AST_CREATE_BINARY_OP
- ZEND_AST_CREATE_CAST
- ZEND_AST_CREATE_CLASS_CONST_OR_NAME
- ZEND_AST_CREATE_EX
- ZEND_AST_CREATE_LIST
- ZEND_AST_CREATE_ZVAL
- ZEND_AST_LIST_ADD
- ZEND_AST_LIST_RTRIM
- ZEND_LEX_TSTRING
- ZEND_NEGATE_NUM_STRING
- ZVAL_INTERNED_STR
-}
-
-%precedence T_THROW
-%precedence PREC_ARROW_FUNCTION
-%precedence T_INCLUDE T_INCLUDE_ONCE T_REQUIRE T_REQUIRE_ONCE
-%left T_LOGICAL_OR
-%left T_LOGICAL_XOR
-%left T_LOGICAL_AND
-%precedence T_PRINT
-%precedence T_YIELD
-%precedence T_DOUBLE_ARROW
-%precedence T_YIELD_FROM
-%precedence '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL 
T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL 
T_SR_EQUAL T_POW_EQUAL T_COALESCE_EQUAL
-%left '?' ':'
-%right T_COALESCE
-