[nongnu] main daff672: elpa-packages (with-editor): Set `:lisp-dir` to match new layout

[monnier--- via]

branch: main
commit daff672edfffa17d79f3e3c07627f0c4546b3538
Author: Stefan Monnier 
Commit: Stefan Monnier 

elpa-packages (with-editor): Set `:lisp-dir` to match new layout
---
 elpa-packages | 1 +
 1 file changed, 1 insertion(+)

diff --git a/elpa-packages b/elpa-packages
index 08c5d45..23545f7 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -305,6 +305,7 @@
 
  ("with-editor":url "https://github.com/magit/with-editor";
   :ignored-files ("htmlxref.cnf" ".travis.yml" ".mailmap" "Makefile")
+  :lisp-dir "lisp"
   :doc "docs/with-editor.texi")
 
  ("wgrep"  :url "https://github.com/mhayashi1120/Emacs-wgrep";)

[elpa] main 91f1c6c: * elpa-packages (nano-modeline): New package

[monnier--- via]

branch: main
commit 91f1c6c98e29866c9cb8fa1368dc482eb5edd4b1
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (nano-modeline): New package
---
 elpa-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 0f7b51f..9b4462b 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -265,6 +265,8 @@
  ("nadvice":url nil)
  ("nameless"   :url "https://github.com/Malabarba/Nameless";)
  ("names"  :url "https://github.com/Malabarba/names";)
+ ("nano-modeline"  :url "https://github.com/rougier/nano-modeline";
+  :auto-sync t)
  ("nano-theme" :url "https://github.com/rougier/nano-theme";
   :auto-sync t)
  ("nhexl-mode" :url nil)

[elpa] main 446a9d9: * elpa-packages (taxy, taxy-magit-section): Update/add

[monnier--- via]

branch: main
commit 446a9d9660de0abef1e1472b5b517d92bafd6f27
Author: Adam Porter 
Commit: Stefan Monnier 

* elpa-packages (taxy, taxy-magit-section): Update/add
---
 elpa-packages | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 1ef16cf..0f7b51f 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -387,6 +387,12 @@
  ("system-packages":url "https://gitlab.com/jabranham/system-packages";)
  ("systemd":url nil)
  ("taxy":url "https://github.com/alphapapa/taxy.el.git";
+  :doc "taxy.info"
+  :ignored-files ("images")
+  :auto-sync t)
+ ("taxy-magit-section"  :url "https://github.com/alphapapa/taxy.el.git";
+  :branch "package/taxy-magit-section"
+  :doc "taxy-magit-section.info"
   :auto-sync t)
  ("temp-buffer-browse"  :url "https://github.com/leoliu/temp-buffer-browse";)
  ("test-simple" :url "https://github.com/rocky/emacs-test-simple";)

[elpa] externals/kiwix updated (7d6039f -> 6191d43)

[monnier--- via]

monnier pushed a change to branch externals/kiwix.

  from  7d6039f   Fix org-kiwix void function incompatible which is behind 
API upgrade
   new  6439f32   Add a note that ‘kiwix-zim-dir’ must end with a slash
   new  0a048c1   Use correct variable name in ‘kiwix-launch-server’
   new  57b07c1   To enable stopping local server, keep a reference to 
server process
   new  2cafd37   I think I was wrong: ‘kiwix-zim-dir’ is distinct from 
‘library-path’
   new  acb1301   There should be a slash between ‘kiwix-zim-dir’ 
‘library.xml’
   new  6191d43   Merge pull request #7 from 
mattbeshara/launch-server-improvements


Summary of changes:
 kiwix.el | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

[elpa] externals/kiwix 6191d43 6/6: Merge pull request #7 from mattbeshara/launch-server-improvements

[monnier--- via]

branch: externals/kiwix
commit 6191d43e184e29de868a82331495ced9c9cc9be0
Merge: 7d6039f acb1301
Author: stardiviner 
Commit: GitHub 

Merge pull request #7 from mattbeshara/launch-server-improvements

Fix deprecated variable kiwix-default-library-dir and add new command to 
stop local server.
---
 kiwix.el | 26 ++
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/kiwix.el b/kiwix.el
index 8f04dbf..7fc0232 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -216,13 +216,15 @@ Set it to ‘t’ will use Emacs built-in ‘completing-read’."
   "Specify kiwix-mode keybinding prefix before loading."
   :type 'kbd)
 
