[elpa] externals/org-transclusion 171c7a38ae: intrnl: add copyrigth comment to avoid ELPA build failure

[ELPA Syncer]

branch: externals/org-transclusion
commit 171c7a38aea3665b94350ab2019585f6ee93f616
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: add copyrigth comment to avoid ELPA build failure
---
 .dir-local.el  | 2 ++
 docs/manual-gen.el | 9 -
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.dir-local.el b/.dir-local.el
index e523a131a7..50813194ab 100644
--- a/.dir-local.el
+++ b/.dir-local.el
@@ -1,3 +1,5 @@
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
 ((emacs-lisp-mode
   (fill-column . 80)
   (indent-tabs-mode . nil)))
diff --git a/docs/manual-gen.el b/docs/manual-gen.el
index 1b53f06a4c..6622bf58f8 100644
--- a/docs/manual-gen.el
+++ b/docs/manual-gen.el
@@ -1,4 +1,11 @@
-;; -*- lexical-binding: t; -*-
+;;; -*- lexical-binding: t; -*-
+
+;; Copyright (C) 2021  Free Software Foundation, Inc.
+
+;;; Commentary:
+
+;; A helper to generate user manual for Org-transclusion
+
 
 (require 'org-transclusion)
 

[elpa] externals/org-transclusion 1a6671c4ff: add:inhibit-read-only: fix:Org export errors with read-only

[ELPA Syncer]

branch: externals/org-transclusion
commit 1a6671c4ffb515271296ed3f2526d183caa6c278
Author: Noboru Ota 
Commit: Noboru Ota 

add:inhibit-read-only: fix:Org export errors with read-only

Some Org exports backends (e.g. texinfo) use org-babel, which does not work 
when
part of the buffer is read-only andoutputs an error message.

Add `org-transclusion-inhibit-read-only` function and add it locally to
`org-export-before-processing-hook`. It temporarily inhibits read-only for 
the
buffer for export.

With this, `manual-gen.el` for make is no longer needed, replaced with an
Elisp expression instead.
---
 docs/Makefile |  3 ++-
 docs/manual-gen.el| 18 --
 docs/org-transclusion.org |  1 -
 org-transclusion.el   | 17 -
 4 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/docs/Makefile b/docs/Makefile
index b12b794ecf..7acd7e8dce 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -13,7 +13,8 @@ run: html install clear
 
 manual:
@printf "\n\n### Generating manual .texi and .info files \n\n"
-   $(EMACS) --batch -L ../ --file org-transclusion.org -l manual-gen.el
+   $(EMACS) --batch -L ../ --file org-transclusion.org \
+ --eval="(progn (require 
'org-transclusion)(org-transclusion-add-all)(org-texinfo-export-to-info))"
 
 html:
@printf "\n\n### Generating manual .html files \n\n"
diff --git a/docs/manual-gen.el b/docs/manual-gen.el
deleted file mode 100644
index 6622bf58f8..00
--- a/docs/manual-gen.el
+++ /dev/null
@@ -1,18 +0,0 @@
-;;; -*- lexical-binding: t; -*-
-
-;; Copyright (C) 2021  Free Software Foundation, Inc.
-
-;;; Commentary:
-
-;; A helper to generate user manual for Org-transclusion
-
-
-(require 'org-transclusion)
-
-;; Need to fix this
-;; Currently it does not work
-(org-transclusion-add-all)
-
-(let ((inhibit-read-only t))
-  (org-texinfo-export-to-info))
-
diff --git a/docs/org-transclusion.org b/docs/org-transclusion.org
index a3e67e32f8..e35347918f 100644
--- a/docs/org-transclusion.org
+++ b/docs/org-transclusion.org
@@ -1,6 +1,5 @@
 #+title: Org-transclusion User Manual
 #+author: Noboru Ota 
-#+modified: 2021-12-24T193446
 #+language: en
 #+export_file_name: org-transclusion.texi
 #+texinfo_dir_category: Emacs
diff --git a/org-transclusion.el b/org-transclusion.el
index ec6a8503e1..4c05513a3b 100644
--- a/org-transclusion.el
+++ b/org-transclusion.el
@@ -17,7 +17,7 @@
 
 ;; Author: Noboru Ota 
 ;; Created: 10 Oct 2020
-;; Last modified: 24 December 2021
+;; Last modified: 25 December 2021
 
 ;; URL: https://github.com/nobiot/org-transclusion
 ;; Keywords: org-mode, transclusion, writing
@@ -325,6 +325,8 @@ and variables."
   (add-hook 'after-save-hook #'org-transclusion-after-save-buffer nil t)
   (add-hook 'kill-buffer-hook #'org-transclusion-before-kill nil t)
   (add-hook 'kill-emacs-hook #'org-transclusion-before-kill nil t)
+  (add-hook 'org-export-before-processing-hook
+#'org-transclusion-inhibit-read-only nil t) 
   (org-transclusion-yank-excluded-properties-set)
   (org-transclusion-load-extensions-maybe))
 
@@ -337,6 +339,8 @@ This function also removes all the transclusions in the 
current buffer."
   (remove-hook 'after-save-hook #'org-transclusion-after-save-buffer t)
   (remove-hook 'kill-buffer-hook #'org-transclusion-before-kill t)
   (remove-hook 'kill-emacs-hook #'org-transclusion-before-kill t)
+  (remove-hook 'org-export-before-processing-hook
+   #'org-transclusion-inhibit-read-only nil t)
   (org-transclusion-yank-excluded-properties-remove))
 
 ;;;###autoload
@@ -1695,6 +1699,17 @@ When DEMOTE is non-nil, demote."
 (org-transclusion-promote-adjust-after)))
 (goto-char pos)
 
+;;-
+ Functions to support Org-export
+
+(defun org-transclusion-inhibit-read-only (&rest _args)
+  "Set `inhibit-read-only' to t for Org export functions.
+Org export may need the buffer not to contain read-only elements.
+This function is meant to be added to
+`org-export-before-processing-hook' to temporarily inhibit
+read-only."
+  (setq-local inhibit-read-only t))
+
 ;;-
  Functions for extensions
 ;;   It's based on `org-modules'

[elpa] externals/org-transclusion 1cc9738f82: intrnl: ELPA should ignore .dir-local

[ELPA Syncer]

branch: externals/org-transclusion
commit 1cc9738f828cfcfdc806a0bcd60c0d2df6381425
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: ELPA should ignore .dir-local
---
 .dir-local.el | 2 --
 .elpaignore   | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.dir-local.el b/.dir-local.el
index 50813194ab..e523a131a7 100644
--- a/.dir-local.el
+++ b/.dir-local.el
@@ -1,5 +1,3 @@
-;; Copyright (C) 2021  Free Software Foundation, Inc.
-
 ((emacs-lisp-mode
   (fill-column . 80)
   (indent-tabs-mode . nil)))
diff --git a/.elpaignore b/.elpaignore
index 6599e1e20a..63f6881593 100644
--- a/.elpaignore
+++ b/.elpaignore
@@ -3,4 +3,5 @@ docs
 resources
 Makefile
 .gitignore
-text-clone-docs
\ No newline at end of file
+text-clone-docs
+.dir-local.el
\ No newline at end of file

[elpa] externals/org-transclusion 5a5a94ebee: intrnl:add time-stamps vars to .dir-locals.el

[ELPA Syncer]

branch: externals/org-transclusion
commit 5a5a94ebeed1cc5f224fa2a764d4d844d55aa783
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl:add time-stamps vars to .dir-locals.el

File name needs to be "locals" -- corrected
---
 .dir-local.el  |  3 ---
 .dir-locals.el | 11 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.dir-local.el b/.dir-local.el
deleted file mode 100644
index e523a131a7..00
--- a/.dir-local.el
+++ /dev/null
@@ -1,3 +0,0 @@
-((emacs-lisp-mode
-  (fill-column . 80)
-  (indent-tabs-mode . nil)))
diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00..ec46ede242
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,11 @@
+((emacs-lisp-mode
+  (fill-column . 80)
+  (indent-tabs-mode . nil)
+  (time-stamp-format . "%02d %:B %Y")
+  (time-stamp-start . "modified:[   ]+?")
+  (time-stamp-end . "$")
+  ;; "Last modified in source code files are at line 20"
+  (time-stamp-line-limit . 20)
+  ;; Need this locale to be "C" or "en_US.UTF-8" or something to standardize 
the
+  ;; time stamp with English
+  (system-time-locale . "C")))

[elpa] externals/mct 91199f8ee9: Add custom code docs: the case of the rde project

[ELPA Syncer]

branch: externals/mct
commit 91199f8ee9bc58803b3d10a40fd463a689d67a50
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Add custom code docs: the case of the rde project
---
 README.org | 78 ++
 1 file changed, 78 insertions(+)

diff --git a/README.org b/README.org
index 9dc71262da..5c8ef67e56 100644
--- a/README.org
+++ b/README.org
@@ -538,6 +538,84 @@ If you want to edit any key bindings, do it in these 
keymaps, not in
 those they extend and override (the names of the original ones are the
 same as above, minus the =mct-= prefix).
 
+* User-level tweaks or custom code
+:PROPERTIES:
+:CUSTOM_ID: h:2630a7a3-1b11-4e9d-8282-0ea3bf9e2a5b
+:END:
+#+cindex: Custom tweaks or extensions
+
+In this section we cover custom code that builds on what MCT offers.
+
+** MCT in the current or the other window
+:PROPERTIES:
+:CUSTOM_ID: h:891c7841-9cdc-42df-bba9-45f7409b807c
+:END:
+
+Over at the [[https://git.sr.ht/~abcdw/rde][rde project]], Andrew Tropin 
configures MCT to display the
+Completions' buffer in either of two places:
+
++ Current window ::  This is the default behaviour.  It means that
+  completions are presented where the user is already focused on,
+  instead of the bottom of the display or some side window.
+
++ Other window :: The least recently used window when the command that
+  performs completion matches certain categories whose candidates are
+  best shown next to the current window/context.  For example, Imenu
+  (and extensions like ~consult-imenu~) creates a dynamically generated
+  index of "points of interest" in the current buffer, so it is useful
+  to have this displayed in the other window.
+
+Implementation details and particular preferences aside, this is a great
+example of using the various ~display-buffer~ functions to control the
+placement of the =*Completions*= buffer.
+
+#+begin_src emacs-lisp
+(defvar rde-completion-categories-other-window
+  '(imenu)
+  "Completion categories that has to be in other window than
+current, otherwise preview functionallity will fail the party.")
+
+(defvar rde-completion-categories-not-show-candidates-on-setup
+  '(command variable function)
+  "Completion categories that has to be in other window than
+current, otherwise preview functionallity will fail the party.")
+
+(defun rde-display-mct-buffer-pop-up-if-apropriate (buffer alist)
+  "Call `display-buffer-pop-up-window' if the completion category
+one of `rde-completion-categories-other-window', it will make
+sure that we don't use same window for completions, which should
+be in separate window."
+  (if (memq (mct--completion-category)
+rde-completion-categories-other-window)
+  (display-buffer-pop-up-window buffer alist)
+nil))
+
+(defun rde-display-mct-buffer-apropriate-window (buffer alist)
+  "Displays completion buffer in the same window, where completion
+was initiated (most recent one), but in case, when compeltion
+buffer should be displayed in other window use least recent one."
+  (let* ((window (if (memq (mct--completion-category)
+   rde-completion-categories-other-window)
+ (get-lru-window (selected-frame) nil nil)
+   (get-mru-window (selected-frame) nil nil
+(window--display-buffer buffer window 'reuse alist)))
+
+(setq mct-display-buffer-action
+  (quote ((display-buffer-reuse-window
+   rde-display-mct-buffer-pop-up-if-apropriate
+   rde-display-mct-buffer-apropriate-window
+
+(defun rde-mct-show-completions ()
+  "Instantly shows completion candidates for categories listed in
+`rde-completion-categories-show-candidates-on-setup'."
+  (unless (memq (mct--completion-category)
+rde-completion-categories-not-show-candidates-on-setup)
+(setq-local mct-minimum-input 0)
+(mct--live-completions)))
+
+(add-hook 'minibuffer-setup-hook 'rde-mct-show-completions)
+#+end_src
+
 * Extensions
 :PROPERTIES:
 :CUSTOM_ID: h:03227254-d467-4147-b8cf-2fe05a2e279b

[elpa] externals/org updated (4eaf088c13 -> ecce81dace)

[ELPA Syncer]

elpasync pushed a change to branch externals/org.

  from  4eaf088c13 Merge branch 'bugfix'
   new  377d6247af org-clock-timestamps-down: Fix typo in docstring
   new  ecce81dace Merge branch 'bugfix'


Summary of changes:
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[elpa] externals-release/org 377d6247af: org-clock-timestamps-down: Fix typo in docstring

[ELPA Syncer]

branch: externals-release/org
commit 377d6247afbaa0fa3fe182564234553179c2f4e2
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-clock-timestamps-down: Fix typo in docstring

Reported in 
https://lists.gnu.org/archive/html/bug-gnu-emacs/2021-12/msg01841.html
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 143ed4f123..6f83fe2bcb 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1747,7 +1747,7 @@ Optional argument N tells to change by that many units."
   (org-clock-timestamps-change 'up n))
 
 (defun org-clock-timestamps-down (&optional n)
-  "Increase CLOCK timestamps at cursor.
+  "Decrease CLOCK timestamps at cursor.
 Optional argument N tells to change by that many units."
   (interactive "P")
   (org-clock-timestamps-change 'down n))

[elpa] externals/org ecce81dace: Merge branch 'bugfix'

[ELPA Syncer]

branch: externals/org
commit ecce81dace7afa8f12740778eb24bc4bc0af41c1
Merge: 4eaf088c13 377d6247af
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Merge branch 'bugfix'
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index e6c7568a65..771f8c0c52 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1750,7 +1750,7 @@ Optional argument N tells to change by that many units."
   (org-clock-timestamps-change 'up n))
 
 (defun org-clock-timestamps-down (&optional n)
-  "Increase CLOCK timestamps at cursor.
+  "Decrease CLOCK timestamps at cursor.
 Optional argument N tells to change by that many units."
   (interactive "P")
   (org-clock-timestamps-change 'down n))

[elpa] externals/org-transclusion 86ff2eaf19: intrnl: update .dir-locals.el to cover org mode

[ELPA Syncer]

branch: externals/org-transclusion
commit 86ff2eaf197f974c50d179deedba3076e339d472
Author: Noboru Ota 
Commit: Noboru Ota 

intrnl: update .dir-locals.el to cover org mode
---
 .dir-locals.el | 9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/.dir-locals.el b/.dir-locals.el
index ec46ede242..349f1363c1 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,6 +1,4 @@
-((emacs-lisp-mode
-  (fill-column . 80)
-  (indent-tabs-mode . nil)
+((nil
   (time-stamp-format . "%02d %:B %Y")
   (time-stamp-start . "modified:[   ]+?")
   (time-stamp-end . "$")
@@ -8,4 +6,7 @@
   (time-stamp-line-limit . 20)
   ;; Need this locale to be "C" or "en_US.UTF-8" or something to standardize 
the
   ;; time stamp with English
-  (system-time-locale . "C")))
+  (system-time-locale . "C"))
+ (emacs-lisp-mode
+  (fill-column . 80)
+  (indent-tabs-mode . nil)))

[elpa] externals/org d012350dad: org-persist: Report read/write duration

[ELPA Syncer]

branch: externals/org
commit d012350dadf15835e361626ba0a6ec08f8c7a715
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

org-persist: Report read/write duration

* lisp/org-persist.el (org-persist--report-time): New variable
controlling time reporting.  The default value is to report if
read/write opeartion takes over 0.5 sec.
(org-persist-write):
(org-persist-read): Display message about read/write duration for each
variable according to `org-persist--report-time'.
---
 lisp/org-persist.el | 42 ++
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/lisp/org-persist.el b/lisp/org-persist.el
index 80bbf7b058..4994625c88 100644
--- a/lisp/org-persist.el
+++ b/lisp/org-persist.el
@@ -88,6 +88,16 @@ a data variable.  Each plist contains the following 
properties:
   - `:inode':  buffer file inode, if any
   - `:hash':   buffer hash, if any")
 
+(defvar org-persist--report-time 0.5
+  "Whether to report read/write time.
+
+When the value is a number, it is a threshold number of seconds.  If
+the read/write time of a single variable exceeds the threashold, a
+message is displayed.
+
+When the value is a non-nil non-number, always display the message.
+When the value is nil, never diplay the message.")
+
 (defun org-persist--get-index (var &optional buffer)
   "Return plist used to store VAR in BUFFER.
 When BUFFER is nil, return plist for global VAR."
@@ -183,7 +193,8 @@ When BUFFER is `all', unregister VAR in all buffers."
   (unless (and buffer (not (get-buffer buffer)))
 (unless (listp var) (setq var (list var)))
 (with-current-buffer (or buffer (current-buffer))
-  (let ((index (org-persist--get-index var buffer)))
+  (let ((index (org-persist--get-index var buffer))
+(start-time (float-time)))
 (setf index (plist-put index :hash (when buffer (secure-hash 'md5 
buffer
 (let ((print-circle t)
   print-level
@@ -218,7 +229,18 @@ When BUFFER is `all', unregister VAR in all buffers."
 (unless (file-exists-p (file-name-directory file))
   (make-directory (file-name-directory file) t))
 (with-temp-file file
-  (prin1 data (current-buffer)))
+  (prin1 data (current-buffer)))
+(let ((duration (- (float-time) start-time)))
+  (when (or (and org-persist--report-time
+ (numberp org-persist--report-time)
+ (>= duration org-persist--report-time))
+(and org-persist--report-time
+ (not (numberp org-persist--report-time
+(if buffer
+(message "org-persist: Writing %S from %S took %.2f 
sec"
+ var buffer duration)
+  (message "org-persist: Writing %S took %.2f sec"
+   var duration
 
 (defun org-persist-write-all (&optional buffer)
   "Save all the persistent data."
@@ -244,7 +266,8 @@ When BUFFER is `all', unregister VAR in all buffers."
   "Restore VAR data in BUFFER."
   (let* ((index (org-persist--get-index var buffer))
  (persist-file (org-file-name-concat org-persist-directory (plist-get 
index :persist-file)))
- (data nil))
+ (data nil)
+ (start-time (float-time)))
 (when (and index
(file-exists-p persist-file)
(or (not buffer)
@@ -275,7 +298,18 @@ When BUFFER is `all', unregister VAR in all buffers."
do
(when (alist-get var1 data)
  (setf (symbol-value var1) (alist-get var1 data)))
-   (run-hook-with-args 'org-persist-after-read-hook var1 
buffer)))
+   (run-hook-with-args 'org-persist-after-read-hook var1 
buffer)))
+(let ((duration (- (float-time) start-time)))
+  (when (or (and org-persist--report-time
+ (numberp org-persist--report-time)
+ (>= duration org-persist--report-time))
+(and org-persist--report-time
+ (not (numberp org-persist--report-time
+(if buffer
+(message "org-persist: Reading %S from %S took %.2f sec"
+ var buffer duration)
+  (message "org-persist: Reading %S took %.2f sec"
+   var duration
 
 (defun org-persist-read-all (&optional buffer)
   "Restore all the persistent data in BUFFER."

[elpa] externals/pyim 0223242fac 1/4: Add pyim-tests-make-temp-file.

[ELPA Syncer]

branch: externals/pyim
commit 0223242fac2e090fa6579a2d83085413d39a7ae5
Author: Feng Shu 
Commit: Feng Shu 

Add pyim-tests-make-temp-file.

* tests/pyim-tests.el (pyim-tests-make-temp-file): New function.
(pyim-dcache-directory, pyim-tests-pyim-import-words-and-counts)
(pyim-tests-pyim-dcache-save/read-variable-value)
(pyim-tests-pyim-dcache-handle-variable)
(pyim-tests-pyim-dcache-export)
(pyim-tests-pyim-dhashcache-generate-file)
(pyim-tests-pyim-dhashcache-export): Use pyim-tests-make-temp-file.
---
 tests/pyim-tests.el | 31 ---
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 328752770a..6795847450 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -35,12 +35,14 @@
 (require 'pyim-dregcache)
 (require 'pyim-dhashcache)
 
+(defun pyim-tests-make-temp-file (&optional dir-flag)
+  (make-temp-file "pyim-tests-temp-" dir-flag))
+
 (setq default-input-method "pyim")
 (setq pyim-dicts nil)
 (setq pyim-extra-dicts nil)
 ;; 设置 pyim-dcache-directory, 防止用户个人词库不小心被覆盖掉。
-(setq pyim-dcache-directory
-  (file-name-as-directory (make-temp-name "pyim-tests-dcache-")))
+(setq pyim-dcache-directory (pyim-tests-make-temp-file t))
 ;; 做测试的时候不保存词库，防止因为误操作导致个人词库损坏。
 (defalias 'pyim-kill-emacs-hook-function #'ignore)
 
@@ -567,9 +569,8 @@
 (ert-deftest pyim-tests-pyim-import-words-and-counts ()
   ;; 这个测试目前主要用于手工测试，在 github 上这个测试无法通过的。
   (when (not noninteractive)
-(let ((pyim-dcache-directory
-   (file-name-as-directory (make-temp-name "pyim-tests-dcache-")))
-  (file (make-temp-file "pyim-tests-import")))
+(let ((pyim-dcache-directory (pyim-tests-make-temp-file t))
+  (file (pyim-tests-make-temp-file)))
   ;; 删除测试用词条
   (dolist (x '("测㤅" "测嘊" "测伌"))
 (pyim-process-delete-word x))
@@ -598,7 +599,7 @@
 
 ;; ** pyim-dcache 相关单元测试
 (ert-deftest pyim-tests-pyim-dcache-save/read-variable-value ()
-  (let* ((file (make-temp-file "pyim-tests-dcache-"))
+  (let* ((file (pyim-tests-make-temp-file))
  (backup-file (concat file "-backup-" (format-time-string 
"%Y%m%d%H%M%S")))
  (value (make-hash-table :test #'equal)))
 (puthash "ni-hao" (list "你好") value)
@@ -612,8 +613,7 @@
'("你好")
 
 (ert-deftest pyim-tests-pyim-dcache-handle-variable ()
-  (let ((pyim-dcache-directory
- (file-name-as-directory (make-temp-name "pyim-tests-dcache-")))
+  (let ((pyim-dcache-directory (pyim-tests-make-temp-file t))
 my/test:1)
 
 (pyim-dcache-save-variable 'my/test:1 "hello")
@@ -634,7 +634,7 @@
 (ert-deftest pyim-tests-pyim-dcache-export ()
   (let ((pyim-dhashcache-iword2count (make-hash-table :test #'equal))
 (pyim-dhashcache-icode2word (make-hash-table :test #'equal))
-(file (make-temp-file "pyim-tests-dcache-export-")))
+(file (pyim-tests-make-temp-file)))
 (puthash "你好" 10 pyim-dhashcache-iword2count)
 (puthash "尼耗" 1 pyim-dhashcache-iword2count)
 (puthash "ni-hao" (list "你好" "尼耗") pyim-dhashcache-icode2word)
@@ -670,14 +670,15 @@ ni-hao 你好 尼耗
   (should (equal (pyim-dhashcache-get-ishortcodes "") nil)))
 
 (ert-deftest pyim-tests-pyim-dhashcache-get-path ()
-  (let ((pyim-dcache-directory "/tmp/dcache"))
-(should (equal (pyim-dhashcache-get-path 'hello) "/tmp/dcache/hello"))
+  (let* ((dir (pyim-tests-make-temp-file t))
+ (pyim-dcache-directory dir))
+(should (equal (pyim-dhashcache-get-path 'hello) (expand-file-name "hello" 
dir)))
 (should (equal (pyim-dhashcache-get-path "hello") nil
 
 (ert-deftest pyim-tests-pyim-dhashcache-generate-file ()
-  (let ((dist-file (make-temp-file "pyim-dist-"))
-(dcache-file (make-temp-file "pyim-tests-dcache-"))
-(word2code-dcache-file (make-temp-file "pyim-word2code-dcache-"))
+  (let ((dist-file (pyim-tests-make-temp-file))
+(dcache-file (pyim-tests-make-temp-file))
+(word2code-dcache-file (pyim-tests-make-temp-file))
 output1 output2)
 (with-temp-buffer
   (insert ";; -*- coding: utf-8 -*--
@@ -775,7 +776,7 @@ zuo-zuo-you-mang 作作有芒")
 (should (equal (gethash "你好" pyim-dhashcache-iword2count) 20
 
 (ert-deftest pyim-tests-pyim-dhashcache-export ()
-  (let ((file (make-temp-file "pyim-tests-dcache-"))
+  (let ((file (pyim-tests-make-temp-file))
 (icode2word (make-hash-table :test #'equal)))
 (puthash "yin-xing"
  (list (propertize "银行" :noexport t)

[elpa] externals/pyim updated (571de3af18 -> 23b4e9e820)

[ELPA Syncer]

elpasync pushed a change to branch externals/pyim.

  from  571de3af18 再次简化 test
   new  0223242fac Add pyim-tests-make-temp-file.
   new  4d584ee28a * tests/pyim-tests.el (pyim-tests-noninteractive-init): 
New function.
   new  80380401eb * tests/Makefile (clean, test): Remove pyim-tests-temp-*
   new  23b4e9e820 Update .gitignore


Summary of changes:
 .gitignore  |  2 +-
 tests/Makefile  |  4 ++--
 tests/pyim-tests.el | 53 +
 3 files changed, 32 insertions(+), 27 deletions(-)

[elpa] externals/pyim 23b4e9e820 4/4: Update .gitignore

[ELPA Syncer]

branch: externals/pyim
commit 23b4e9e820fbfd30e0a6724b8c349f6c0828c6cf
Author: Feng Shu 
Commit: Feng Shu 

Update .gitignore
---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 99aa775db0..b9578db745 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,6 @@
 *.elc
 /pyim-autoloads.el
 /pyim-pkg.el
-/tests/pyim-tests-dcache-*
+/tests/pyim-tests-temp-*
 /tests/deps/
 

[elpa] externals/pyim 4d584ee28a 2/4: * tests/pyim-tests.el (pyim-tests-noninteractive-init): New function.

[ELPA Syncer]

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

* tests/pyim-tests.el (pyim-tests-noninteractive-init): New function.
---
 tests/pyim-tests.el | 24 ++--
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/tests/pyim-tests.el b/tests/pyim-tests.el
index 6795847450..1a9652332e 100644
--- a/tests/pyim-tests.el
+++ b/tests/pyim-tests.el
@@ -38,16 +38,20 @@
 (defun pyim-tests-make-temp-file (&optional dir-flag)
   (make-temp-file "pyim-tests-temp-" dir-flag))
 
-(setq default-input-method "pyim")
-(setq pyim-dicts nil)
-(setq pyim-extra-dicts nil)
-;; 设置 pyim-dcache-directory, 防止用户个人词库不小心被覆盖掉。
-(setq pyim-dcache-directory (pyim-tests-make-temp-file t))
-;; 做测试的时候不保存词库，防止因为误操作导致个人词库损坏。
-(defalias 'pyim-kill-emacs-hook-function #'ignore)
-
-(pyim-basedict-enable)
-(pyim-dcache-init-variables)
+(defun pyim-tests-noninteractive-init ()
+  (setq default-input-method "pyim")
+  (setq pyim-dicts nil)
+  (setq pyim-extra-dicts nil)
+  ;; 设置 pyim-dcache-directory, 防止用户个人词库不小心被覆盖掉。
+  (setq pyim-dcache-directory (pyim-tests-make-temp-file t))
+  ;; 做测试的时候不保存词库，防止因为误操作导致个人词库损坏。
+  (defalias 'pyim-kill-emacs-hook-function #'ignore)
+
+  (pyim-basedict-enable)
+  (pyim-dcache-init-variables))
+
+(when noninteractive
+  (pyim-tests-noninteractive-init))
 
 ;; ** pyim-schemes 相关单元测试
 (ert-deftest pyim-tests-pyim-schemes ()

[elpa] externals/pyim 80380401eb 3/4: * tests/Makefile (clean, test): Remove pyim-tests-temp-*

[ELPA Syncer]

branch: externals/pyim
commit 80380401eb4593f84085bcfb2610b84029d9e298
Author: Feng Shu 
Commit: Feng Shu 

* tests/Makefile (clean, test): Remove pyim-tests-temp-*
---
 tests/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 13e7966f81..d022834cf7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -3,7 +3,7 @@ SHELL = /bin/sh
 EMACS ?= emacs
 
 clean:
-   @rm -rf pyim-tests-dcache-*
+   @rm -rf pyim-tests-temp-*
 
 .PHONY: deps
 deps:
@@ -17,4 +17,4 @@ deps:
 .PHONY: test
 test: deps clean
@$(EMACS) --batch --quick --directory .. --directory ./deps --load 
./pyim-tests.el
-   @rm -rf pyim-tests-dcache-*
+   @rm -rf pyim-tests-temp-*

[elpa] externals/transient 459e28e28a 03/11: Add lisp-imenu-generic-expression entry

[Jonas Bernoulli]

branch: externals/transient
commit 459e28e28a5f29e4dd59c7d61ec8557ce9b57ef3
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

Add lisp-imenu-generic-expression entry

Closes #178.
---
 lisp/transient.el | 13 +
 1 file changed, 13 insertions(+)

diff --git a/lisp/transient.el b/lisp/transient.el
index 0305418dea..5a41ac55e4 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -3638,6 +3638,19 @@ search instead."
 
  Miscellaneous
 
+(with-eval-after-load 'lisp-mode
+  (cl-pushnew (list nil (concat "^\\s-*("
+(eval-when-compile
+ (regexp-opt
+  '("transient-define-prefix"
+ "transient-define-suffix"
+ "transient-define-infix"
+ "transient-define-argument")
+   t))
+   "\\s-+\\(" lisp-mode-symbol-regexp "\\)")
+   2)
+  lisp-imenu-generic-expression :test #'equal))
+
 (declare-function which-key-mode "which-key" (&optional arg))
 
 (defun transient--suspend-which-key-mode ()

[elpa] externals/transient 61af234d41 06/11: make: Update stats target

[Jonas Bernoulli]

branch: externals/transient
commit 61af234d41cacfd17360bbfd87def40f3fc09051
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Update stats target
---
 default.mk| 3 ++-
 docs/Makefile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/default.mk b/default.mk
index 6977ea0a27..89ba6fa17d 100644
--- a/default.mk
+++ b/default.mk
@@ -24,4 +24,5 @@ INSTALL_INFO ?= $(shell command -v ginstall-info || 
printf install-info)
 MAKEINFO ?= makeinfo
 MANUAL_HTML_ARGS ?= --css-ref /assets/page.css
 
-STATS_DIR ?= $(TOP)docs/stats
+GITSTATS_DIR  ?= $(TOP)docs/stats
+GITSTATS_ARGS ?= -c style=https://magit.vc/assets/stats.css -c max_authors=999
diff --git a/docs/Makefile b/docs/Makefile
index f94aeea658..0cda1fdd0d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -63,7 +63,7 @@ html-dir: $(PKG).texi
 .PHONY: stats
 stats:
@printf "Generating statistics\n"
-   @gitstats -c style=https://magit.vc/assets/stats.css -c max_authors=999 
$(TOP) $(STATS_DIR)
+   @gitstats $(GITSTATS_ARGS) $(TOP) $(GITSTATS_DIR)
 
 DOMAIN ?= magit.vc
 PUBLISH_PATH   ?= /manual/

[elpa] externals/transient 0695b617cc 02/11: manual: No longer use dissolvable sections

[Jonas Bernoulli]

branch: externals/transient
commit 0695b617cce701449c167a6ec9cb27eccadeec47
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: No longer use dissolvable sections

These sections existed because I am not fully happy with how
`org-cycle' works, which I should deal with by patching that
function or writing a substitute.
---
 docs/transient.org | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/docs/transient.org b/docs/transient.org
index f321ef80fb..04aedc739d 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -770,7 +770,6 @@ that is used to invoke that transient.
   the branch whose variables are being configured.
 
 ** Binding Suffix and Infix Commands
-*** _
 
 The macro ~transient-define-prefix~ is used to define a transient.
 This defines the actual transient prefix command (see [[*Defining
@@ -1104,7 +1103,6 @@ function, which for infix arguments serves about the same 
purpose as
   returned value is a symbol, the transient prefix command.
 
 ** Transient State
-*** _
 
 Invoking a transient prefix command "activates" the respective
 transient, i.e. it puts a transient keymap into effect, which binds
@@ -1257,7 +1255,6 @@ slot.
   This is used when the user pressed ~C-z~.
 
 * Classes and Methods
-** _
 
 Transient uses classes and generic functions to make it possible to
 define new types of suffix commands that are similar to existing
@@ -1433,7 +1430,6 @@ classes will likely get generalized and added to 
Transient.  For now
 they are very much subject to change and not documented.
 
 ** Suffix Methods
-*** _
 
 To get information about the methods implementing these generic
 functions use ~describe-function~.
@@ -2146,7 +2142,7 @@ necessary changes.  See its doc string for more 
information.
 :INDEX:  vr
 :END:
 
-* _ Copying
+* Copying
 :PROPERTIES:
 :COPYING:t
 :END:
@@ -2177,7 +2173,6 @@ General Public License for more details.
 # IMPORTANT: Also update ORG_ARGS and ORG_EVAL in the Makefile.
 # Local Variables:
 # eval: (require 'ox-texinfo+ nil t)
-# org-texinfo+-dissolve-noexport-headlines: t
 # indent-tabs-mode: nil
 # org-src-preserve-indentation: nil
 # End:

[elpa] externals/transient abbe17560c 10/11: manual: Move common settings to .orgconfig

[Jonas Bernoulli]

branch: externals/transient
commit abbe17560cd175bb83f06d23763868481e5bb78f
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Move common settings to .orgconfig
---
 docs/.orgconfig| 10 ++
 docs/transient.org |  7 +--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/.orgconfig b/docs/.orgconfig
new file mode 100644
index 00..8919537a19
--- /dev/null
+++ b/docs/.orgconfig
@@ -0,0 +1,10 @@
+# -*- mode:org -*-
+
+#+options: H:4 num:4 toc:2
+#+property: header-args :eval never
+
+#+texinfo_deffn: t
+#+macro: year (eval (format-time-string "%Y"))
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+
+#+language: en
diff --git a/docs/transient.org b/docs/transient.org
index 319768c8db..c92122c004 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -3,18 +3,13 @@
 #+author: Jonas Bernoulli
 #+email: jo...@bernoul.li
 #+date: 2018-{{{year}}}
-#+language: en
 
 #+texinfo_dir_category: Emacs
 #+texinfo_dir_title: Transient: (transient).
 #+texinfo_dir_desc: Transient Commands
 #+subtitle: for version {{{version}}}
 
-#+texinfo_deffn: t
-#+options: H:4 num:4 toc:2
-#+property: header-args :eval never
-#+macro: version (eval (ox-texinfo+-get-version 'mixed))
-#+macro: year (eval (format-time-string "%Y"))
+#+setupfile: .orgconfig
 
 Taking inspiration from prefix keys and prefix arguments, Transient
 implements a similar abstraction involving a prefix command, infix

[elpa] externals/transient c26cbac574 08/11: transient-{init, set}-value: Use case-sensitive matching

[Jonas Bernoulli]

branch: externals/transient
commit c26cbac57429d958ee939765da25553b26b7410f
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

transient-{init,set}-value: Use case-sensitive matching

Closes #181.
---
 lisp/transient.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lisp/transient.el b/lisp/transient.el
index 5a41ac55e4..bfe0da356d 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -2473,6 +2473,7 @@ Otherwise call the primary method according to object's 
class."
   (argument (and (slot-boundp obj 'argument)
  (oref obj argument)))
   (multi-value (oref obj multi-value))
+  (case-fold-search nil)
   (regexp (if (slot-exists-p obj 'argument-regexp)
   (oref obj argument-regexp)
 (format "\\`%s\\(.*\\)" (oref obj argument)
@@ -2822,7 +2823,8 @@ a string, using the empty string for the empty value, or 
nil if
 the option does not appear in ARGS."
   (if (string-match-p "=\\'" arg)
   (save-match-data
-(when-let ((match (let ((re (format "\\`%s\\(?:=\\(.+\\)\\)?\\'"
+(when-let ((match (let ((case-fold-search nil)
+(re (format "\\`%s\\(?:=\\(.+\\)\\)?\\'"
 (substring arg 0 -1
 (cl-find-if (lambda (a)
   (and (stringp a)

[elpa] externals/transient 4e8aa09b3f 01/11: transient-define-infix: Fix documentation

[Jonas Bernoulli]

branch: externals/transient
commit 4e8aa09b3f9b909e85269eb5051b5801a07c
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

transient-define-infix: Fix documentation

Closes #175.
---
 docs/transient.org  | 4 ++--
 docs/transient.texi | 8 
 lisp/transient.el   | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/transient.org b/docs/transient.org
index 675dc805d0..f321ef80fb 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -1029,8 +1029,8 @@ suffixes".
   methods are different for different infix command classes.  In rare
   cases the above command function might not be suitable, even if you
   define your own infix command class.  In that case you have to use
-  ~transient-suffix-command~ to define the infix command and use ~t~ as
-  the value of the ~:transient~ keyword.
+  ~transient-define-suffix~ to define the infix command and use ~t~ as the
+  value of the ~:transient~ keyword.
 
 - Macro: transient-define-argument name arglist [docstring] [keyword value]...
 
diff --git a/docs/transient.texi b/docs/transient.texi
index ae44d41aa6..3347e3be83 100644
--- a/docs/transient.texi
+++ b/docs/transient.texi
@@ -31,7 +31,7 @@ General Public License for more details.
 @finalout
 @titlepage
 @title Transient User and Developer Manual
-@subtitle for version 0.3.7 (v0.3.7-9-g667488eb+1)
+@subtitle for version 0.3.7 (v0.3.7-12-g34911615+1)
 @author Jonas Bernoulli
 @page
 @vskip 0pt plus 1filll
@@ -65,7 +65,7 @@ Calling a suffix command usually causes the transient to be 
exited
 but suffix commands can also be configured to not exit the transient.
 
 @noindent
-This manual is for Transient version 0.3.7 (v0.3.7-9-g667488eb+1).
+This manual is for Transient version 0.3.7 (v0.3.7-12-g34911615+1).
 
 @quotation
 Copyright (C) 2018-2021 Jonas Bernoulli 
@@ -1279,8 +1279,8 @@ Different infix commands behave differently because the 
concrete
 methods are different for different infix command classes.  In rare
 cases the above command function might not be suitable, even if you
 define your own infix command class.  In that case you have to use
-@code{transient-suffix-command} to define the infix command and use @code{t} as
-the value of the @code{:transient} keyword.
+@code{transient-define-suffix} to define the infix command and use @code{t} as 
the
+value of the @code{:transient} keyword.
 @end defmac
 
 @defmac transient-define-argument name arglist [docstring] [keyword 
value]@dots{}
diff --git a/lisp/transient.el b/lisp/transient.el
index f80e6afb10..0305418dea 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -911,7 +911,7 @@ functions.  Different infix commands behave differently 
because
 the concrete methods are different for different infix command
 classes.  In rare case the above command function might not be
 suitable, even if you define your own infix command class.  In
-that case you have to use `transient-suffix-command' to define
+that case you have to use `transient-define-suffix' to define
 the infix command and use t as the value of the `:transient'
 keyword.
 

[elpa] externals/transient 129c2b1685 07/11: make: Set more variables in default.mk

[Jonas Bernoulli]

branch: externals/transient
commit 129c2b1685368757ffe2b6fb2d57da4b06330968
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Set more variables in default.mk
---
 default.mk| 3 +++
 docs/Makefile | 4 
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/default.mk b/default.mk
index 89ba6fa17d..08d3d74a88 100644
--- a/default.mk
+++ b/default.mk
@@ -7,6 +7,9 @@ ELCS  = $(ELS:.el=.elc)
 
 DEPS  =
 
+DOMAIN  ?= magit.vc
+CFRONT_DIST ?= E2LUHBKU1FBV02
+
 VERSION ?= $(shell test -e $(TOP).git && git describe --tags --abbrev=0 | cut 
-c2-)
 
 EMACS  ?= emacs
diff --git a/docs/Makefile b/docs/Makefile
index 0cda1fdd0d..4ac8df4ae9 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -65,15 +65,11 @@ stats:
@printf "Generating statistics\n"
@gitstats $(GITSTATS_ARGS) $(TOP) $(GITSTATS_DIR)
 
-DOMAIN ?= magit.vc
 PUBLISH_PATH   ?= /manual/
 RELEASE_PATH   ?= /manual/$(VERSION)/
-
 S3_BUCKET  ?= s3://$(DOMAIN)
 PUBLISH_TARGET  = $(S3_BUCKET)$(PUBLISH_PATH)
 RELEASE_TARGET  = $(S3_BUCKET)$(RELEASE_PATH)
-
-CFRONT_DIST?= E2LUHBKU1FBV02
 CFRONT_PATHS= $(PKG).html $(PKG).pdf $(PKG)/*
 
 comma := ,

[elpa] externals/transient daa22e7632 09/11: manual: Downcase keywords

[Jonas Bernoulli]

branch: externals/transient
commit daa22e7632e90b44513d1babc83e159b0b32e8a8
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Downcase keywords
---
 docs/transient.org | 82 +++---
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/docs/transient.org b/docs/transient.org
index 04aedc739d..319768c8db 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -1,20 +1,20 @@
-#+TITLE: Transient User and Developer Manual
+#+title: Transient User and Developer Manual
 :PREAMBLE:
-#+AUTHOR: Jonas Bernoulli
-#+EMAIL: jo...@bernoul.li
-#+DATE: 2018-{{{year}}}
-#+LANGUAGE: en
-
-#+TEXINFO_DIR_CATEGORY: Emacs
-#+TEXINFO_DIR_TITLE: Transient: (transient).
-#+TEXINFO_DIR_DESC: Transient Commands
-#+SUBTITLE: for version {{{version}}}
-
-#+TEXINFO_DEFFN: t
-#+OPTIONS: H:4 num:4 toc:2
-#+PROPERTY: header-args :eval never
-#+MACRO: version (eval (ox-texinfo+-get-version 'mixed))
-#+MACRO: year (eval (format-time-string "%Y"))
+#+author: Jonas Bernoulli
+#+email: jo...@bernoul.li
+#+date: 2018-{{{year}}}
+#+language: en
+
+#+texinfo_dir_category: Emacs
+#+texinfo_dir_title: Transient: (transient).
+#+texinfo_dir_desc: Transient Commands
+#+subtitle: for version {{{version}}}
+
+#+texinfo_deffn: t
+#+options: H:4 num:4 toc:2
+#+property: header-args :eval never
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+#+macro: year (eval (format-time-string "%Y"))
 
 Taking inspiration from prefix keys and prefix arguments, Transient
 implements a similar abstraction involving a prefix command, infix
@@ -36,10 +36,10 @@ reading a new value in the minibuffer.
 Calling a suffix command usually causes the transient to be exited
 but suffix commands can also be configured to not exit the transient.
 
-#+TEXINFO: @noindent
+#+texinfo: @noindent
 This manual is for Transient version {{{version}}}.
 
-#+BEGIN_QUOTE
+#+begin_quote
 Copyright (C) 2018-{{{year}}} Jonas Bernoulli 
 
 You can redistribute this document and/or modify it under the terms
@@ -51,7 +51,7 @@ This document is distributed in the hope that it will be 
useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
-#+END_QUOTE
+#+end_quote
 :END:
 * Introduction
 
@@ -62,7 +62,7 @@ arguments and suffix commands.  We could call this 
abstraction a
 commands (a prefix and a suffix) we prefer to call it just a
 "transient".
 
-#+BEGIN_QUOTE
+#+begin_quote
 Transient keymaps are a feature provided by Emacs.  Transients as
 implemented by this package involve the use of transient keymaps.
 
@@ -71,7 +71,7 @@ talk about "prefix commands" in this manual, then we mean our 
own kind
 of "prefix commands", unless specified otherwise.  To avoid ambiguity
 we sometimes use the terms "transient prefix command" for our kind and
 "regular prefix command" for Emacs' kind.
-#+END_QUOTE
+#+end_quote
 
 When the user calls a transient prefix command, then a transient
 (temporary) keymap is activated, which binds the transient's infix and
@@ -106,7 +106,7 @@ arguments have been set using a command such as 
~universal-argument~.
 The information shown in the popup buffer while a transient is active
 looks a bit like this:
 
-#+BEGIN_EXAMPLE
+#+begin_example
 ,-
 |Arguments
 | -f Force (--force)
@@ -116,15 +116,15 @@ looks a bit like this:
 | t tag
 | r release
 `-
-#+END_EXAMPLE
+#+end_example
 
-#+BEGIN_QUOTE
+#+begin_quote
 This is a simplified version of ~magit-tag~.  Info manuals do not
 support images or colored text, so the above "screenshot" lacks some
 information; in practice you would be able to tell whether the
 arguments ~--force~ and ~--annotate~ are enabled or not based on their
 color.
-#+END_QUOTE
+#+end_quote
 
 Transient can be used to implement simple "command dispatchers".  The
 main benefit then is that the user can see all the available commands
@@ -800,9 +800,9 @@ brackets to do the latter.
 
 Group specifications then have this form:
 
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   [{LEVEL} {DESCRIPTION} {KEYWORD VALUE}... ELEMENT...]
-#+END_SRC
+#+end_src
 
 The LEVEL is optional and defaults to 4.  See [[*Enabling and Disabling
 Suffixes]].
@@ -895,9 +895,9 @@ suffixes".  Here it means the former.
 
 Suffix specifications have this form:
 
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   ([LEVEL] [KEY] [DESCRIPTION] COMMAND|ARGUMENT [KEYWORD VALUE]...)
-#+END_SRC
+#+end_src
 
 LEVEL, KEY and DESCRIPTION can also be specified using the KEYWORDs
 ~:level~, ~:key~ and ~:description~.  If the object that is associated with
@@ -1754,13 +1754,13 @@ The following diagrams illustrate some of the 
differences.
 
 See [[info:elisp#Prefix Keys]].
 
-#+BEGIN_EXAMPLE
+#+begin_example
 ,--> command1 --> (c)
 |
   (c)-(+)-> p

[elpa] externals/transient f4790969fe 04/11: make: Add stats target

[Jonas Bernoulli]

branch: externals/transient
commit f4790969fe9ed0084be537ed476e9292d1e92244
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Add stats target
---
 .gitignore| 1 +
 Makefile  | 4 
 default.mk| 4 
 docs/Makefile | 5 +
 4 files changed, 14 insertions(+)

diff --git a/.gitignore b/.gitignore
index 668ffb9639..3578139fdf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 /docs/*.info
 /docs/*.pdf
 /docs/dir
+/docs/stats/
 /docs/transient/
 /lisp/*.elc
 /lisp/transient-autoloads.el
diff --git a/Makefile b/Makefile
index 7f5ab43734..db38d2cdd6 100644
--- a/Makefile
+++ b/Makefile
@@ -14,6 +14,7 @@ help:
$(info make html - generate html manual file)
$(info make html-dir - generate html manual directory)
$(info make pdf  - generate pdf manual)
+   $(info make stats- generate statistics)
$(info make publish  - publish snapshot manuals)
$(info make release  - publish release manuals)
$(info make clean- remove most generated files)
@@ -40,6 +41,9 @@ html-dir:
 pdf:
@$(MAKE) -C docs pdf
 
+stats:
+   @$(MAKE) -C docs stats
+
 publish:
@$(MAKE) -C docs publish
 
diff --git a/default.mk b/default.mk
index 1d4fd17636..6977ea0a27 100644
--- a/default.mk
+++ b/default.mk
@@ -1,3 +1,5 @@
+TOP := $(dir $(lastword $(MAKEFILE_LIST)))
+
 PKG = transient
 
 ELS   = $(PKG).el
@@ -21,3 +23,5 @@ endif
 INSTALL_INFO ?= $(shell command -v ginstall-info || printf install-info)
 MAKEINFO ?= makeinfo
 MANUAL_HTML_ARGS ?= --css-ref /assets/page.css
+
+STATS_DIR ?= $(TOP)docs/stats
diff --git a/docs/Makefile b/docs/Makefile
index 86573aa253..ae2a4f5287 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -60,6 +60,11 @@ html-dir: $(PKG).texi
@printf "Generating $@\n"
@texi2pdf --clean $< > /dev/null
 
+.PHONY: stats
+stats:
+   @printf "Generating statistics\n"
+   @gitstats -c style=https://magit.vc/assets/stats.css -c max_authors=999 
$(TOP) $(STATS_DIR)
+
 DOMAIN ?= magit.vc
 PUBLISH_PATH   ?= /manual/
 RELEASE_PATH   ?= /manual/$(VERSION)/

[elpa] externals/transient updated (349116159f -> 51c50d8c82)

[Jonas Bernoulli]

tarsius pushed a change to branch externals/transient.

  from  349116159f manual: Use Org macros
   new  4e8aa09b3f transient-define-infix: Fix documentation
   new  0695b617cc manual: No longer use dissolvable sections
   new  459e28e28a Add lisp-imenu-generic-expression entry
   new  f4790969fe make: Add stats target
   new  e57d1e176b make: Cosmetics
   new  61af234d41 make: Update stats target
   new  129c2b1685 make: Set more variables in default.mk
   new  c26cbac574 transient-{init,set}-value: Use case-sensitive matching
   new  daa22e7632 manual: Downcase keywords
   new  abbe17560c manual: Move common settings to .orgconfig
   new  51c50d8c82 manual: Use updated support for definition commands


Summary of changes:
 .gitignore  |   7 +-
 Makefile|  14 ++--
 default.mk  |   9 +-
 docs/.orgconfig |  10 +++
 docs/Makefile   |  13 +--
 docs/transient.org  | 236 
 docs/transient.texi | 227 --
 lisp/Makefile   |   7 +-
 lisp/transient.el   |  19 -
 9 files changed, 201 insertions(+), 341 deletions(-)
 create mode 100644 docs/.orgconfig

[elpa] externals/transient 51c50d8c82 11/11: manual: Use updated support for definition commands

[Jonas Bernoulli]

branch: externals/transient
commit 51c50d8c828b5fac2878b651e2188ad0c6f44184
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Use updated support for definition commands

Instead of ox-texinfo+.el use the new implementation
that I expect to be merged into Org itself.
---
 default.mk  |   1 -
 docs/.orgconfig |   4 +-
 docs/Makefile   |   3 +-
 docs/transient.org  | 148 +-
 docs/transient.texi | 223 +---
 5 files changed, 109 insertions(+), 270 deletions(-)

diff --git a/default.mk b/default.mk
index 08d3d74a88..eb1a74d17c 100644
--- a/default.mk
+++ b/default.mk
@@ -20,7 +20,6 @@ LOAD_PATH  += -L .
 
 ifndef ORG_LOAD_PATH
 ORG_LOAD_PATH  = -L ../../org/lisp
-ORG_LOAD_PATH += -L ../../ox-texinfo+
 endif
 
 INSTALL_INFO ?= $(shell command -v ginstall-info || printf install-info)
diff --git a/docs/.orgconfig b/docs/.orgconfig
index 8919537a19..3a00c75840 100644
--- a/docs/.orgconfig
+++ b/docs/.orgconfig
@@ -3,8 +3,8 @@
 #+options: H:4 num:4 toc:2
 #+property: header-args :eval never
 
-#+texinfo_deffn: t
+#+macro: kbd (eval (let ((case-fold-search nil) (regexp (regexp-opt '("SPC" 
"RET" "LFD" "TAB" "BS" "ESC" "DELETE" "SHIFT" "Ctrl" "Meta" "Alt" "Cmd" "Super" 
"UP" "LEFT" "RIGHT" "DOWN") 'words))) (format 
"@@texinfo:@kbd{@@%s@@texinfo:}@@" (replace-regexp-in-string regexp 
"@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t
 #+macro: year (eval (format-time-string "%Y"))
-#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+#+macro: version (eval (or (getenv "PACKAGE-VERSION") (ignore-errors (car 
(process-lines "git" "describe" "--exact"))) (ignore-errors (concat (car 
(process-lines "git" "describe" (if (getenv "AMEND") "HEAD~" "HEAD"))) "+1"
 
 #+language: en
diff --git a/docs/Makefile b/docs/Makefile
index 4ac8df4ae9..13237ca8d9 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -7,8 +7,7 @@ info: $(PKG).info dir
 html: $(PKG).html
 pdf:  $(PKG).pdf
 
-ORG_ARGS  = --batch -Q $(ORG_LOAD_PATH) -l ox-texinfo+
-ORG_EVAL  = --eval "(setq org-texinfo+-dissolve-noexport-headlines t)"
+ORG_ARGS  = --batch -Q $(ORG_LOAD_PATH)
 ORG_EVAL += --eval "(setq indent-tabs-mode nil)"
 ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
 ORG_EVAL += --funcall org-texinfo-export-to-texinfo
diff --git a/docs/transient.org b/docs/transient.org
index c92122c004..798c27dd46 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -209,8 +209,8 @@ transient.
 the latter, then you can later resume the stack of transients using
 ~M-x transient-resume~.
 
-- Key: C-g, transient-quit-seq
-- Key: C-g, transient-quit-one
+- Key: C-g (transient-quit-seq) ::
++ Key: C-g (transient-quit-one) ::
 
   This key quits the currently active incomplete key sequence, if any,
   or else the current transient.  When quitting the current transient,
@@ -220,13 +220,13 @@ Transient's predecessor bound ~q~ instead of ~C-g~ to the 
quit command.
 To learn how to get that binding back see ~transient-bind-q-to-quit~'s
 doc string.
 
-- Key: C-q, transient-quit-all
+- Key: C-q (transient-quit-all) ::
 
   This command quits the currently active incomplete key sequence, if
   any, and all transients, including the active transient and all
   suspended transients, if any.
 
-- Key: C-z, transient-suspend
+- Key: C-z (transient-suspend) ::
 
   Like ~transient-quit-all~, this command quits an incomplete key
   sequence, if any, and all transients.  Additionally it saves the
@@ -239,7 +239,7 @@ doc string.
   If another stack is already saved, then saving a new stack discards
   the previous stack.
 
-- Key: M-x transient-resume, transient-resume
+- Key: M-x transient-resume ::
 
   This command resumes the previously suspended stack of transients,
   if any.
@@ -257,14 +257,14 @@ the section disappears again.  Note however that one of 
these commands
 is described as "Show common permanently"; invoke that if you want the
 common commands to always be shown for all transients.
 
-- Key: C-x t, transient-toggle-common
+- Key: C-x t (transient-toggle-common) ::
 
   This command toggles whether the generic commands that are common to
   all transients are always displayed or only after typing the
   incomplete prefix key sequence ~C-x~.  This only affects the current
   Emacs session.
 
-- User Option: transient-show-common-commands
+- User Option: transient-show-common-commands ::
 
   This option controls whether shared suffix commands are shown
   alongside the transient-specific infix and suffix commands.  By
@@ -297,17 +297,17 @@ suffix command, then the value is merely saved to the 
transient's
 history.  That value won't be used when the transient is next invoked
 but it is easily accessible (see [[*Using History]]).
 
-- Key: C-x s, transient-set
+- Key: C-x s (transient-set) ::
 
   This command saves the value of the active transient for this Emacs
   session.
 
-- Key: C-x C-s, transient-save
+- Key: C-x C-s (tran

[elpa] externals/transient e57d1e176b 05/11: make: Cosmetics

[Jonas Bernoulli]

branch: externals/transient
commit e57d1e176b4737421d81cc5c2d9e5354321cad2e
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

make: Cosmetics

For consistency with Makefiles of related repositories.
---
 .gitignore|  6 +++---
 Makefile  | 12 ++--
 docs/Makefile |  1 +
 lisp/Makefile |  7 +++
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3578139fdf..d39c061d3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
 /config.mk
 /docs/*.html
-/docs/*.info
 /docs/*.pdf
 /docs/dir
 /docs/stats/
-/docs/transient/
+/lisp/*-autoloads.el
 /lisp/*.elc
-/lisp/transient-autoloads.el
+
+/docs/transient/
diff --git a/Makefile b/Makefile
index db38d2cdd6..404f119c90 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,14 @@
 -include config.mk
 include default.mk
 
-.PHONY: lisp docs clean
+.PHONY: lisp docs
 
 all: lisp docs
 
 help:
$(info make all  - generate lisp and manual)
-   $(info make docs - generate most manual formats)
$(info make lisp - generate byte-code and autoloads)
+   $(info make docs - generate most manual formats)
$(info make texi - generate texi manual (see comments))
$(info make info - generate info manual)
$(info make html - generate html manual file)
@@ -25,28 +25,21 @@ lisp:
 
 docs:
@$(MAKE) -C docs docs
-
 texi: bump-version
@$(MAKE) -C docs texi
-
 info:
@$(MAKE) -C docs info
-
 html:
@$(MAKE) -C docs html
-
 html-dir:
@$(MAKE) -C docs html-dir
-
 pdf:
@$(MAKE) -C docs pdf
-
 stats:
@$(MAKE) -C docs stats
 
 publish:
@$(MAKE) -C docs publish
-
 release:
@$(MAKE) VERSION=$(VERSION) -C docs release
 
@@ -57,6 +50,5 @@ bump-version:
@sed -i -e "/Package-Version:/s|UNRELEASED|$(shell date +%F)|" 
docs/CHANGELOG
 
 clean:
-   @printf "Cleaning...\n"
@$(MAKE) -C lisp clean
@$(MAKE) -C docs clean
diff --git a/docs/Makefile b/docs/Makefile
index ae2a4f5287..f94aeea658 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -101,4 +101,5 @@ release: html html-dir pdf
 CLEAN = $(PKG).info dir $(PKG) $(PKG).html $(PKG).pdf
 
 clean:
+   @printf "Cleaning docs/*...\n"
@rm -rf $(CLEAN)
diff --git a/lisp/Makefile b/lisp/Makefile
index 280b317485..ba0c4c1992 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -7,13 +7,12 @@ loaddefs: $(PKG)-autoloads.el
 
 %.elc: %.el
@printf "Compiling $<\n"
-   @$(EMACS) -Q --batch $(EMACS_ARGS) \
-   $(LOAD_PATH) --funcall batch-byte-compile $<
+   @$(EMACS) -Q --batch $(EMACS_ARGS) $(LOAD_PATH) -f batch-byte-compile $<
 
-CLEAN  = $(ELCS) $(PKG)-autoloads.el
+CLEAN = $(ELCS) $(PKG)-autoloads.el
 
 clean:
-   @printf "Cleaning...\n"
+   @printf "Cleaning lisp/*...\n"
@rm -rf $(CLEAN)
 
 define LOADDEFS_TMPL

[nongnu] elpa/git-commit eb0d359dc5 2/3: manual: Move common settings to .orgconfig

[ELPA Syncer]

branch: elpa/git-commit
commit eb0d359dc57dd284852a723f442e149a3bb4832e
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Move common settings to .orgconfig
---
 docs/.orgconfig| 10 ++
 docs/magit-section.org |  7 +--
 docs/magit.org |  7 +--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docs/.orgconfig b/docs/.orgconfig
new file mode 100644
index 00..7e3fc15660
--- /dev/null
+++ b/docs/.orgconfig
@@ -0,0 +1,10 @@
+# -*- mode:org -*-
+
+#+options: H:4 num:3 toc:2
+#+property: header-args :eval never
+
+#+texinfo_deffn: t
+#+macro: year (eval (format-time-string "%Y"))
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+
+#+language: en
diff --git a/docs/magit-section.org b/docs/magit-section.org
index 137ede3a7e..096c4d14c5 100644
--- a/docs/magit-section.org
+++ b/docs/magit-section.org
@@ -3,18 +3,13 @@
 #+author: Jonas Bernoulli
 #+email: jo...@bernoul.li
 #+date: 2015-{{{year}}}
-#+language: en
 
 #+texinfo_dir_category: Emacs
 #+texinfo_dir_title: Magit-Section: (magit-section).
 #+texinfo_dir_desc: Use Magit sections in your own packages.
 #+subtitle: for version {{{version}}}
 
-#+texinfo_deffn: t
-#+options: H:4 num:3 toc:2
-#+property: header-args :eval never
-#+macro: version (eval (ox-texinfo+-get-version 'mixed))
-#+macro: year (eval (format-time-string "%Y"))
+#+setupfile: .orgconfig
 
 This package implements the main user interface of Magit — the
 collapsible sections that make up its buffers.  This package used
diff --git a/docs/magit.org b/docs/magit.org
index d59a69b488..e14d0a58a8 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -3,18 +3,13 @@
 #+author: Jonas Bernoulli
 #+email: jo...@bernoul.li
 #+date: 2015-{{{year}}}
-#+language: en
 
 #+texinfo_dir_category: Emacs
 #+texinfo_dir_title: Magit: (magit).
 #+texinfo_dir_desc: Using Git from Emacs with Magit.
 #+subtitle: for version {{{version}}}
 
-#+texinfo_deffn: t
-#+options: H:4 num:3 toc:2
-#+property: header-args :eval never
-#+macro: version (eval (ox-texinfo+-get-version 'mixed))
-#+macro: year (eval (format-time-string "%Y"))
+#+setupfile: .orgconfig
 
 Magit is an interface to the version control system Git, implemented
 as an Emacs package.  Magit aspires to be a complete Git porcelain.

[nongnu] elpa/git-commit updated (fa620ed3e4 -> 03f495f351)

[ELPA Syncer]

elpasync pushed a change to branch elpa/git-commit.

  from  fa620ed3e4 magit-convert-filename-for-git: Fix for Tramp in Windows
   new  5245c91a3c manual: Downcase keywords
   new  eb0d359dc5 manual: Move common settings to .orgconfig
   new  03f495f351 manual: Use updated support for definition commands


Summary of changes:
 default.mk  |1 -
 docs/.orgconfig |   10 +
 docs/Makefile   |3 +-
 docs/magit-section.org  |   65 +-
 docs/magit-section.texi |   20 +-
 docs/magit.org  | 1661 ---
 docs/magit.texi | 2516 +++
 7 files changed, 1658 insertions(+), 2618 deletions(-)
 create mode 100644 docs/.orgconfig

[nongnu] elpa/git-commit 5245c91a3c 1/3: manual: Downcase keywords

[ELPA Syncer]

branch: elpa/git-commit
commit 5245c91a3ccafffc7c3268d6c7909adac9c54189
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Downcase keywords
---
 docs/magit-section.org |  42 +-
 docs/magit.org | 216 -
 2 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/docs/magit-section.org b/docs/magit-section.org
index 682840827e..137ede3a7e 100644
--- a/docs/magit-section.org
+++ b/docs/magit-section.org
@@ -1,20 +1,20 @@
-#+TITLE: Magit-Section Developer Manual
+#+title: Magit-Section Developer Manual
 :PREAMBLE:
-#+AUTHOR: Jonas Bernoulli
-#+EMAIL: jo...@bernoul.li
-#+DATE: 2015-{{{year}}}
-#+LANGUAGE: en
-
-#+TEXINFO_DIR_CATEGORY: Emacs
-#+TEXINFO_DIR_TITLE: Magit-Section: (magit-section).
-#+TEXINFO_DIR_DESC: Use Magit sections in your own packages.
-#+SUBTITLE: for version {{{version}}}
-
-#+TEXINFO_DEFFN: t
-#+OPTIONS: H:4 num:3 toc:2
-#+PROPERTY: header-args :eval never
-#+MACRO: version (eval (ox-texinfo+-get-version 'mixed))
-#+MACRO: year (eval (format-time-string "%Y"))
+#+author: Jonas Bernoulli
+#+email: jo...@bernoul.li
+#+date: 2015-{{{year}}}
+#+language: en
+
+#+texinfo_dir_category: Emacs
+#+texinfo_dir_title: Magit-Section: (magit-section).
+#+texinfo_dir_desc: Use Magit sections in your own packages.
+#+subtitle: for version {{{version}}}
+
+#+texinfo_deffn: t
+#+options: H:4 num:3 toc:2
+#+property: header-args :eval never
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+#+macro: year (eval (format-time-string "%Y"))
 
 This package implements the main user interface of Magit — the
 collapsible sections that make up its buffers.  This package used
@@ -25,10 +25,10 @@ To learn more about the section abstraction and available 
commands and
 user options see [[info:magit#Sections]].  This manual documents how you
 can use sections in your own packages.
 
-#+TEXINFO: @noindent
+#+texinfo: @noindent
 This manual is for Magit-Section version {{{version}}}.
 
-#+BEGIN_QUOTE
+#+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli 
 
 You can redistribute this document and/or modify it under the terms
@@ -40,7 +40,7 @@ This document is distributed in the hope that it will be 
useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
-#+END_QUOTE
+#+end_quote
 :END:
 * Introduction
 
@@ -254,7 +254,7 @@ source for suitable examples before asking me for help.  
Thanks!
 :COPYING:t
 :END:
 
-#+BEGIN_QUOTE
+#+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli 
 
 You can redistribute this document and/or modify it under the terms
@@ -266,7 +266,7 @@ This document is distributed in the hope that it will be 
useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
-#+END_QUOTE
+#+end_quote
 
 #  LocalWords:  ARGS CONDITIONs EVAL Git Git's IDENT
 #  LocalWords:  LocalWords MERCHANTABILITY Magit Makefile
diff --git a/docs/magit.org b/docs/magit.org
index a0ee5e1510..d59a69b488 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -1,20 +1,20 @@
-#+TITLE: Magit User Manual
+#+title: Magit User Manual
 :PREAMBLE:
-#+AUTHOR: Jonas Bernoulli
-#+EMAIL: jo...@bernoul.li
-#+DATE: 2015-{{{year}}}
-#+LANGUAGE: en
-
-#+TEXINFO_DIR_CATEGORY: Emacs
-#+TEXINFO_DIR_TITLE: Magit: (magit).
-#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version {{{version}}}
-
-#+TEXINFO_DEFFN: t
-#+OPTIONS: H:4 num:3 toc:2
-#+PROPERTY: header-args :eval never
-#+MACRO: version (eval (ox-texinfo+-get-version 'mixed))
-#+MACRO: year (eval (format-time-string "%Y"))
+#+author: Jonas Bernoulli
+#+email: jo...@bernoul.li
+#+date: 2015-{{{year}}}
+#+language: en
+
+#+texinfo_dir_category: Emacs
+#+texinfo_dir_title: Magit: (magit).
+#+texinfo_dir_desc: Using Git from Emacs with Magit.
+#+subtitle: for version {{{version}}}
+
+#+texinfo_deffn: t
+#+options: H:4 num:3 toc:2
+#+property: header-args :eval never
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+#+macro: year (eval (format-time-string "%Y"))
 
 Magit is an interface to the version control system Git, implemented
 as an Emacs package.  Magit aspires to be a complete Git porcelain.
@@ -24,10 +24,10 @@ Git users to perform almost all of their daily version 
control tasks
 directly from within Emacs.  While many fine Git clients exist, only
 Magit and Git itself deserve to be called porcelains.
 
-#+TEXINFO: @noindent
+#+texinfo: @noindent
 This manual is for Magit version {{{version}}}.
 
-#+BEGIN_QUOTE
+#+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli 
 
 You can redistribute this document and/or modify it under the terms
@@ -39,7 +39,7 @@ This document is distributed in the hope that it will be 
useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FIT

[nongnu] elpa/magit updated (fa620ed3e4 -> 03f495f351)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit.

  from  fa620ed3e4 magit-convert-filename-for-git: Fix for Tramp in Windows
  adds  5245c91a3c manual: Downcase keywords
  adds  eb0d359dc5 manual: Move common settings to .orgconfig
  adds  03f495f351 manual: Use updated support for definition commands

No new revisions were added by this update.

Summary of changes:
 default.mk  |1 -
 docs/.orgconfig |   10 +
 docs/Makefile   |3 +-
 docs/magit-section.org  |   65 +-
 docs/magit-section.texi |   20 +-
 docs/magit.org  | 1661 ---
 docs/magit.texi | 2516 +++
 7 files changed, 1658 insertions(+), 2618 deletions(-)
 create mode 100644 docs/.orgconfig

[nongnu] elpa/magit-section updated (fa620ed3e4 -> 03f495f351)

[ELPA Syncer]

elpasync pushed a change to branch elpa/magit-section.

  from  fa620ed3e4 magit-convert-filename-for-git: Fix for Tramp in Windows
  adds  5245c91a3c manual: Downcase keywords
  adds  eb0d359dc5 manual: Move common settings to .orgconfig
  adds  03f495f351 manual: Use updated support for definition commands

No new revisions were added by this update.

Summary of changes:
 default.mk  |1 -
 docs/.orgconfig |   10 +
 docs/Makefile   |3 +-
 docs/magit-section.org  |   65 +-
 docs/magit-section.texi |   20 +-
 docs/magit.org  | 1661 ---
 docs/magit.texi | 2516 +++
 7 files changed, 1658 insertions(+), 2618 deletions(-)
 create mode 100644 docs/.orgconfig

[nongnu] elpa/with-editor updated (53a6b8ad8a -> 87f8cbf540)

[ELPA Syncer]

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

  from  53a6b8ad8a with-editor-sleeping-editor-filter: Limit length of 
saved output
   new  09a38531b5 manual: Downcase keywords
   new  46de358be6 manual: Move common settings to .orgconfig
   new  87f8cbf540 manual: Use updated support for definition commands


Summary of changes:
 default.mk|  1 -
 docs/.orgconfig   | 10 +++
 docs/Makefile |  3 +-
 docs/with-editor.org  | 81 ++-
 docs/with-editor.texi | 33 -
 5 files changed, 51 insertions(+), 77 deletions(-)
 create mode 100644 docs/.orgconfig

[nongnu] elpa/with-editor 09a38531b5 1/3: manual: Downcase keywords

[ELPA Syncer]

branch: elpa/with-editor
commit 09a38531b5bab28830e658ae93f7a5bd6fd053bb
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Downcase keywords
---
 docs/with-editor.org | 54 ++--
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/docs/with-editor.org b/docs/with-editor.org
index c9a0bcba0a..d951e6a913 100644
--- a/docs/with-editor.org
+++ b/docs/with-editor.org
@@ -1,20 +1,20 @@
-#+TITLE: With-Editor User Manual
+#+title: With-Editor User Manual
 :PREAMBLE:
-#+AUTHOR: Jonas Bernoulli
-#+EMAIL: jo...@bernoul.li
-#+DATE: 2015-{{{year}}}
-#+LANGUAGE: en
-
-#+TEXINFO_DIR_CATEGORY: Emacs
-#+TEXINFO_DIR_TITLE: With-Editor: (with-editor).
-#+TEXINFO_DIR_DESC: Using the Emacsclient as $EDITOR
-#+SUBTITLE: for version {{{version}}}
-
-#+TEXINFO_DEFFN: t
-#+OPTIONS: H:4 num:4 toc:2
-#+PROPERTY: header-args :eval never
-#+MACRO: version (eval (ox-texinfo+-get-version 'mixed))
-#+MACRO: year (eval (format-time-string "%Y"))
+#+author: Jonas Bernoulli
+#+email: jo...@bernoul.li
+#+date: 2015-{{{year}}}
+#+language: en
+
+#+texinfo_dir_category: Emacs
+#+texinfo_dir_title: With-Editor: (with-editor).
+#+texinfo_dir_desc: Using the Emacsclient as $EDITOR
+#+subtitle: for version {{{version}}}
+
+#+texinfo_deffn: t
+#+options: H:4 num:4 toc:2
+#+property: header-args :eval never
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+#+macro: year (eval (format-time-string "%Y"))
 
 The library ~with-editor~ makes it easy to use the Emacsclient as the
 ~$EDITOR~ of child processes, making sure they know how to call home.
@@ -31,10 +31,10 @@ library is made available as a separate package.  It also 
defines some
 additional functionality which makes it useful even for end-users, who
 don't use Magit or another package which uses it internally.
 
-#+TEXINFO: @noindent
+#+texinfo: @noindent
 This manual is for With-Editor version {{{version}}}.
 
-#+BEGIN_QUOTE
+#+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli 
 
 You can redistribute this document and/or modify it under the terms
@@ -46,7 +46,7 @@ This document is distributed in the hope that it will be 
useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
-#+END_QUOTE
+#+end_quote
 :END:
 * Using the With-Editor package
 
@@ -177,12 +177,12 @@ prompt for an alternative environment variable such as 
~$GIT_EDITOR~.
 
 To always use these variants add this to you init file:
 
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (define-key (current-global-map)
 [remap async-shell-command] 'with-editor-async-shell-command)
   (define-key (current-global-map)
 [remap shell-command] 'with-editor-shell-command)
-#+END_SRC
+#+end_src
 
 Alternatively use the global ~shell-command-with-editor-mode~.
 
@@ -200,20 +200,20 @@ command which needs the editor set, or always arrange for 
the current
 Emacs instance to be used as editor by adding it to the appropriate
 mode hooks:
 
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (add-hook 'shell-mode-hook  'with-editor-export-editor)
   (add-hook 'eshell-mode-hook 'with-editor-export-editor)
   (add-hook 'term-exec-hook   'with-editor-export-editor)
   (add-hook 'vterm-exec-hook  'with-editor-export-editor)
-#+END_SRC
+#+end_src
 
 Some variants of this function exist; these two forms are equivalent:
 
-#+BEGIN_SRC emacs-lisp
+#+begin_src emacs-lisp
   (add-hook 'shell-mode-hook
 (apply-partially 'with-editor-export-editor "GIT_EDITOR"))
   (add-hook 'shell-mode-hook 'with-editor-export-git-editor)
-#+END_SRC
+#+end_src
 
 - Command: with-editor-export-editor
 
@@ -307,7 +307,7 @@ Emacs and what is the output of ~M-x with-editor-debug RET~.
 :COPYING:t
 :END:
 
-#+BEGIN_QUOTE
+#+begin_quote
 Copyright (C) 2015-{{{year}}} Jonas Bernoulli 
 
 You can redistribute this document and/or modify it under the terms
@@ -319,7 +319,7 @@ This document is distributed in the hope that it will be 
useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 General Public License for more details.
-#+END_QUOTE
+#+end_quote
 
 # LocalWords: LocalWords
 # LocalWords: Magit Emacs emacsclient FreeBSD macOS texinfo

[nongnu] elpa/with-editor 46de358be6 2/3: manual: Move common settings to .orgconfig

[ELPA Syncer]

branch: elpa/with-editor
commit 46de358be62e2ac1f962469a44669372a7b32c20
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Move common settings to .orgconfig
---
 docs/.orgconfig  | 10 ++
 docs/with-editor.org |  7 +--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/docs/.orgconfig b/docs/.orgconfig
new file mode 100644
index 00..8919537a19
--- /dev/null
+++ b/docs/.orgconfig
@@ -0,0 +1,10 @@
+# -*- mode:org -*-
+
+#+options: H:4 num:4 toc:2
+#+property: header-args :eval never
+
+#+texinfo_deffn: t
+#+macro: year (eval (format-time-string "%Y"))
+#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+
+#+language: en
diff --git a/docs/with-editor.org b/docs/with-editor.org
index d951e6a913..42336cf9d1 100644
--- a/docs/with-editor.org
+++ b/docs/with-editor.org
@@ -3,18 +3,13 @@
 #+author: Jonas Bernoulli
 #+email: jo...@bernoul.li
 #+date: 2015-{{{year}}}
-#+language: en
 
 #+texinfo_dir_category: Emacs
 #+texinfo_dir_title: With-Editor: (with-editor).
 #+texinfo_dir_desc: Using the Emacsclient as $EDITOR
 #+subtitle: for version {{{version}}}
 
-#+texinfo_deffn: t
-#+options: H:4 num:4 toc:2
-#+property: header-args :eval never
-#+macro: version (eval (ox-texinfo+-get-version 'mixed))
-#+macro: year (eval (format-time-string "%Y"))
+#+setupfile: .orgconfig
 
 The library ~with-editor~ makes it easy to use the Emacsclient as the
 ~$EDITOR~ of child processes, making sure they know how to call home.

[nongnu] elpa/with-editor 87f8cbf540 3/3: manual: Use updated support for definition commands

[ELPA Syncer]

branch: elpa/with-editor
commit 87f8cbf5400bc9b6561f61970576831170362cb9
Author: Jonas Bernoulli 
Commit: Jonas Bernoulli 

manual: Use updated support for definition commands

Instead of ox-texinfo+.el use the new implementation
that I expect to be merged into Org itself.
---
 default.mk|  1 -
 docs/.orgconfig   |  4 ++--
 docs/Makefile |  3 +--
 docs/with-editor.org  | 32 +---
 docs/with-editor.texi | 33 +
 5 files changed, 21 insertions(+), 52 deletions(-)

diff --git a/default.mk b/default.mk
index 6a82f9fda7..84892b341a 100644
--- a/default.mk
+++ b/default.mk
@@ -21,7 +21,6 @@ LOAD_PATH  += -L .
 
 ifndef ORG_LOAD_PATH
 ORG_LOAD_PATH  = -L ../../org/lisp
-ORG_LOAD_PATH += -L ../../ox-texinfo+
 endif
 
 INSTALL_INFO ?= $(shell command -v ginstall-info || printf install-info)
diff --git a/docs/.orgconfig b/docs/.orgconfig
index 8919537a19..3a00c75840 100644
--- a/docs/.orgconfig
+++ b/docs/.orgconfig
@@ -3,8 +3,8 @@
 #+options: H:4 num:4 toc:2
 #+property: header-args :eval never
 
-#+texinfo_deffn: t
+#+macro: kbd (eval (let ((case-fold-search nil) (regexp (regexp-opt '("SPC" 
"RET" "LFD" "TAB" "BS" "ESC" "DELETE" "SHIFT" "Ctrl" "Meta" "Alt" "Cmd" "Super" 
"UP" "LEFT" "RIGHT" "DOWN") 'words))) (format 
"@@texinfo:@kbd{@@%s@@texinfo:}@@" (replace-regexp-in-string regexp 
"@@texinfo:@key{@@\\&@@texinfo:}@@" $1 t
 #+macro: year (eval (format-time-string "%Y"))
-#+macro: version (eval (ox-texinfo+-get-version 'mixed))
+#+macro: version (eval (or (getenv "PACKAGE-VERSION") (ignore-errors (car 
(process-lines "git" "describe" "--exact"))) (ignore-errors (concat (car 
(process-lines "git" "describe" (if (getenv "AMEND") "HEAD~" "HEAD"))) "+1"
 
 #+language: en
diff --git a/docs/Makefile b/docs/Makefile
index d1cb3ee2e2..b41c80828c 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -7,8 +7,7 @@ info: $(PKG).info dir
 html: $(PKG).html
 pdf:  $(PKG).pdf
 
-ORG_ARGS  = --batch -Q $(ORG_LOAD_PATH) -l ox-texinfo+
-ORG_EVAL  = --eval "(setq org-texinfo+-dissolve-noexport-headlines t)"
+ORG_ARGS  = --batch -Q $(ORG_LOAD_PATH)
 ORG_EVAL += --eval "(setq indent-tabs-mode nil)"
 ORG_EVAL += --eval "(setq org-src-preserve-indentation nil)"
 ORG_EVAL += --funcall org-texinfo-export-to-texinfo
diff --git a/docs/with-editor.org b/docs/with-editor.org
index 42336cf9d1..93278e830c 100644
--- a/docs/with-editor.org
+++ b/docs/with-editor.org
@@ -62,7 +62,7 @@ most likely reason is that someone found yet another way to 
package
 Emacs (most likely on macOS) without putting the executable on ~$PATH~,
 and we have to add another kludge to find it anyway.
 
-- User Option: with-editor-emacsclient-executable
+- User Option: with-editor-emacsclient-executable ::
 
   The ~emacsclient~ executable used as the editor by child process of
   this Emacs instance.  By using this executable, child processes can
@@ -91,7 +91,7 @@ and we have to add another kludge to find it anyway.
   this except in "emergencies", i.e. before we had a change to add a
   kludge appropriate for you setup.
 
-- Function: with-editor-locate-emacsclient
+- Function: with-editor-locate-emacsclient ::
 
   The function used to set the initial value of the option
   ~with-editor-emacsclient-executable~.  There's a lot of voodoo here.
@@ -106,7 +106,7 @@ remote processes in much the same way as local processes 
use an
 editor" because it is implemented as a shell script which sleeps until
 it receives a signal.
 
-- User Option: with-editor-sleeping-editor
+- User Option: with-editor-sleeping-editor ::
 
   The sleeping editor is a shell script used as the editor of child
   processes when the ~emacsclient~ executable cannot be used.
@@ -159,12 +159,12 @@ The commands ~with-editor-async-shell-command~ and
 instance as "the editor".  With a prefix argument these commands
 prompt for an alternative environment variable such as ~$GIT_EDITOR~.
 
-- Command: with-editor-async-shell-command
+- Command: with-editor-async-shell-command ::
 
   This command is like ~async-shell-command~, but it runs the shell
   command with the current Emacs instance exported as ~$EDITOR~.
 
-- Command: with-editor-shell-command
+- Command: with-editor-shell-command ::
 
   This command is like ~shell-command~, but if the shell command ends
   with ~&~ and is therefore run asynchronously, then the current Emacs
@@ -181,7 +181,7 @@ To always use these variants add this to you init file:
 
 Alternatively use the global ~shell-command-with-editor-mode~.
 
-- Variable: shell-command-with-editor-mode
+- Variable: shell-command-with-editor-mode ::
 
   When this mode is active, then ~$EDITOR~ is exported whenever
   ultimately ~shell-command~ is called to asynchronously run some shell
@@ -210,18 +210,18 @@ Some variants of this function exist; these two forms are 
equivalent:
   (add-hook 'shell-mode-hook 'with-editor-export-git-editor)
 #+end_src
 
-- Command: with-editor-export-editor