+(defvar kiwix--server-process nil
+  "Local server process launched by ‘kiwix-launch-server’.")
 
 ;; launch Kiwix server
 ;;;###autoload
 (defun kiwix-launch-server ()
   "Launch Kiwix server."
   (interactive)
-  (let ((library-path kiwix-default-library-dir))
+  (let ((library-path kiwix-zim-dir))
 (cl-case kiwix-server-type
   ('docker-remote
(message "kiwix-serve service is started by user manually at other 
place."))
@@ -236,13 +238,21 @@ Set it to ‘t’ will use Emacs built-in ‘completing-read’."
   "-p" (format "%s:80" kiwix-server-port)
   "kiwix/kiwix-serve"
   "--library" "library.xml"))
-  ('kiwix-serve-local (start-process
-   "kiwix-server"
-   " *kiwix server*"
-   kiwix-server-command
-   "--port" (number-to-string kiwix-server-port)
-   "--daemon"
-   "--library" (concat library-path "library.xml"))
+  ('kiwix-serve-local
+   (setq kiwix--server-process
+ (start-process
+  "kiwix-server"
+  " *kiwix server*"
+  kiwix-server-command
+  "--port" (number-to-string kiwix-server-port)
+  "--library" (concat kiwix-zim-dir "/library.xml")))
+
+(defun kiwix-stop-local-server ()
+  "Stops a Kiwix server started by ‘kiwix-launch-server’."
+  (interactive)
+  (when kiwix--server-process
+(kill-process kiwix--server-process)
+(setq kiwix--server-process nil)))
 
 (defun kiwix-capitalize-first (string)
   "Only capitalize the first word of STRING."

[elpa] externals/kiwix 57b07c1 3/6: To enable stopping local server, keep a reference to server process

[monnier--- via]

branch: externals/kiwix
commit 57b07c1d80a8a2825794f349741158bd26cbabe6
Author: Matt Beshara 
Commit: Matt Beshara 

To enable stopping local server, keep a reference to server process
---
 kiwix.el | 24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/kiwix.el b/kiwix.el
index a97f43c..70eacc4 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -216,6 +216,8 @@ Set it to ‘t’ will use Emacs built-in ‘completing-read’."
   "Specify kiwix-mode keybinding prefix before loading."
   :type 'kbd)
 
+(defvar kiwix--server-process nil
+  "Local server process launched by ‘kiwix-launch-server’.")
 
 ;; launch Kiwix server
 ;;;###autoload
@@ -236,13 +238,21 @@ Set it to ‘t’ will use Emacs built-in ‘completing-read’."
   "-p" (format "%s:80" kiwix-server-port)
   "kiwix/kiwix-serve"
   "--library" "library.xml"))
-  ('kiwix-serve-local (start-process
-   "kiwix-server"
-   " *kiwix server*"
-   kiwix-server-command
-   "--port" (number-to-string kiwix-server-port)
-   "--daemon"
-   "--library" (concat library-path "library.xml"))
+  ('kiwix-serve-local
+   (setq kiwix--server-process
+ (start-process
+  "kiwix-server"
+  " *kiwix server*"
+  kiwix-server-command
+  "--port" (number-to-string kiwix-server-port)
+  "--library" (concat kiwix-zim-dir "library.xml")))
+
+(defun kiwix-stop-local-server ()
+  "Stops a Kiwix server started by ‘kiwix-launch-server’."
+  (interactive)
+  (when kiwix--server-process
+(kill-process kiwix--server-process)
+(setq kiwix--server-process nil)))
 
 (defun kiwix-capitalize-first (string)
   "Only capitalize the first word of STRING."

[elpa] externals/kiwix 0a048c1 2/6: Use correct variable name in ‘kiwix-launch-server’

[monnier--- via]

branch: externals/kiwix
commit 0a048c1e6c4e8dc0d14dc4bfec4a3310190ec7fe
Author: Matt Beshara 
Commit: Matt Beshara 

Use correct variable name in ‘kiwix-launch-server’
---
 kiwix.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwix.el b/kiwix.el
index 5364c68..a97f43c 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -222,7 +222,7 @@ Set it to ‘t’ will use Emacs built-in ‘completing-read’."
 (defun kiwix-launch-server ()
   "Launch Kiwix server."
   (interactive)
-  (let ((library-path kiwix-default-library-dir))
+  (let ((library-path kiwix-zim-dir))
 (cl-case kiwix-server-type
   ('docker-remote
(message "kiwix-serve service is started by user manually at other 
place."))

[elpa] externals/kiwix acb1301 5/6: There should be a slash between ‘kiwix-zim-dir’ ‘library.xml’

[monnier--- via]

branch: externals/kiwix
commit acb13012d04f29ac84d535b6c64f743124449722
Author: Matt Beshara 
Commit: Matt Beshara 

There should be a slash between ‘kiwix-zim-dir’ ‘library.xml’
---
 kiwix.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwix.el b/kiwix.el
index f0bc13d..7fc0232 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -245,7 +245,7 @@ Set it to ‘t’ will use Emacs built-in ‘completing-read’."
   " *kiwix server*"
   kiwix-server-command
   "--port" (number-to-string kiwix-server-port)
-  "--library" (concat kiwix-zim-dir "library.xml")))
+  "--library" (concat kiwix-zim-dir "/library.xml")))
 
 (defun kiwix-stop-local-server ()
   "Stops a Kiwix server started by ‘kiwix-launch-server’."

[elpa] externals/leaf c2fbf98 1/2: Fixes typo in README

[monnier--- via]

branch: externals/leaf
commit c2fbf987b51d45c8e3dbfbaa8ea1675e3cd444d2
Author: jgart <47760695+jga...@users.noreply.github.com>
Commit: GitHub 

Fixes typo in README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a655334..abaa2f2 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ Please put the following code (`` to 
``)
 
 Package to be developed
 
--   [feather.el](https://github.com/conao3/feather.el) instead of `package.el` 
-> (Achieved! Now available but it is just a pakcage.el wraper)
+-   [feather.el](https://github.com/conao3/feather.el) instead of `package.el` 
-> (Achieved! Now available but it is just a package.el wraper)
 
 -   leaf-key.el instead of `bind-key` -> (Achieved! Now `leaf` builtin)
 

[elpa] externals/leaf 0ccc52b 2/2: Merge pull request #503 from jgarte/jgarte-patch-1

[monnier--- via]

branch: externals/leaf
commit 0ccc52bb85592d09499a09768a61ecfeccbfdf1e
Merge: a4fd520 c2fbf98
Author: Naoya Yamashita 
Commit: GitHub 

Merge pull request #503 from jgarte/jgarte-patch-1

Fixes typo in README
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a655334..abaa2f2 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ Please put the following code (`` to 
``)
 
 Package to be developed
 
--   [feather.el](https://github.com/conao3/feather.el) instead of `package.el` 
-> (Achieved! Now available but it is just a pakcage.el wraper)
+-   [feather.el](https://github.com/conao3/feather.el) instead of `package.el` 
-> (Achieved! Now available but it is just a package.el wraper)
 
 -   leaf-key.el instead of `bind-key` -> (Achieved! Now `leaf` builtin)
 

[elpa] externals/sql-indent 0d2b3c9: don't recognize "if" statements after "routine" and "view" keywords (#100)

[monnier--- via]

branch: externals/sql-indent
commit 0d2b3c9b0ef5f629c5b9f9eab248a4a01f71b1cc
Author: Vincent Bernardoff 
Commit: GitHub 

don't recognize "if" statements after "routine" and "view" keywords (#100)
---
 sql-indent.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql-indent.el b/sql-indent.el
index 5a42695..e3503d7 100644
--- a/sql-indent.el
+++ b/sql-indent.el
@@ -497,7 +497,7 @@ We try to avoid false positives, like \"end if\" or the 
various
  (forward-word -1)
  ;; we don't want to match an "end if", and things like "drop index if
  ;; exists..." and "create index if not exist..."
- (not (looking-at 
"end\\|schema\\|table\\|view\\|index\\|trigger\\|procedure\\|function\\|package\\|body\\|extension")
+ (not (looking-at 
"end\\|schema\\|table\\|view\\|index\\|type\\|trigger\\|procedure\\|function\\|routine\\|package\\|body\\|extension")
 
 (defun sqlind-maybe-if-statement ()
   "If (point) is on an IF statement, report its syntax."

[elpa] externals/kiwix 6439f32 1/6: Add a note that ‘kiwix-zim-dir’ must end with a slash

[monnier--- via]

branch: externals/kiwix
commit 6439f32ccadd7870bbbe7b7d2608dc5c956eb29c
Author: Matt Beshara 
Commit: Matt Beshara 

Add a note that ‘kiwix-zim-dir’ must end with a slash
---
 kiwix.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwix.el b/kiwix.el
index 8f04dbf..5364c68 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -79,7 +79,7 @@
   (expand-file-name "~/.www.kiwix.org/kiwix")
   (car (directory-files (expand-file-name "~/.www.kiwix.org/kiwix") nil 
".*\\.default\\'")) ; profile folder name
   "/data/library/*.zim")))
-  "The kiwix ZIM files directory."
+  "The kiwix ZIM files directory.  Must end with a slash."
   :type 'string
   :safe #'stringp)
 

[elpa] externals/kiwix 2cafd37 4/6: I think I was wrong: ‘kiwix-zim-dir’ is distinct from ‘library-path’

[monnier--- via]

branch: externals/kiwix
commit 2cafd37267ae5c7e64657750c7f8446d13683ff5
Author: Matt Beshara 
Commit: Matt Beshara 

I think I was wrong: ‘kiwix-zim-dir’ is distinct from ‘library-path’
---
 kiwix.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kiwix.el b/kiwix.el
index 70eacc4..f0bc13d 100644
--- a/kiwix.el
+++ b/kiwix.el
@@ -79,7 +79,7 @@
   (expand-file-name "~/.www.kiwix.org/kiwix")
   (car (directory-files (expand-file-name "~/.www.kiwix.org/kiwix") nil 
".*\\.default\\'")) ; profile folder name
   "/data/library/*.zim")))
-  "The kiwix ZIM files directory.  Must end with a slash."
+  "The kiwix ZIM files directory."
   :type 'string
   :safe #'stringp)
 

[elpa] main babd2b0: * elpa-packages (boxy-headings): Rename from boxy-headlines

[monnier--- via]

branch: main
commit babd2b07adad09297fa1784f1f65c0d96f4ff94b
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (boxy-headings): Rename from boxy-headlines
---
 elpa-packages | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/elpa-packages b/elpa-packages
index 9b4462b..f991f95 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -61,7 +61,7 @@
  ("bnf-mode"   :url "https://github.com/sergeyklay/bnf-mode";)
  ("boxy"   :url "https://gitlab.com/tygrdev/boxy";
   :auto-sync t)
- ("boxy-headlines" :url "https://gitlab.com/tygrdev/boxy-headlines";
+ ("boxy-headings"  :url "https://gitlab.com/tygrdev/boxy-headings";
   :auto-sync t)
  ("brief"  :url nil)
  ("buffer-expose"  :url "https://github.com/clemera/buffer-expose";)

[elpa] externals/company-math 45778f5: [Fix #20] Use symbol boundary for prefix computation

[monnier--- via]

branch: externals/company-math
commit 45778f5731c97a21a83e3b965cbde42018709afd
Author: Vitalie Spinu 
Commit: Vitalie Spinu 

[Fix #20] Use symbol boundary for prefix computation
---
 company-math.el | 44 ++--
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/company-math.el b/company-math.el
index b8eba7c..92ec5ac 100644
--- a/company-math.el
+++ b/company-math.el
@@ -64,21 +64,15 @@ in a new Emacs session."
   :type '(choice (const :tag "No Custom Prefix" nil)
  string))
 
-;; no more custom since since v.1.2
-(when (boundp 'company-math-prefix-regexp)
-  (warn "`company-math-prefix-regexp' is deprecated, please remove from your 
custom settings."))
-
-(defvar company-math--latex-prefix-regexp
-  (concat (regexp-quote company-math-symbol-prefix)
-  "[^ \t\n]+"))
-
-(let ((psym (regexp-quote company-math-symbol-prefix))
-  (psub (when company-math-symbol-prefix
-  (concat "\\|" (regexp-quote company-math-subscript-prefix
-  (psup (when company-math-superscript-prefix
-  (concat "\\|" (regexp-quote company-math-superscript-prefix)
-  (setq company-math--unicode-prefix-regexp
-(concat "\\(" psym psub psup "\\)[^ \t\n]*")))
+(defvar company-math--symbol-prefix-regex
+  (regexp-quote company-math-symbol-prefix))
+(defvar company-math--unicode-prefix-regex
+  (let ((psym (regexp-quote company-math-symbol-prefix))
+(psub (when company-math-symbol-prefix
+(concat "\\|" (regexp-quote company-math-subscript-prefix
+(psup (when company-math-superscript-prefix
+(concat "\\|" (regexp-quote 
company-math-superscript-prefix)
+(concat "\\(" psym psub psup "\\)")))
 
 (defcustom company-math-allow-unicode-symbols-in-faces t
   "List of faces to allow the insertion of Unicode symbols.
@@ -159,15 +153,21 @@ various faces to allow or disallow completion on."
 (let* ((ppss (syntax-ppss))
(min-point (if (nth 3 ppss)
   (max (nth 8 ppss) (point-at-bol))
-(point-at-bol
-  (when (looking-back regexp min-point 'greedy)
-(match-string 0)))
+(point-at-bol)))
+   (bounds (bounds-of-thing-at-point 'symbol)))
+  (save-match-data
+(when (and bounds
+   (save-excursion
+ (goto-char (car bounds))
+ (or (looking-at regexp) ;; symbol might contain 
prefix (like in org)
+ (looking-back regexp min-point 'greedy
+  (buffer-substring-no-properties (match-beginning 0) 
(point)
 
 (defun company-math--substitute-unicode (symbol)
   "Substitute preceding latex command with with SYMBOL."
   (let ((pos (point))
 (inhibit-point-motion-hooks t))
-(when (re-search-backward company-math--unicode-prefix-regexp) ; should 
always match
+(when (re-search-backward (concat company-math--unicode-prefix-regex "[^ 
\t\n]*")) ; should always match
   (goto-char (match-beginning 0))
   ;; allow subsups to start with \
   (let ((start (max (point-min) (- (point) (length 
company-math-symbol-prefix)
@@ -188,7 +188,7 @@ COMMAND and ARG is as required by company backends."
   (cl-case command
 (interactive (company-begin-backend 'company-latex-commands))
 (prefix (unless (company-in-string-or-comment)
-  (company-math--prefix company-math--latex-prefix-regexp t '(
+  (company-math--prefix company-math--symbol-prefix-regex t '(
 (candidates (all-completions arg company-math--latex-commands))
 (sorted t)))
 
@@ -200,7 +200,7 @@ COMMAND and ARG is as required by company backends."
   (cl-case command
 (interactive (company-begin-backend 'company-math-symbols-latex))
 (prefix (unless (company-in-string-or-comment)
-  (company-math--prefix company-math--latex-prefix-regexp
+  (company-math--prefix company-math--symbol-prefix-regex
 company-math-allow-latex-symbols-in-faces
 
company-math-disallow-latex-symbols-in-faces)))
 (annotation (concat " " (get-text-property 0 :symbol arg)))
@@ -220,7 +220,7 @@ for details.
   (interactive (list 'interactive))
   (cl-case command
 (interactive (company-begin-backend 'company-math-symbols-unicode))
-(prefix (company-math--prefix company-math--unicode-prefix-regexp
+(prefix (company-math--prefix company-math--unicode-prefix-regex
   company-math-allow-unicode-symbols-in-faces
   
company-math-disallow-unicode-symbols-in-faces))
 (annotation (concat " " (get-text-property 0 :symbol arg)))

[elpa] branch scratch/auctex-lexbind deleted (was 7606a49)

[monnier--- via]

monnier pushed a change to branch scratch/auctex-lexbind.

   was  7606a49   Use UTF-8 for all ELisp files

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[elpa] branch scratch/hyperbole-merge-7.0.2b deleted (was a6eb9f8)

[monnier--- via]

monnier pushed a change to branch scratch/hyperbole-merge-7.0.2b.

   was  a6eb9f8   Re-apply commit 1188e43f16, apparently lost

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[elpa] elpa-admin 9ff3ed3 2/3: * elpa-admin (elpaa--section-to-html) : Fix level

[monnier--- via]

branch: elpa-admin
commit 9ff3ed3858ea4f93477e37a0beff5fcadf942d75
Author: Adam Porter 
Commit: Stefan Monnier 

* elpa-admin (elpaa--section-to-html) : Fix level

Make sure the doc's headings have a deeper level than the enclosing one.
---
 elpa-admin.el | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index c0e0625..6a88e3d 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -642,7 +642,7 @@ Return non-nil if a new tarball was created."
(group-n 7 (+ digit)) ":"
(group-n 8 (+ digit
 gitdate)
-(error "unknown date format: %S" gitdate))
+(error "Unknown date format: %S" gitdate))
   (let* ((field
   (lambda (group)
 (and (match-beginning group)
@@ -1224,7 +1224,8 @@ which see."
 (cl-defmethod elpaa--section-to-html ((section (head text/x-org)))
   (elpaa--export-org (cdr section) 'html
  :body-only t
- :ext-plist elpaa--org-export-options))
+ :ext-plist (append '(:html-toplevel-hlevel 3)
+elpaa--org-export-options)))
 
 (defun elpaa--extension-to-mime (ext)
   (pcase ext
@@ -1854,6 +1855,10 @@ If WITH-CORE is non-nil, it means we manage :core 
packages as well."
   (when elpaa--email-to
 (with-temp-buffer
   (message-mode)
+  (declare-function message-setup "message"
+(headers &optional yank-action actions continue
+ switch-function return-action))
+  (declare-function message-send "message" (&optional arg))
   (let* ((version (nth 1 metadata))
  (pkgname (car pkg-spec))
  (name (capitalize pkgname))

[elpa] elpa-admin 976e4be 1/3: Merge remote-tracking branch 'origin/scratch/prettify-readme.org' into elpa-admin

[monnier--- via]

branch: elpa-admin
commit 976e4befc00f1a6c534a1773fd77436a0f3c19c6
Merge: c362980 214032b
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge remote-tracking branch 'origin/scratch/prettify-readme.org' into 
elpa-admin
---
 elpa-admin.el | 181 ++
 1 file changed, 131 insertions(+), 50 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 0cdff76..c0e0625 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -69,6 +69,11 @@ to be installed and has only been tested on some Debian 
systems.")
 
 (defvar elpaa--debug nil)
 
+(defvar elpaa--org-export-options
+  '(:with-author nil :with-creator nil :with-broken-links t)
+  "Options used common to all Org export backends.
+See variable `org-export-options-alist'.")
+
 (unless (fboundp 'ignore-error)
   (defmacro ignore-error (condition &rest body)
 `(condition-case nil (progn ,@body) (,condition nil
@@ -1197,10 +1202,49 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
  (insert-file-contents mainsrcfile)
  (lm-header prop))
 
+(cl-defgeneric elpaa--section-to-plain-text (section)
+  "Return SECTION as plain text.
+SECTION should be a cons as returned by `elpaa--get-section',
+which see."
+  (cdr section))
+
+(cl-defmethod elpaa--section-to-plain-text ((section (head text/x-org)))
+  (elpaa--export-org (cdr section) 'ascii
+ :ext-plist (append '(:ascii-charset utf-8)
+elpaa--org-export-options)))
+
+(cl-defgeneric elpaa--section-to-html (section)
+  "Return SECTION as HTML.
+SECTION should be a cons as returned by `elpaa--get-section',
+which see."
+  (concat "\n"
+  (elpaa--html-quote (cdr section))
+  "\n\n"))
+
+(cl-defmethod elpaa--section-to-html ((section (head text/x-org)))
+  (elpaa--export-org (cdr section) 'html
+ :body-only t
+ :ext-plist elpaa--org-export-options))
+
+(defun elpaa--extension-to-mime (ext)
+  (pcase ext
+;; FIXME: On my Debian machine, `mailcap-extension-to-mime' tells me
+;; "org" is `application/vnd.lotus-organizer'.
+("org" 'text/x-org)
+;; FIXME: Apparently on some systems, `mailcap-extension-to-mime'
+;; returns nil for this one.
+((or "md" "markdown") 'text/markdown)
+(_
+ (require 'mailcap)
+ (let ((mt (if ext (mailcap-extension-to-mime ext
+ (if mt (intern mt) 'text/plain)
+
 (defun elpaa--get-section (header file srcdir pkg-spec)
-  "Return specified section as a string from SRCDIR for PKG-SPEC.
-If FILE is readable in SRCDIR, return its contents.  Otherwise
-return section under HEADER in package's main file."
+  "Return specified section for PKG-SPEC.
+Returns (TYPE . CONTENT) cons, where TYPE is a MIME-type string,
+and CONTENT is the content string.  If FILE is readable in
+SRCDIR, return its contents.  Otherwise return section under
+HEADER in package's main file."
   (when (consp file)
 (while (cdr-safe file)
   (setq file
@@ -1210,51 +1254,78 @@ return section under HEADER in package's main file."
 (when (consp file) (setq file (car file
   (cond
((file-readable-p (expand-file-name file srcdir))
-(with-temp-buffer
-  (insert-file-contents (expand-file-name file srcdir))
-  (buffer-string)))
+;; Return FILE's contents.
+(let ((type (elpaa--extension-to-mime (file-name-extension file)))
+  (content (with-temp-buffer
+ (insert-file-contents (expand-file-name file srcdir))
+ (buffer-string
+  (cons type content)))
((file-readable-p (expand-file-name (elpaa--main-file pkg-spec) srcdir))
-(with-temp-buffer
-  (insert-file-contents
-   (expand-file-name (elpaa--main-file pkg-spec) srcdir))
-  (emacs-lisp-mode) ;lm-section-start needs the outline-mode setting.
-  (let ((start (lm-section-start header)))
-(when start
-  ;; FIXME: Emacs<28 had a bug in `lm-section-end', so cook up
-  ;; our own ad-hoc replacement.
-  (goto-char start) (forward-line 1)
-  (re-search-forward "^\\(;;;[^;\n]\\|[^; \n]\\)" nil t)
-  (insert
-   (prog1
-   (buffer-substring start (match-beginning 0))
- (erase-buffer)))
-  (emacs-lisp-mode)
-  (goto-char (point-min))
-  (delete-region (point) (line-beginning-position 2))
-  (uncomment-region (point-min) (point-max))
-  (when (looking-at "^\\([ \t]*\n\\)+")
-(replace-match ""))
-  (goto-char (point-max))
-  (skip-chars-backward " \t\n")
-  (delete-region (point) (point-max))
-  (buffer-string)))
-
-(defun elpaa--get-README (pkg-spec dir)
-  (elpaa--get-section
-   "Commentary" (elpaa--spec-get pkg-spec :readme
- '("README" "README.rst"
-   ;; Most README.md files seem to be currently
-   

[elpa] elpa-admin b93fc0e 3/3: * elpa-admin.el (elpaa--html-make-pkg): Handle multiple maintainers

[monnier--- via]

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

* elpa-admin.el (elpaa--html-make-pkg): Handle multiple maintainers

(elpaa--make-one-tarball): Don't hide backtrace.
---
 elpa-admin.el | 21 +
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 6a88e3d..b9c1b87 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -531,7 +531,7 @@ Return non-nil if a new tarball was created."
 (message " Building tarball %s..." tarball)
 (let ((res nil))
   (unwind-protect
-  (condition-case err
+  (condition-case-unless-debug err
   (setq res (elpaa--make-one-tarball-1
  tarball dir pkg-spec metadata
  revision-function tarball-only))
@@ -1399,13 +1399,18 @@ arbitrary code."
   file (elpaa--html-quote file)
   (format-time-string "%Y-%b-%d" (nth 5 attrs))
   (elpaa--html-bytes-format (nth 7 attrs))
-  (let ((maint (elpaa--get-prop "Maintainer" name srcdir mainsrcfile)))
-(when maint
-  (when (consp maint)
-(elpaa--message "maint=%S" maint)
-(setq maint (concat (if (car maint) (concat (car maint) " "))
-"<" (cdr maint) ">")))
-  (insert (format "Maintainer %s\n" 
(elpaa--html-quote maint)
+  (let ((maints (elpaa--get-prop "Maintainer" name srcdir mainsrcfile)))
+(elpaa--message "maints=%S" maints)
+(insert
+ "Maintainer "
+ (mapconcat (lambda (maint)
+  (when (consp maint)
+(setq maint (concat (if (car maint) (concat (car 
maint) " "))
+"<" (cdr maint) ">")))
+  (elpaa--html-quote maint))
+(if (consp (car-safe maints)) maints (list maints))
+", ")
+ "\n"))
   (elpaa--insert-repolinks
pkg-spec
(or (cdr (assoc :url (aref (cdr pkg) 4)))

[elpa] elpa-admin updated (c362980 -> b93fc0e)

[monnier--- via]

monnier pushed a change to branch elpa-admin.

  from  c362980   Don't use `date` to parse date from git; it's unportable.
  adds  1a42fb8   * elpa-admin.el: Export Org readmes to ASCII and HTML
  adds  3dc70f4   * elpa-admin.el: Fix mime types for org and md
  adds  214032b   * elpa-admin.el (elpaa--export-org): Take the content 
string as input
   new  976e4be   Merge remote-tracking branch 
'origin/scratch/prettify-readme.org' into elpa-admin
   new  9ff3ed3   * elpa-admin (elpaa--section-to-html) : Fix 
level
   new  b93fc0e   * elpa-admin.el (elpaa--html-make-pkg): Handle multiple 
maintainers


Summary of changes:
 elpa-admin.el | 209 +-
 1 file changed, 150 insertions(+), 59 deletions(-)

[elpa] branch scratch/prettify-readme.org deleted (was 214032b)

[monnier--- via]

monnier pushed a change to branch scratch/prettify-readme.org.

   was  214032b   * elpa-admin.el (elpaa--export-org): Take the content 
string as input

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[elpa] elpa-admin 73db0c8: * elpa-admin.el (elpaa--get-section): Return nil when appropriate

[monnier--- via]

branch: elpa-admin
commit 73db0c8d94ad7bc027f05825e13f4f7a7e14be77
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--get-section): Return nil when appropriate

(elpaa--html-make-pkg): Handle nil return value.
---
 elpa-admin.el | 56 
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index b9c1b87..61918b6 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1263,32 +1263,31 @@ HEADER in package's main file."
   (cons type content)))
((file-readable-p (expand-file-name (elpaa--main-file pkg-spec) srcdir))
 ;; Return specified section from package's main source file.
-(let ((type 'text/plain)
-  (content (with-temp-buffer
- (insert-file-contents
-  (expand-file-name (elpaa--main-file pkg-spec) srcdir))
- (emacs-lisp-mode) ;lm-section-start needs the 
outline-mode setting.
- (let ((start (lm-section-start header)))
-   (when start
- ;; FIXME: Emacs<28 had a bug in `lm-section-end', so 
cook up
- ;; our own ad-hoc replacement.
- (goto-char start) (forward-line 1)
- (re-search-forward "^\\(;;;[^;\n]\\|[^; \n]\\)" nil t)
- (insert
-  (prog1
-  (buffer-substring start (match-beginning 0))
-(erase-buffer)))
- (emacs-lisp-mode)
- (goto-char (point-min))
- (delete-region (point) (line-beginning-position 2))
- (uncomment-region (point-min) (point-max))
- (when (looking-at "^\\([ \t]*\n\\)+")
-   (replace-match ""))
- (goto-char (point-max))
- (skip-chars-backward " \t\n")
- (delete-region (point) (point-max))
- (buffer-string))
-  (cons type content)
+(with-temp-buffer
+  (let ((type 'text/plain))
+(insert-file-contents
+ (expand-file-name (elpaa--main-file pkg-spec) srcdir))
+(emacs-lisp-mode)   ;lm-section-start needs the outline-mode 
setting.
+(let ((start (lm-section-start header)))
+  (when start
+;; FIXME: Emacs<28 had a bug in `lm-section-end', so cook up
+;; our own ad-hoc replacement.
+(goto-char start) (forward-line 1)
+(re-search-forward "^\\(;;;[^;\n]\\|[^; \n]\\)" nil t)
+(insert
+ (prog1
+ (buffer-substring start (match-beginning 0))
+   (erase-buffer)))
+(emacs-lisp-mode)
+(goto-char (point-min))
+(delete-region (point) (line-beginning-position 2))
+(uncomment-region (point-min) (point-max))
+(when (looking-at "^\\([ \t]*\n\\)+")
+  (replace-match ""))
+(goto-char (point-max))
+(skip-chars-backward " \t\n")
+(delete-region (point) (point-max))
+(cons type (buffer-string)
 
 (cl-defun elpaa--export-org (content backend &key body-only ext-plist)
   "Return Org CONTENT as an exported string.
@@ -1428,8 +1427,9 @@ arbitrary code."
  ;; "README.md"
  "README.org")))
  (readme-content
-  (elpaa--get-section "Commentary" package-readme-file-name
-  srcdir pkg-spec))
+  (or (elpaa--get-section "Commentary" package-readme-file-name
+  srcdir pkg-spec)
+  '(text/plain . "!No description!")))
  (readme-text (elpaa--section-to-plain-text readme-content))
  (readme-html (elpaa--section-to-html readme-content))
  (readme-output-filename (concat name "-readme.txt")))

[elpa] externals/coffee-mode 14a7213 2/2: Merge branch 'externals/coffee-mode' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa into externals/coffee-mode

[monnier--- via]

branch: externals/coffee-mode
commit 14a7213717a00c00ffaa2f0fc4c5113299bd13cb
Merge: 5761f4f 52dbdcf
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge branch 'externals/coffee-mode' of 
git+ssh://git.sv.gnu.org/srv/git/emacs/elpa into externals/coffee-mode
---
 coffee-mode.el | 13 +
 1 file changed, 13 insertions(+)

diff --git a/coffee-mode.el b/coffee-mode.el
index e5fac26..3687fa9 100644
--- a/coffee-mode.el
+++ b/coffee-mode.el
@@ -73,6 +73,19 @@
 
 ;; Please file bugs at 
 
+;; Thanks:
+
+;; Major thanks to http://xahlee.org/emacs/elisp_syntax_coloring.html
+;; the instructions.
+
+;; Also thanks to Jason Blevins's markdown-mode.el and Steve Yegge's
+;; js2-mode for guidance.
+
+;; TODO:
+;; - Execute {buffer,region,line} and show output in new buffer
+;; - Make prototype accessor assignments like `String::length: -> 10` pretty.
+;; - mirror-mode - close brackets and parens automatically
+
 ;;; Code:
 
 (require 'comint)

[elpa] externals/coffee-mode 5761f4f 1/2: * coffee-mode.el: Fix `Commentary:` header

[monnier--- via]

branch: externals/coffee-mode
commit 5761f4f586574b64eca2b8040b8b4ea9c94f5afb
Author: Stefan Monnier 
Commit: Stefan Monnier 

* coffee-mode.el: Fix `Commentary:` header
---
 coffee-mode.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/coffee-mode.el b/coffee-mode.el
index 2d4206c..e5fac26 100644
--- a/coffee-mode.el
+++ b/coffee-mode.el
@@ -1,6 +1,6 @@
 ;;; coffee-mode.el --- Major mode for CoffeeScript files
 
-;; Copyright (C) 2010-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2021 Free Software Foundation, Inc.
 
 ;; Version: 0.4.1.1
 ;; Keywords: CoffeeScript major mode
@@ -22,7 +22,7 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs.  If not, see .
 
-;;; Commentary
+;;; Commentary:
 
 ;; CoffeeScript mode is an Emacs major mode for [CoffeeScript][cs],
 ;; unfancy JavaScript.  It provides syntax highlighting, indentation

[elpa] elpa-admin cb24ed1: * elpa-admin.el (elpaa--html-make-pkg): Don't burp if there's no maintainer

[monnier--- via]

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

* elpa-admin.el (elpaa--html-make-pkg): Don't burp if there's no maintainer
---
 elpa-admin.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 61918b6..272dc88 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1407,7 +1407,9 @@ arbitrary code."
 (setq maint (concat (if (car maint) (concat (car 
maint) " "))
 "<" (cdr maint) ">")))
   (elpaa--html-quote maint))
-(if (consp (car-safe maints)) maints (list maints))
+(if (or (null maints) (consp (car-safe maints)))
+maints
+  (list maints))
 ", ")
  "\n"))
   (elpaa--insert-repolinks

[elpa] main 6871d91: * elpa-packages (nano-agenda): New package

[monnier--- via]

branch: main
commit 6871d91f0d853ff9414c0665802d54cd7aafdaf2
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (nano-agenda): New package
---
 elpa-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 977a2f8..268f0bf 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -306,6 +306,8 @@
  ("nadvice":url nil)
  ("nameless"   :url "https://github.com/Malabarba/Nameless";)
  ("names"  :url "https://github.com/Malabarba/names";)
+ ("nano-agenda":url "https://github.com/rougier/nano-agenda";
+  :auto-sync t)
  ("nano-modeline"  :url "https://github.com/rougier/nano-modeline";
   :auto-sync t)
  ("nano-theme" :url "https://github.com/rougier/nano-theme";

[elpa] main 79b7c81 2/2: * gitignore: Add `packages-other`.

[monnier--- via]

branch: main
commit 79b7c81988923404c6df74894ff42b0ae6480931
Author: Stefan Monnier 
Commit: Stefan Monnier 

* gitignore: Add `packages-other`.
---
 .gitignore  | 1 +
 elpa-config | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c9cb2b8..6ecf83c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ core
 # Generated during deployment
 /.pkg-descs.mk
 /packages/
+/other-packages
 /archive/
 /archive-devel/
 GNUmakefile
diff --git a/elpa-config b/elpa-config
index 6f8ae4b..77d516d 100644
--- a/elpa-config
+++ b/elpa-config
@@ -6,5 +6,5 @@
  (branch-prefix"externals/")
  (release-branch-prefix"externals-release/")
  ;;(specs-file "elpa-packages")
- ;;(debug  nil)
+ ;;(debug  t)
  )

[elpa] main updated (40e7269 -> 79b7c81)

[monnier--- via]

monnier pushed a change to branch main.

  from  40e7269   * elpa-packages (erc): Add some missing files
   new  5f5faca   * elpa-packages (coterm): New package
   new  79b7c81   * gitignore: Add `packages-other`.


Summary of changes:
 .gitignore| 1 +
 elpa-config   | 2 +-
 elpa-packages | 2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

[elpa] main 5f5faca 1/2: * elpa-packages (coterm): New package

[monnier--- via]

branch: main
commit 5f5faca90c8c2a63775a70e21c70657493fa5970
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (coterm): New package
---
 elpa-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 8ae69ff..8145d95 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -106,6 +106,8 @@
  ("context-coloring"   :url 
"https://github.com/jacksonrayhamilton/context-coloring.git";)
  ("corfu"  :url "https://github.com/minad/corfu";
   :doc "README.org" :auto-sync t)
+ ("coterm" :url "https://repo.or.cz/emacs-coterm.git";
+  :auto-sync t)
  ("counsel":url "https://github.com/abo-abo/swiper";)
  ("cpio-mode"  :url "https://github.com/dlewan/cpio-mode";)
  ("crisp"  :url nil)

[elpa] elpa-admin 7532532: * elpa-admin.el (elpaa--get-README): Re-add

[monnier--- via]

branch: elpa-admin
commit 753253237bfa1fc27478133e98f2302807a9fdbf
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el (elpaa--get-README): Re-add

(elpaa--html-make-pkg): Use it.
---
 elpa-admin.el | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 272dc88..f3d4593 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1319,6 +1319,17 @@ arbitrary code."
   (delete-file input-filename)
   (delete-file output-filename
 
+(defun elpaa--get-README (pkg-spec dir)
+  (or (elpaa--get-section
+   "Commentary" (elpaa--spec-get pkg-spec :readme
+ '("README" "README.rst"
+   ;; Most README.md files seem to be
+   ;; currently worse than the Commentary:
+   ;; section :-( "README.md"
+   "README.org"))
+   dir pkg-spec)
+  '(text/plain . "!No description!")))
+
 (defun elpaa--get-NEWS (pkg-spec dir)
   (let* ((news
   (elpaa--get-section
@@ -1421,17 +1432,7 @@ arbitrary code."
   (insert (format "To install this package, run in Emacs:
M-x package-install RET 
%s RET"
   name))
-  (let* ((package-readme-file-name
-  (elpaa--spec-get pkg-spec :readme
-   '("README" "README.rst"
- ;; Most README.md files seem to be currently
- ;; worse than the Commentary: section :-(
- ;; "README.md"
- "README.org")))
- (readme-content
-  (or (elpaa--get-section "Commentary" package-readme-file-name
-  srcdir pkg-spec)
-  '(text/plain . "!No description!")))
+  (let* ((readme-content (elpaa--get-README pkg-spec srcdir))
  (readme-text (elpaa--section-to-plain-text readme-content))
  (readme-html (elpaa--section-to-html readme-content))
  (readme-output-filename (concat name "-readme.txt")))

[elpa] scratch/publish-docs b2887d7: Merge branch 'elpa-admin' into publish-docs

[monnier--- via]

branch: scratch/publish-docs
commit b2887d76030616c00a7937076fed1e7336417057
Merge: 2ae7bc2 7532532
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge branch 'elpa-admin' into publish-docs
---
 elpa-admin.el | 244 +++---
 1 file changed, 184 insertions(+), 60 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 1cc2d22..d791bc0 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -75,6 +75,11 @@ relative to the tarball directory. Can be set in elpa-config 
via
 
 (defvar elpaa--debug nil)
 
+(defvar elpaa--org-export-options
+  '(:with-author nil :with-creator nil :with-broken-links t)
+  "Options used common to all Org export backends.
+See variable `org-export-options-alist'.")
+
 (unless (fboundp 'ignore-error)
   (defmacro ignore-error (condition &rest body)
 `(condition-case nil (progn ,@body) (,condition nil
@@ -533,7 +538,7 @@ Return non-nil if a new tarball was created."
 (message " Building tarball %s..." tarball)
 (let ((res nil))
   (unwind-protect
-  (condition-case err
+  (condition-case-unless-debug err
   (setq res (elpaa--make-one-tarball-1
  tarball dir pkg-spec metadata
  revision-function tarball-only))
@@ -631,11 +636,42 @@ Return non-nil if a new tarball was created."
  dir
  'new)))
 
+(defun elpaa--git-date-to-timestamp (gitdate)
+  "Convert date from git (ISO 6401) to a timestamp."
+  (unless (string-match (rx bos
+(group-n 1 (+ digit)) "-"
+(group-n 2 (+ digit)) "-"
+(group-n 3 (+ digit)) "T"
+(group-n 4 (+ digit)) ":"
+(group-n 5 (+ digit)) ":"
+(group-n 6 (+ digit))
+(? "+"
+   (group-n 7 (+ digit)) ":"
+   (group-n 8 (+ digit
+gitdate)
+(error "Unknown date format: %S" gitdate))
+  (let* ((field
+  (lambda (group)
+(and (match-beginning group)
+ (string-to-number (match-string group gitdate)
+ (y (funcall field 1))
+ (mo (funcall field 2))
+ (d (funcall field 3))
+ (h (funcall field 4))
+ (mi (funcall field 5))
+ (s (funcall field 6))
+ (zh (funcall field 7))
+ (zm (funcall field 8))
+ (zs (if zh
+ (* 60 (+ (* zh 60) zm))
+   0)))
+(encode-time (list s mi h d mo y nil nil zs
+
 (defun elpaa--get-devel-version (dir pkg-spec)
   "Compute the date-based pseudo-version used for devel builds."
   (let* ((ftn (file-truename  ;; Follow symlinks!
   (expand-file-name (elpaa--main-file pkg-spec) dir)))
-(default-directory (file-name-directory ftn))
+ (default-directory (file-name-directory ftn))
  (gitdate
   (with-temp-buffer
(if (plist-get (cdr pkg-spec) :core)
@@ -650,10 +686,9 @@ Return non-nil if a new tarball was created."
   ;; Convert Git's date into something that looks like a version 
number.
   ;; While we're at it, convert Git's date into its UTC equivalent,
   ;; to try and make sure time-versions are monotone.
-  (let ((process-environment (cons "TZ=UTC" process-environment)))
-(with-temp-buffer
-  (elpaa--call t "date" "-d" gitdate "+%Y%m%d.%H%M%S")
-  (buffer-string)
+  (format-time-string "%Y%m%d.%H%M%S"
+  (elpaa--git-date-to-timestamp gitdate)
+  0)))
 ;; Get rid of leading zeros since ELPA's version numbers don't allow them.
 (replace-regexp-in-string "\\(\\`\\|[^0-9]\\)0+\\([0-9]\\)" "\\1\\2"
   ;; Remove trailing newline or anything untoward.
@@ -1177,10 +1212,50 @@ Rename DIR/ to PKG-VERS/, and return the descriptor."
  (insert-file-contents mainsrcfile)
  (lm-header prop))
 
+(cl-defgeneric elpaa--section-to-plain-text (section)
+  "Return SECTION as plain text.
+SECTION should be a cons as returned by `elpaa--get-section',
+which see."
+  (cdr section))
+
+(cl-defmethod elpaa--section-to-plain-text ((section (head text/x-org)))
+  (elpaa--export-org (cdr section) 'ascii
+ :ext-plist (append '(:ascii-charset utf-8)
+elpaa--org-export-options)))
+
+(cl-defgeneric elpaa--section-to-html (section)
+  "Return SECTION as HTML.
+SECTION should be a cons as returned by `elpaa--get-section',
+which see."
+  (concat "\n"
+  (elpaa--html-quote (cdr section))
+  "\n\n"))
+
+(cl-defmethod elpaa--section-to-html ((section (head text/x-org)))
+  (elpaa--export-org (cdr section) 'html
+ :body-only t
+  

[elpa] scratch/publish-docs updated (2ae7bc2 -> b2887d7)

[monnier--- via]

monnier pushed a change to branch scratch/publish-docs.

  from  2ae7bc2   Use symlinks for cross-references among package docs
  adds  c362980   Don't use `date` to parse date from git; it's unportable.
  adds  1a42fb8   * elpa-admin.el: Export Org readmes to ASCII and HTML
  adds  3dc70f4   * elpa-admin.el: Fix mime types for org and md
  adds  214032b   * elpa-admin.el (elpaa--export-org): Take the content 
string as input
  adds  976e4be   Merge remote-tracking branch 
'origin/scratch/prettify-readme.org' into elpa-admin
  adds  9ff3ed3   * elpa-admin (elpaa--section-to-html) : Fix 
level
  adds  b93fc0e   * elpa-admin.el (elpaa--html-make-pkg): Handle multiple 
maintainers
  adds  73db0c8   * elpa-admin.el (elpaa--get-section): Return nil when 
appropriate
  adds  cb24ed1   * elpa-admin.el (elpaa--html-make-pkg): Don't burp if 
there's no maintainer
  adds  7532532   * elpa-admin.el (elpaa--get-README): Re-add
   new  b2887d7   Merge branch 'elpa-admin' into publish-docs


Summary of changes:
 elpa-admin.el | 244 +++---
 1 file changed, 184 insertions(+), 60 deletions(-)

[elpa] scratch/publish-docs 1dfd89b: * elpa-admin.el: Split large functions

[monnier--- via]

branch: scratch/publish-docs
commit 1dfd89b785c2bb53bb0147bcd838c37b30bf3b7d
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Split large functions

(elpaa--html-insert-docs): Extract from `elpaa--html-make-pkg`.
(elpaa--html-make-pkg): Use it.
(elpaa--html-build-doc): Extract from `elpaa--build-Info-1`.
(elpaa--build-Info-1): Use it.
---
 elpa-admin.el | 80 ---
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index d791bc0..58dbdd2 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1391,6 +1391,26 @@ arbitrary code."
  (concat git-sv (nth 1 urls))
  'Gitweb
 
+(defun elpaa--html-insert-docs (pkg-spec)
+  (let ((docfiles (elpaa--spec-get pkg-spec :doc))
+   (html-dir (concat elpaa--doc-subdirectory "/"))
+   ;; html-dir is relative to the tarball directory, so html
+   ;; references on mirrors work. It does not include the
+   ;; package name, so cross references among package docs
+   ;; work.
+   )
+(when (file-readable-p html-dir) ;; html doc files were built
+  (insert "Documentation\n")
+  (dolist (f (if (listp docfiles) docfiles (list docfiles)))
+   (let ((html-file
+  (concat html-dir
+  (file-name-sans-extension f)
+  ".html")))
+ (insert "" 
(file-name-sans-extension f) "\n")
+ ;; FIXME: get link text from info direntry?
+ ))
+  (insert "\n"
+
 (defun elpaa--html-make-pkg (pkg pkg-spec files srcdir)
   (let* ((name (symbol-name (car pkg)))
  (latest (package-version-join (aref (cdr pkg) 0)))
@@ -1449,24 +1469,7 @@ arbitrary code."
 (write-region readme-text nil readme-output-filename)
 (insert "Full description\n" readme-html))
 
-  (let ((docfiles (elpaa--spec-get pkg-spec :doc))
-   (html-dir (concat elpaa--doc-subdirectory "/"))
-   ;; html-dir is relative to the tarball directory, so html
-   ;; references on mirrors work. It does not include the
-   ;; package name, so cross references among package docs
-   ;; work.
-   )
-   (when (file-readable-p html-dir) ;; html doc files were built
-  (insert "Documentation\n")
- (dolist (f (if (listp docfiles) docfiles (list docfiles)))
-   (let ((html-file
-  (concat html-dir
-  (file-name-sans-extension f)
-  ".html")))
- (insert "" 
(file-name-sans-extension f) "\n")
- ;; FIXME: get link text from info direntry?
- ))
- (insert "\n")))
+  (elpaa--html-insert-docs pkg-spec)
 
   ;; (message "latest=%S; files=%S" latest files)
   (unless (< (length files) (if (zerop (length latest)) 1 2))
@@ -1956,6 +1959,27 @@ directory; one of archive, archive-devel."
 (dolist (f (if (listp docfile) docfile (list docfile)))
   (elpaa--build-Info-1 f dir html-dir
 
+
+(defun elpaa--html-build-doc (docfile html-dir)
+  (let ((html-file
+(expand-file-name
+ (concat (file-name-base docfile) ".html")
+ html-dir))
+   (html-xref-file
+(expand-file-name
+ (concat (file-name-base docfile) ".html")
+ (file-name-directory (directory-file-name html-dir)
+(with-temp-buffer
+  (elpaa--call-sandboxed
+   t "makeinfo" "--no-split" "--html" docfile "-o" html-file)
+  (message "%s" (buffer-string)))
+
+;; Create a symlink from elpa/archive[-devel]/doc/* to
+;; the actual file, so html references work.
+(with-demoted-errors ;; 'make-symbolic-link' doesn't work on Windows
+   (make-symbolic-link html-file html-xref-file t))
+))
+
 (defun elpaa--build-Info-1 (docfile dir html-dir)
   "Build an info file from DOCFILE (a texinfo source file).
 DIR must be the package source directory.  If HTML-DIR is
@@ -1999,25 +2023,7 @@ relative to elpa root."
t "makeinfo" "--no-split" docfile "-o" info-file)
   (message "%s" (buffer-string)))
 
-   (when html-dir
- (let ((html-file
-(expand-file-name
- (concat (file-name-base docfile) ".html")
- html-dir))
-   (html-xref-file
-(expand-file-name
- (concat (file-name-base docfile) ".html")
- (file-name-directory (directory-file-name html-dir)
-(with-temp-buffer
-  (elpaa--call-sandboxed
-   t "makeinfo" "--no-split" "--html" docfile "-o" html-file)
-  (message "%s" (buffer-string)))
-
-   ;; Create a symlink from elpa/archive[-devel]/doc/* to
-   ;; the actual file, so html references work.
-   (with-demoted-errors ;; 'make-symbolic-link' doesn't work on Windows
-   (make-symbolic-link html-file html-xref-file t))
-  

[elpa] scratch/publish-docs 0bf336e: * elpa-admin.el: Fix up some loose ends in the HTML doc generation

[monnier--- via]

branch: scratch/publish-docs
commit 0bf336e742c46ca138b690bcecf856561f454ab1
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Fix up some loose ends in the HTML doc generation

(elpaa-read-config): Fix typo.
(elpaa--get-docfiles, elpaa--doc-html-file): New functions
(elpaa--html-insert-docs): Use them.
Do nothing if elpaa--doc-subdirectory is nil.
(elpaa--build-Info): Use `elpaa--get-docfiles`.
(elpaa--html-build-doc): Use `elpaa--doc-html-file`.  Fix sandbox
access failure.  Use a relative name for the symlink target.
---
 elpa-admin.el | 85 +--
 1 file changed, 48 insertions(+), 37 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index 58dbdd2..ef0b37b 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -68,10 +68,10 @@ but this requires Bubblewrap 
(https://github.com/containers/bubblewrap)
 to be installed and has only been tested on some Debian systems.")
 
 (defvar elpaa--doc-subdirectory "doc/"
-  "If non-nil, build html docs as well as info docs, and save the
-html docs in this dir, for the ELPA website. Directory is
-relative to the tarball directory. Can be set in elpa-config via
-'doc-dir.")
+  "Directory in which to place HTML docs for the ELPA website.
+If nil, don't build the docs in the first place.
+Directory is relative to the tarball directory.
+Can be set in elpa-config via `doc-dir'.")
 
 (defvar elpaa--debug nil)
 
@@ -112,7 +112,7 @@ See variable `org-export-options-alist'.")
   ('email-reply-to elpaa--email-reply-to)
   ('sandboxelpaa--sandbox)
   ('sandbox-extra-ro-dirs  elpaa--sandbox-extra-ro-dirs)
- ('doc-dir elpa--doc-subdirectory)
+  ('doc-dir elpaa--doc-subdirectory)
   ('debug  elpaa--debug))
 val
 
@@ -1391,22 +1391,30 @@ arbitrary code."
  (concat git-sv (nth 1 urls))
  'Gitweb
 
+(defun elpaa--get-docfiles (pkg-spec)
+  (let ((files (elpaa--spec-get pkg-spec :doc)))
+(if (listp files) files (list files
+
+(defun elpaa--doc-html-file (docfile)
+  (concat (file-name-base docfile) ".html"))
+
 (defun elpaa--html-insert-docs (pkg-spec)
-  (let ((docfiles (elpaa--spec-get pkg-spec :doc))
-   (html-dir (concat elpaa--doc-subdirectory "/"))
-   ;; html-dir is relative to the tarball directory, so html
-   ;; references on mirrors work. It does not include the
-   ;; package name, so cross references among package docs
-   ;; work.
-   )
-(when (file-readable-p html-dir) ;; html doc files were built
+  (let ((docfiles (elpaa--get-docfiles pkg-spec))
+   ;; `html-dir' is relative to the tarball directory, so html
+   ;; references on mirrors work.  It does not include the
+   ;; package name, so cross references among package docs work.
+   (html-dir (when elpaa--doc-subdirectory
+   (file-name-as-directory elpaa--doc-subdirectory
+(when (and docfiles html-dir
+  ;; FIXME: This dir is shared, so it will always exist.
+  ;; Should we use (expand-file-name pkg html-dir) instead?
+   (file-readable-p html-dir)) ;; html doc files were built
   (insert "Documentation\n")
-  (dolist (f (if (listp docfiles) docfiles (list docfiles)))
-   (let ((html-file
-  (concat html-dir
-  (file-name-sans-extension f)
-  ".html")))
- (insert "" 
(file-name-sans-extension f) "\n")
+  (dolist (f docfiles)
+   (let ((html-file (concat html-dir (elpaa--doc-html-file f
+ (insert ""
+ (file-name-sans-extension f)
+ "\n")
  ;; FIXME: get link text from info direntry?
  ))
   (insert "\n"
@@ -1943,47 +1951,50 @@ More at " (elpaa--default-url pkgname))
 (defun elpaa--build-Info (pkg-spec dir tarball-dir)
   "Build info files for docs specified in :doc field of PKG-SPEC.
 If `elpa--doc-subdirectory' is non-nil, also build html files.
-DIR is the package directory. TARBALL-DIR is an absolute
+DIR is the package directory.  TARBALL-DIR is an absolute
 directory; one of archive, archive-devel."
   ;; default-directory is the GNUMakefile directory.
-  (let ((docfile (elpaa--spec-get pkg-spec :doc))
+  (let ((docfiles (elpaa--get-docfiles pkg-spec))
(html-dir
 (when elpaa--doc-subdirectory
   (elpaa--dirname
(car pkg-spec)
(expand-file-name elpaa--doc-subdirectory tarball-dir)
 (when html-dir
-  (when (not (file-readable-p html-dir))
+  (when (not (file-readable-p html-dir)) ;FIXME: Why bother testing?
(make-directory html-dir t)))
 
-(dolist (f (if (listp docfile) docfile (list docfile)))
+(dolist (f docfiles)
   (elpaa--build-Info-1 f dir html-dir
 
-
 (defun elpaa--h

[elpa] elpa-admin 3da4b94: Merge branch 'publish-docs' into elpa-admin

[monnier--- via]

branch: elpa-admin
commit 3da4b9459e666cab28e2a360f5d0e69b8532154c
Merge: 7532532 0bf336e
Author: Stefan Monnier 
Commit: Stefan Monnier 

Merge branch 'publish-docs' into elpa-admin
---
 elpa-admin.el | 106 +-
 1 file changed, 98 insertions(+), 8 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index f3d4593..ef0b37b 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -67,6 +67,12 @@ This is recommended when building packages from untrusted 
sources,
 but this requires Bubblewrap (https://github.com/containers/bubblewrap)
 to be installed and has only been tested on some Debian systems.")
 
+(defvar elpaa--doc-subdirectory "doc/"
+  "Directory in which to place HTML docs for the ELPA website.
+If nil, don't build the docs in the first place.
+Directory is relative to the tarball directory.
+Can be set in elpa-config via `doc-dir'.")
+
 (defvar elpaa--debug nil)
 
 (defvar elpaa--org-export-options
@@ -106,6 +112,7 @@ See variable `org-export-options-alist'.")
   ('email-reply-to elpaa--email-reply-to)
   ('sandboxelpaa--sandbox)
   ('sandbox-extra-ro-dirs  elpaa--sandbox-extra-ro-dirs)
+  ('doc-dir elpaa--doc-subdirectory)
   ('debug  elpaa--debug))
 val
 
@@ -572,7 +579,7 @@ Return non-nil if a new tarball was created."
  ;; Run `make' before building the Info file, so that the `make' rule
  ;; can be used to build the Info/Texinfo file.
  (elpaa--make pkg-spec dir)
- (elpaa--build-Info pkg-spec dir)
+ (elpaa--build-Info pkg-spec dir destdir)
  (elpaa--write-pkg-file dir pkgname metadata)
  ;; FIXME: Allow renaming files or selecting a subset of the files!
  (cl-assert (not (string-match "[][*\\|?]" pkgname)))
@@ -725,6 +732,9 @@ Return non-nil if a new tarball was created."
 (defun elpaa--string-width (str)
   "Determine string width in pixels of STR."
   (with-temp-buffer
+;; Current (2021) ImageMagick recommends using the "magick"
+;; driver, rather than "convert" directly, but Debian doesn't
+;; provide it yet.
 (elpaa--call (current-buffer)
  "convert" "-debug" "annotate" "xc:" "-font" "DejaVu-Sans"
  "-pointsize" "110" "-annotate" "0" str "null:")
@@ -1381,6 +1391,34 @@ arbitrary code."
  (concat git-sv (nth 1 urls))
  'Gitweb
 
+(defun elpaa--get-docfiles (pkg-spec)
+  (let ((files (elpaa--spec-get pkg-spec :doc)))
+(if (listp files) files (list files
+
+(defun elpaa--doc-html-file (docfile)
+  (concat (file-name-base docfile) ".html"))
+
+(defun elpaa--html-insert-docs (pkg-spec)
+  (let ((docfiles (elpaa--get-docfiles pkg-spec))
+   ;; `html-dir' is relative to the tarball directory, so html
+   ;; references on mirrors work.  It does not include the
+   ;; package name, so cross references among package docs work.
+   (html-dir (when elpaa--doc-subdirectory
+   (file-name-as-directory elpaa--doc-subdirectory
+(when (and docfiles html-dir
+  ;; FIXME: This dir is shared, so it will always exist.
+  ;; Should we use (expand-file-name pkg html-dir) instead?
+   (file-readable-p html-dir)) ;; html doc files were built
+  (insert "Documentation\n")
+  (dolist (f docfiles)
+   (let ((html-file (concat html-dir (elpaa--doc-html-file f
+ (insert ""
+ (file-name-sans-extension f)
+ "\n")
+ ;; FIXME: get link text from info direntry?
+ ))
+  (insert "\n"
+
 (defun elpaa--html-make-pkg (pkg pkg-spec files srcdir)
   (let* ((name (symbol-name (car pkg)))
  (latest (package-version-join (aref (cdr pkg) 0)))
@@ -1438,6 +1476,9 @@ arbitrary code."
  (readme-output-filename (concat name "-readme.txt")))
 (write-region readme-text nil readme-output-filename)
 (insert "Full description\n" readme-html))
+
+  (elpaa--html-insert-docs pkg-spec)
+
   ;; (message "latest=%S; files=%S" latest files)
   (unless (< (length files) (if (zerop (length latest)) 1 2))
 (insert (format "Old versions\n"))
@@ -1907,16 +1948,59 @@ More at " (elpaa--default-url pkgname))
 
 ;;; Build Info files from Texinfo
 
-(defun elpaa--build-Info (pkg-spec dir)
-  (let ((docfile (elpaa--spec-get pkg-spec :doc)))
-(dolist (f (if (listp docfile) docfile (list docfile)))
-  (elpaa--build-Info-1 f dir
-
-(defun elpaa--build-Info-1 (docfile dir)
+(defun elpaa--build-Info (pkg-spec dir tarball-dir)
+  "Build info files for docs specified in :doc field of PKG-SPEC.
+If `elpa--doc-subdirectory' is non-nil, also build html files.
+DIR is the package directory.  TARBALL-DIR is an absolute
+directory; one of archive, archive-devel."
+  ;; default-directory is the GNUMakefile directory.
+  (let ((docfiles (elpaa--get-

[elpa] elpa-admin updated (7532532 -> 3da4b94)

[monnier--- via]

monnier pushed a change to branch elpa-admin.

  from  7532532   * elpa-admin.el (elpaa--get-README): Re-add
  adds  e0dc20b   Add links to html :doc files in each package's ELPA web 
page
  adds  2ae7bc2   Use symlinks for cross-references among package docs
  adds  b2887d7   Merge branch 'elpa-admin' into publish-docs
  adds  1dfd89b   * elpa-admin.el: Split large functions
  adds  0bf336e   * elpa-admin.el: Fix up some loose ends in the HTML doc 
generation
   new  3da4b94   Merge branch 'publish-docs' into elpa-admin


Summary of changes:
 elpa-admin.el | 106 +-
 1 file changed, 98 insertions(+), 8 deletions(-)

[elpa] main 577892f: * copyright_exceptions (coterm): Add some false positives

[monnier--- via]

branch: main
commit 577892f58ea7674e6dd0445597fc38d61acb7cc2
Author: Stefan Monnier 
Commit: Stefan Monnier 

* copyright_exceptions (coterm): Add some false positives
---
 copyright_exceptions | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/copyright_exceptions b/copyright_exceptions
index d3ac4bb..86b528a 100644
--- a/copyright_exceptions
+++ b/copyright_exceptions
@@ -34,6 +34,8 @@ auctex/style/scrreprt.el
 auctex/style/slovak.el
 auctex/style/swedish.el
 auctex/style/virtex.el
+coterm/coterm.el:;; package is stored in GNU ELPA, non-trivial patches require 
copyright
+coterm/coterm.el:;; assignment to the FSF, see info node "(emacs) Copyright 
Assignment".
 excorporate/excorporate-calfw.el:;; copyright assignment papers on file with 
the FSF.
 hyperbole/hib-doc-id.el:;;  Copyright:
 hyperbole/kotl/kotl-autoloads.el

[elpa] elpa-admin 3de676c: * elpa-admin.el: Fix computation of list of docs

[monnier--- via]

branch: elpa-admin
commit 3de676cde3fce160b093e93d6aa3762e60a680a4
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-admin.el: Fix computation of list of docs

We can't compute the list of HTML docs from the `:doc` property (and
even if we could it would not be a good idea), so instead keep track
of those docs as we build them so the data is readily available.

(elpaa--html-insert-docs): Get the HTML docs names from the pkg-spec.
(elpaa--html-build-doc): Add `pkg-spec` arg.
Put the doc's info into the `pkg-spec`.
(elpaa--build-Info-1): Add `pkg-spec` arg accordingly.
(elpaa--build-Info): Adjust accordingly.
---
 elpa-admin.el | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index ef0b37b..a13b17f 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1399,7 +1399,7 @@ arbitrary code."
   (concat (file-name-base docfile) ".html"))
 
 (defun elpaa--html-insert-docs (pkg-spec)
-  (let ((docfiles (elpaa--get-docfiles pkg-spec))
+  (let ((docfiles (plist-get (cdr pkg-spec) :internal--html-docs))
;; `html-dir' is relative to the tarball directory, so html
;; references on mirrors work.  It does not include the
;; package name, so cross references among package docs work.
@@ -1410,10 +1410,10 @@ arbitrary code."
   ;; Should we use (expand-file-name pkg html-dir) instead?
(file-readable-p html-dir)) ;; html doc files were built
   (insert "Documentation\n")
-  (dolist (f docfiles)
-   (let ((html-file (concat html-dir (elpaa--doc-html-file f
+  (dolist (doc docfiles)
+   (let ((html-file (concat html-dir (cdr doc
  (insert ""
- (file-name-sans-extension f)
+ (car doc)
  "\n")
  ;; FIXME: get link text from info direntry?
  ))
@@ -1965,9 +1965,9 @@ directory; one of archive, archive-devel."
(make-directory html-dir t)))
 
 (dolist (f docfiles)
-  (elpaa--build-Info-1 f dir html-dir
+  (elpaa--build-Info-1 pkg-spec f dir html-dir
 
-(defun elpaa--html-build-doc (docfile html-dir)
+(defun elpaa--html-build-doc (pkg-spec docfile html-dir)
   (setq html-dir (directory-file-name html-dir))
   (let* ((destname (elpaa--doc-html-file docfile))
 (html-file (expand-file-name destname html-dir))
@@ -1982,7 +1982,9 @@ directory; one of archive, archive-devel."
   (elpaa--call-sandboxed
t "makeinfo" "--no-split" "--html" docfile "-o" tmpfile)
   (message "%s" (buffer-string)))
-(rename-file tmpfile html-file)
+(rename-file tmpfile html-file t)
+(push (cons (file-name-base html-file) (file-name-nondirectory html-file))
+  (plist-get (cdr pkg-spec) :internal--html-docs))
 
 ;; Create a symlink from elpa/archive[-devel]/doc/* to
 ;; the actual file, so html references work.
@@ -1991,7 +1993,7 @@ directory; one of archive, archive-devel."
(concat (file-name-nondirectory html-dir) "/" destname)
html-xref-file t
 
-(defun elpaa--build-Info-1 (docfile dir html-dir)
+(defun elpaa--build-Info-1 (pkg-spec docfile dir html-dir)
   "Build an info file from DOCFILE (a texinfo source file).
 DIR must be the package source directory.  If HTML-DIR is
 non-nil, also build html files, store them there.  HTML-DIR is
@@ -2034,7 +2036,7 @@ relative to elpa root."
t "makeinfo" "--no-split" docfile "-o" info-file)
   (message "%s" (buffer-string)))
 
-   (when html-dir (elpaa--html-build-doc docfile html-dir))
+   (when html-dir (elpaa--html-build-doc pkg-spec docfile html-dir))
 
 (setq docfile info-file)))
 

[nongnu] branch new-with-editor created (now 8d52f93)

[monnier--- via]

monnier pushed a change to branch new-with-editor.

at  8d52f93   Recognize output of the sleeping editor even if it 
arrives in chunks

This branch includes the following new commits:

   new  8d52f93   Recognize output of the sleeping editor even if it 
arrives in chunks

[nongnu] new-with-editor 8d52f93: Recognize output of the sleeping editor even if it arrives in chunks

[monnier--- via]

branch: new-with-editor
commit 8d52f933e50624c7bca3880f57297ac17ba4ac2d
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Recognize output of the sleeping editor even if it arrives in chunks

Fixes https://github.com/magit/magit/issues/4288#issuecomment-797972932.
---
 with-editor.el | 54 +-
 1 file changed, 33 insertions(+), 21 deletions(-)

diff --git a/with-editor.el b/with-editor.el
index 4a43595..ba856e6 100644
--- a/with-editor.el
+++ b/with-editor.el
@@ -641,33 +641,45 @@ may not insert the text into the PROCESS's buffer.  Then 
it calls
 
 (defvar with-editor-filter-visit-hook nil)
 
+(defconst with-editor-sleeping-editor-regexp
+  "^WITH-EDITOR: \\([0-9]+\\) OPEN \\([^]+?\\)\\(?: IN 
\\([^\r]+?\\)\\)?\r?$")
+
 (defun with-editor-output-filter (string)
+  (with-editor-sleeping-editor-filter nil string))
+
+(defun with-editor-sleeping-editor-filter (process string)
+  (when-let ((incomplete (and process (process-get process 'incomplete
+(setq string (concat incomplete string)))
   (save-match-data
-(if (string-match "^WITH-EDITOR: \
-\\([0-9]+\\) OPEN \\([^]+?\\)\
-\\(?: IN \\([^\r]+?\\)\\)?\r?$" string)
-(let ((pid  (match-string 1 string))
-  (file (match-string 2 string))
-  (dir  (match-string 3 string)))
-  (unless (file-name-absolute-p file)
-(setq file (expand-file-name file dir)))
-  (when default-directory
-(setq file (concat (file-remote-p default-directory) file)))
-  (with-current-buffer (find-file-noselect file)
-(with-editor-mode 1)
-(setq with-editor--pid pid)
-(run-hooks 'with-editor-filter-visit-hook)
-(funcall (or (with-editor-server-window) 'switch-to-buffer)
- (current-buffer))
-(kill-local-variable 'server-window))
-  nil)
-  string)))
+(cond
+ ((and process (not (string-match-p "\n\\'" string)))
+  (process-put process 'incomplete string)
+  nil)
+ ((string-match with-editor-sleeping-editor-regexp string)
+  (when process
+(process-put process 'incomplete nil))
+  (let ((pid  (match-string 1 string))
+(file (match-string 2 string))
+(dir  (match-string 3 string)))
+(unless (file-name-absolute-p file)
+  (setq file (expand-file-name file dir)))
+(when default-directory
+  (setq file (concat (file-remote-p default-directory) file)))
+(with-current-buffer (find-file-noselect file)
+  (with-editor-mode 1)
+  (setq with-editor--pid pid)
+  (run-hooks 'with-editor-filter-visit-hook)
+  (funcall (or (with-editor-server-window) 'switch-to-buffer)
+   (current-buffer))
+  (kill-local-variable 'server-window)))
+  nil)
+ (t string
 
 (defun with-editor-process-filter
 (process string &optional no-default-filter)
   "Listen for edit requests by child processes."
   (let ((default-directory (process-get process 'default-dir)))
-(with-editor-output-filter string))
+(with-editor-sleeping-editor-filter process string))
   (unless no-default-filter
 (internal-default-process-filter process string)))
 
@@ -744,7 +756,7 @@ This works in `shell-mode', `term-mode', `eshell-mode' and
 
 (defun with-editor-emulate-terminal (process string)
   "Like `term-emulate-terminal' but also handle edit requests."
-  (when (with-editor-output-filter string)
+  (when (with-editor-sleeping-editor-filter process string)
 (term-emulate-terminal process string)))
 
 (defvar with-editor-envvars '("EDITOR" "GIT_EDITOR" "HG_EDITOR"))

[nongnu] branch elpa/with-editor deleted (was 939e825)

[monnier--- via]

monnier pushed a change to branch elpa/with-editor.

   was  939e825   with-editor-sleeping-editor-filter: Restore significant 
return value

This change permanently discards the following revisions:

  discards  939e825   with-editor-sleeping-editor-filter: Restore significant 
return value
  discards  63afb66   Recognize output of the sleeping editor even if it 
arrives in chunks

[nongnu] branch elpa/with-editor created (now 8d52f93)

[monnier--- via]

monnier pushed a change to branch elpa/with-editor.

at  8d52f93   Recognize output of the sleeping editor even if it 
arrives in chunks

No new revisions were added by this update.

[nongnu] branch new-with-editor deleted (was 8d52f93)

[monnier--- via]

monnier pushed a change to branch new-with-editor.

   was  8d52f93   Recognize output of the sleeping editor even if it 
arrives in chunks

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[elpa] elpa-admin d1a6387: * elpa-admin.el (elpaa--html-build-doc): Fix backward compatibility

[monnier--- via]

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

* elpa-admin.el (elpaa--html-build-doc): Fix backward compatibility

Emacs-27 doesn't have a setf handler for `plist-get`.
---
 elpa-admin.el | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/elpa-admin.el b/elpa-admin.el
index a13b17f..381aed6 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -1983,8 +1983,12 @@ directory; one of archive, archive-devel."
t "makeinfo" "--no-split" "--html" docfile "-o" tmpfile)
   (message "%s" (buffer-string)))
 (rename-file tmpfile html-file t)
-(push (cons (file-name-base html-file) (file-name-nondirectory html-file))
-  (plist-get (cdr pkg-spec) :internal--html-docs))
+;; FIXME: Use `push' in Emacs≥28
+(plist-put (cdr pkg-spec)
+   :internal--html-docs
+   (cons (cons (file-name-base html-file)
+   (file-name-nondirectory html-file))
+ (plist-get (cdr pkg-spec) :internal--html-docs)))
 
 ;; Create a symlink from elpa/archive[-devel]/doc/* to
 ;; the actual file, so html references work.

[elpa] main 1d36901: * elpa-packages (comint-mime): New package

[monnier--- via]

branch: main
commit 1d369010cea6d976b50c5504777e94da0e241374
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (comint-mime): New package
---
 elpa-packages | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/elpa-packages b/elpa-packages
index 8f2221e..6ae7119 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -92,6 +92,8 @@
  ("cobol-mode"  :url 
"https://gist.github.com/Edward-H/6768e7dc53ea3dd2adca";)
  ("coffee-mode":url "https://github.com/defunkt/coffee-mode";)
  ("compact-docstrings"  :url 
"https://github.com/cpitclaudel/compact-docstrings";)
+ ("comint-mime":url "https://github.com/astoff/comint-mime";
+  :auto-sync t)
  ("company"
   :url "https://github.com/company-mode/company-mode.git";
   :auto-sync t)

[elpa] main 1a5da94: * elpa-packages (comint-mime): Comment it out for now

[monnier--- via]

branch: main
commit 1a5da94d1ca9f4940dc70f062f92c7c46cae5137
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (comint-mime): Comment it out for now
---
 elpa-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index 6ae7119..5056751 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -92,8 +92,8 @@
  ("cobol-mode"  :url 
"https://gist.github.com/Edward-H/6768e7dc53ea3dd2adca";)
  ("coffee-mode":url "https://github.com/defunkt/coffee-mode";)
  ("compact-docstrings"  :url 
"https://github.com/cpitclaudel/compact-docstrings";)
- ("comint-mime":url "https://github.com/astoff/comint-mime";
-  :auto-sync t)
+ ;; ("comint-mime" :url "https://github.com/astoff/comint-mime";
+ ;;  :auto-sync t)
  ("company"
   :url "https://github.com/company-mode/company-mode.git";
   :auto-sync t)

[nongnu] branch elpa-admin deleted (was e71d294)

[monnier--- via]

monnier pushed a change to branch elpa-admin.

   was  e71d294   * GNUmakefile (packages/%.elc): Use `other-packages` if 
present

This change permanently discards the following revisions:

  discards  e71d294   * GNUmakefile (packages/%.elc): Use `other-packages` if 
present
  discards  d4c962a   * elpa-admin.el (elpaa--get-section): Add docstring, 
rename vars
  discards  69118c5   * elpa-admin.el (elpaa--release-email): Fix thinko
  discards  97d2765   * elpa-admin.el (ignore-error): Add backward 
compatibility definition
  discards  384e805   * elpa-admin.el (elpaa--sandbox): Default to nil on w32 
and macos
  discards  005c37e   * README (Configuration (elpa-config)): Document 
`elpa-config`
  discards  1beeffd   * elpa-admin.el (elpaa--make-one-tarball): Return nil on 
error!
  discards  9b28c79   * elpa-admin.el (elpaa--make-one-tarball-1): Return 
non-nil when built
  discards  6afe3b7   * elpa-admin.el (elpaa--make-one-tarball): Be a bit more 
verbose
  discards  4541ebe   * elpa-admin.el (elpaa--get-release-revision): Workaround 
for git bug
  discards  069c128   Allow testing locally via list-packages
  discards  e850286   Merge branch 'elpa-admin' of 
git+ssh://git.sv.gnu.org/srv/git/emacs/elpa into elpa-admin
  discards  28b66f7   * elpa-admin.el (elpaa--get-last-release): Don't return 
snapshot versions
  discards  e3683d9   elpa-admin.el: Improve the badge generation code
  discards  8e351cc   * elpa-admin.el (elpaa--string-width): Use `elpaa--call`
  discards  c29da22   * elpa-admin.el: Generate SVG badges
  discards  6b5c39d   ; * elpa-admin.el (elpaa--html-footer): Fix LibreJS 
support.
  discards  fd42057   Prefer HTTPS to HTTP
  discards  396a74b   Bump license for package pages to CC BY-ND 4.0
  discards  e3ca730   Support LibreJS
  discards  d10026f   * elpa-admin.el: Preserve release tarballs at least 2 
years
  discards  de2fd22   * elpa-admin.el (elpaa-read-config): Allow lists of 
strings
  discards  0783750   * elpa-admin.el (elpaa--sandbox-extra-ro-dirs): New var
  discards  d56a357   * elpa-admin.el: Don't hide the log of diverged packages 
in `fetch/`
  discards  54ca8ea   * elpa-admin.el: Don't build release tarballs for 
pre-release versions
  discards  68c0d47   * elpa-admin.el (elpaa--fetch): Don't show the log if 
branches diverged
  discards  fa18a66   * elpa-admin.el: Improve doc build for the :core packages
  discards  fae2e2e   * elpa-admin.el (elpaa--prune-old-tarballs): Fix 
computation of .sig name
  discards  c84575d   * elpa-admin.el (elpaa--get-release-revision): Fix code 
for :core pkgs
  discards  6d923b9   * elpa-admin.el (elpaa--prune-old-tarballs): Fix renaming 
destination
  discards  bdb17b6   * elpa-admin.el (elpaa--get-devel-version): Don't remove 
*all* zeroes!
  discards  b776ff9   * elpa-admin.el (elpaa--prune-old-tarballs): Move the 
.sig files as well
  discards  21cddee   * elpa-admin.el (elpaa--get-devel-version): Fix regexp 
substitution
  discards  9e01d93   * elpa-admin.el (elpaa--prune-old-tarballs): Return 
resulting oldtarballs
  discards  97ebbd5   * elpa-admin.el (elpaa--prune-old-tarballs): "(Re)move" 
the non-kept files
  discards  d5001e6   * elpa-admin.el: Keep the number of old tarballs under 
check
  discards  da248f5   * elpa-admin.el: Fix spurious message and unneeded error
  discards  47280ce   * elpa-admin.el: Don't mention skipping :core if there 
are no :core
  discards  995404d   * elpa-admin.el: Allow generating autoloads for 
"unlisted" packages
  discards  08c448d   * elpa-admin.el (elpaa--pull): Fix last change
  discards  7fa8f34   * elpa-admin.el (elpaa--pull): Don't set non-existing 
upstream
  discards  cabb85a   * elpa-admin.el: Avoid build side-products in the tarball
  discards  de02176   * elpa-admin.el: Use :lisp-dir in default value of 
:main-file and :renames
  discards  dcc3222   Fix various problems when compiling packages in place
  discards  e22c225   * elpa-admin.el (elpaa--fetch): Only show upstream commits
  discards  802b866   * GNUmakefile (sync-some): New target
  discards  d1d1dbd   * elpa-admin.el (elpaa--build-Info): Fix last change
  discards  c26df96   * elpa-admin.el: Allow `:doc` to specify several doc files
  discards  26d341c   * elpa-admin.el (elpaa--make): Add support for non-make 
command
  discards  ceb7580   * elpa-admin.el (elpaa--sandboxed-ro-binds): Add `/bin`
  discards  922d625   * GNUmakefile (EMACS): Split out EMACSBIN for convenience
  discards  48e4ccf   * elpa-admin.el: Don't pass non-existing dirs to `bwrap`
  discards  f3fd8c5   * GNUmakefile (%.tar): New target
  discards  12cd68f   * README.org: Update according to comments from RMS.
  discards  0942ea5   ; * README.org: Fix typos.
  discards  fd06277   * elpa-admin.el (elpaa--core-package-sync): Don't presume 
shape of plist
  discards  1ee6e0e   * elpa-admin.el (elpaa--get-section): Use the whole 
section
  discards  e79cce6   * elpa-admin.el (elpaa--get-section): Fix fetching from 
main file
  discards  3926bbc   * e

[elpa] main 790fc46: * elpa-packages (comint-mine): Uncomment

[monnier--- via]

branch: main
commit 790fc46c4e04adf58bb0eaa69c69e9153947c811
Author: Stefan Monnier 
Commit: Stefan Monnier 

* elpa-packages (comint-mine): Uncomment
---
 elpa-packages | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/elpa-packages b/elpa-packages
index 5056751..6ae7119 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -92,8 +92,8 @@
  ("cobol-mode"  :url 
"https://gist.github.com/Edward-H/6768e7dc53ea3dd2adca";)
  ("coffee-mode":url "https://github.com/defunkt/coffee-mode";)
  ("compact-docstrings"  :url 
"https://github.com/cpitclaudel/compact-docstrings";)
- ;; ("comint-mime" :url "https://github.com/astoff/comint-mime";
- ;;  :auto-sync t)
+ ("comint-mime":url "https://github.com/astoff/comint-mime";
+  :auto-sync t)
  ("company"
   :url "https://github.com/company-mode/company-mode.git";
   :auto-sync t)

[elpa] externals/ergoemacs-mode 34c2099 016/325: Remove ergoemacs-autoload

[monnier--- via]

branch: externals/ergoemacs-mode
commit 34c2099ab620acc52dfdc93191567eabb4d971e0
Author: Walter Landry 
Commit: Walter Landry 

Remove ergoemacs-autoload
---
 ergoemacs-macros.el | 36 
 ergoemacs-themes.el | 20 
 2 files changed, 56 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 2c13591..e50c1c9 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -439,42 +439,6 @@ on the definition:
,(when (plist-get (nth 0 kb) :ergoemacs-require)
   `(ergoemacs-require ',(intern (plist-get (nth 0 kb) :name)))
 
-(defmacro ergoemacs-autoload (name &rest keys-and-body)
-  "Defines a required package named NAME.
-
-KEYS-AND-BODY will be processed by
-`ergoemacs-theme-component--parse-keys-and-body'.
-
-The documentation of the supported keys are in
-`ergoemacs-theme-component'.
-
-The NAME will be assumed to be the :package-name keyword.
-
-By default, this package also set the :ergoemacs-require to nil,
-deferring the ergoemacs theme component until it is required by
-the user by either `ergoemacs-require' or turning it on/off in an
-ergoemacs-mode theme.  To turn off this feature, you can
-specify :ergoemacs-require t in the body of the
-`ergoemacs-autoload' macro."
-  (declare (indent 2))
-  (let ((kb (make-symbol "body-and-plist"))
-(plist (make-symbol "plist"))
-(body (make-symbol "body"))
-(doc (make-symbol "doc")))
-(setq kb (ergoemacs-theme-component--parse-keys-and-body keys-and-body  
nil t)
-  plist (nth 0 kb)
-  body (nth 1 kb))
-(when (equal (car body) '())
-  (setq body (cdr body)))
-(setq doc (if (stringp (car body)) (pop body) (symbol-name name)))
-(unless (plist-get plist :package-name)
-  (setq plist (plist-put plist :package-name name)))
-(macroexpand-all
- `(ergoemacs-theme-component ,name ()
-,doc
-,@plist
-,@body
-
 (defvar ergoemacs-theme-components--modified-plist nil
   "Modified plist.")
 
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index bdf8a48..9338770 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -1736,26 +1736,6 @@
   "Switch major modes by clicking mode-name."
   (setq ergoemacs-swap-major-modes-when-clicking-major-mode-name t))
 
-
-(ergoemacs-autoload multiple-cursors
-"Multiple Cursors"
-:bind (("M-*" mc/mark-next-like-this)
-   ("M-&" mc/edit-lines))
-:ensure t)
-
-(ergoemacs-autoload avy
-"Avy"
-:bind ("M-," 'avy-goto-word-or-subword-1)
-:ensure t)
-
-(ergoemacs-autoload expand-region
-"Expand Region"
-:bind (("M-8" er/expand-region)
-   ("M-9" er/contract-region)
-   ("M-*". er/mark-inside-quotes))
-:ensure t)
-
-
 (ergoemacs-theme standard ()
   "Standard Ergoemacs Theme"
   :components '(copy

[elpa] externals/ergoemacs-mode f58f7d8 008/325: Replace all cl with cl-lib

[monnier--- via]

branch: externals/ergoemacs-mode
commit f58f7d8dc84c81202f16e91ae9443b81a0e46290
Author: Walter Landry 
Commit: Walter Landry 

Replace all cl with cl-lib
---
 Makefile  |  4 ++--
 ergoemacs-component.el|  2 +-
 ergoemacs-test.el | 20 ++--
 ergoemacs-theme-engine.el |  2 +-
 ergoemacs-themes.el   |  2 +-
 ergoemacs-translate.el|  8 
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 09b4822..6f0a0d7 100644
--- a/Makefile
+++ b/Makefile
@@ -105,12 +105,12 @@ start0:
$(EMACS) -Q -L . -L .. -l ergoemacs-mode -l ergoemacs-test --eval 
"(ergoemacs-mode)"
 
 ert :
-   $(EMACS) $(EMACS_BATCH) -L . -L .. -l cl -l ergoemacs-mode -l 
ergoemacs-test --eval \
+   $(EMACS) $(EMACS_BATCH) -L . -L .. -l cl-lib -l ergoemacs-mode -l 
ergoemacs-test --eval \
"(progn (setq ergoemacs-command-loop-type nil)  
\
  (ert-run-tests-batch-and-exit '(and \"$(TESTS)\" $(SELECT) (not 
(tag :interactive)" || exit 1; \
 
 erti :
-   $(EMACS) $(EMACS_BATCH) -L . -L .. -l cl -l ergoemacs-mode -l 
ergoemacs-test --eval \
+   $(EMACS) $(EMACS_BATCH) -L . -L .. -l cl-lib -l ergoemacs-mode -l 
ergoemacs-test --eval \
"(progn (setq ergoemacs-command-loop-type nil)  
   \
  (fset 'ert--print-backtrace 'ignore)  \
  (ert-run-tests-batch-and-exit '(and \"$(TESTS)\" $(SELECT) (not 
(tag :interactive)" || exit 1; \
diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index 3740e57..c3d460f 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -1192,7 +1192,7 @@ to prevent infinite recursion."
   (when (ignore-errors (boundp (nth 1 (nth 1 (nth 0 
init)
 (apply 'add-to-list (nth 1 (nth 1 (nth 0 init))) (cdr 
(cdr (nth 0 init
 (push (nth 0 init) 
ergoemacs-component-struct--deferred-functions)
- ((memq (car (nth 0 init)) '(push pushnew cl-pushnew))
+ ((memq (car (nth 0 init)) '(push cl-pushnew))
   (when (ignore-errors (boundp (nth 2 (nth 0 init
 (if (ignore-errors (eq 'quote (nth 1 (nth 1 (nth 0 
init)
 (ignore-errors
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index c62330a..168694d 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -29,7 +29,7 @@
 ;;; Code:
 
 (eval-when-compile 
-  (require 'cl)
+  (require 'cl-lib)
   (require 'ergoemacs-macros))
 
 (declare-function ergoemacs-translate--keymap "ergoemacs-translate")
@@ -1120,7 +1120,7 @@ Should test issue #142"
  (w-file (expand-file-name "global-test" ergoemacs-dir))
  (temp-file (make-temp-file "ergoemacs-test" nil ".el")))
 (with-temp-file temp-file
-  (insert "(eval-when-compile (load (expand-file-name 
\"ergoemacs-macros\")) (require 'cl))"
+  (insert "(eval-when-compile (load (expand-file-name 
\"ergoemacs-macros\")) (require 'cl-lib))"
   (or (and (boundp 'wait-for-me)
"(setq debug-on-error t debug-on-quit t)") "")
  "(setq ergoemacs-theme nil)"
@@ -1162,7 +1162,7 @@ Should test issue #142"
 (with-temp-file temp-file
   (insert "(add-to-list 'load-path \"" (expand-file-name 
(file-name-directory (locate-library "ergoemacs-mode"))) "\")"
  "(add-to-list 'load-path \"" (expand-file-name 
(file-name-directory (locate-library "icicles"))) "\")"
-   "(eval-when-compile (require 'ergoemacs-macros) (require 'cl))"
+   "(eval-when-compile (require 'ergoemacs-macros) (require 'cl-lib))"
   (or (and (boundp 'wait-for-me)
"(setq debug-on-error t debug-on-quit t)") "")
  "(setq ergoemacs-theme nil)"
@@ -1199,7 +1199,7 @@ Should test issue #142"
  (w-file (expand-file-name "global-test" ergoemacs-dir))
  (temp-file (make-temp-file "ergoemacs-test" nil ".el")))
 (with-temp-file temp-file
-  (insert "(eval-when-compile (require 'ergoemacs-macros) (require 'cl))"
+  (insert "(eval-when-compile (require 'ergoemacs-macros) (require 
'cl-lib))"
   (or (and (boundp 'wait-for-me)
"(setq debug-on-error t debug-on-quit t)") "")
  "(setq ergoemacs-theme nil)"
@@ -1289,7 +1289,7 @@ Should test issue #142"
  (w-file (expand-file-name "global-test" ergoemacs-dir))
  (temp-file (make-temp-file "ergoemacs-test" nil ".el")))
 (with-temp-file temp-file
-  (insert "(eval-when-compile (require 'ergoemacs-macros) (require 'cl))"
+  (insert "(eval-when-compile (require 'ergoemacs-macros) (require 
'cl-lib))"
   (or (and (boundp 'wait-for-me)
"(setq debug-on-error t debug-on-quit t)") "")
   "(ergoemacs-theme-component my-theme01 ()\n"
@@ -1336,7

[elpa] externals/ergoemacs-mode 4f43e90 001/325: Add a whole bunch of keybindings

[monnier--- via]

branch: externals/ergoemacs-mode
commit 4f43e9093bb4f761cb391d33673271e4da150666
Author: Walter Landry 
Commit: Walter Landry 

Add a whole bunch of keybindings
---
 ergoemacs-themes.el | 184 +++-
 1 file changed, 167 insertions(+), 17 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 0763a2a..9436eae 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -338,6 +338,48 @@
   (global-set-key (kbd "M-S-") 'backward-page)
 
   ;; Mode specific changes
+
+  ;; For term, do not bind anything that modifies the buffer, like
+  ;; cut, undo, and redo.  The only exception is paste.  Paste-cycle
+  ;; is not bound, because it would require deleting and inserting
+  ;; text.
+  ;;
+  ;; Also, do not bind any special keys like  or .
+  ;; They get passed into term.
+  (define-key term-raw-map (kbd "C-n") 'ergoemacs-new-empty-buffer)
+  (define-key term-raw-map (kbd "C-o") ("C-o" :emacs))
+  (define-key term-raw-map (kbd "C-S-o") 'ergoemacs-open-in-desktop)
+  (define-key term-raw-map (kbd "C-S-t") 'ergoemacs-open-last-closed)
+  (define-key term-raw-map (kbd "C-w") 'ergoemacs-close-current-buffer)
+  (define-key term-raw-map (kbd "C-f") ("C-s" :emacs))
+  (define-key term-raw-map (kbd "C-s") ("C-x C-s" :emacs))
+  (define-key term-raw-map (kbd "C-S-s") ("C-x C-w" :emacs))
+  (define-key term-raw-map (kbd "C-p") 'ergoemacs-print-buffer-confirm)
+  (define-key term-raw-map (kbd "C-a") ("C-x h" :emacs))
+  (define-key term-raw-map (kbd "C-v") 'term-paste)
+  (define-key term-raw-map (kbd "C-S-n") 'make-frame-command)
+  (define-key term-raw-map (kbd "C-+") 'text-scale-increase)
+  (define-key term-raw-map (kbd "C--") 'text-scale-decrease)
+  (define-key term-raw-map (kbd "C-.") 'keyboard-quit)
+  (define-key term-raw-map (kbd "C-/") 'info)
+  (define-key term-raw-map (kbd "C-0") 'ergoemacs-text-scale-normal-size)
+  (define-key term-raw-map (kbd "C-=") 'text-scale-increase)
+  (define-key term-raw-map (kbd "C-S-f") 'occur)
+  (define-key term-raw-map (kbd "C-S-o") 'ergoemacs-open-in-external-app)
+  (define-key term-raw-map (kbd "C-S-s") 'write-file)
+  (define-key term-raw-map (kbd "C-S-t") 'ergoemacs-open-last-closed)
+  (define-key term-raw-map (kbd "C-S-w") 'delete-frame)
+  (define-key term-raw-map (kbd "C-`") 'other-frame)
+  (define-key term-raw-map (kbd "C-a") 'mark-whole-buffer)
+  (define-key term-raw-map (kbd "C-f") 'isearch-forward)
+  (define-key term-raw-map (kbd "C-l") 'goto-line)
+  (define-key term-raw-map (kbd "C-n") 'ergoemacs-new-empty-buffer)
+  (define-key term-raw-map (kbd "C-o") 'find-file)
+  (define-key term-raw-map (kbd "C-p") 'ergoemacs-print-buffer-confirm)
+  (define-key term-raw-map (kbd "C-w") 'ergoemacs-close-current-buffer)
+  ;; Maybe not bind anything with a C-x prefix?
+  (define-key term-raw-map (kbd "C-x C-b") 'ibuffer)
+  
   (define-key org-mode-map (kbd "") 
'ergoemacs-org-insert-heading-respect-content)
   (define-key org-mode-map (kbd "") 'ergoemacs-org-metadown)
   (define-key org-mode-map (kbd "") 'ergoemacs-org-metaup)
@@ -569,20 +611,31 @@
   (global-set-key (kbd "C-SPC") nil) ;; Set Mark
   (global-set-key (kbd "M-SPC") ("C-SPC" :emacs))
   
-  ;; Mode specific changes
-  (define-key browse-kill-ring-mode-map (kbd "M-i") 'browse-kill-ring-previous)
-  (define-key browse-kill-ring-mode-map (kbd "M-k")  'browse-kill-ring-forward)
-
   ;; Delete previous/next char.
   (global-set-key (kbd "M-d") 'delete-backward-char)
 
   (global-set-key (kbd "C-d") nil)
   (global-set-key (kbd "M-f") 'delete-char)
-  ;; Mode specific changes
 
+  ;; Mode specific changes
+  (define-key browse-kill-ring-mode-map (kbd "M-i") 'browse-kill-ring-previous)
+  (define-key browse-kill-ring-mode-map (kbd "M-k")  'browse-kill-ring-forward)
+  ;; Duplication?
   (define-key browse-kill-ring-mode-map (kbd "M-i") 'browse-kill-ring-backward)
   (define-key browse-kill-ring-mode-map (kbd "M-k") 'browse-kill-ring-forward)
   (define-key browse-kill-ring-mode-map (kbd "M-f") 'browse-kill-ring-delete)
+
+  (define-key term-raw-map (kbd "M-j") 'backward-char)
+  (define-key term-raw-map (kbd "M-l") 'forward-char)
+  (define-key term-raw-map (kbd "M-i") 'previous-line)
+  (define-key term-raw-map (kbd "M-k") 'next-line)
+  (define-key term-raw-map (kbd "M-C-j") ("" :emacs))
+  (define-key term-raw-map (kbd "M-C-l") ("" :emacs))
+  (define-key term-raw-map (kbd "M-C-i") ("" :emacs))
+  (define-key term-raw-map (kbd "M-C-k") ("" :emacs))
+  (define-key term-raw-map (kbd "M-SPC") 'set-mark-command)
+  (define-key term-raw-map (kbd "M-d") nil)
+  (define-key term-raw-map (kbd "M-f") nil)
   
   (when iswitchb-define-mode-map-hook 
 (define-key iswitchb-mode-map [remap backward-char] 'iswitchb-prev-match)
@@ -605,7 +658,16 @@
   (global-set-key (kbd "M-e") 'backward-kill-word)
   
   (global-set-key (kbd "M-d") nil)
-  (global-set-key (kbd "M-r") 'kill-word))
+  (global-set-key (kbd "M-r") 'kill-word)
+
+  ;; Mode specific move

[elpa] externals/ergoemacs-mode 89b618b 004/325: Merge branch 'master' into ergoterm

[monnier--- via]

branch: externals/ergoemacs-mode
commit 89b618b44c81f3c25a3fcb968a2f2031e2741f62
Merge: de74f45 d30b431
Author: Walter Landry 
Commit: Walter Landry 

Merge branch 'master' into ergoterm
---
 ergoemacs-advice.el   |   6 --
 ergoemacs-command-loop.el | 218 ++
 ergoemacs-component.el|   1 -
 ergoemacs-mode.el |   5 --
 ergoemacs-themes.el   |  13 ++-
 ergoemacs-translate.el|  32 +--
 6 files changed, 103 insertions(+), 172 deletions(-)

diff --git a/ergoemacs-advice.el b/ergoemacs-advice.el
index e2320d3..ecb93b9 100644
--- a/ergoemacs-advice.el
+++ b/ergoemacs-advice.el
@@ -361,12 +361,6 @@ TYPE is the type of translation installed."
   ad-do-it
 (ergoemacs-mode--undefined-advice)))
 
-(ergoemacs-advice handle-shift-selection ()
-  "Allow `ergoemacs-mode' to do shift selection on keys like Alt+# to Alt+3."
-  :type :before
-  (when (eq 'ergoemacs-command-loop--shift-translate (key-binding 
(this-single-command-keys)))
-(setq this-command-keys-shift-translated t)))
-
 (provide 'ergoemacs-advice)
 ;;
 ;;; ergoemacs-advice.el ends here
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 8628dbb..3a28560 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -184,7 +184,6 @@ ignore the post-command hooks.")
 (defvar ergoemacs-command-loop-time-before-blink)
 (defvar ergoemacs-command-loop-blink-character)
 (defvar ergoemacs-command-loop-blink-rate)
-(defvar ergoemacs-command-loop-hide-shift-translations)
 (defvar ergoemacs-mode)
 (defvar ergoemacs-command-loop-type)
 (defvar ergoemacs-keymap)
@@ -801,9 +800,6 @@ KEYS is the keys information"
(push 'ergoemacs-timeout unread-command-events))
   (setq ergoemacs-command--timeout-keys nil
 
-(defvar ergoemacs-this-command-keys-shift-translated nil
-  "ergoemacs override of shift translation in command loop.")
-
 (defun ergoemacs-command--echo-prefix ()
   "Echos prefix keys in the ergoemacs-mode way."
   (let ((keys (this-single-command-keys))
@@ -821,8 +817,6 @@ KEYS is the keys information"
   ((eq ergoemacs-handle-ctl-c-or-ctl-x 'only-copy-cut) 
(push 'ergoemacs-timeout unread-command-events))
   ((not (region-active-p))) ;; active
-  ((and (or ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated)
- (eq ergoemacs-handle-ctl-c-or-ctl-x 'both)))
   ((and (not ergoemacs-ctl-c-or-ctl-x-delay) ;; Immediate
  (eq ergoemacs-handle-ctl-c-or-ctl-x 'both))
(push 'ergoemacs-timeout unread-command-events))
@@ -905,8 +899,7 @@ read."
   ;; Don't echo the uncommon hyper/super/alt translations (alt is
   ;; not the alt key...)
   (dolist (tr trans)
-(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr))
-(and ergoemacs-command-loop-hide-shift-translations (memq 
'shift (nth 0  tr
+(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr)))
   (if (member (list (nth 1 tr) (nth 0 tr)) trans)
   (when (not (member (list (nth 1 tr) (nth 0 tr)) double))
 (push tr double))
@@ -1560,8 +1553,7 @@ needed (and resotre them to the original values)."
   "Call the COMMAND interactively.  Also handle mouse events (if possible.)
 The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'."
   (ergoemacs-command-loop--sync-point)
-  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil
-   this-command-keys-shift-translated (or 
ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated))
+  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil)
   (cond
((and (eventp last-command-event)
  (consp last-command-event)
@@ -1577,8 +1569,7 @@ The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'.
 (ergoemacs-specials
  (ergoemacs-command-loop--grow-interactive command record-flag keys)))
(t
-(ergoemacs-command-loop--grow-interactive command record-flag keys)))
-  (setq ergoemacs-this-command-keys-shift-translated nil))
+(ergoemacs-command-loop--grow-interactive command record-flag keys
 
 
 (defun ergoemacs-command-loop-start ()
@@ -1831,8 +1822,7 @@ Emacs versions)."
  "Key sequence %s aborted by %s"
  (ergoemacs-key-description last-current-key)
  (ergoemacs-key-description raw-key))
-(setq quit-flag t
- ergoemacs-this-command-keys-shift-translated nil))
+(setq quit-flag t))
;; Handle local commands.
((and (or modal-p
  (not (equal current-key raw-key)))
@@ -2138,106 +2128,90 @@ pressed the translated key by changing
 ;; Mak

[elpa] externals/ergoemacs-mode de74f45 002/325: Remove some Control key bindings, so nano works

[monnier--- via]

branch: externals/ergoemacs-mode
commit de74f4551341e356fa47d18d8a2d44e1c16b0982
Author: Walter Landry 
Commit: Walter Landry 

Remove some Control key bindings, so nano works
---
 ergoemacs-themes.el | 10 +-
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 9436eae..5f25367 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -356,7 +356,6 @@
   (define-key term-raw-map (kbd "C-S-s") ("C-x C-w" :emacs))
   (define-key term-raw-map (kbd "C-p") 'ergoemacs-print-buffer-confirm)
   (define-key term-raw-map (kbd "C-a") ("C-x h" :emacs))
-  (define-key term-raw-map (kbd "C-v") 'term-paste)
   (define-key term-raw-map (kbd "C-S-n") 'make-frame-command)
   (define-key term-raw-map (kbd "C-+") 'text-scale-increase)
   (define-key term-raw-map (kbd "C--") 'text-scale-decrease)
@@ -377,8 +376,6 @@
   (define-key term-raw-map (kbd "C-o") 'find-file)
   (define-key term-raw-map (kbd "C-p") 'ergoemacs-print-buffer-confirm)
   (define-key term-raw-map (kbd "C-w") 'ergoemacs-close-current-buffer)
-  ;; Maybe not bind anything with a C-x prefix?
-  (define-key term-raw-map (kbd "C-x C-b") 'ibuffer)
   
   (define-key org-mode-map (kbd "") 
'ergoemacs-org-insert-heading-respect-content)
   (define-key org-mode-map (kbd "") 'ergoemacs-org-metadown)
@@ -387,7 +384,6 @@
   (define-key org-mode-map (kbd "") 'ergoemacs-org-metaright)
   (define-key org-mode-map (kbd "") 'org-insert-item)
   (define-key org-mode-map (kbd "M-v") 'ergoemacs-org-yank)
-  (define-key org-mode-map (kbd "C-v") 'ergoemacs-org-yank)
 
   (define-key browse-kill-ring-mode-map (kbd "C-f") 
'browse-kill-ring-search-forward)
   (define-key browse-kill-ring-mode-map (kbd "") 
'browse-kill-ring-delete)
@@ -815,10 +811,6 @@
   (define-key term-raw-map (kbd "M-C") 'ergoemacs-copy-all)
   (define-key term-raw-map (kbd "M-X") nil)
   (define-key term-raw-map (kbd "M-Z") nil)
-  (define-key term-raw-map (kbd "C-S-x") ("C-x" :normal))
-  (define-key term-raw-map (kbd "C-z") nil)
-  (define-key term-raw-map (kbd "C-S-z") nil)
-  (define-key term-raw-map (kbd "C-y") nil)
 
   (define-key calc-mode-map [remap ergoemacs-paste] 'calc-yank)
   (define-key calc-mode-map [remap undo-tree-undo] 'calc-undo))
@@ -840,7 +832,7 @@
   ;; Mode specific changes
   (define-key term-raw-map (kbd "M-y") '("C-s" :emacs))
   (define-key term-raw-map (kbd "M-Y") '("C-r" :emacs))
-  ;; FIXME: Duplicated from search-reg
+
   (define-key term-raw-map (kbd "M-5") '("M-%" :emacs))
   (define-key term-raw-map (kbd "M-%") '("C-M-%" :emacs))
 

[elpa] externals/ergoemacs-mode d30b431 003/325: Remove shift translation, instead directly binding those keys

[monnier--- via]

branch: externals/ergoemacs-mode
commit d30b431517951f0c5971bd240ec82d4ac80b490f
Author: Walter Landry 
Commit: Walter Landry 

Remove shift translation, instead directly binding those keys

This allows "C-h k" and describe-ergoemacs-theme to give a useful
answer for those keys.
---
 ergoemacs-advice.el   |   6 --
 ergoemacs-command-loop.el | 218 ++
 ergoemacs-component.el|   1 -
 ergoemacs-mode.el |   5 --
 ergoemacs-themes.el   |  18 +++-
 ergoemacs-translate.el|  32 +--
 6 files changed, 106 insertions(+), 174 deletions(-)

diff --git a/ergoemacs-advice.el b/ergoemacs-advice.el
index e2320d3..ecb93b9 100644
--- a/ergoemacs-advice.el
+++ b/ergoemacs-advice.el
@@ -361,12 +361,6 @@ TYPE is the type of translation installed."
   ad-do-it
 (ergoemacs-mode--undefined-advice)))
 
-(ergoemacs-advice handle-shift-selection ()
-  "Allow `ergoemacs-mode' to do shift selection on keys like Alt+# to Alt+3."
-  :type :before
-  (when (eq 'ergoemacs-command-loop--shift-translate (key-binding 
(this-single-command-keys)))
-(setq this-command-keys-shift-translated t)))
-
 (provide 'ergoemacs-advice)
 ;;
 ;;; ergoemacs-advice.el ends here
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 8628dbb..3a28560 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -184,7 +184,6 @@ ignore the post-command hooks.")
 (defvar ergoemacs-command-loop-time-before-blink)
 (defvar ergoemacs-command-loop-blink-character)
 (defvar ergoemacs-command-loop-blink-rate)
-(defvar ergoemacs-command-loop-hide-shift-translations)
 (defvar ergoemacs-mode)
 (defvar ergoemacs-command-loop-type)
 (defvar ergoemacs-keymap)
@@ -801,9 +800,6 @@ KEYS is the keys information"
(push 'ergoemacs-timeout unread-command-events))
   (setq ergoemacs-command--timeout-keys nil
 
-(defvar ergoemacs-this-command-keys-shift-translated nil
-  "ergoemacs override of shift translation in command loop.")
-
 (defun ergoemacs-command--echo-prefix ()
   "Echos prefix keys in the ergoemacs-mode way."
   (let ((keys (this-single-command-keys))
@@ -821,8 +817,6 @@ KEYS is the keys information"
   ((eq ergoemacs-handle-ctl-c-or-ctl-x 'only-copy-cut) 
(push 'ergoemacs-timeout unread-command-events))
   ((not (region-active-p))) ;; active
-  ((and (or ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated)
- (eq ergoemacs-handle-ctl-c-or-ctl-x 'both)))
   ((and (not ergoemacs-ctl-c-or-ctl-x-delay) ;; Immediate
  (eq ergoemacs-handle-ctl-c-or-ctl-x 'both))
(push 'ergoemacs-timeout unread-command-events))
@@ -905,8 +899,7 @@ read."
   ;; Don't echo the uncommon hyper/super/alt translations (alt is
   ;; not the alt key...)
   (dolist (tr trans)
-(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr))
-(and ergoemacs-command-loop-hide-shift-translations (memq 
'shift (nth 0  tr
+(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr)))
   (if (member (list (nth 1 tr) (nth 0 tr)) trans)
   (when (not (member (list (nth 1 tr) (nth 0 tr)) double))
 (push tr double))
@@ -1560,8 +1553,7 @@ needed (and resotre them to the original values)."
   "Call the COMMAND interactively.  Also handle mouse events (if possible.)
 The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'."
   (ergoemacs-command-loop--sync-point)
-  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil
-   this-command-keys-shift-translated (or 
ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated))
+  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil)
   (cond
((and (eventp last-command-event)
  (consp last-command-event)
@@ -1577,8 +1569,7 @@ The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'.
 (ergoemacs-specials
  (ergoemacs-command-loop--grow-interactive command record-flag keys)))
(t
-(ergoemacs-command-loop--grow-interactive command record-flag keys)))
-  (setq ergoemacs-this-command-keys-shift-translated nil))
+(ergoemacs-command-loop--grow-interactive command record-flag keys
 
 
 (defun ergoemacs-command-loop-start ()
@@ -1831,8 +1822,7 @@ Emacs versions)."
  "Key sequence %s aborted by %s"
  (ergoemacs-key-description last-current-key)
  (ergoemacs-key-description raw-key))
-(setq quit-flag t
- ergoemacs-this-command-keys-shift-translated nil))
+(setq quit-flag t))
;; Handle local commands.
((and (or modal-p
  (not

[elpa] externals/ergoemacs-mode 3e25eac 043/325: Remove unused modal customizations

[monnier--- via]

branch: externals/ergoemacs-mode
commit 3e25eacc435ed7f405c280a5fd7dd5e8a0670e12
Author: Walter Landry 
Commit: Walter Landry 

Remove unused modal customizations
---
 ergoemacs-command-loop.el |   2 -
 ergoemacs-macros.el   |   3 +-
 ergoemacs-mode.el | 138 --
 3 files changed, 1 insertion(+), 142 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 955ef50..925e282 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -89,8 +89,6 @@
 (defvar ergoemacs-default-cursor-color)
 (defvar ergoemacs-echo-function)
 (defvar ergoemacs-map--quit-map)
-(defvar ergoemacs-modal-emacs-state-modes)
-(defvar ergoemacs-modal-ignored-buffers)
 (defvar ergoemacs-modal-ignored-keymap)
 (defvar ergoemacs-mode-started-p)
 (defvar guide-key/guide-key-sequence)
diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 9bea54e..ee8c41a 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -780,8 +780,7 @@ When arg1 can be a property.  The following properties are 
supported:
 :keymap -- Local Keymap for translation
 :keymap-modal -- Modal keymap for overrides.
 :modal-always -- If the modal state is always on, regardless of
- the values of  `ergoemacs-modal-ignored-buffers',
-`ergoemacs-modal-emacs-state-modes' `minibufferp'
+ the values of `minibufferp'
 The following arguments allow the keyboard presses to be translated:
  - :meta
  - :control
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index abc3985..39e9a5a 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -1002,15 +1002,6 @@ Valid values are:
   :group 'ergoemacs-command-loop)
 
 
-(defgroup ergoemacs-modal nil
-  "Modal `ergoemacs-mode'."
-  :group 'ergoemacs-mode)
-(defcustom ergoemacs-modal-ignored-buffers
-  '("^ \\*load\\*" "^[*]e?shell[*]" "^[*]R.*[*]$")
-  "Buffers where modal ergoemacs-mode is ignored."
-  :type '(repeat string)
-  :group 'ergoemacs-modal)
-
 (defcustom ergoemacs-default-cursor-color nil
   "Default cursor color.
 
@@ -1023,135 +1014,6 @@ color.  Otherwise this will be nil A color string as 
passed to
 
 (define-obsolete-variable-alias 'ergoemacs-default-cursor 
'ergoemacs-default-cursor-color)
 
-(defcustom ergoemacs-modal-emacs-state-modes
-  '(archive-mode
-bbdb-mode
-bookmark-bmenu-mode
-bookmark-edit-annotation-mode
-browse-kill-ring-mode
-bzr-annotate-mode
-calc-mode
-cfw:calendar-mode
-completion-list-mode
-Custom-mode
-debugger-mode
-delicious-search-mode
-desktop-menu-blist-mode
-desktop-menu-mode
-doc-view-mode
-dvc-bookmarks-mode
-dvc-diff-mode
-dvc-info-buffer-mode
-dvc-log-buffer-mode
-dvc-revlist-mode
-dvc-revlog-mode
-dvc-status-mode
-dvc-tips-mode
-ediff-mode
-ediff-meta-mode
-efs-mode
-Electric-buffer-menu-mode
-emms-browser-mode
-emms-mark-mode
-emms-metaplaylist-mode
-emms-playlist-mode
-etags-select-mode
-fj-mode
-gc-issues-mode
-gdb-breakpoints-mode
-gdb-disassembly-mode
-gdb-frames-mode
-gdb-locals-mode
-gdb-memory-mode
-gdb-registers-mode
-gdb-threads-mode
-gist-list-mode
-gnus-article-mode
-gnus-browse-mode
-gnus-group-mode
-gnus-server-mode
-gnus-summary-mode
-google-maps-static-mode
-ibuffer-mode
-jde-javadoc-checker-report-mode
-magit-commit-mode
-magit-diff-mode
-magit-key-mode
-magit-log-mode
-magit-mode
-magit-reflog-mode
-magit-show-branches-mode
-magit-branch-manager-mode ;; New name for magit-show-branches-mode
-magit-stash-mode
-magit-status-mode
-magit-wazzup-mode
-mh-folder-mode
-monky-mode
-notmuch-hello-mode
-notmuch-search-mode
-notmuch-show-mode
-occur-mode
-org-agenda-mode
-package-menu-mode
-proced-mode
-rcirc-mode
-rebase-mode
-recentf-dialog-mode
-reftex-select-bib-mode
-reftex-select-label-mode
-reftex-toc-mode
-sldb-mode
-slime-inspector-mode
-slime-thread-control-mode
-slime-xref-mode
-shell-mode
-sr-buttons-mode
-sr-mode
-sr-tree-mode
-sr-virtual-mode
-tar-mode
-tetris-mode
-tla-annotate-mode
-tla-archive-list-mode
-tla-bconfig-mode
-tla-bookmarks-mode
-tla-branch-list-mode
-tla-browse-mode
-tla-category-list-mode
-tla-changelog-mode
-tla-follow-symlinks-mode
-tla-inventory-file-mode
-tla-inventory-mode
-tla-lint-mode
-tla-logs-mode
-tla-revision-list-mode
-tla-revlog-mode
-tla-tree-lint-mode
-tla-version-list-mode
-twittering-mode
-urlview-mode
-vc-annotate-mode
-vc-dir-mode
-vc-git-log-view-mode
-vc-svn-log-view-mode
-vm-mode
-vm-summary-mode
-w3m-mode
-wab-compilation-mode
-xgit-annotate-mode
-xgit-changelog-mode
-xgit-diff-mode
-xgit-revlog-mode
-xhg-a

[elpa] externals/ergoemacs-mode 5fbcf0c 048/325: Remove unchorded stuff and related tests

[monnier--- via]

branch: externals/ergoemacs-mode
commit 5fbcf0c1a16017481a9a2ea69f9a83b6433e7d1e
Author: Walter Landry 
Commit: Walter Landry 

Remove unchorded stuff and related tests
---
 ergoemacs-command-loop.el |  1 -
 ergoemacs-test.el | 40 
 ergoemacs-theme-engine.el |  1 -
 ergoemacs-themes.el   | 30 --
 4 files changed, 72 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 826c158..0c4b8f9 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -786,7 +786,6 @@ read."
  reset-key-p
  double)
 
-;; (ergoemacs-command-loop--read-key (read-kbd-macro "C-x" t) 
:unchorded-ctl)
 (when (functionp text)
   (setq text (funcall text)))
 
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index d27a861..08addb5 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -80,7 +80,6 @@
 (declare-function ergoemacs-translate--quail-to-ergoemacs 
"ergoemacs-translate")
 (declare-function ergoemacs-translate-layout "ergoemacs-translate")
 (declare-function ergoemacs-translate--get "ergoemacs-translate")
-(declare-function ergoemacs-unchorded-alt-modal "ergoemacs-translate")
 (declare-function ergoemacs-translate--event-modifiers "ergoemacs-translate")
 
 (require 'ert)
@@ -649,43 +648,6 @@ Grep finished (matches found) at Fri Aug 22 08:30:37
  (call-interactively 'calc-quit)
  (should (eq (key-binding (kbd "M-u")) 'previous-line)
 
-;;; Modal
-
-(ert-deftest ergoemacs-test-modal-preserve-mark ()
-  "Issue #101.
-Test next and prior translation."
-  (with-temp-buffer
-(insert ergoemacs-test-lorem-ipsum)
-(goto-char (point-min))
-(ergoemacs-translate--get :unchorded-alt) ;; Load translation
-(ergoemacs-unchorded-alt-modal)
-(set-mark (point))
-(forward-char 3)
-(ergoemacs-unchorded-alt-modal)
-(should mark-active)))
-
-(ert-deftest ergoemacs-test-modal-alt-mode-horizontal-position ()
-  "Tests Issue #213"
-  (let (ret)
-(ergoemacs-test-layout
- :layout "colemak"
- :macro "i u u"
- (save-excursion
-   (switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
-   (delete-region (point-min) (point-max))
-   (insert ergoemacs-test-lorem-ipsum)
-   (goto-char (point-max))
-   (beginning-of-line)
-   (ergoemacs-translate--get :unchorded-alt)
-   (ergoemacs-unchorded-alt-modal)
-   (execute-kbd-macro macro)
-   (looking-at ".*? ")
-   (ignore-errors (should (string= (match-string 0) "eprehenderit ")))
-   (ergoemacs-unchorded-alt-modal)
-   (kill-buffer (current-buffer))
-
-
-
 ;;; Command Loop
 
 (ert-deftest ergoemacs-test-command-loop-apps-e-t-_ ()
@@ -1441,8 +1403,6 @@ Tests Issue #372."
   "Test ergoemacs-mode translations"
   :tags '(:translate)
   (should (string= "A" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0))
-  (should (string= "M-A" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0) 
:unchorded-alt)
-  (should (string= "C-S-a" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0) 
:unchorded-ctl)
   (should (string= "M-A" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-S-a" t) 0) 
:ctl-to-alt)
 
   ;; DEL = ^?, doesn't seem to have the issues that RET, ESC, and TAB has.
diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index be12fcd..6e3a6ba 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -737,7 +737,6 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 (ergoemacs-text-scale-normal-size "Reset Zoom")
 (ergoemacs-toggle-camel-case "tog. camel")
 (ergoemacs-toggle-letter-case "tog. case")
-(ergoemacs-unchorded-alt-modal "Alt+ Mode")
 (ergoemacs-universal-argument "Argument")
 (execute-extended-command "M-x")
 (find-file "Open")
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 5dc5ae5..37b3411 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -400,7 +400,6 @@
   (global-set-key (kbd "") 'previous-line)
   (global-set-key (kbd "") 'next-line)
   (global-set-key (kbd "") 'ergoemacs-copy-line-or-region)
-  (global-set-key (kbd "") 'ergoemacs-unchorded-alt-modal)
   (global-set-key (kbd "") 'search-map)
   (global-set-key (kbd " ") 'highlight-symbol-at-point)
   (global-set-key (kbd " ") 'highlight-symbol-query-replace)
@@ -812,7 +811,6 @@
  " SPC"   set-mark-command
  " a" mark-whole-buffer
  " d" ("C-x" :ctl-to-alt)
- " f" ("C-c" :unchorded-ctl)
  " h" help-map
  " h '"   ergoemacs-describe-current-theme
  " h 1"   describe-function
@@ -1856,32 +1854,4 @@
 (define-key map (read-kbd-macro "M-SPC") 
'ergoemacs-read-key-force-next-key

[elpa] externals/ergoemacs-mode 21cab2a 006/325: Merge branch 'master' into ergoterm

[monnier--- via]

branch: externals/ergoemacs-mode
commit 21cab2a6a38163207cb2d5e3340cddb5c6cf965b
Merge: 89b618b 57bbe7d
Author: Walter Landry 
Commit: Walter Landry 

Merge branch 'master' into ergoterm
---
 ergoemacs-advice.el   |   6 ++
 ergoemacs-command-loop.el | 218 --
 ergoemacs-component.el|   1 +
 ergoemacs-mode.el |   5 ++
 ergoemacs-themes.el   |  10 +--
 ergoemacs-translate.el|  32 ++-
 6 files changed, 172 insertions(+), 100 deletions(-)

diff --git a/ergoemacs-advice.el b/ergoemacs-advice.el
index ecb93b9..e2320d3 100644
--- a/ergoemacs-advice.el
+++ b/ergoemacs-advice.el
@@ -361,6 +361,12 @@ TYPE is the type of translation installed."
   ad-do-it
 (ergoemacs-mode--undefined-advice)))
 
+(ergoemacs-advice handle-shift-selection ()
+  "Allow `ergoemacs-mode' to do shift selection on keys like Alt+# to Alt+3."
+  :type :before
+  (when (eq 'ergoemacs-command-loop--shift-translate (key-binding 
(this-single-command-keys)))
+(setq this-command-keys-shift-translated t)))
+
 (provide 'ergoemacs-advice)
 ;;
 ;;; ergoemacs-advice.el ends here
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 3a28560..8628dbb 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -184,6 +184,7 @@ ignore the post-command hooks.")
 (defvar ergoemacs-command-loop-time-before-blink)
 (defvar ergoemacs-command-loop-blink-character)
 (defvar ergoemacs-command-loop-blink-rate)
+(defvar ergoemacs-command-loop-hide-shift-translations)
 (defvar ergoemacs-mode)
 (defvar ergoemacs-command-loop-type)
 (defvar ergoemacs-keymap)
@@ -800,6 +801,9 @@ KEYS is the keys information"
(push 'ergoemacs-timeout unread-command-events))
   (setq ergoemacs-command--timeout-keys nil
 
+(defvar ergoemacs-this-command-keys-shift-translated nil
+  "ergoemacs override of shift translation in command loop.")
+
 (defun ergoemacs-command--echo-prefix ()
   "Echos prefix keys in the ergoemacs-mode way."
   (let ((keys (this-single-command-keys))
@@ -817,6 +821,8 @@ KEYS is the keys information"
   ((eq ergoemacs-handle-ctl-c-or-ctl-x 'only-copy-cut) 
(push 'ergoemacs-timeout unread-command-events))
   ((not (region-active-p))) ;; active
+  ((and (or ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated)
+ (eq ergoemacs-handle-ctl-c-or-ctl-x 'both)))
   ((and (not ergoemacs-ctl-c-or-ctl-x-delay) ;; Immediate
  (eq ergoemacs-handle-ctl-c-or-ctl-x 'both))
(push 'ergoemacs-timeout unread-command-events))
@@ -899,7 +905,8 @@ read."
   ;; Don't echo the uncommon hyper/super/alt translations (alt is
   ;; not the alt key...)
   (dolist (tr trans)
-(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr)))
+(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr))
+(and ergoemacs-command-loop-hide-shift-translations (memq 
'shift (nth 0  tr
   (if (member (list (nth 1 tr) (nth 0 tr)) trans)
   (when (not (member (list (nth 1 tr) (nth 0 tr)) double))
 (push tr double))
@@ -1553,7 +1560,8 @@ needed (and resotre them to the original values)."
   "Call the COMMAND interactively.  Also handle mouse events (if possible.)
 The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'."
   (ergoemacs-command-loop--sync-point)
-  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil)
+  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil
+   this-command-keys-shift-translated (or 
ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated))
   (cond
((and (eventp last-command-event)
  (consp last-command-event)
@@ -1569,7 +1577,8 @@ The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'.
 (ergoemacs-specials
  (ergoemacs-command-loop--grow-interactive command record-flag keys)))
(t
-(ergoemacs-command-loop--grow-interactive command record-flag keys
+(ergoemacs-command-loop--grow-interactive command record-flag keys)))
+  (setq ergoemacs-this-command-keys-shift-translated nil))
 
 
 (defun ergoemacs-command-loop-start ()
@@ -1822,7 +1831,8 @@ Emacs versions)."
  "Key sequence %s aborted by %s"
  (ergoemacs-key-description last-current-key)
  (ergoemacs-key-description raw-key))
-(setq quit-flag t))
+(setq quit-flag t
+ ergoemacs-this-command-keys-shift-translated nil))
;; Handle local commands.
((and (or modal-p
  (not (equal current-key raw-key)))
@@ -2128,90 +2138,106 @@ pressed the translated key by changing
 ;; Mak

[elpa] externals/ergoemacs-mode b20b8ae 033/325: Remove :mode and unused macro properties

[monnier--- via]

branch: externals/ergoemacs-mode
commit b20b8ae3b8ae441636fb8c11fbf9902fc530a15d
Author: Walter Landry 
Commit: Walter Landry 

Remove :mode and unused macro properties
---
 ergoemacs-component.el  | 35 +--
 ergoemacs-macros.el | 29 +
 ergoemacs-map-properties.el | 15 ---
 ergoemacs-map.el|  1 -
 4 files changed, 2 insertions(+), 78 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index dfe3160..db328d5 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -147,7 +147,7 @@
 (defvar ergoemacs-component-struct--define-key-current nil)
 
 (defun ergoemacs-component-struct--parse-list (list function &rest args)
-  "Handle :bind and :mode LIST and call FUNCTION.
+  "Handle :bind LIST and call FUNCTION.
 
 The FUNCTION calls the with the first argument as the string
 piece and the second argument the symbol piece of the definition.
@@ -191,32 +191,6 @@ binding assumes KEYMAP is `global-map'."
 (ergoemacs-component-struct--parse-list
  bind #'ergoemacs-component-struct--handle-bind-1 keymap)))
 
-(defun ergoemacs-component-struct--handle-mode-1 (regexpr mode)
-  "Add (cons REGEXPR MODE) to `auto-mode-alist'.
-Also autoload MODE.
-
-Requires `ergoemacs-component-struct--define-key-current' to be
-an `ergoemacs-component-struct' object."
-  ;; (message "Handle Mode #2: %s %s" regexpr mode)
-  (when (ergoemacs-component-struct-p 
ergoemacs-component-struct--define-key-current)
-(let* ((c (cons regexpr mode))
-   (obj ergoemacs-component-struct--define-key-current)
-   (package-name (ergoemacs-component-struct-package-name obj)))
-  (ergoemacs-component-struct--deferred
-   `(unless (member ',c auto-mode-alist)
-  (push ',c auto-mode-alist)))
-  (when (and package-name mode (not (fboundp mode)))
-;; Create autoload.
-(autoload mode (format "%s, a major mode defined in %s" mode 
package-name) nil t)
-(setq c (cons mode package-name))
-(unless (member c (ergoemacs-component-struct-autoloads obj))
-  (push (cons mode package-name) (ergoemacs-component-struct-autoloads 
obj)))
-
-(defun ergoemacs-component-struct--handle-mode (mode)
-  "Handle MODE list from :mode keyword."
-  (when mode
-(ergoemacs-component-struct--parse-list mode 
#'ergoemacs-component-struct--handle-mode-1)))
-
 (defun ergoemacs-component-struct--create-component (plist body file)
   "Create ergoemacs component.
 
@@ -271,13 +245,6 @@ FILE is the file name where the component was created."
   (setf (ergoemacs-component-struct-defer 
ergoemacs-component-struct--define-key-current) t))
 (ergoemacs-component-struct--handle-bind tmp 
'ergoemacs-override-keymap)
 
-;; Handle :mode
-(setq tmp (plist-get plist :mode))
-(when (and tmp (not defer-present-p) (not defer))
-  (setq defer-present-p t defer t)
-  (setf (ergoemacs-component-struct-defer 
ergoemacs-component-struct--define-key-current) t))
-(ergoemacs-component-struct--handle-mode tmp)
-
 ;; Handle :commands
 (setq tmp (plist-get plist :commands))
 (when (and tmp (not defer-present-p) (not defer))
diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 1f37478..66193e3 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -252,7 +252,6 @@ macro."
 :bind*
 :bind-keymap*
 :commands
-:mode
 :interpreter
 :defer
 :demand
@@ -333,7 +332,7 @@ This accepts the following keywords:
 
 :defer -- Should this package's loading be deferred?
 When using :commands :bind :bind* :bind-keymap :bind-keymap*
-   :mode or :interperter, defer is implied.  When :package-name
+   or :interperter, defer is implied.  When :package-name
is nil, this dosen't do anything.
 
 :demand -- Prevent deferred loading in all cases
@@ -349,19 +348,6 @@ This accepts the following keywords:
 
 By default this is nil.
 
-:mode -- Modes to be added to `auto-mode-alist'. This can be a string such as:
-
-:mode \".rb'\"
-
-or a list 
-
-:mode (\".rb'\" . ruby-mode)
-
-or a list of modes:
-
-:mode ((\".R'\" . R.mode)
-   (\".[Ss][Aa][Ss]'\" . SAS-mode))
-
 Borrowed from `use-package'.
 
 :package-name -- Name of package to load.  When non-nil any key
@@ -704,16 +690,6 @@ When arg1 can be a property.  The following properties are 
supported:
   (if (>= 25 emacs-major-version)
  `(gui-set-selection ,@(cdr args))
`(x-set-selection ,@(cdr args
- ((and arg1 (symbolp arg1) (eq arg1 :width))
-  `(ergoemacs-mode--eval-width ,arg2))
- ((and arg1 (symbolp arg1) (eq arg1 :mode-if) arg2)
-  `(ergoemacs-mode-line--if ,arg2 ,arg3 ,arg4))
- ((and arg1 (symbolp arg1) (memq arg1 '(:sep :separator)))
-  `(ergoemacs-mode-line--sep ,@(cdr ar

[elpa] externals/ergoemacs-mode 57bbe7d 005/325: Revert "Remove shift translation, instead directly binding those keys"

[monnier--- via]

branch: externals/ergoemacs-mode
commit 57bbe7d23752f735eb91f5cd307eea18f72383c3
Author: Walter Landry 
Commit: Walter Landry 

Revert "Remove shift translation, instead directly binding those keys"

This reverts commit d30b431517951f0c5971bd240ec82d4ac80b490f.
---
 ergoemacs-advice.el   |   6 ++
 ergoemacs-command-loop.el | 218 --
 ergoemacs-component.el|   1 +
 ergoemacs-mode.el |   5 ++
 ergoemacs-themes.el   |  18 +---
 ergoemacs-translate.el|  32 ++-
 6 files changed, 174 insertions(+), 106 deletions(-)

diff --git a/ergoemacs-advice.el b/ergoemacs-advice.el
index ecb93b9..e2320d3 100644
--- a/ergoemacs-advice.el
+++ b/ergoemacs-advice.el
@@ -361,6 +361,12 @@ TYPE is the type of translation installed."
   ad-do-it
 (ergoemacs-mode--undefined-advice)))
 
+(ergoemacs-advice handle-shift-selection ()
+  "Allow `ergoemacs-mode' to do shift selection on keys like Alt+# to Alt+3."
+  :type :before
+  (when (eq 'ergoemacs-command-loop--shift-translate (key-binding 
(this-single-command-keys)))
+(setq this-command-keys-shift-translated t)))
+
 (provide 'ergoemacs-advice)
 ;;
 ;;; ergoemacs-advice.el ends here
diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 3a28560..8628dbb 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -184,6 +184,7 @@ ignore the post-command hooks.")
 (defvar ergoemacs-command-loop-time-before-blink)
 (defvar ergoemacs-command-loop-blink-character)
 (defvar ergoemacs-command-loop-blink-rate)
+(defvar ergoemacs-command-loop-hide-shift-translations)
 (defvar ergoemacs-mode)
 (defvar ergoemacs-command-loop-type)
 (defvar ergoemacs-keymap)
@@ -800,6 +801,9 @@ KEYS is the keys information"
(push 'ergoemacs-timeout unread-command-events))
   (setq ergoemacs-command--timeout-keys nil
 
+(defvar ergoemacs-this-command-keys-shift-translated nil
+  "ergoemacs override of shift translation in command loop.")
+
 (defun ergoemacs-command--echo-prefix ()
   "Echos prefix keys in the ergoemacs-mode way."
   (let ((keys (this-single-command-keys))
@@ -817,6 +821,8 @@ KEYS is the keys information"
   ((eq ergoemacs-handle-ctl-c-or-ctl-x 'only-copy-cut) 
(push 'ergoemacs-timeout unread-command-events))
   ((not (region-active-p))) ;; active
+  ((and (or ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated)
+ (eq ergoemacs-handle-ctl-c-or-ctl-x 'both)))
   ((and (not ergoemacs-ctl-c-or-ctl-x-delay) ;; Immediate
  (eq ergoemacs-handle-ctl-c-or-ctl-x 'both))
(push 'ergoemacs-timeout unread-command-events))
@@ -899,7 +905,8 @@ read."
   ;; Don't echo the uncommon hyper/super/alt translations (alt is
   ;; not the alt key...)
   (dolist (tr trans)
-(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr)))
+(unless (or (memq 'hyper (nth 0  tr)) (memq 'super (nth 0 tr)) (memq 
'alt (nth 0 tr))
+(and ergoemacs-command-loop-hide-shift-translations (memq 
'shift (nth 0  tr
   (if (member (list (nth 1 tr) (nth 0 tr)) trans)
   (when (not (member (list (nth 1 tr) (nth 0 tr)) double))
 (push tr double))
@@ -1553,7 +1560,8 @@ needed (and resotre them to the original values)."
   "Call the COMMAND interactively.  Also handle mouse events (if possible.)
 The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'."
   (ergoemacs-command-loop--sync-point)
-  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil)
+  (setq ergoemacs-last-command-was-ergoemacs-ignore-p nil
+   this-command-keys-shift-translated (or 
ergoemacs-this-command-keys-shift-translated 
this-command-keys-shift-translated))
   (cond
((and (eventp last-command-event)
  (consp last-command-event)
@@ -1569,7 +1577,8 @@ The RECORD-FLAG and KEYS are sent to 
`ergoemacs-command-loop--grow-interactive'.
 (ergoemacs-specials
  (ergoemacs-command-loop--grow-interactive command record-flag keys)))
(t
-(ergoemacs-command-loop--grow-interactive command record-flag keys
+(ergoemacs-command-loop--grow-interactive command record-flag keys)))
+  (setq ergoemacs-this-command-keys-shift-translated nil))
 
 
 (defun ergoemacs-command-loop-start ()
@@ -1822,7 +1831,8 @@ Emacs versions)."
  "Key sequence %s aborted by %s"
  (ergoemacs-key-description last-current-key)
  (ergoemacs-key-description raw-key))
-(setq quit-flag t))
+(setq quit-flag t
+ ergoemacs-this-command-keys-shift-translated nil))
;; Handle local commands.
((and (or modal-p
  (not (equal current-key ra

[elpa] externals/ergoemacs-mode 72a812c 025/325: Remove dead code

[monnier--- via]

branch: externals/ergoemacs-mode
commit 72a812c4e749376a35ec47964d62c2dff4a0760c
Author: Walter Landry 
Commit: Walter Landry 

Remove dead code
---
 ergoemacs-test.el | 16 
 1 file changed, 16 deletions(-)

diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index 2eb6f5e..b3618a1 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -339,22 +339,6 @@ Tests issue #347"
   (isearch-mode -1))
 (kill-buffer (current-buffer)
 
-;; Not sure why; Fixed but test dosesn't work
-;; (ert-deftest ergoemacs-test-isearch-isearch-backward-repeats-backward ()
-;;   "Tests backward isearch remapping is correct."
-;;   :tags '(:search)
-;;   (ergoemacs-test-layout
-;;:macro "M-j ars M-j M-i"
-;;:layout "colemak"
-;;:theme "reduction"
-;;(save-excursion
-;;  (switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
-;;  (delete-region (point-min) (point-max))
-;;  (insert "aars1\nars2\nars3\nars4")
-;;  (goto-char (point-max))
-;;  (execute-kbd-macro macro)
-;;  (should (looking-at "rs3")
-
 ;;; Shift Selection
 (ert-deftest ergoemacs-test-shift-select-move-no-mark ()
   "Tests another shifted selection"

[elpa] externals/ergoemacs-mode d6926f0 095/325: Simplify menus

[monnier--- via]

branch: externals/ergoemacs-mode
commit d6926f02385aab5f9fb7f21ce891067fa387f427
Author: Walter Landry 
Commit: Walter Landry 

Simplify menus
---
 ergoemacs-theme-engine.el | 39 +--
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 8269411..86949d8 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -296,7 +296,7 @@ When AT-END is non-nil, append a $ to the regular 
expression."
 (push desc options-list)
 (push (list desc option) options-alist
   `(ergoemacs-theme-options
-menu-item "Theme Options"
+menu-item "Options"
 (keymap
  ,@menu-pre
  ,@(mapcar
@@ -318,49 +318,12 @@ When AT-END is non-nil, append a $ to the regular 
expression."
 (if (not theme-ver) nil
   (car (cdr theme-ver)
 
-
-(defun ergoemacs-theme--version-menu (theme)
-  "Get version menu for THEME."
-  (let ((theme-versions (ergoemacs-component-struct--versions 
(ergoemacs-theme-components theme
-(if (not theme-versions) nil
-  `(ergoemacs-versions
-menu-item "Theme Versions"
-(keymap
- (ergoemacs-current-version
-  menu-item "Current Version"
-  (lambda()
-(interactive)
-(ergoemacs-theme-set-version nil)
-(customize-mark-as-set 'ergoemacs-theme-version)
-(ergoemacs-mode-reset))
-  :button (:radio . (equal (ergoemacs :current-version) nil)))
- ,@(mapcar
-(lambda(version)
-  `(,(intern version) menu-item ,version
-(lambda() (interactive)
-  (ergoemacs-theme-set-version ,version)
-  (customize-mark-as-set 'ergoemacs-theme-version)
-  (ergoemacs-mode-reset))
-:button (:radio . (equal (ergoemacs :current-version) 
,version
-theme-versions))
-
 (defun ergoemacs-theme--menu (theme)
   "Define menus for current THEME."
   `(keymap
 ,(ergoemacs-layouts--menu)
 (ergoemacs-theme-sep "--")
-(ergoemacs-themes
- menu-item "Themes"
- (keymap
-  ,@(mapcar
- (lambda(theme)
-   `(,(intern theme) menu-item ,(concat theme " - " (plist-get 
(ergoemacs-gethash theme ergoemacs-theme-hash) ':description))
- (lambda() (interactive)
-   (ergoemacs-save 'ergoemacs-theme ,theme))
- :button (:radio . (string= (ergoemacs :current-theme) ,theme
- (sort (ergoemacs-theme--list) 'string<
 ,(ergoemacs-theme--menu-options theme)
-,(ergoemacs-theme--version-menu theme)
 (ergoemacs-c-x-sep "--")
 (c-v
  menu-item "Paste behavior"

[elpa] externals/ergoemacs-mode f2caedb 032/325: Remove dead code

[monnier--- via]

branch: externals/ergoemacs-mode
commit f2caedbecb0ac6e6c6bdad16a3bcd442508b4128
Author: Walter Landry 
Commit: Walter Landry 

Remove dead code
---
 ergoemacs-component.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index c289457..dfe3160 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -164,8 +164,6 @@ It also passes ARGS if any are specified."
 (setq arg1 (pop list)
   arg2 (pop list
  ((and (consp list) (stringp (car list)))
-  ;; :list ("C-." . ace-jump-mode)
-  ;; :list ("C-." ace-jump-mode)
   (apply function (car list)
  (or (and (consp (cdr list)) (nth 1 list))
  (cdr list))

[elpa] externals/ergoemacs-mode 3c793e3 035/325: Cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit 3c793e3fec42eedac08cd0399179caef7c9e5e15
Author: Walter Landry 
Commit: Walter Landry 

Cleanup
---
 ergoemacs-map.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index 241488b..8702952 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -102,6 +102,7 @@
 (declare-function ergoemacs-map-properties--lookup "ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--map-fixed-plist 
"ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--map-list 
"ergoemacs-map-properties")
+(declare-function ergoemacs-map-properties--new-command 
"ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--original 
"ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--original-user 
"ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--override-maps 
"ergoemacs-map-properties")

[elpa] externals/ergoemacs-mode 149c900 037/325: Remove ergoemacs-command-loop--modal-pop

[monnier--- via]

branch: externals/ergoemacs-mode
commit 149c900ff9d10c3396c92c752c816554a0c26202
Author: Walter Landry 
Commit: Walter Landry 

Remove ergoemacs-command-loop--modal-pop
---
 ergoemacs-command-loop.el | 5 -
 ergoemacs-functions.el| 3 ---
 2 files changed, 8 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index f6935e0..9f4f2da 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -241,11 +241,6 @@ If so return the translation."
   (setq ret translation
   ret)))
 
-(defun ergoemacs-command-loop--modal-pop ()
-  "Turn off the last ergoemacs modal in the modal-stack."
-  (when ergoemacs-command-loop--modal-stack
-(ergoemacs-command-loop--modal (ergoemacs-translation-struct-key (nth 0 
ergoemacs-command-loop--modal-stack)
-
 (defun ergoemacs-command-loop--modal (type)
   "Toggle ergoemacs command modes.
 
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 6aeb54e..7ec3372 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -66,7 +66,6 @@
 (declare-function ergoemacs-map-- "ergoemacs-map")
 (declare-function ergoemacs-mode "ergoemacs-mode")
 
-(declare-function ergoemacs-command-loop--modal-pop "ergoemacs-command-loop")
 (declare-function ergoemacs-theme-describe "ergoemacs-theme-engine")
 
 (declare-function helm-attrset "helm")
@@ -1642,8 +1641,6 @@ Similar to `keyboard-quit', with the following changes:
   (setq saved-region-selection nil)
   (let (select-active-regions)
 (deactivate-mark)))
- (ergoemacs-command-loop--modal-stack
-  (ergoemacs-command-loop--modal-pop))
  ((and (setq bind (key-binding [7])) ;; C-g
(not (memq bind '(ergoemacs-keyboard-quit minibuffer-keyboard-quit 
keyboard-quit
   (call-interactively bind))

[elpa] externals/ergoemacs-mode 138245e 096/325: Remove unused separators

[monnier--- via]

branch: externals/ergoemacs-mode
commit 138245e4093d8e7939646189aabab9cf29dc2eff
Author: Walter Landry 
Commit: Walter Landry 

Remove unused separators
---
 ergoemacs-theme-engine.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 86949d8..e327901 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -322,9 +322,7 @@ When AT-END is non-nil, append a $ to the regular 
expression."
   "Define menus for current THEME."
   `(keymap
 ,(ergoemacs-layouts--menu)
-(ergoemacs-theme-sep "--")
 ,(ergoemacs-theme--menu-options theme)
-(ergoemacs-c-x-sep "--")
 (c-v
  menu-item "Paste behavior"
  (keymap

[elpa] externals/ergoemacs-mode e3d4071 108/325: Remove standard-var component

[monnier--- via]

branch: externals/ergoemacs-mode
commit e3d4071d894c9bdfffa06327e502d282b5944642
Author: Walter Landry 
Commit: Walter Landry 

Remove standard-var component
---
 ergoemacs-themes.el | 126 +---
 1 file changed, 1 insertion(+), 125 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 24a6e65..ea69dc8 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -28,129 +28,6 @@
 (require 'advice)
 (require 'ibuffer)
 
-(ergoemacs-component standard-vars ()
-  "Enabled/changed variables/modes"
-  (setq org-CUA-compatible t
-org-support-shift-select t
-set-mark-command-repeat-pop t
-org-special-ctrl-a/e t
-ido-vertical-define-keys 'C-n-C-p-up-down-left-right
-scroll-error-top-bottom t
-initial-scratch-message (substitute-command-keys ";; This buffer is 
for notes you don't want to save, and for Lisp evaluation.\n;; If you want to 
create a file, visit that file with \\[find-file],\n;; then enter the text in 
that file's own buffer.")
-;; Remove tutorial and guided tour, since the keys don't apply...
-fancy-startup-text
-`((:face (variable-pitch font-lock-comment-face)
- "Welcome to "
- :link ("GNU Emacs"
-,(lambda (_button) (browse-url 
"http://www.gnu.org/software/emacs/";))
-"Browse http://www.gnu.org/software/emacs/";)
- ", one component of the "
- :link
- ,(lambda ()
-(if (eq system-type 'gnu/linux)
-`("GNU/Linux"
-  ,(lambda (_button) (browse-url 
"http://www.gnu.org/gnu/linux-and-gnu.html";))
-  "Browse http://www.gnu.org/gnu/linux-and-gnu.html";)
-  `("GNU" ,(lambda (_button) (describe-gnu-project))
-"Display info on the GNU project")))
- " operating system.\n\n"
- "\n"
- :link ("View Emacs Manual" ,(lambda (_button) 
(info-emacs-manual)))
- "\tView the Emacs manual using Info\n"
- :link ("Absence of Warranty" ,(lambda (_button) 
(describe-no-warranty)))
- "\tGNU Emacs comes with "
- :face (variable-pitch (:slant oblique))
- "ABSOLUTELY NO WARRANTY\n"
- :face variable-pitch
- :link ("Copying Conditions" ,(lambda (_button) 
(describe-copying)))
- "\tConditions for redistributing and changing Emacs\n"
- :link ("Ordering Manuals" ,(lambda (_button) 
(view-order-manuals)))
- "\tPurchasing printed copies of manuals\n"
- "\n"))
-;;
-fancy-about-text
-`((:face (variable-pitch font-lock-comment-face)
- "This is "
- :link ("GNU Emacs"
-,(lambda (_button) (browse-url 
"http://www.gnu.org/software/emacs/";))
-"Browse http://www.gnu.org/software/emacs/";)
- ", one component of the "
- :link
- ,(lambda ()
-(if (eq system-type 'gnu/linux)
-`("GNU/Linux"
-  ,(lambda (_button)
- (browse-url 
"http://www.gnu.org/gnu/linux-and-gnu.html";))
-  "Browse http://www.gnu.org/gnu/linux-and-gnu.html";)
-  `("GNU" ,(lambda (_button) (describe-gnu-project))
-"Display info on the GNU project.")))
- " operating system.\n"
- :face (variable-pitch font-lock-builtin-face)
- "\n"
- ,(lambda () (emacs-version))
- "\n"
- :face (variable-pitch (:height 0.8))
- ,(lambda () emacs-copyright)
- "\n\n"
- :face variable-pitch
- :link ("Authors"
-,(lambda (_button)
-   (view-file (expand-file-name "AUTHORS" 
data-directory))
-   (goto-char (point-min
- "\tMany people have contributed code included in GNU Emacs\n"
- :link ("Contributing"
-,(lambda (_button)
-   (view-file (expand-file-name "CONTRIBUTE" 
data-directory))
-   (goto-char (point-min
- "\tHow to contribute improvements to Emacs\n"
- "\n"
- :link ("GNU and Freedom" ,(lambda (_button) 
(describe-gnu-project)))
- "\tWhy we developed GNU Emacs, and the GNU operating system\n"
- :link ("Absence of Warranty" ,(lambda (_button) 
(describe-no-warranty)))
- "\tGNU Emacs comes with "
- :face (variable-pitch (:slant 

[elpa] externals/ergoemacs-mode 8e17210 044/325: Remove ergoemacs-modal-ignored-keymap

[monnier--- via]

branch: externals/ergoemacs-mode
commit 8e172100d22e92ad9a571f6e105a8e8e9484fc89
Author: Walter Landry 
Commit: Walter Landry 

Remove ergoemacs-modal-ignored-keymap
---
 ergoemacs-command-loop.el |  1 -
 ergoemacs-mode.el | 50 ---
 2 files changed, 51 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 925e282..7bcfda9 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -89,7 +89,6 @@
 (defvar ergoemacs-default-cursor-color)
 (defvar ergoemacs-echo-function)
 (defvar ergoemacs-map--quit-map)
-(defvar ergoemacs-modal-ignored-keymap)
 (defvar ergoemacs-mode-started-p)
 (defvar guide-key/guide-key-sequence)
 (defvar keyfreq-mode)
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 39e9a5a..bc71de6 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -1016,56 +1016,6 @@ color.  Otherwise this will be nil A color string as 
passed to
 
 (defvar ergoemacs-modal-list '())
 (defvar ergoemacs-translate--translation-hash)
-(defvar ergoemacs-modal-ignored-keymap
-  (let ((ret (make-sparse-keymap))
-(mods '(control meta shift hyper super alt))
-tmp
-key)
-(dolist (char '(""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-"" ""
-"RET" "ESC" "DEL" "TAB"
-""
-""
-""
-""
-""
-""))
-  (define-key ret (setq key (read-kbd-macro char t)) 
'ergoemacs-ignore-modal)
-  (setq key (elt key 0))
-  (dolist (mod1 mods)
-(setq tmp (vector (event-convert-list (list mod1 key
-(ignore-errors (define-key ret tmp 'ignore))
-(when (setq tmp (ergoemacs-translate--meta-to-escape tmp))
-  (ignore-errors (define-key ret tmp 'ignore)))
-(dolist (mod2 mods)
-  (setq tmp (vector (event-convert-list (list mod1 mod2 key
-  (ignore-errors (define-key ret tmp 'ignore))
-  (when (setq tmp (ergoemacs-translate--meta-to-escape tmp))
-(ignore-errors (define-key ret tmp 'ignore)))
-  (dolist (mod3 mods)
-(setq tmp (vector (event-convert-list (list mod1 mod2 mod3 key
-(ignore-errors (define-key ret tmp 'ignore))
-(when (setq tmp (ergoemacs-translate--meta-to-escape tmp))
-  (ignore-errors (define-key ret tmp 'ignore)))
-(dolist (mod4 mods)
-  (setq tmp (vector (event-convert-list (list mod1 mod2 mod3 mod4 
key
-  (ignore-errors (define-key ret tmp 'ignore))
-  (when (setq tmp (ergoemacs-translate--meta-to-escape tmp))
-(ignore-errors (define-key ret tmp 'ignore
-ret)
-  "`ergoemacs-mode' keys to ignore the modal translation.
-Typically function keys")
 
 (defcustom ergoemacs-translate-keys nil
   "Try differnt key combinations to lookup unfound command.

[elpa] externals/ergoemacs-mode 5a1ec10 111/325: Fix some warnings

[monnier--- via]

branch: externals/ergoemacs-mode
commit 5a1ec1008ad194b59e676e4d8cae258c798969b3
Author: Walter Landry 
Commit: Walter Landry 

Fix some warnings
---
 ergoemacs-lib.el   | 2 +-
 ergoemacs-translate.el | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-lib.el b/ergoemacs-lib.el
index 1c585d9..e48f902 100644
--- a/ergoemacs-lib.el
+++ b/ergoemacs-lib.el
@@ -523,7 +523,7 @@ The reset is done with `ergoemacs-mode-reset'."
   (setq file-temp (expand-file-name "ergoemacs.ini" extra-dir))
   (with-temp-file file-temp
 (set-buffer-file-coding-system 'utf-8)
-(insert (ergoemacs-translate--ahk-ini all all)))
+(insert (ergoemacs-translate--ahk-ini all)))
   (setq file-temp (expand-file-name "ergoemacs.ahk" extra-dir))
   (with-temp-file file-temp
 (set-buffer-file-coding-system 'utf-8)
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 6019f90..71b682d 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -1076,14 +1076,13 @@ If there are no gui elements, retun nil."
   (setq ret (format "%s\n%s=%s" ret f (ergoemacs-translate--ahk-code 
key))
 ret))
 
-(defun ergoemacs-translate--ahk-ini (&optional all-layouts all-themes)
+(defun ergoemacs-translate--ahk-ini (&optional all-layouts)
   "Creates the ini file used with the autohotkey script."
   (let ((layouts (or (and all-layouts (sort (ergoemacs-layouts--list) 
'string<))
  (and (eq (ergoemacs :layout) 'ergoemacs-layout-us) (list 
"us"))
  (list "us" ergoemacs-keyboard-layout)))
 (themes (list "standard"))
 (original-layout ergoemacs-keyboard-layout)
-(original-theme ergoemacs-theme)
 ret)
 (unwind-protect
 (setq ret (with-temp-buffer

[elpa] externals/ergoemacs-mode 46f027f 042/325: More modal removal

[monnier--- via]

branch: externals/ergoemacs-mode
commit 46f027ff3d7646f619b1538f173919eca2518fe2
Author: Walter Landry 
Commit: Walter Landry 

More modal removal
---
 ergoemacs-macros.el|  2 --
 ergoemacs-translate.el | 20 +---
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 8ddf345..9bea54e 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -706,8 +706,6 @@ When arg1 can be a property.  The following properties are 
supported:
   `(ergoemacs-map-properties--before-ergoemacs))
  ((and arg1 (symbolp arg1) (eq arg1 :user-after) (not arg2) (not arg3))
   `(ergoemacs-map-properties--before-ergoemacs t))
- ((and arg1 (symbolp arg1) (eq arg1 :modal-p))
-  nil)
  ((and arg1 (symbolp arg1) (eq arg1 :combine) arg2 arg3)
   `(ergoemacs-command-loop--combine ,arg2 ,arg3))
  ((and arg1 (symbolp arg1) (memq arg1 '(:unicode-or-alt :unicode)))
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index 554123f..09281d2 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -703,7 +703,6 @@ For keys, the list consists of:
   (universal-argument nil)
   (negative-argument nil)
   (digit-argument nil)
-  (modal nil)
   (text "")
   (keymap (make-sparse-keymap))
   (keymap-modal (make-sparse-keymap))
@@ -942,25 +941,16 @@ If there are no gui elements, retun nil."
 ;; (add-hook 'ergoemacs-mode-intialize-hook 
#'ergoemacs-translate--keymap-reset)
 
 (defun ergoemacs-translate--keymap (&optional translation)
-  "Get the keymap for TRANSLATION.
-This takes into consideration the modal state of `ergoemacs-mode'."
-  (let* ((modal nil)
- (translation (or (and (ergoemacs-translation-struct-p translation)
-   (or (not modal) ;; prefer modal when :normal 
-   (not (eq :normal 
(ergoemacs-translation-struct-key translation
+  "Get the keymap for TRANSLATION."
+  (let* ((translation (or (and (ergoemacs-translation-struct-p translation)
translation)
-  modal
   (ergoemacs-translate--get (or translation :normal
- (key (or (and modal (intern (concat ":" 
(ergoemacs-translation-struct-name translation) "-modal")))
-  (ergoemacs-translation-struct-key translation)))
+ (key (ergoemacs-translation-struct-key translation))
  (ret (ergoemacs-gethash key ergoemacs-translate--keymap-hash))
  keymap)
 (unless ret
-  (if modal
-  (setq keymap (ergoemacs-translation-struct-keymap-modal translation)
-ret keymap)
-(setq keymap (ergoemacs-translation-struct-keymap translation)
-  ret (make-composed-keymap (ergoemacs keymap) (ergoemacs 
ergoemacs-translate--parent-map
+  (setq keymap (ergoemacs-translation-struct-keymap translation)
+ret (make-composed-keymap (ergoemacs keymap) (ergoemacs 
ergoemacs-translate--parent-map)))
   (puthash key ret ergoemacs-translate--keymap-hash))
 ret))
 

[elpa] externals/ergoemacs-mode 71e949b 063/325: Remove dead code

[monnier--- via]

branch: externals/ergoemacs-mode
commit 71e949b598ebeecf5b515de89e18701f011924c7
Author: Walter Landry 
Commit: Walter Landry 

Remove dead code
---
 ergoemacs-mode.el | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index a854387..8fd11f8 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -72,7 +72,6 @@
 (declare-function ergoemacs-layouts--custom-documentation "ergoemacs-layouts")
 
 (declare-function ergoemacs-map-keymap "ergoemacs-mapkeymap")
-;; (declare-function ergoemacs-map-properties--create-label-function 
"ergoemacs-map-properties")
 (declare-function ergoemacs-map-properties--put "ergoemacs-map-properties")
 
 (declare-function ergoemacs-theme--custom-documentation 
"ergoemacs-theme-engine")
@@ -533,15 +532,9 @@ When STORE-P is non-nil, save the tables."
  'ergoemacs-translate--hash (make-hash-table)
  'ergoemacs-translation-hash (make-hash-table)
  'ergoemacs-breadcrumb-hash (make-hash-table)
- ;; 'ergoemacs-map-properties--create-label-function nil
  'ergoemacs-map-properties--get-or-generate-map-key most-negative-fixnum
  'ergoemacs-map-properties--before-ergoemacs nil
  'ergoemacs-map-properties--label-atoms-maps nil
- ;;'ergoemacs-map-- (make-hash-table :test 'equal))
- ;;'ergoemacs-map--alist (make-hash-table)
- ;;'ergoemacs-map--alists (make-hash-table)
- ;;'ergoemacs-map-properties--user-map-hash (make-hash-table :test 'equal)
- ;;'ergoemacs-translate--keymap-hash (make-hash-table)
  )
 (when (and store-p (featurep 'persistent-soft))
   (persistent-soft-flush (ergoemacs-mode--pcache-repository))

[elpa] externals/ergoemacs-mode 5b285ea 057/325: Run everything immediately

[monnier--- via]

branch: externals/ergoemacs-mode
commit 5b285ea987c0790879a9dece1c7174da3662305a
Author: Walter Landry 
Commit: Walter Landry 

Run everything immediately
---
 ergoemacs-command-loop.el | 8 
 ergoemacs-mode.el | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index fa96369..abde7ec 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -1106,9 +1106,9 @@ to start with
  (ergoemacs-command-loop-full-p))
 (if ergoemacs-last-command-was-ergoemacs-ignore-p
(unless (eq ergoemacs-last-command-was-ergoemacs-ignore-p :idle)
- (run-with-idle-timer 0.05 nil (lambda()
- (setq 
ergoemacs-last-command-was-ergoemacs-ignore-p :idle)
- (ergoemacs-command-loop-start
+ (run-with-timer 0.0 nil (lambda()
+   (setq 
ergoemacs-last-command-was-ergoemacs-ignore-p :idle)
+   (ergoemacs-command-loop-start
   (push 'ergoemacs-ignore unread-command-events
 
 (add-hook 'ergoemacs-post-command-hook 
#'ergoemacs-command-loop--start-with-post-command-hook)
@@ -1569,7 +1569,7 @@ They don't exactly behave like their Emacs equivalents."
 (defun ergoemacs-command-loop--install-timer ()
   "Install the `ergoemacs-command-loop--timer'."
   (setq ergoemacs-command-loop--timer
-(run-with-idle-timer 0.05 nil #'ergoemacs-command-loop--timer)))
+(run-with-timer 0.0 nil #'ergoemacs-command-loop--timer)))
 
 (defun ergoemacs-command-loop--remove-timer ()
   "Remove `ergoemacs-command-loop--timer'."
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index cc3b9a5..210a0be 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -1074,7 +1074,7 @@ also perform `outline-next-visible-heading'"
 (puthash 'ergoemacs-load-time (vector 1 ergoemacs--load-time 
ergoemacs--load-time ergoemacs--load-time (or load-file-name buffer-file-name))
  ergoemacs-timing-hash)
 
-(run-with-idle-timer 0.05 nil #'ergoemacs-mode-after-init-emacs)
+(run-with-timer 0.0 nil #'ergoemacs-mode-after-init-emacs)
 (add-hook 'emacs-startup-hook #'ergoemacs-mode-after-init-emacs)
 
 (provide 'ergoemacs-mode)

[elpa] externals/ergoemacs-mode c53e573 056/325: Cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit c53e573c45afe8b8a639d6ded2eb2f886aefff7e
Author: Walter Landry 
Commit: Walter Landry 

Cleanup
---
 ergoemacs-theme-engine.el | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index 9aa329c..8269411 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -645,17 +645,18 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
   (dolist (cmds ergoemacs-theme-create-bash-functions)
 (dolist (cmd cmds)
   (dolist (key-cmd (where-is-internal cmd nil))
-(setq key-string (key-description key-cmd))
-;; Only set up the Meta bindings, not the regular arrow or
-;; Control bindings.  That would require more complicated
-;; logic to get right.
-(if (string-prefix-p "M-" key-string)
-(setq ret (concat ret "\n\"\\"
-  (replace-regexp-in-string "M-" "e" 
key-string t)
-  "\": "
-  (symbol-name (nth 0 cmds))
-  )
-  )
+(let ((key-string (key-description key-cmd)))
+  ;; Only set up the Meta bindings, not the regular arrow or
+  ;; Control bindings.  That would require more complicated
+  ;; logic to get right.
+  (if (string-prefix-p "M-" key-string)
+  (setq ret (concat ret "\n\"\\"
+(replace-regexp-in-string "M-" "e" 
key-string t)
+"\": "
+(symbol-name (nth 0 cmds))
+)
+)
+)
   )
 )
   )

[elpa] externals/ergoemacs-mode 9e8d701 010/325: Remove unused require 'strings and assorted cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit 9e8d7016bafee2afe6c59099ca0c1adbf6abf8cb
Author: Walter Landry 
Commit: Walter Landry 

Remove unused require 'strings and assorted cleanup
---
 ergoemacs-component.el | 4 +---
 ergoemacs-debug.el | 4 +---
 ergoemacs-functions.el | 6 --
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index c3d460f..e61a86e 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -28,9 +28,7 @@
 ;; along with this program.  If not, see .
 ;; 
 ;;
-;; 
-;;; Code:
-;; (require 'guide-key nil t)
+
 (require 'cl-lib)
 
 (eval-when-compile
diff --git a/ergoemacs-debug.el b/ergoemacs-debug.el
index 465e959..2123777 100644
--- a/ergoemacs-debug.el
+++ b/ergoemacs-debug.el
@@ -28,9 +28,7 @@
 ;; along with this program.  If not, see .
 ;; 
 ;;
-;; 
-;;; Code:
-;; (require 'guide-key nil t)
+
 (require 'cl-lib)
 
 (eval-when-compile
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index 5c46645..74b23f1 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -2342,12 +2342,6 @@ If arg is a negative prefix, copy file path only"
   :type 'string
   :group 'ergoemacs-mode)
 
-;;; Unaccent region taken and modified from Drew Adam's unaccent.el
-
-(require 'strings nil t) ;; (no error if not found): region-description
-
-
-
 
 (defvar ergoemacs-reverse-iso-chars-alist
   '(;; Trema/umlaut (äëïöü) (ÄËÏÖÜ)

[elpa] externals/ergoemacs-mode e7a914b 094/325: Remove ctl-to-alt

[monnier--- via]

branch: externals/ergoemacs-mode
commit e7a914b03003895b2e457b6340ff4fe0cd031599
Author: Walter Landry 
Commit: Walter Landry 

Remove ctl-to-alt
---
 ergoemacs-command-loop.el |  6 ++--
 ergoemacs-mode.el |  7 +
 ergoemacs-test.el | 75 ---
 ergoemacs-themes.el   | 39 
 4 files changed, 4 insertions(+), 123 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 959e4b4..16b4b13 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -246,7 +246,7 @@ This is called through `ergoemacs-command-loop'"
 This is called through `ergoemacs-command-loop'.
 
 TYPE is the keyboard translation type, defined by `ergoemacs-translate'.
-Ergoemacs-mode sets up: :ctl-to-alt :unchorded :normal."
+Ergoemacs-mode sets up: :unchorded :normal."
   (interactive)
   (let* ((char (if (integerp last-command-event)
last-command-event
@@ -263,7 +263,7 @@ Ergoemacs-mode sets up: :ctl-to-alt :unchorded :normal."
 This is called through `ergoemacs-command-loop'.
 
 TYPE is the keyboard translation type, defined by `ergoemacs-translate'
-Ergoemacs-mode sets up: :ctl-to-alt :unchorded :normal."
+Ergoemacs-mode sets up: :unchorded :normal."
   (setq current-prefix-arg '-)
   (ergoemacs-command-loop nil type nil t))
 
@@ -1586,7 +1586,7 @@ The KEY is the keyboard input where the reading begins.  
If nil,
 read the whole keymap.
 
 TYPE is the keyboard translation type, defined by `ergoemacs-translate'
-Ergoemacs-mode sets up: :ctl-to-alt :unchorded :normal.
+Ergoemacs-mode sets up: :unchorded :normal.
 
 INITIAL-KEY-TYPE represents the translation type for the initial KEY.
 
diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 76534a8..7e720ce 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -918,12 +918,7 @@ Valid values are:
 
 (defcustom ergoemacs-command-loop-swap-translation
   '(((:normal :normal) :unchorded-ctl)
-((:normal :unchorded-ctl) :ctl-to-alt)
-((:normal :unchorded-ctl) :normal)
-((:ctl-to-alt :ctl-to-alt) :unchorded-ctl)
-((:ctl-to-alt :unchorded-ctl) :ctl-to-alt)
-((:unchorded-ctl :unchorded-ctl) :ctl-to-alt)
-((:unchorded-ctl :ctl-to-alt) :unchorded-ctl))
+((:normal :unchorded-ctl) :normal))
   "How the translation will be swapped."
   :type '(repeat
   (list
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index ada68c4..1b9cad2 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -1299,81 +1299,6 @@ Tests Issue #372."
   :tags '(:translate)
   (should (equal ergoemacs-layout-us (ergoemacs-translate--quail-to-ergoemacs 
(ergoemacs-translate-layout 'us :quail)
 
-(ert-deftest ergoemacs-test-translations ()
-  "Test ergoemacs-mode translations"
-  :tags '(:translate)
-  (should (string= "A" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "A" t) 0))
-  (should (string= "M-A" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-S-a" t) 0) 
:ctl-to-alt)
-
-  ;; DEL = ^?, doesn't seem to have the issues that RET, ESC, and TAB has.
-  (should (string= "DEL" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "DEL" t) 0) 
:ctl-to-alt)
-  
-  (should (string= "C-DEL" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "M-DEL" t) 0) 
:ctl-to-alt)
-  
-  (should (string= "M-DEL" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-DEL" t) 0) 
:ctl-to-alt)
-
-  ;; RET = ^M
-  (should (string= "RET" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "RET" t) 0) 
:ctl-to-alt)
-
-  (should (string= "M-RET" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-RET" t) 0) 
:ctl-to-alt)
-
-  (should (string= "C-RET" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "M-RET" t) 0) 
:ctl-to-alt)
-
-  ;; ESC = ^[
-  (should (string= "ESC" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "ESC" t) 0) 
:ctl-to-alt)
-
-  (should (string= "C-ESC" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "M-ESC" t) 0) 
:ctl-to-alt)
-
-  (should (string= "M-ESC" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-ESC" t) 0) 
:ctl-to-alt)
-
-  ;; TAB = ^i
-  (should (string= "TAB" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "TAB" t) 0) 
:ctl-to-alt)
-
-  (should (string= "C-TAB" (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "M-TAB" t) 0) 
:ctl-to-alt)
-  
-  (should (string= (key-description (kbd "M-TAB")) (key-description (vector 
(ergoemacs-translate--event-mods (elt (read-kbd-macro "C-TAB" t) 0) 
:ctl-to-alt)
-
-  (cl-letf (((symbol-function 'display-graphic-p) (lambda(&rest _ignore) t)))

[elpa] externals/ergoemacs-mode 886e3eb 014/325: Remove an ergoemacs-package call in the tests

[monnier--- via]

branch: externals/ergoemacs-mode
commit 886e3ebc90f875d89ad2828cf08f3377a32aa7eb
Author: Walter Landry 
Commit: Walter Landry 

Remove an ergoemacs-package call in the tests
---
 ergoemacs-test.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index a6e3fe3..0163aaf 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -1204,8 +1204,6 @@ Should test issue #142"
   (delete-file w-file
 
 (defvar ergoemacs-component-hash)
-(ergoemacs-package icicles
-:ensure t)
 
 (ert-deftest ergoemacs-test-397-test-4 ()
   "Test M-s is switch pane."

[elpa] externals/ergoemacs-mode b0c649d 052/325: Cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit b0c649dbd4eb67061812f89da1b6cbdc118235f4
Author: Walter Landry 
Commit: Walter Landry 

Cleanup
---
 ergoemacs-component.el |  2 +-
 ergoemacs-functions.el |  4 ++--
 ergoemacs-layouts.el   | 14 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index db328d5..6519dfd 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -1013,7 +1013,7 @@ to prevent infinite recursion."
   (when (eq ergoemacs-component-struct--refresh-variables t)
 (setq ergoemacs-component-struct--refresh-variables 
ergoemacs-component-struct--applied-inits))
   (let* ((obj (or obj (ergoemacs-theme-components)))
- package-name defer comp tmp autoloads)
+ tmp)
 (when ergoemacs-component-struct--apply-inits-first-p
   (setq ergoemacs-component-struct--apply-inits-first-p nil)
   (if (not ergoemacs-mode--fast-p)
diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index df106c8..0fc 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -340,8 +340,8 @@ If TERMINAL is non-nil, run the terminal version"
 
 (defun ergoemacs-emacs-exe ()
   "Get the Emacs executable for testing purposes."
-  (let* ((emacs-exe (invocation-name))
- (emacs-dir (invocation-directory))
+  (let* ((emacs-exe invocation-name)
+ (emacs-dir invocation-directory)
  (full-exe (concat "\"" (expand-file-name emacs-exe emacs-dir)
"\"")))
 full-exe))
diff --git a/ergoemacs-layouts.el b/ergoemacs-layouts.el
index dc3f913..2049b9b 100644
--- a/ergoemacs-layouts.el
+++ b/ergoemacs-layouts.el
@@ -69,6 +69,7 @@
 
 ;; From Baptiste Fouques
 ;; changed to bepo because it breaks how I run things (unfortunately)...
+(defvaralias 'ergoemacs-layout-bépo 'ergoemacs-layout-bepo)
 (defvar ergoemacs-layout-bepo
   '("" "$" "\"" "«" "»" "(" ")" "@" "+" "-" "/" "*" "=" "%" ""
 "" ""  "b" "é" "p" "o" "è" "^" "v" "d" "l" "j" "z" "w" ""
@@ -95,8 +96,6 @@
 "" ">"  "W" "X" "C" "V" "B" "N" "?" "." "/" "+" "" "" "")
   "Belgian AZERTY.")
 
-(defvaralias 'ergoemacs-layout-bépo 'ergoemacs-layout-bepo)
-
 (defvar ergoemacs-layout-colemak
   '("" "`" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "=" ""
 "" ""  "q" "w" "f" "p" "g" "j" "l" "u" "y" ";" "[" "]" "\\"
@@ -122,6 +121,7 @@
   "Danish layout.")
 
 ;; From Thomas Rikl
+(defvaralias 'ergoemacs-layout-ge 'ergoemacs-layout-de)
 (defvar ergoemacs-layout-de
   '("" "" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "ß" "" ""
 "" ""  "q" "w" "e" "r" "t" "z" "u" "i" "o" "p" "ü" "+" ""
@@ -146,6 +146,7 @@
 "" "" "K" "Y" "Ö" "Ä" "Q" "J" "G" "W" "V" "Z" "" "" "")
   "German BU-TECK Layout.  URL `http://www.adnw.de'.")
 
+(defvaralias 'ergoemacs-layout-us_dvorak 'ergoemacs-layout-dv)
 (defvar ergoemacs-layout-dv
   '("" "`" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "[" "]" ""
 "" ""  "'" "," "." "p" "y" "f" "g" "c" "r" "l" "/" "=" "\\"
@@ -182,6 +183,7 @@
 "" ""  "Z" "Ĉ" "C" "V" "B" "N" "M" ";" ":" "?" "" "" "")
   "Esperanto (displaced semicolon and quote, obsolete) layout.")
 
+(defvaralias 'ergoemacs-layout-sp 'ergoemacs-layout-es)
 (defvar ergoemacs-layout-es
   '("" "°" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "'" "¡" ""
 "" ""  "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "`" "+" ""
@@ -255,8 +257,6 @@
 "" "|"  ":" "Q" "J" "K" "X" "B" "M" "W" "V" "Z" "" "" "")
   "UK Dvorak layout.")
 
-(defvaralias 'ergoemacs-layout-ge 'ergoemacs-layout-de)
-
 (defvar ergoemacs-layout-it
   '("" "\\" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "'" "¡" ""
 "" ""  "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "è" "+" ""
@@ -317,8 +317,6 @@
 "" "»"  "Y" "Ç" "J" "B" "K" "Q" "V" "G" "F" "Z" "" "" "")
   "PT Nativo layout URL 
`http://xahlee.info/kbd/pt-nativo_keyboard_layout.html'.")
 
-(defvaralias 'ergoemacs-layout-sp 'ergoemacs-layout-es)
-
 (defvar ergoemacs-layout-sw
   '("" "½" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "+" "’" ""
 "" ""  "q" "w" "e" "r" "t" "y" "u" "i" "o" "p" "å" "\"" ""
@@ -343,8 +341,6 @@
 "" ""  "Z" "X" "C" "V" "B" "N" "M" "<" ">" "?" "" "" "")
   "US English QWERTY layout.")
 
-(defvaralias 'ergoemacs-layout-us_dvorak 'ergoemacs-layout-dv)
-
 (defvar ergoemacs-layout-workman
   '("" "`" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "=" ""
 "" ""  "q" "d" "r" "w" "b" "j" "f" "u" "p" ";" "[" "]" "\\"
@@ -369,6 +365,7 @@
 "" ""  "Z" "X" "M" "C" "V" "K" "L" "<" ">" "?" "" "" "")
   "US Workman layout.  URL `http://www.workmanlayout.com/blog/'.")
 
+(defvaralias 'ergoemacs-layout-jcuken 'ergoemacs-layout-ru)
 (defvar ergoemacs-layout-ru
   '("" "" "1" "2" "3" "4" "5" "6" "7" "8" "9" "0" "-" "=" "\\"
 "" ""  "й" "ц" "у" "к" "е" "н" "г" "ш" "щ" "з" "х" "ъ" "" 
@@ -381,7 +378,6 @@
 "" "" "Я" "Ч" "С" "М" "И" "Т" "Ь" "Б" "Ю" "," "" "" "")
   "Russian/Cryllic jcuken layout.")
 
-(defvaralias 'ergoemacs-layout-jcuken 'ergoemacs-layout-ru)
 
 (require 'help-mode)
 (defvar quail

[elpa] externals/ergoemacs-mode updated (f9d6e3f -> 5692fc1)

[monnier--- via]

monnier pushed a change to branch externals/ergoemacs-mode.

  from  f9d6e3f   Bring over some more emacs mainatiner fixes
   new  4f43e90   Add a whole bunch of keybindings
   new  de74f45   Remove some Control key bindings, so nano works
   new  d30b431   Remove shift translation, instead directly binding those 
keys
   new  89b618b   Merge branch 'master' into ergoterm
   new  57bbe7d   Revert "Remove shift translation, instead directly 
binding those keys"
   new  21cab2a   Merge branch 'master' into ergoterm
   new  331a359   Directly bind a bunch of shift keys
   new  f58f7d8   Replace all cl with cl-lib
   new  160e94b   Remove unused easymenu
   new  9e8d701   Remove unused require 'strings and assorted cleanup
   new  e9ec38d   Remove dead code
   new  30ed202   Remove cttl-x-c 'both' option
   new  8dc60d8   Move ergoemacs-test-layout to ergoemacs-test
   new  886e3eb   Remove an ergoemacs-package call in the tests
   new  c9d4c1b   Remove ergoemacs-package
   new  34c2099   Remove ergoemacs-autoload
   new  49360a1   Remove ergoemacs-redo since it only exists to download 
undo-tree
   new  1c2f61e   Remove tabbar-toddle since its only purpose is to 
download tabber
   new  bc28407   Remove icicles tests
   new  8b47756   Revert "Remove cttl-x-c 'both' option"
   new  0935e87   Remove timeout for ctl-x-c
   new  25f5be8   Merge branch 'ctl-x-c'
   new  c3e7830   Remove option to bind C-c and C-x as copy/cut
   new  706e35e   Remove dead code
   new  72a812c   Remove dead code
   new  c88308e   Make ergoemacs-test-keep-ctl-s work
   new  a876297   Add a comment
   new  a6c1ca2   Remove dead code
   new  fccae9b   Remove ensure functions
   new  b62f068   Remove more package stuff
   new  7851e51   Remove more package stuff
   new  f2caedb   Remove dead code
   new  b20b8ae   Remove :mode and unused macro properties
   new  45a2ec3   Remove unused 'require
   new  3c793e3   Cleanup
   new  46c76c0   Remove a little modal
   new  149c900   Remove ergoemacs-command-loop--modal-pop
   new  25dd364   Remove ergoemacs-command-loop--modal-stack
   new  6b1b60e   Cleanup
   new  96cb33d   Remove ergoemacs-command-loop--modal-p
   new  270e6b7   Remove all of :modal
   new  46f027f   More modal removal
   new  3e25eac   Remove unused modal customizations
   new  8e17210   Remove ergoemacs-modal-ignored-keymap
   new  d297724   Remove ergoemacs-command-loop--modal and 
ergoemacs-command-loop--modal-show
   new  ade1df9   Cleanup
   new  c59bedc   Remove more modal
   new  5fbcf0c   Remove unchorded stuff and related tests
   new  fdafbdf   Cleanup
   new  5e0c000   Cleanup
   new  61410ff   Fix a typo when invoking a timeout
   new  b0c649d   Cleanup
   new  8f6a50e   Cleanup
   new  65ad125   Cleanup
   new  3729fbd   Cleanup
   new  c53e573   Cleanup
   new  5b285ea   Run everything immediately
   new  6868238   Merge branch 'master' into ergoterm
   new  1203d93   Remove dead code
   new  4b850f2   Remove dead code and useless message
   new  58ac535   Remove obsolete names
   new  34daf02   Do not autoload ergoemacs-debug
   new  71e949b   Remove dead code
   new  49a1430   Remove theme test
   new  d84c00c   Add missing requires for ibuffer
   new  4996d2c   Remove the apply-inits function
   new  ac50534   Make ergoemacs-mode only run when called, not when the 
file is loaded.
   new  b16e51c   Remove unused diminish functions
   new  7c8eea5   Remove command loop timer
   new  82cba16   Remove shift selection
   new  b928611   Remove keyfreq
   new  acf3dfe   Cleanup
   new  87a332c   Merge branch 'master' into HEAD
   new  1a67e04   Remove shift translation
   new  dd8796f   Remove unused shift translation code
   new  e5172b8   Remove more shift translation stuff
   new  3690135   Remove more shift translation
   new  45c855a   Remove ergoemacs-score
   new  e84def4   Remove unused ibuf-ext
   new  7499511   Spacing fix
   new  97ac03f   Resolve all of the :emacs keybindings in ergoemacs-themes
   new  876e40e   Merge branch 'master' into ergoterm
   new  58dc2d8   Use explicit functions for term-raw-map so byte compiling 
works
   new  b40f209   Remove duplicate entries
   new  655f116   Remove redundant entries in term-raw-map
   new  7ce34ce   Remove some M-C-* entries in term-raw-map.
   new  f46b453   Remove some term bindings
   new  5464d82   Remove dead code
   new  4e5dfc6   Turn off caching in ergoemacs-map--composed-list
   new  1c84bf1   Reindent
   new  5257c0e   Remove commented code
   new  37d642e   Remove the optional off stuff and lots of helm stuff.
   new  9664994   Remove eshell  weirdness
   new  e7a914b

[elpa] externals/ergoemacs-mode 270e6b7 041/325: Remove all of :modal

[monnier--- via]

branch: externals/ergoemacs-mode
commit 270e6b7dfc8e50829f5c7f343a2b630d6a9750af
Author: Walter Landry 
Commit: Walter Landry 

Remove all of :modal
---
 ergoemacs-command-loop.el | 29 ++---
 ergoemacs-translate.el|  4 +---
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 3159484..955ef50 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -193,7 +193,7 @@ Returns the mode-line text."
   (let (tmp color text)
 (ergoemacs-save-buffer-state
  (cond
-  ((setq tmp (ergoemacs :modal-p))
+  ((setq tmp nil)
(setq color (ergoemacs-translation-struct-modal-color tmp))
(if color
(set-cursor-color color)
@@ -813,7 +813,6 @@ read."
  (text (ergoemacs-translation-struct-text translation))
  (unchorded (ergoemacs-translation-struct-unchorded translation))
  (trans (ergoemacs-translation-struct-translation translation))
- (modal (ergoemacs :modal-p))
  (keys nil)
  (blink-on nil)
  input
@@ -821,17 +820,6 @@ read."
  mod-keys tmp
  reset-key-p
  double)
-;; Setup modal translation
-(when (and (eq type :normal) modal)
-  (setq type (ergoemacs-translation-struct-key modal)
-local-keymap (ergoemacs-translation-struct-keymap-modal modal)
-text (ergoemacs-translation-struct-text modal)
-unchorded (ergoemacs-translation-struct-unchorded modal)
-trans (ergoemacs-translation-struct-translation modal)
-tmp translation
-translation modal
-modal tmp
-tmp nil))
 
 ;; (ergoemacs-command-loop--read-key (read-kbd-macro "C-x" t) 
:unchorded-ctl)
 (when (functionp text)
@@ -920,17 +908,6 @@ read."
   ergoemacs-last-command-event last-command-event))
(t
 ;; Translate the key appropriately.
-(when (and modal (lookup-key ergoemacs-modal-ignored-keymap (vector 
input)))
-  ;; Swap back, or ignore the modal translation.
-  (setq type (ergoemacs-translation-struct-key modal)
-local-keymap (ergoemacs-translation-struct-keymap-modal modal)
-text (ergoemacs-translation-struct-text modal)
-unchorded (ergoemacs-translation-struct-unchorded modal)
-trans (ergoemacs-translation-struct-translation modal)
-tmp translation
-translation modal
-modal tmp
-tmp nil))
 (setq raw-input input
   input (ergoemacs-translate--event-mods input type)
   last-command-event input
@@ -1129,7 +1106,7 @@ appropriate value based on the COMMAND."
 TYPE is the type of command loop to check for.  By default this
 is the :full command loop."
   (and
-   (or (eq ergoemacs-command-loop-type (or type :full)) (ergoemacs :modal-p))
+   (eq ergoemacs-command-loop-type (or type :full))
(ergoemacs-command-loop--minibuffer-supported-p)
(catch 'excluded-variables
  (dolist (var ergoemacs-command-loop--excluded-variables)
@@ -1755,8 +1732,6 @@ Emacs versions)."
 current-key (nth 1 raw-key)
 raw-key (nth 0 raw-key)
 continue-read nil)
- (when (setq modal-p (ergoemacs :modal-p))
-   (setq local-keymap 
(ergoemacs-translation-struct-keymap-modal modal-p)))
   (cond
;; Handle quit commands
((and last-current-key
diff --git a/ergoemacs-translate.el b/ergoemacs-translate.el
index d82529c..554123f 100644
--- a/ergoemacs-translate.el
+++ b/ergoemacs-translate.el
@@ -773,7 +773,6 @@ When NAME is a symbol, setup the translation function for 
the symbol."
 -universal-argument
 -negative-argument
 -digit-argument
--modal
 translation
 (local-keymap (or (plist-get plist :keymap) (make-sparse-keymap)))
(trans-keymap (intern (concat "ergoemacs-translate--" (plist-get plist 
:name) "-map"
@@ -819,7 +818,6 @@ When NAME is a symbol, setup the translation function for 
the symbol."
:universal-argument -universal-argument
:negative-argument -negative-argument
:digit-argument -digit-argument
-   :modal -modal
:text (plist-get plist :text)
:keymap local-keymap
:keymap-modal (or (plist-get plist :keymap-modal) 
(make-sparse-keymap))
@@ -946,7 +944,7 @@ If there are no gui elements, retun nil."
 (defun ergoemacs-translate--keymap (&optional translation)
   "Get the keymap for TRANSLATION.
 This takes into consideration the modal state of `ergoemacs-mode'."
-  (let* ((modal (ergoemacs :modal-p))
+  (let* ((modal nil)
  (translation (or (and (ergoemacs-translation-struct-p translation)
(or (

[elpa] externals/ergoemacs-mode 5122817 097/325: cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit 5122817496f42137ccaf100d4ac06c22f586b97e
Author: Walter Landry 
Commit: Walter Landry 

cleanup
---
 ergoemacs-theme-engine.el | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/ergoemacs-theme-engine.el b/ergoemacs-theme-engine.el
index e327901..dbf4689 100644
--- a/ergoemacs-theme-engine.el
+++ b/ergoemacs-theme-engine.el
@@ -650,13 +650,10 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 (delete-frame "x Frame")
 (delete-indentation "⌧ indentation")
 (delete-other-windows "x other pane")
-(delete-other-windows "x other pane")
-(delete-window "x pane")
 (delete-window "x pane")
 (digit-argument "#Argument")
 (er/contract-region "→ region ←")
 (er/expand-region "←region→")
-(er/expand-region "←region→")
 (er/mark-outside-quotes "←quote→")
 (ergoemacs-backward-block "← ¶")
 (ergoemacs-backward-open-bracket "← bracket")
@@ -667,16 +664,13 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 (ergoemacs-command-loop--universal-argument "Argument")
 (ergoemacs-compact-uncompact-block "fill/unfill ¶")
 (ergoemacs-copy-all "copy all")
-(ergoemacs-copy-all "copy all")
 (ergoemacs-copy-line-or-region "copy")
 (ergoemacs-cut-all "✂ all")
-(ergoemacs-cut-all "✂ all")
 (ergoemacs-cut-line-or-region "✂ region")
 (ergoemacs-delete-frame "Close Frame")
 (ergoemacs-end-of-line-or-what "→ line/*")
 (ergoemacs-end-or-beginning-of-buffer "↓ Bottom*")
 (ergoemacs-extend-selection "←region→")
-(ergoemacs-extend-selection "←region→")
 (ergoemacs-forward-block  "→ ¶")
 (ergoemacs-forward-close-bracket "→ bracket")
 (ergoemacs-kill-line-backward "⌫ line")
@@ -715,7 +709,7 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 (isearch-backward-regexp "← reg isearch")
 (isearch-forward "→ isearch")
 (isearch-forward-regexp "→ reg isearch")
-(keyboard-quit "Stop Command")
+(keyboard-quit "stop cmd")
 (kill-line "⌦ line")
 (kill-word "⌦ word")
 (left-word  "← word")
@@ -732,7 +726,6 @@ See also `find-function-recenter-line' and 
`find-function-after-hook'."
 (pr-interface)
 (previous-line "↑ line")
 (query-replace "rep")
-(query-replace "rep")
 (query-replace-regexp "rep reg")
 (recenter-top-bottom "recenter")
 (redo "↷ redo")

[elpa] externals/ergoemacs-mode b16e51c 068/325: Remove unused diminish functions

[monnier--- via]

branch: externals/ergoemacs-mode
commit b16e51c3d18a506bef23ce35cd1b16a055517cea
Author: Walter Landry 
Commit: Walter Landry 

Remove unused diminish functions
---
 ergoemacs-component.el | 164 -
 ergoemacs-macros.el|  12 
 2 files changed, 176 deletions(-)

diff --git a/ergoemacs-component.el b/ergoemacs-component.el
index 583c3a8..fb89e6e 100644
--- a/ergoemacs-component.el
+++ b/ergoemacs-component.el
@@ -54,9 +54,6 @@
 (defvar ergoemacs-translate--translation-hash)
 (defvar ergoemacs-translation-hash)
 
-(declare-function diminish "diminish")
-(declare-function diminish-undo "diminish")
-
 (declare-function ergoemacs--emacs-state "ergoemacs-mode")
 (declare-function ergoemacs-timing-- "ergoemacs-mode")
 (declare-function ergoemacs-mode--setup-hash-tables--setq "ergoemacs-mode")
@@ -1375,167 +1372,6 @@ Return 0 if there is no such symbol.  Based on
 
 (defalias 'describe-ergoemacs-component 'ergoemacs-component-describe)
 
-(defun ergoemacs-component--diminish-on (plist &optional dim type)
-  "Apply `diminish' to PLIST for theme component.
-
-The :dimininish tag can be of the form:
-
-- t -- Removes the package name (PLIST :package-name) from the
-  minor mode display list.
-
-- minor-mode symbol -- Removes the symbol from the minor mode
-  display list.
-
-- string -- Replace the minor mode symbol with a string.
-
-- (string1 string2) -- Unicode (string1) and terminal (string2)
-  displays.  The display is determined by
-  `ergoemacs-key-description--unicode-char'.
-
-- (minor-mode-symbol) -- Suppress minor mode symbol
-
-- (minor-mode-symbol string) -- Replace minor mode symbol
-  modeline indicator with string
-
-- (minor-mode-symbol string1 string2) -- Replace
-  minor-mode-symbol indicator with unicode (string1) or
-  terminal (string2) indicators.  The display is determined by
-  `ergoemacs-key-description--unicode-char'.
-
-- List of minor mode symbols, or list specifications that include
-  the minor- mode symbol, so that multiple minor modes may be
-   processed by a single :diminish specifciation.
-
-DIM is the replacement for the PLIST :diminish, this is used in
-recursive calls to `ergoemacs-component--diminish-on' to process
-lists.  It can also be the symbol name of the package.
-uu
-When TYPE is non-nil, the function turns off the diminish
-modifications with `diminish-undo'"
-  (require 'diminish nil t)
-  (if (not (featurep 'diminish))
-  (message "Error installing diminish package.")
-(let ((diminish-symbol (or (plist-get plist :package-name)
-   (plist-get plist :name)
-   plist))
-  (dim (or dim (plist-get plist :diminish
-  (when (and diminish-symbol (stringp diminish-symbol))
-(setq diminish-symbol (intern diminish-symbol)))
-
-  (cond
-   ((not dim))
-   ;; :diminish t
-   ((eq t dim)
-(cond
- (type (diminish-undo diminish-symbol))
- ((ignore-errors (and (commandp diminish-symbol t) (not 
(ergoemacs-autoloadp diminish-symbol))
-  (diminish diminish-symbol)))
-  )
- (t (eval-after-load diminish-symbol
-  `(diminish ',diminish-symbol)
-   ;; :diminish mode
-   ((symbolp dim)
-(cond
- (type (diminish-undo dim))
- ((ignore-errors (and (commandp diminish-symbol t) (not 
(ergoemacs-autoloadp diminish-symbol))
-  (diminish dim
- (t (eval-after-load diminish-symbol
-  `(diminish ',dim)
-
-   ;; :diminish " g"
-   ((stringp dim)
-(cond
- (type (diminish-undo diminish-symbol))
- ((ignore-errors (and (commandp diminish-symbol t) (not 
(ergoemacs-autoloadp diminish-symbol))
-  (diminish diminish-symbol dim
- (t (eval-after-load diminish-symbol
-  `(diminish ',diminish-symbol ,dim)
-   ((and (consp dim)
- (= 1 (length dim))
- (symbolp (nth 0 dim)))
-(cond
- (type (diminish-undo (nth 0 dim)))
- ((ignore-errors (and (commandp (nth 0 dim) t) (not 
(ergoemacs-autoloadp (nth 0 dim)))
-  (diminish (nth 0 dim) dim
- (t (eval-after-load diminish-symbol
-  `(diminish ',(nth 0 dim))
-   
-   ;; :diminish (" " " g")
-   ((and (consp dim)
- (= 2 (length dim))
- (stringp (nth 0 dim))
- (stringp (nth 1 dim)))
-(cond
- (type (diminish-undo diminish-symbol))
- ((ignore-errors (and (commandp diminish-symbol t) (not 
(ergoemacs-autoloadp diminish-symbol))
-  (diminish diminish-symbol (ergoemacs :unicode 
(nth 0 dim) (nth 1 dim))
- (t (eval-after-load diminish-symbol
-  `(ignore-errors
- (diminish ',diminish-symbol
-   ,(ergoema

[elpa] externals/ergoemacs-mode 58ac535 061/325: Remove obsolete names

[monnier--- via]

branch: externals/ergoemacs-mode
commit 58ac53582dc19b5232652ae793a068fdc34792f3
Author: Walter Landry 
Commit: Walter Landry 

Remove obsolete names
---
 ergoemacs-mode.el | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 8fed0d9..7dc80c7 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -814,7 +814,6 @@ Valid values are:
   "Display Options for `ergoemacs-mode'."
   :group 'ergoemacs-mode)
 
-(define-obsolete-variable-alias 'ergoemacs-use-unicode-char 
'ergoemacs-display-unicode-characters)
 (defcustom ergoemacs-display-unicode-characters t
   "Use unicode characters when available."
   :type 'boolean
@@ -822,7 +821,6 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-use-ergoemacs-key-descriptions 
'ergoemacs-display-ergoemacs-key-descriptions)
 (defcustom ergoemacs-display-ergoemacs-key-descriptions t
   "Use ergoemacs key descriptions (Alt+)."
   :type 'boolean
@@ -831,7 +829,6 @@ Valid values are:
   :group 'ergoemacs-display)
 
 
-(define-obsolete-variable-alias 'ergoemacs-use-unicode-brackets 
'ergoemacs-display-use-unicode-brackets-around-keys)
 (defcustom ergoemacs-display-use-unicode-brackets-around-keys t
   "Use unicode brackets."
   :type 'boolean
@@ -839,7 +836,6 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-use-small-symbols 
'ergoemacs-display-small-symbols-for-key-modifiers)
 (defcustom ergoemacs-display-small-symbols-for-key-modifiers nil
   "Use small symbols to represent alt+ ctl+ on windows/linux."
   :type 'boolean
@@ -847,7 +843,6 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-capitalize-keys 
'ergoemacs-display-capitalize-keys)
 (defcustom ergoemacs-display-capitalize-keys 'with-modifiers
   "Capitalize keys like Ctrl+C.
 `ergoemacs-mode' should show Ctrl+Shift+C if you are pressing these keys."
@@ -859,7 +854,6 @@ Valid values are:
   :initialize #'custom-initialize-default
   :group 'ergoemacs-display)
 
-(define-obsolete-variable-alias 'ergoemacs-pretty-key-use-face 
'ergoemacs-display-key-use-face-p)
 (defcustom ergoemacs-display-key-use-face-p t
   "Use a button face for keys."
   :type 'boolean
@@ -914,8 +908,6 @@ Valid values are:
   "Options for `ergoemacs-command-loop'."
   :group 'ergoemacs-mode)
 
-(define-obsolete-variable-alias 'ergoemacs-read-blink 
'ergoemacs-command-loop-blink-character)
-
 (defcustom ergoemacs-command-loop-blink-character (ergoemacs :unicode-or-alt 
"•" "·" "-")
   "Blink character."
   :type '(choice
@@ -923,13 +915,11 @@ Valid values are:
   (const :tag "No cursor" nil))
   :group 'ergoemacs-command-loop)
 
-(define-obsolete-variable-alias 'ergoemacs-read-blink-timeout 
'ergoemacs-command-loop-blink-rate)
 (defcustom ergoemacs-command-loop-blink-rate 0.4
   "Rate that the ergoemacs-command loop cursor blinks."
   :type 'number
   :group 'ergoemacs-command-loop)
 
-(define-obsolete-variable-alias 'ergoemacs-read-swaps 
'ergoemacs-command-loop-swap-translation)
 (defcustom ergoemacs-command-loop-swap-translation
   '(((:normal :normal) :unchorded-ctl)
 ((:normal :unchorded-ctl) :ctl-to-alt)
@@ -981,7 +971,6 @@ Valid values are:
   :group 'ergoemacs-command-loop)
 
 
-(define-obsolete-variable-alias 'ergoemacs-default-cursor 
'ergoemacs-default-cursor-color)
 (defcustom ergoemacs-default-cursor-color nil
   "Default cursor color.
 

[elpa] externals/ergoemacs-mode 37d642e 092/325: Remove the optional off stuff and lots of helm stuff.

[monnier--- via]

branch: externals/ergoemacs-mode
commit 37d642e8543ca4ca0effbf5a0ff61af6f7eecca6
Author: Walter Landry 
Commit: Walter Landry 

Remove the optional off stuff and lots of helm stuff.
---
 ergoemacs-test.el   |  53 -
 ergoemacs-themes.el | 546 +---
 2 files changed, 6 insertions(+), 593 deletions(-)

diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index 061aa42..ada68c4 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -650,23 +650,6 @@ Grep finished (matches found) at Fri Aug 22 08:30:37
 
 ;;; Command Loop
 
-(ert-deftest ergoemacs-test-command-loop-apps-e-t-_ ()
-  "Test that colemak  e t sends _.
-Should test for Issue #143."
-  (ergoemacs-test-layout
-   :theme "reduction"
-   :layout "colemak"
-   (save-excursion
- (switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
- (delete-region (point-min) (point-max))
- (with-timeout (0.5 nil)
-   (ergoemacs-command-loop--internal (format "<%s> e t"
-   (if (eq system-type 'windows-nt)
-   "apps" "menu"
- (should (string= "_" (buffer-string)))
- (kill-buffer (current-buffer)
-
-
 (ert-deftest ergoemacs-test-command-loop-C-x-8-! ()
   "Test that unicode translations work.
 See Issue #138."
@@ -691,34 +674,6 @@ See Issue #138."
 (should (string= "Ä" (buffer-string)))
 (kill-buffer (current-buffer
 
-(ert-deftest ergoemacs-test-command-loop-overlay-paren ()
-  "Test that overlays will send the appropriate parenthesis"
-  (let (ret
-tmp (tmp-key (make-sparse-keymap)) overlays)
-(ergoemacs-test-layout
- :layout "colemak"
- :macro (format "M-i <%s> e e"
-(if (eq system-type 'windows-nt)
-"apps" "menu"))
- (define-key tmp-key [ergoemacs-test] 'ignore)
- (save-excursion
-   (switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
-   (insert ergoemacs-test-lorem-ipsum)
-   (goto-char (point-min))
-   ;; Put in dummy overlay
-   (while (re-search-forward "[A-Za-z]+" nil t)
- (setq tmp (make-overlay (match-beginning 0) (match-end 0)))
- (overlay-put tmp 'keymap tmp-key)
- (push tmp overlays))
-   (goto-char (point-min))
-   (execute-kbd-macro macro)
-   (when (looking-at ")")
- (setq ret t))
-   (dolist (x overlays)
- (delete-overlay x))
-   (kill-buffer (current-buffer
-(should (equal ret t
-
 (ert-deftest ergoemacs-test-command-loop-shortcut ()
   "Test that shortcuts don't eat or duplicate key-strokes. (Issue #141)"
   :tags '(:interactive)
@@ -808,14 +763,6 @@ Should test issue #142"
  (setq input-decode-map (copy-keymap old-map)))
 (should ret)))
 
-;;; Key inheritance 
-(ert-deftest ergoemacs-key-inheitance-alt-up-and-down ()
-  "Test M-up and M-down keys make sure they are moving lines"
-  (ergoemacs-require 'move-and-transpose-lines)
-  (ergoemacs-mode-reset)
-  (should (eq (key-binding [\M-up]) 'ergoemacs-move-text-up))
-  (should (eq (key-binding [\M-down]) 'ergoemacs-move-text-down)))
-
 ;;; Global map tests.
 (defun ergoemacs-test-global-key-set-before (&optional after key ergoemacs 
ignore-prev-global delete-def)
   "Test the global key set before ergoemacs-mode is loaded."
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index ac0371c..d2ae331 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -162,10 +162,6 @@
   (recentf-mode (if noninteractive -1 1))
   )
 
-(ergoemacs-component save-options-on-exit ()
-  "Save emacs options on exit"
-  (add-hook 'kill-emacs-hook 'ergoemacs-exit-customize-save-customized))
-
 ;;; Fixed components
 (ergoemacs-component standard-fixed ()
   "Standard Fixed Shortcuts"
@@ -336,11 +332,6 @@
   (define-key eshell-mode-map (kbd "") 'eshell-bol)
   (define-key comint-mode-map (kbd "") 'comint-bol)
 
-  (define-key helm-map [remap mark-whole-buffer] 'helm-mark-all)
-  (define-key helm-map (kbd "C-w") 'helm-keyboard-quit)
-  (define-key helm-map (kbd "C-z") nil)
-  
-
   ;; Compatibility with Icicle (allows the use of
   ;; `icicle-read-string-completing' directly)
   (when icicle-mode
@@ -370,120 +361,9 @@
   (define-key org-mode-map (kbd "") 'org-cycle)
   (define-key org-mode-map (kbd "") 'org-cycle))
 
-(ergoemacs-component backspace-is-back ()
-  "Backspace is back, as in browsers..."
-  (define-key Info-mode-map (kbd "") 'Info-history-back)
-  (define-key Info-mode-map (kbd "") 'Info-history-forward)
-  (define-key Info-mode-map (kbd "") 'Info-history-forward)
-  (define-key help-mode-map (kbd "") 'help-go-back)
-  (define-key help-mode-map (kbd "") 'help-go-forward)
-  (define-key eww-mode-map (kbd "") 'eww-back-url)
-  (define-key eww-mode-map (kbd "") 'eww-forward-url))
-
 (ergoemacs-component fixed-newline ()
   "Newline and indent"
-  (global-set-key (kbd "M-RET") 'electric-newline-and-maybe-indent)
-  (define-key helm-map (kbd "M-RET") 'helm-exe

[elpa] externals/ergoemacs-mode 4e5dfc6 089/325: Turn off caching in ergoemacs-map--composed-list

[monnier--- via]

branch: externals/ergoemacs-mode
commit 4e5dfc6c084ee6c638e72a1eab2fc220c8952839
Author: Walter Landry 
Commit: Walter Landry 

Turn off caching in ergoemacs-map--composed-list

It causes infinite loops in mu4e for reasons that are hard to figure
out.
---
 ergoemacs-map.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ergoemacs-map.el b/ergoemacs-map.el
index 4c5505a..d699c92 100644
--- a/ergoemacs-map.el
+++ b/ergoemacs-map.el
@@ -396,8 +396,8 @@ It takes the following arguments:
 (unless (ergoemacs lookup-keymap :installed-p)
   (let ((ret (make-sparse-keymap))
 tmp composed-list local-unbind-list bound-keys i key2)
-(ergoemacs-cache (and lookup-key (intern (format "%s-%s-composed-key" 
lookup-key
- (ergoemacs 
lookup-keymap :map-key
+;; This used to have caching.  It causes infinite loops in
+;; mu4e for reasons that are hard to figure out.
   (unless only-modify-p
 (ergoemacs-timing lookup-keymap
   (ergoemacs-map-keymap
@@ -436,7 +436,7 @@ It takes the following arguments:
lookup-keymap))
 (ergoemacs ret :label (list (ergoemacs lookup-keymap :key-hash) 
'ergoemacs-mode (intern ergoemacs-keyboard-layout
   (setq tmp (ergoemacs-component-struct--lookup-list lookup-keymap) 
composed-list (or (and ret (or (and tmp (append tmp (list ret))) (list ret))) 
tmp))
-  (list composed-list local-unbind-list ret))
+  (list composed-list local-unbind-list ret)
 
 (defun ergoemacs-map--puthash (key new &optional table)
   "Associate KEY with a list including NEW in TABLE."

[elpa] externals/ergoemacs-mode cc8c354 106/325: Simplify ergoemacs-mode and remove ergoemacs-mode--update-theme-description

[monnier--- via]

branch: externals/ergoemacs-mode
commit cc8c354527d1dcca034bd3b083fb10aa3ff0d484
Author: Walter Landry 
Commit: Walter Landry 

Simplify ergoemacs-mode and remove ergoemacs-mode--update-theme-description
---
 ergoemacs-mode.el | 99 +--
 1 file changed, 37 insertions(+), 62 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 26e7eeb..dab6c00 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -275,50 +275,47 @@ The `execute-extended-command' is now 
\\[execute-extended-command].
   :group 'ergoemacs-mode
   :keymap ergoemacs-menu-keymap
   (setq ergoemacs-mode--start-p t)
-  (if (and (not noninteractive)
-   (not ergoemacs-mode--start-p))
-  (if ergoemacs-mode
-  (message "Ergoemacs will be started.")
-(message "Ergoemacs startup canceled."))
-(setq ergoemacs-map--hashkey nil)
-(unless ergoemacs-require--ini-p
-  (setq ergoemacs-require--ini-p :ini)
-  (when ergoemacs-require
-(dolist (elt ergoemacs-require)
-  (apply #'ergoemacs-require elt
-(let ((refresh-p ergoemacs-component-struct--refresh-variables))
-  (if ergoemacs-mode
-  (progn
-(setq ergoemacs-mode--default-frame-alist nil)
-(dolist (elt (reverse default-frame-alist))
-  (push elt ergoemacs-mode--default-frame-alist))
-(run-hooks 'ergoemacs-mode-startup-hook)
-(add-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
-(add-hook 'post-command-hook #'ergoemacs-post-command-hook)
-(add-hook 'after-load-functions #'ergoemacs-after-load-functions)
-(add-hook 'after-load-functions 
#'ergoemacs-mode-after-startup-run-load-hooks)
-
-(setq ergoemacs-require--ini-p t)
-   (ergoemacs-setup-override-keymap)   
-(if refresh-p
-(message "Ergoemacs-mode keys refreshed (%s)" 
ergoemacs-keyboard-layout)
-  (message "Ergoemacs-mode turned ON (%s)." 
ergoemacs-keyboard-layout)))
-
-(modify-all-frames-parameters ergoemacs-mode--default-frame-alist)
-(unless (assoc 'cursor-type ergoemacs-mode--default-frame-alist)
-  (modify-all-frames-parameters (list (cons 'cursor-type 'box
-(setq ergoemacs-mode--default-frame-alist nil)
-(run-hooks 'ergoemacs-mode-shutdown-hook)
-(remove-hook 'post-command-hook #'ergoemacs-post-command-hook)
-(remove-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
-(remove-hook 'after-load-functions #'ergoemacs-after-load-functions)
-(unless refresh-p
-  (message "Ergoemacs-mode turned OFF.")
+  (setq ergoemacs-map--hashkey nil)
+  (unless ergoemacs-require--ini-p
+(setq ergoemacs-require--ini-p :ini)
+(when ergoemacs-require
+  (dolist (elt ergoemacs-require)
+(apply #'ergoemacs-require elt
+  (let ((refresh-p ergoemacs-component-struct--refresh-variables))
+;; Turn on
+(if ergoemacs-mode
+(progn
+  (setq ergoemacs-mode--default-frame-alist nil)
+  (dolist (elt (reverse default-frame-alist))
+(push elt ergoemacs-mode--default-frame-alist))
+  (run-hooks 'ergoemacs-mode-startup-hook)
+  (add-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
+  (add-hook 'post-command-hook #'ergoemacs-post-command-hook)
+  (add-hook 'after-load-functions #'ergoemacs-after-load-functions)
+  (add-hook 'after-load-functions 
#'ergoemacs-mode-after-startup-run-load-hooks)
+
+  (setq ergoemacs-require--ini-p t)
+ (ergoemacs-setup-override-keymap)   
+  (if refresh-p
+  (message "Ergoemacs-mode keys refreshed (%s)" 
ergoemacs-keyboard-layout)
+(message "Ergoemacs-mode turned ON (%s)." 
ergoemacs-keyboard-layout)
+)
   )
+  ;; Turn off
+  (modify-all-frames-parameters ergoemacs-mode--default-frame-alist)
+  (unless (assoc 'cursor-type ergoemacs-mode--default-frame-alist)
+(modify-all-frames-parameters (list (cons 'cursor-type 'box
+  (setq ergoemacs-mode--default-frame-alist nil)
+  (run-hooks 'ergoemacs-mode-shutdown-hook)
+  (remove-hook 'post-command-hook #'ergoemacs-post-command-hook)
+  (remove-hook 'pre-command-hook #'ergoemacs-pre-command-hook)
+  (remove-hook 'after-load-functions #'ergoemacs-after-load-functions)
+  (unless refresh-p
+(message "Ergoemacs-mode turned OFF.")
 )
   )
-(setq ergoemacs-mode-started-p t)
 )
+  (setq ergoemacs-mode-started-p t)
   )
 
 (defvar ergoemacs--gzip (executable-find "gzip")
@@ -766,28 +763,6 @@ Valid values are:
   :group 'ergoemacs-mode)
 
 
-(defun ergoemacs-mode--update-theme-description ()
-  "Update theme description based on loaded themes."
-  (defcustom ergoemacs-theme (if (and (boundp 'ergoemacs-variant) 
ergoemacs-variant)
- 

[elpa] externals/ergoemacs-mode d3a7657 116/325: Make 306 work and clean up lots of tests.

[monnier--- via]

branch: externals/ergoemacs-mode
commit d3a7657312910b98aede25affcf92e6e237b4fac
Author: Walter Landry 
Commit: Walter Landry 

Make 306 work and clean up lots of tests.
---
 ergoemacs-test.el | 63 +++
 1 file changed, 12 insertions(+), 51 deletions(-)

diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index 08e7dcd..1ab7e55 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -188,8 +188,6 @@ sunt in culpa qui officia deserunt mollit anim id est 
laborum.")
 (old-type ergoemacs-command-loop-type)
 (old-paste interprogram-paste-function)
 (old-cut interprogram-cut-function)
-;; (old-kill kill-ring)
-;; (old-pointer kill-ring-yank-pointer)
 (old-version (ergoemacs :current-version))
 (macro
  ,(if (plist-get plist :macro)
@@ -201,8 +199,6 @@ sunt in culpa qui officia deserunt mollit anim id est 
laborum.")
   ergoemacs-command-loop-type nil
   interprogram-paste-function nil
   interprogram-cut-function nil
-  ;; kill-ring nil
-  ;; kill-ring-yank-pointer nil
   
   ;; Make sure the copy functions don't think the last
   ;; command was a copy.
@@ -223,8 +219,6 @@ sunt in culpa qui officia deserunt mollit anim id est 
laborum.")
 ergoemacs-keyboard-layout old-ergoemacs-keyboard-layout
 interprogram-paste-function old-paste
 interprogram-cut-function old-cut
-;; kill-ring old-kill
-;; kill-ring-yank-pointer old-pointer
 )
   (when reset-ergoemacs
 (ergoemacs-mode-reset)))
@@ -284,7 +278,7 @@ sunt in culpa qui officia deserunt mollit anim id est 
laborum.")
 
 (ert-deftest ergoemacs-test-isearch-in-eshell ()
   "Test Issue #322."
-  :tags '(:search :calc)
+  :tags '(:search)
   (ergoemacs-test-layout
:layout "us"
(ergoemacs-eshell-here)
@@ -372,7 +366,6 @@ Tests issue #347"
   "Test that shift selection works properly in reduction."
   :tags '(:shift-select :calc :interactive)
   (ergoemacs-test-layout
-   :theme "reduction"
:layout "colemak"
:macro "M-E M-E M-x"
(save-excursion
@@ -391,7 +384,6 @@ Tests issue #347"
   (let (ret)
 (ergoemacs-test-layout
  :macro "M-Y M-x"
- :theme "reduction"
  :layout "colemak"
  (save-excursion
(switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
@@ -472,22 +464,27 @@ not using cua or cutting line. I think kill-region is 
what is meant."
   "Make sure the unbound keys work"
   (should (eq 'ergoemacs-map-undefined (key-binding (read-kbd-macro "C-x 
C-s")
 
-(ert-deftest ergoemacs-test-function-M-e-only-one-char-issue-306 ()
+(ert-deftest ergoemacs-test-function-M-f-only-one-char-issue-306 ()
   "Tests Issue #306."
   :tags '(:calc)
   (let ((ergoemacs-test-fn t)
 (ergoemacs-read-input-keys nil))
 (ergoemacs-test-layout
- :layout "us"
- :theme "lvl2"
- :macro "M-e"
+ ;; Using 'us' here breaks everything.  All of the other tests use
+ ;; 'colemak' or have identical bindings as colemak, so it is
+ ;; probably an issue when you switch.  That is now unsupported.
+ :layout "colemak"
+ :macro "M-f"
  (save-excursion
(switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
(delete-region (point-min) (point-max))
(insert ergoemacs-test-lorem-ipsum)
(fundamental-mode)
-   (should (or (eq (key-binding (kbd "M-e")) 'backward-kill-word)
-   (eq (key-binding (kbd "M-e")) (command-remapping 
'backward-kill-word (point)
+   (print "(eq (key-binding (kbd \"M-f\")) 'backward-kill-word)")
+   (print (key-binding (kbd "M-f")))
+   (print (eq (key-binding (kbd "M-f")) 'backward-kill-word))
+   (should (or (eq (key-binding (kbd "M-f")) 'backward-kill-word)
+   (eq (key-binding (kbd "M-f")) (command-remapping 
'backward-kill-word (point)
(setq ergoemacs-test-fn nil)
(goto-char (point-max))
(execute-kbd-macro macro)
@@ -560,7 +557,6 @@ Grep finished (matches found) at Fri Aug 22 08:30:37
   (let ((ergoemacs-test-fn t))
 (ergoemacs-test-layout
  :layout "us"
- :theme "standard"
  (save-excursion
(switch-to-buffer (get-buffer-create "*ergoemacs-test*"))
(delete-region (point-min) (point-max))
@@ -581,7 +577,6 @@ Grep finished (matches found) at Fri Aug 22 08:30:37
   :tags '(:calc :interactive)
   (let ((ergoemacs-test-fn t))
 (ergoemacs-test-layout
- :theme "reduction"
  :layout "colemak"
  (call-interactively 'calc)
  (unwind-protect
@@ -593,7 +588,6 @@ Grep finished (matches found) at Fri Aug 22 08:30:37
   :tags '(:calc :interactive)
   (let ((ergoemacs-test-fn t))
 (ergoemacs-test-layout
- :theme "reduction"
  :layout "colemak"
  (call-interacti

[elpa] externals/ergoemacs-mode 160e94b 009/325: Remove unused easymenu

[monnier--- via]

branch: externals/ergoemacs-mode
commit 160e94b3deb5dabb865fcafedf99310648e937af
Author: Walter Landry 
Commit: Walter Landry 

Remove unused easymenu
---
 ergoemacs-mode.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 001c343..f5c68e5 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -49,7 +49,6 @@
 (eval-when-compile
   (require 'ergoemacs-macros))
 
-(require 'easymenu)
 (require 'undo-tree nil t)
 (provide 'ergoemacs-mode)
 (require 'package)

[elpa] externals/ergoemacs-mode ac50534 067/325: Make ergoemacs-mode only run when called, not when the file is loaded.

[monnier--- via]

branch: externals/ergoemacs-mode
commit ac50534dd91617c10b95cf4f00cdeb41a77cd29b
Author: Walter Landry 
Commit: Walter Landry 

Make ergoemacs-mode only run when called, not when the file is loaded.
---
 ergoemacs-mode.el | 32 
 1 file changed, 12 insertions(+), 20 deletions(-)

diff --git a/ergoemacs-mode.el b/ergoemacs-mode.el
index 8fd11f8..94f145d 100644
--- a/ergoemacs-mode.el
+++ b/ergoemacs-mode.el
@@ -279,7 +279,8 @@ The `execute-extended-command' is now 
\\[execute-extended-command].
   :global t
   :group 'ergoemacs-mode
   :keymap ergoemacs-menu-keymap
-  :after-hook (if (and (not noninteractive)
+  (setq ergoemacs-mode--start-p t)
+  (if (and (not noninteractive)
(not ergoemacs-mode--start-p))
   (if ergoemacs-mode
   (message "Ergoemacs will be started.")
@@ -300,12 +301,15 @@ The `execute-extended-command' is now 
\\[execute-extended-command].
 (add-hook 'pre-command-hook 
#'ergoemacs-pre-command-hook)
 (add-hook 'post-command-hook 
#'ergoemacs-post-command-hook)
 (add-hook 'after-load-functions 
#'ergoemacs-after-load-functions)
+(add-hook 'after-load-functions 
#'ergoemacs-mode-after-startup-run-load-hooks)
+
 (setq ergoemacs-require--ini-p t)
(ergoemacs-setup-override-keymap)   
 (if refresh-p
 (message "Ergoemacs-mode keys refreshed (%s:%s)"
  ergoemacs-keyboard-layout (or 
ergoemacs-theme "standard"))
   (message "Ergoemacs-mode turned ON (%s:%s)." 
ergoemacs-keyboard-layout (or ergoemacs-theme "standard"
+
 (modify-all-frames-parameters 
ergoemacs-mode--default-frame-alist)
 (unless (assoc 'cursor-type 
ergoemacs-mode--default-frame-alist)
   (modify-all-frames-parameters (list (cons 'cursor-type 
'box
@@ -315,7 +319,13 @@ The `execute-extended-command' is now 
\\[execute-extended-command].
 (remove-hook 'pre-command-hook 
#'ergoemacs-pre-command-hook)
 (remove-hook 'after-load-functions 
#'ergoemacs-after-load-functions)
 (unless refresh-p
-  (message "Ergoemacs-mode turned OFF."))
+  (message "Ergoemacs-mode turned OFF.")
+  )
+)
+  )
+(setq ergoemacs-mode-started-p t)
+)
+  )
 
 (defvar ergoemacs--gzip (executable-find "gzip")
   "Gzip location.")
@@ -423,7 +433,6 @@ This is structured by valid keyboard layouts for
 (calculate-ergoemacs-remap . "ergoemacs-map.el")
 (calc-remaps . "ergoemacs-map.el")
 (calc-passthrough . "ergoemacs-map.el")
-(ergoemacs-mode-after-init-emacs . "ergoemacs-mode.el")
 (setup-ergoemacs-hash . "ergoemacs-mode.el"))
   "Alist of known timing functions.")
 
@@ -1008,20 +1017,6 @@ also perform `outline-next-visible-heading'"
   (run-hooks 'ergoemacs-mode-after-load-hook))
 
 (defvar ergoemacs-mode-started-p nil)
-(defun ergoemacs-mode-after-init-emacs ()
-  "Start `ergoemacs-mode' after loading Emacs."
-  (unless ergoemacs-mode--start-p
-(ergoemacs-timing ergoemacs-mode-after-init-emacs
-  (setq ergoemacs-mode--start-p t)
-  (ergoemacs-mode ergoemacs-mode)
-  (run-hooks 'ergoemacs-mode-init-hook)
-  (add-hook 'after-load-functions 
#'ergoemacs-mode-after-startup-run-load-hooks))
-(let* ((time1 ergoemacs--load-time)
-   (time2 (aref (gethash 'ergoemacs-mode-after-init-emacs 
ergoemacs-timing-hash) 1))
-   (time3 (+ time1 time2)))
-  (message "Started `ergoemacs-mode'. Total startup time %f (Load: %f, 
Initialize:%f%s)"
-   time3 time1 time2 (or (and ergoemacs-mode--fast-p ", cached") 
""
-  (setq ergoemacs-mode-started-p t))
 
 (if ergoemacs-mode--fast-p
 (provide 'ergoemacs-themes)
@@ -1039,9 +1034,6 @@ also perform `outline-next-visible-heading'"
 (puthash 'ergoemacs-load-time (vector 1 ergoemacs--load-time 
ergoemacs--load-time ergoemacs--load-time (or load-file-name buffer-file-name))
  ergoemacs-timing-hash)
 
-(run-with-timer 0.0 nil #'ergoemacs-mode-after-init-emacs)
-(add-hook 'emacs-startup-hook #'ergoemacs-mode-after-init-emacs)
-
 (provide 'ergoemacs-mode)
 ;;
 ;;; ergoemacs-mode.el ends here

[elpa] externals/ergoemacs-mode 9ded0d2 126/325: Move more keys into plain functions

[monnier--- via]

branch: externals/ergoemacs-mode
commit 9ded0d2ff3de84df9a742a859eb848148afdd008
Author: Walter Landry 
Commit: Walter Landry 

Move more keys into plain functions
---
 ergoemacs-themes.el | 46 +++---
 1 file changed, 35 insertions(+), 11 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index dae65be..ea8b35c 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -28,6 +28,24 @@
 (require 'advice)
 (require 'ibuffer)
 
+(defun ergoemacs-global-set-key (key command)
+  "Translates KEY from a 'us' layout to the current layout and
+set it as a global binding as COMMAND.
+
+For example, if your layout is 'us', the command
+
+  (ergoemaces-global-set-key (kbd \"M-k\") 'next-line)
+
+will bind 'Meta-k' to next-line.  If your layout is 'colemak', it will bind
+'Meta-e' to next-line.
+"
+  (global-set-key (ergoemacs-translate--event-layout
+   (vconcat (listify-key-sequence key))
+   )
+  command
+  )
+  )
+
 (defun ergoemacs-set-standard-vars ()
   "Enabled/changed variables/modes"
   (setq org-CUA-compatible t
@@ -327,11 +345,17 @@
   "Help changes for ergoemacs-mode"
   (global-set-key (kbd "C-h '") 'ergoemacs-describe-current-theme))
 
+(defun ergoemacs-set-move-char ()
+  "Movement by Characters & Set Mark"
+  (global-set-key (kbd "C-b") nil) 
+  (ergoemacs-global-set-key (kbd "M-j") 'backward-char)
+  )  
+
 ;;; Variable Components
 (ergoemacs-component move-char ()
   "Movement by Characters & Set Mark"
-  (global-set-key (kbd "C-b") nil) 
-  (global-set-key (kbd "M-j") 'backward-char)
+  ;; (global-set-key (kbd "C-b") nil) 
+  ;; (global-set-key (kbd "M-j") 'backward-char)
   
   (define-key global-map (kbd "M-l") 'forward-char)
   
@@ -446,18 +470,16 @@
   (define-key term-raw-map (kbd "M-K") 'scroll-up)
   )
 
-(ergoemacs-component move-buffer ()
-  "Move Beginning/End of buffer"
+(defun ergoemacs-set-move-buffer ()
   (global-unset-key (kbd "M->"))
   (global-unset-key (kbd "M-<"))
-  (global-set-key (kbd "M-n") 'ergoemacs-beginning-or-end-of-buffer)
-  (global-set-key (kbd "M-N") 'ergoemacs-end-or-beginning-of-buffer)
-  :version 5.7.5
-  (global-reset-key (kbd "M->"))
-  (global-reset-key (kbd "M-<"))
-  (global-unset-key (kbd "M-n"))
-  (global-unset-key (kbd "M-N"))
+  (ergoemacs-global-set-key (kbd "M-n") 'ergoemacs-beginning-or-end-of-buffer)
+  (ergoemacs-global-set-key (kbd "M-N") 'ergoemacs-end-or-beginning-of-buffer)
+  (define-key isearch-mode-map (kbd "M-n") nil)
+)  
 
+(ergoemacs-component move-buffer ()
+  "Move Beginning/End of buffer"
   ;; Mode specific movement
   (define-key term-raw-map (kbd "M-n") 'ergoemacs-beginning-or-end-of-buffer)
   (define-key term-raw-map (kbd "M-N") 'ergoemacs-end-or-beginning-of-buffer)
@@ -1251,6 +1273,8 @@
   (ergoemacs-set-standard-vars)
   (ergoemacs-set-standard-fixed)
   (ergoemacs-set-help)
+  (ergoemacs-set-move-char)
+  (ergoemacs-set-move-buffer)
   )
 
 (add-hook 'ergoemacs-mode-startup-hook #'ergoemacs-install-standard-theme)

[elpa] externals/ergoemacs-mode b40f209 084/325: Remove duplicate entries

[monnier--- via]

branch: externals/ergoemacs-mode
commit b40f209bed12f9cd28e9181cdf0dc14872b31747
Author: Walter Landry 
Commit: Walter Landry 

Remove duplicate entries
---
 ergoemacs-themes.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index aad3672..3780700 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -172,7 +172,6 @@
   "Standard Fixed Shortcuts"
   :variable-reg nil ;; No variable keys
   (global-set-key [tool-bar kill-buffer] 'ergoemacs-close-current-buffer)
-  (global-set-key (kbd "C-n") 'ergoemacs-new-empty-buffer)
   
   (global-set-key (kbd "C-x C-f") nil) ;; Remove Emacs Method
   (global-set-key (kbd "C-o") 'find-file)
@@ -303,7 +302,6 @@
   ;;
   ;; Also, do not bind any special keys like  or .
   ;; They get passed into term.
-  (define-key term-raw-map (kbd "C-n") 'ergoemacs-new-empty-buffer)
   (define-key term-raw-map (kbd "C-o") 'find-file)
   (define-key term-raw-map (kbd "C-S-o") 'ergoemacs-open-in-desktop)
   (define-key term-raw-map (kbd "C-S-t") 'ergoemacs-open-last-closed)

[elpa] externals/ergoemacs-mode 8dc60d8 013/325: Move ergoemacs-test-layout to ergoemacs-test

[monnier--- via]

branch: externals/ergoemacs-mode
commit 8dc60d8cd97db7d09c37e5a24c9b334a8f244ea6
Author: Walter Landry 
Commit: Walter Landry 

Move ergoemacs-test-layout to ergoemacs-test
---
 ergoemacs-macros.el | 66 +++--
 ergoemacs-test.el   | 56 +
 2 files changed, 59 insertions(+), 63 deletions(-)

diff --git a/ergoemacs-macros.el b/ergoemacs-macros.el
index 4cb1dda..b9b2a81 100644
--- a/ergoemacs-macros.el
+++ b/ergoemacs-macros.el
@@ -352,20 +352,16 @@ This accepts the following keywords:
 
 :mode -- Modes to be added to `auto-mode-alist'. This can be a string such as:
 
-(ergoemacs-package ruby-mode
-:mode \".rb'\")
+:mode \".rb'\"
 
 or a list 
 
-(ergoemacs-package ruby-mode
-:mode (\".rb'\" . ruby-mode))
+:mode (\".rb'\" . ruby-mode)
 
 or a list of modes:
 
-(ergoemacs-package ess-site
-:ensure ess
 :mode ((\".R'\" . R.mode)
-   (\".[Ss][Aa][Ss]'\" . SAS-mode)))
+   (\".[Ss][Aa][Ss]'\" . SAS-mode))
 
 Borrowed from `use-package'.
 
@@ -520,62 +516,6 @@ with :ergoemacs-require set to t."
 ,@plist
 ,@body
 
-;;;###autoload
-(defmacro ergoemacs-test-layout (&rest keys-and-body)
-  (let ((kb (make-symbol "body-and-plist"))
-(plist (make-symbol "plist"))
-(body (make-symbol "body")))
-(setq kb (ergoemacs-theme-component--parse-keys-and-body keys-and-body  
nil t)
-  plist (nth 0 kb)
-  body (nth 1 kb))
-(macroexpand-all
- `(let ((old-ergoemacs-theme (ergoemacs :current-theme))
-(old-type ergoemacs-command-loop-type)
-(old-paste interprogram-paste-function)
-(old-cut interprogram-cut-function)
-;; (old-kill kill-ring)
-;; (old-pointer kill-ring-yank-pointer)
-(old-version (ergoemacs :current-version))
-(macro
- ,(if (plist-get plist :macro)
-  `(edmacro-parse-keys ,(plist-get plist :macro) t)))
-(old-ergoemacs-keyboard-layout ergoemacs-keyboard-layout)
-(reset-ergoemacs nil))
-(setq ergoemacs-theme ,(plist-get plist ':current-theme)
-  ergoemacs-keyboard-layout ,(or (plist-get plist ':layout) "us")
-  ergoemacs-command-loop-type nil
-  interprogram-paste-function nil
-  interprogram-cut-function nil
-  ;; kill-ring nil
-  ;; kill-ring-yank-pointer nil
-  
-  ;; Make sure the copy functions don't think the last
-  ;; command was a copy.
-  last-command 'ergoemacs-test)
-(ergoemacs-theme-set-version ,(or (plist-get plist ':version) nil))
-(unless (and (equal old-ergoemacs-theme ergoemacs-theme)
- (equal old-ergoemacs-keyboard-layout 
ergoemacs-keyboard-layout)
- (equal old-version (ergoemacs :current-vresion)))
-  (setq reset-ergoemacs t)
-  (ergoemacs-mode-reset))
-
-,(if (plist-get plist :cua)
- `(cua-mode 1))
-(unwind-protect
-(progn
-  ,@body)
-  (setq ergoemacs-command-loop-type old-type
-ergoemacs-theme old-ergoemacs-theme
-ergoemacs-keyboard-layout old-ergoemacs-keyboard-layout
-interprogram-paste-function old-paste
-interprogram-cut-function old-cut
-;; kill-ring old-kill
-;; kill-ring-yank-pointer old-pointer
-)
-  (ergoemacs-theme-set-version old-version)
-  (when reset-ergoemacs
-(ergoemacs-mode-reset)))
-
 (defvar ergoemacs-theme-components--modified-plist nil
   "Modified plist.")
 
diff --git a/ergoemacs-test.el b/ergoemacs-test.el
index dfdffef..a6e3fe3 100644
--- a/ergoemacs-test.el
+++ b/ergoemacs-test.el
@@ -180,6 +180,62 @@ sunt in culpa qui officia deserunt mollit anim id est 
laborum.")
 
 ;; Test isearch
 
+(defmacro ergoemacs-test-layout (&rest keys-and-body)
+  (let ((kb (make-symbol "body-and-plist"))
+(plist (make-symbol "plist"))
+(body (make-symbol "body")))
+(setq kb (ergoemacs-theme-component--parse-keys-and-body keys-and-body  
nil t)
+  plist (nth 0 kb)
+  body (nth 1 kb))
+(macroexpand-all
+ `(let ((old-ergoemacs-theme (ergoemacs :current-theme))
+(old-type ergoemacs-command-loop-type)
+(old-paste interprogram-paste-function)
+(old-cut interprogram-cut-function)
+;; (old-kill kill-ring)
+;; (old-pointer kill-ring-yank-pointer)
+(old-version (ergoemacs :current-version))
+(macro
+ ,(if (plist-get plist :macro)
+  `(edmacro-parse-keys ,(plist-get plist :macro) t)))
+(old-ergoemacs-keyboard-layout ergoemacs-keyboard-layout)
+ 

[elpa] externals/ergoemacs-mode a6c1ca2 028/325: Remove dead code

[monnier--- via]

branch: externals/ergoemacs-mode
commit a6c1ca2169ce3f30e1e9c9f8d02be05b16a86684
Author: Walter Landry 
Commit: Walter Landry 

Remove dead code
---
 ergoemacs-command-loop.el | 6 --
 1 file changed, 6 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 523730f..f6935e0 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -590,12 +590,6 @@ This is not done when the event is [ergoemacs-ignore]"
  ((not (numberp ergoemacs-command-loop-echo-keystrokes)) 
prompt)
  ((= 0 ergoemacs-command-loop-echo-keystrokes) prompt)
  ((< last-event-time 
ergoemacs-command-loop-echo-keystrokes) nil)
- ;; ((and (not 
ergoemacs-command-loop--echo-keystrokes-complete)
- ;;   (numberp ergoemacs-command-loop-echo-keystrokes)
- ;;   (or (= 0 ergoemacs-command-loop-echo-keystrokes)
- ;;   (< last-event-time 
ergoemacs-command-loop-echo-keystrokes))) nil)
- ;; ((and (< last-event-time 
ergoemacs-command-loop-time-before-blink) (string= prompt "")) nil)
- ;; ((and (< last-event-time 
ergoemacs-command-loop-time-before-blink) ) nil)
  (t
   (setq ergoemacs-command-loop--echo-keystrokes-complete t)
   prompt)))

[elpa] externals/ergoemacs-mode 49360a1 017/325: Remove ergoemacs-redo since it only exists to download undo-tree

[monnier--- via]

branch: externals/ergoemacs-mode
commit 49360a19a24d8e2e02d150cedddab2acae887b20
Author: Walter Landry 
Commit: Walter Landry 

Remove ergoemacs-redo since it only exists to download undo-tree
---
 ergoemacs-functions.el | 20 
 ergoemacs-themes.el| 20 ++--
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/ergoemacs-functions.el b/ergoemacs-functions.el
index cad8069..8c31e4f 100644
--- a/ergoemacs-functions.el
+++ b/ergoemacs-functions.el
@@ -1621,26 +1621,6 @@ by `ergoemacs-maximum-number-of-files-to-open'.
 (when (> (length ergoemacs-recently-closed-buffers) 
ergoemacs-recently-closed-buffers-max)
   (setq ergoemacs-recently-closed-buffers (butlast 
ergoemacs-recently-closed-buffers 1)
 
-(defun ergoemacs-redo ()
-  "Redo using either `redo' or `undo-tree-redo'.
-Installs `undo-tree' if not present."
-  (interactive "*")
-  (require 'undo-tree nil t)
-  (cond
-   ((fboundp 'redo)
-(call-interactively 'redo))
-   ((fboundp 'undo-tree-redo)
-(call-interactively 'undo-tree-redo))
-   (t
-(if (not (yes-or-no-p "Redo command not found, install undo-tree for 
redo?"))
-(error "Redo not found, need undo-tree or redo commands present.")
-  (package-refresh-contents) ;;available in gnu elpa.
-  (package-initialize)
-  (package-install 'undo-tree)
-  (require 'undo-tree)
-  (undo-tree-mode 1)
-  (call-interactively 'undo-tree-redo)
-
 (defun ergoemacs-keyboard-quit ()
   "Quit the current command/process.
 Similar to `keyboard-quit', with the following changes:
diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 9338770..ee95a4c 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -200,8 +200,8 @@
   (define-key undo-tree-map (kbd "C-?") nil)
   (define-key undo-tree-map (kbd "M-_") nil)
   
-  (global-set-key (kbd "C-S-z") '(redo undo-tree-redo ergoemacs-redo))
-  (global-set-key (kbd "M-S-z") '(redo undo-tree-redo ergoemacs-redo))
+  (global-set-key (kbd "C-S-z") '(redo undo-tree-redo))
+  (global-set-key (kbd "M-S-z") '(redo undo-tree-redo))
   (global-set-key (kbd "") 'ergoemacs-cut-line-or-region)
   (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
   (global-set-key (kbd "C-c ")
@@ -295,7 +295,7 @@
   (global-set-key (kbd "C-x ") 
'ergoemacs-cut-line-or-region)
 )
   (global-set-key (kbd "C-x C-b") 'ibuffer)
-  (global-set-key (kbd "C-y") '(redo undo-tree-redo ergoemacs-redo) "↷ redo")
+  (global-set-key (kbd "C-y") '(redo undo-tree-redo) "↷ redo")
   
   (global-set-key (kbd "M-S-") 'forward-page)
   (global-set-key (kbd "M-S-") 'backward-page)
@@ -400,12 +400,12 @@
   (global-set-key (kbd "") 'ergoemacs-cut-all)
   (global-set-key (kbd "") 'ergoemacs-copy-all)
   (global-set-key (kbd "") 'ergoemacs-paste-cycle)
-  (global-set-key (kbd "") '(redo undo-tree-redo ergoemacs-redo))
+  (global-set-key (kbd "") '(redo undo-tree-redo))
   (global-set-key (kbd "") 'highlight-symbol-prev)
   (global-set-key (kbd "") 'highlight-symbol-next)
   (global-set-key (kbd "") 'ergoemacs-cut-all)
   (global-set-key (kbd "") 'ergoemacs-copy-all)
-  (global-set-key (kbd "") '(redo undo-tree-redo ergoemacs-redo))
+  (global-set-key (kbd "") '(redo undo-tree-redo))
   (global-set-key (kbd "") 'ergoemacs-toggle-letter-case)
   (global-set-key (kbd "") 'previous-line)
   (global-set-key (kbd "") 'next-line)
@@ -665,8 +665,8 @@
 )
   (global-set-key (kbd "C-S-x") ("C-x" :normal))
   (global-set-key (kbd "C-z") 'undo)
-  (global-set-key (kbd "C-S-z") '(redo undo-tree-redo ergoemacs-redo))
-  (global-set-key (kbd "C-y") '(redo undo-tree-redo ergoemacs-redo))
+  (global-set-key (kbd "C-S-z") '(redo undo-tree-redo))
+  (global-set-key (kbd "C-y") '(redo undo-tree-redo))
 
   ;; Mode specific changes
   (if (not (eq ergoemacs-handle-ctl-c-or-ctl-x 'only-C-c-and-C-x))
@@ -857,7 +857,7 @@
  " x" ergoemacs-cut-line-or-region
  " c" ergoemacs-copy-line-or-region
  " v" ergoemacs-paste
- " b" (redo undo-tree-redo ergoemacs-redo)
+ " b" (redo undo-tree-redo)
  " t" switch-to-buffer
  " z" undo
  " r" goto-map))
@@ -1075,7 +1075,7 @@
 (ergoemacs-component ergoemacs-remaps ()
   "Remaps for ergoemacs-mode"
   (when undo-tree-mode
-(global-set-key [remap ergoemacs-redo] 'undo-tree-redo)
+(global-set-key [remap redo] 'undo-tree-redo)
 (global-set-key [remap undo] 'undo-tree-undo))
   (when mark-active
 (global-set-key (kbd "TAB") 'indent-region))
@@ -1220,7 +1220,7 @@
  (listp pending-undo-list)
(consp buffer-undo-list)))
 :help "Undo last operation")
-  (redo menu-item "Redo" ergoemacs-redo
+  (redo menu-item "Redo" redo
 :enable (and
   

[elpa] externals/ergoemacs-mode 655f116 085/325: Remove redundant entries in term-raw-map

[monnier--- via]

branch: externals/ergoemacs-mode
commit 655f116e2f64dc9cb353299ff54ecd77b9b3e286
Author: Walter Landry 
Commit: Walter Landry 

Remove redundant entries in term-raw-map
---
 ergoemacs-themes.el | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 3780700..095ba94 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -303,11 +303,9 @@
   ;; Also, do not bind any special keys like  or .
   ;; They get passed into term.
   (define-key term-raw-map (kbd "C-o") 'find-file)
-  (define-key term-raw-map (kbd "C-S-o") 'ergoemacs-open-in-desktop)
   (define-key term-raw-map (kbd "C-S-t") 'ergoemacs-open-last-closed)
   (define-key term-raw-map (kbd "C-w") 'ergoemacs-close-current-buffer)
   (define-key term-raw-map (kbd "C-f") 'isearch-forward)
-  (define-key term-raw-map (kbd "C-p") 'ergoemacs-print-buffer-confirm)
   (define-key term-raw-map (kbd "C-a") 'mark-whole-buffer)
   (define-key term-raw-map (kbd "C-S-n") 'make-frame-command)
   (define-key term-raw-map (kbd "C-+") 'text-scale-increase)
@@ -319,7 +317,6 @@
   (define-key term-raw-map (kbd "C-S-f") 'occur)
   (define-key term-raw-map (kbd "C-S-o") 'ergoemacs-open-in-external-app)
   (define-key term-raw-map (kbd "C-S-s") 'write-file)
-  (define-key term-raw-map (kbd "C-S-t") 'ergoemacs-open-last-closed)
   (define-key term-raw-map (kbd "C-S-w") 'delete-frame)
   (define-key term-raw-map (kbd "C-`") 'other-frame)
   (define-key term-raw-map (kbd "C-a") 'mark-whole-buffer)

[elpa] externals/ergoemacs-mode 65ad125 054/325: Cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit 65ad125f48e0957b9ca742c327b9e17e00c8b00c
Author: Walter Landry 
Commit: Walter Landry 

Cleanup
---
 ergoemacs-map-properties.el | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ergoemacs-map-properties.el b/ergoemacs-map-properties.el
index 53e32be..c5fe061 100644
--- a/ergoemacs-map-properties.el
+++ b/ergoemacs-map-properties.el
@@ -914,7 +914,6 @@ STRUCT is the keymap structure for the current map."
(error "Will not label a composed map's members to %s" map-key))
(t
(let ((breadcrumb-base ergoemacs-map--breadcrumb)
- (struct (or struct (ergoemacs-gethash map-key 
ergoemacs-map-properties--key-struct)))
  (comp (plist-get struct :composed))
  (comp-list (ergoemacs-map-properties--composed-list keymap))
  from-prop-p
@@ -947,7 +946,6 @@ STRUCT is the keymap structure for the current map."
 old-plist
 (breadcrumb-base ergoemacs-map--breadcrumb)
 (parent (keymap-parent map))
-(struct (or struct (ergoemacs-gethash map-key 
ergoemacs-map-properties--key-struct)))
 label tmp1 tmp2)
(unwind-protect
(progn

[elpa] externals/ergoemacs-mode 5e0c000 050/325: Cleanup

[monnier--- via]

branch: externals/ergoemacs-mode
commit 5e0c000ab365069d16b9f06d2cd0c6acdbf1345f
Author: Walter Landry 
Commit: Walter Landry 

Cleanup
---
 ergoemacs-command-loop.el | 15 +--
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ergoemacs-command-loop.el b/ergoemacs-command-loop.el
index 2d319ce..017aa7b 100644
--- a/ergoemacs-command-loop.el
+++ b/ergoemacs-command-loop.el
@@ -105,8 +105,6 @@
 (defvar ergoemacs-command-loop--universal-functions '(universal-argument 
ergoemacs-universal-argument ergoemacs-command-loop--universal-argument)
   "List of `ergoemacs-mode' recognized functions.")
 
-(define-obsolete-variable-alias 'ergoemacs-universal-fns 
'ergoemacs-command-loop--universal-functions)
-
 (defvar ergoemacs-command-loop--next-key-hash
   (let ((hash (make-hash-table)))
 (puthash 'event-apply-shift-modifier (list '(shift) :force) hash)
@@ -131,8 +129,6 @@ This is to distinguish events in a terminal, like xterm.
 
 It needs to be less than `ergoemacs-command-loop-blink-rate'.")
 
-(define-obsolete-variable-alias 'ergoemacs-read-key-delay 
'ergoemacs-command-loop--decode-event-delay)
-
 (defvar ergoemacs-command-loop--history nil
   "History of command loop locations.")
 
@@ -712,8 +708,7 @@ KEYS is the keys information"
 
 (defun ergoemacs-command--echo-prefix ()
   "Echos prefix keys in the ergoemacs-mode way."
-  (let ((keys (this-single-command-keys))
-   ret timeout)
+  (let ((keys (this-single-command-keys)))
 (when (and ergoemacs-command--timeout-timer
   (not (equal keys ergoemacs-command--timeout-keys)))
   (cancel-timer ergoemacs-command--timeout-timer)
@@ -721,8 +716,8 @@ KEYS is the keys information"
ergoemacs-command--timeout-timer nil))
 (unless (or (equal [] keys)
(ergoemacs-command-loop-p))
-  (when (ergoemacs-keymapp (setq ret (key-binding keys)))
-   (when (setq timeout (key-binding (vconcat keys [ergoemacs-timeout])))
+  (when (ergoemacs-keymapp (key-binding keys))
+   (when (key-binding (vconcat keys [ergoemacs-timeout]))
  (cond
   ((not (region-active-p))) ;; active
(t
@@ -1006,7 +1001,7 @@ KEY is the key being read, or sequence being read.
 
 TYPE is the translation being used.
 
-INITIAL-KEY-TYPE ist he key type that is used fot the initial
+INITIAL-KEY-TYPE is the key type that is used fot the initial
 translation.
 
 UNIVERSAL is if the function will be calling a universal
@@ -2009,7 +2004,7 @@ pressed the translated key by changing
 ;; Make sure to lookup the keys in the selected buffer
 (ergoemacs-command-loop--sync-point)
 (let ((trials (ergoemacs-translate--trials key))
-tmp tmp2 ret)
+tmp ret)
   (setq this-command-keys-shift-translated nil)
 (catch 'found-command
   (dolist (cur-key trials)

[elpa] externals/ergoemacs-mode 6e2383d 128/325: Put all of the non-mode key bindings into regular functions

[monnier--- via]

branch: externals/ergoemacs-mode
commit 6e2383de3b2f4bb946adf3fcab37a431a0148866
Author: Walter Landry 
Commit: Walter Landry 

Put all of the non-mode key bindings into regular functions
---
 ergoemacs-themes.el | 25 -
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index f050d70..9c057a1 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -784,7 +784,7 @@ calling any other ergoemacs-set-* function"
 (global-set-key [remap ergoemacs-print-buffer-confirm]
 'pr-interface)))
 
-(ergoemacs-component menu-bar-file ()
+(defun ergoemacs-set-menu-bar-file ()
   "File menu"
   (global-set-key [menu-bar file]
   (cons "File"
@@ -828,7 +828,7 @@ calling any other ergoemacs-set-* function"
   (exit-emacs-menu menu-item "Quit" 
save-buffers-kill-emacs)
   "File"
 
-(ergoemacs-component menu-bar-edit ()
+(defun ergoemacs-set-menu-bar-edit ()
   "Edit menu"
   (global-set-key [menu-bar edit]
   (cons "Edit"
@@ -988,7 +988,7 @@ calling any other ergoemacs-set-* function"
   (props menu-item "Text Properties" facemenu-menu)
   "Edit"
 
-(ergoemacs-component menu-bar-search ()
+(defun ergoemacs-set-menu-bar-search ()
   "Search menu"
   (global-set-key [menu-bar search]
   (cons "Search"
@@ -1073,7 +1073,7 @@ calling any other ergoemacs-set-* function"
   (bookmark menu-item "Bookmarks" 
menu-bar-bookmark-map)
   "Search"
 
-(ergoemacs-component menu-bar-view ()
+(defun ergoemacs-set-menu-bar-view ()
   "View menu"
   (global-set-key [menu-bar view]
   (cons "View"
@@ -1127,7 +1127,7 @@ calling any other ergoemacs-set-* function"
   (global-linum-mode menu-item "Show/Hide line numbers 
in margin" global-linum-mode :button
  (:toggle . global-linum-mode))
 
-(ergoemacs-theme-component menu-bar-help ()
+(defun ergoemacs-set-menu-bar-help ()
   "Help menu"
   (global-set-key [menu-bar help-menu]
   (cons (if (eq system-type 'darwin) "Help" "?")
@@ -1294,7 +1294,7 @@ calling any other ergoemacs-set-* function"
describe-copying)
   ,(if (eq system-type 'darwin) "Help" "?")
 
-(ergoemacs-component mode-line-major-mode-switch ()
+(defun ergoemacs-set-mode-line-major-mode-switch ()
   "Switch major modes by clicking mode-name."
   (setq ergoemacs-swap-major-modes-when-clicking-major-mode-name t))
 
@@ -1324,13 +1324,6 @@ calling any other ergoemacs-set-* function"
  ido-remaps
  multiple-cursors-remaps
  quit
- ;; Reverse menu-bar order
- menu-bar-help
- menu-bar-view
- menu-bar-search
- menu-bar-edit
- menu-bar-file
-mode-line-major-mode-switch
  )
   :options-menu '(("Remaps" (ido-remaps multiple-cursors-remaps icy-reclaim))
   ("Standard Keys" (standard-fixed fixed-bold-italic quit))
@@ -1362,6 +1355,12 @@ calling any other ergoemacs-set-* function"
   (ergoemacs-set-text-transform)
   (ergoemacs-set-select-items)
   (ergoemacs-set-quit)
+  (ergoemacs-set-menu-bar-help)
+  (ergoemacs-set-menu-bar-view)
+  (ergoemacs-set-menu-bar-search)
+  (ergoemacs-set-menu-bar-edit)
+  (ergoemacs-set-menu-bar-file)
+  (ergoemacs-set-mode-line-major-mode-switch)
   )
 
 (add-hook 'ergoemacs-mode-startup-hook #'ergoemacs-install-standard-theme)

[elpa] externals/ergoemacs-mode 4b850f2 060/325: Remove dead code and useless message

[monnier--- via]

branch: externals/ergoemacs-mode
commit 4b850f22b0706584f66bfb85a246c8a3b44d
Author: Walter Landry 
Commit: Walter Landry 

Remove dead code and useless message
---
 ergoemacs-map-properties.el | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ergoemacs-map-properties.el b/ergoemacs-map-properties.el
index c5fe061..2fad276 100644
--- a/ergoemacs-map-properties.el
+++ b/ergoemacs-map-properties.el
@@ -635,14 +635,11 @@ These keymaps are saved in 
`ergoemacs-map-properties--hook-map-hash'."
   (progn
(setq ergoemacs-map-properties--known-maps 
ergoemacs-map-properties--label-atoms-maps)
(ergoemacs-map-properties--label-known))
-  ;; (ergoemacs-map-properties--label-atoms)
 (ergoemacs-timing get-original-global-map
-  ;; (ergoemacs-map-properties--label-atoms)
   (if (file-readable-p (ergoemacs-map-properties--default-global-file))
   (progn
(load (ergoemacs-map-properties--default-global-file))
(setq ergoemacs-map-properties--known-maps 
ergoemacs-map-properties--label-atoms-maps)
-   (message "Breadcrumb %s" (ergoemacs-gethash 
'describe-european-environment-map ergoemacs-breadcrumb-hash))
(ergoemacs-map-properties--label-known)
 (ergoemacs-map-properties--protect-global-map))
 (if noninteractive

[elpa] externals/ergoemacs-mode 7ce34ce 086/325: Remove some M-C-* entries in term-raw-map.

[monnier--- via]

branch: externals/ergoemacs-mode
commit 7ce34ceb82f55c93249b20a15cf3ca203d184ec7
Author: Walter Landry 
Commit: Walter Landry 

Remove some M-C-* entries in term-raw-map.

They are redundant with some M-* entries
---
 ergoemacs-themes.el | 4 
 1 file changed, 4 deletions(-)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 095ba94..f7d9da9 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -571,10 +571,6 @@
   (define-key term-raw-map (kbd "M-l") 'forward-char)
   (define-key term-raw-map (kbd "M-i") 'previous-line)
   (define-key term-raw-map (kbd "M-k") 'next-line)
-  (define-key term-raw-map (kbd "M-C-j") 'left-word)
-  (define-key term-raw-map (kbd "M-C-l") 'right-word)
-  (define-key term-raw-map (kbd "M-C-i") 'backward-paragraph)
-  (define-key term-raw-map (kbd "M-C-k") 'forward-paragraph)
   (define-key term-raw-map (kbd "M-SPC") 'set-mark-command)
   
   (when iswitchb-define-mode-map-hook 

[elpa] externals/ergoemacs-mode d84c00c 065/325: Add missing requires for ibuffer

[monnier--- via]

branch: externals/ergoemacs-mode
commit d84c00cea733f7087ae527218269691fae10236d
Author: Walter Landry 
Commit: Walter Landry 

Add missing requires for ibuffer
---
 ergoemacs-themes.el | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ergoemacs-themes.el b/ergoemacs-themes.el
index 37b3411..7c9097d 100644
--- a/ergoemacs-themes.el
+++ b/ergoemacs-themes.el
@@ -38,6 +38,8 @@
 (autoload 'dired-jump "dired-x" nil t)
 
 (require 'advice)
+(require 'ibuffer)
+(require 'ibuf-ext)
 
 (ergoemacs-component standard-vars ()
   "Enabled/changed variables/modes"