[elpa] externals/org 8219776: org-agenda-get-scheduled: Make sure that 'org-marker is at timestamp
branch: externals/org commit 821977611c1a51a0aa72959f649b8ef0bc87339c Author: Ihor Radchenko Commit: Ihor Radchenko org-agenda-get-scheduled: Make sure that 'org-marker is at timestamp * lisp/org-agenda.el (org-agenda-get-scheduled): Use beginning position of the timestamp as 'org-marker. Fixes https://list.orgmode.org/87sfwyrcyj@gnu.org/T/#meeca619b0abd3c3b30fe5057b51c891e8de705b8 --- lisp/org-agenda.el | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 8334b08..2b7e298 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6406,6 +6406,10 @@ scheduled items with an hour specification like [h]h:mm." :raw-value (org-element-property :scheduled el)) 1 -1)) + (pos (save-excursion + (goto-char (org-element-property :contents-begin el)) + (re-search-forward regexp) + (1- (match-beginning 1 (todo-state (org-element-property :todo-keyword el)) (donep (eq 'done (org-element-property :todo-type el))) (sexp? (eq 'diary @@ -6420,7 +6424,7 @@ scheduled items with an hour specification like [h]h:mm." ((or (eq org-agenda-prefer-last-repeat t) (member todo-state org-agenda-prefer-last-repeat)) (org-agenda--timestamp-to-absolute - s today 'past (current-buffer) (point))) + s today 'past (current-buffer) pos)) (t (org-agenda--timestamp-to-absolute s ;; REPEAT is the future repeat closest from CURRENT, ;; according to `org-agenda-show-future-repeats'. If @@ -6436,7 +6440,7 @@ scheduled items with an hour specification like [h]h:mm." (1+ today) current))) (org-agenda--timestamp-to-absolute - s base 'future (current-buffer) (point)) + s base 'future (current-buffer) pos) (diff (- current schedule)) (warntime (get-text-property (point) 'org-appt-warntime)) (pastschedp (< schedule today)) @@ -6577,7 +6581,7 @@ scheduled items with an hour specification like [h]h:mm." (org-add-props item props 'undone-face face 'face (if donep 'org-agenda-done face) - 'org-marker (org-agenda-new-marker (org-element-property :contents-begin el)) + 'org-marker (org-agenda-new-marker pos) 'org-hd-marker (org-agenda-new-marker (line-beginning-position)) 'type (if pastschedp "past-scheduled" "scheduled") 'date (if pastschedp schedule date)
[elpa] externals/svg-lib a7326b4 1/2: charater -> character
branch: externals/svg-lib commit a7326b44561655fd4807fe24079ffefb958e5035 Author: Jonathan Lai Commit: GitHub charater -> character --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 1ff0eb0..912603e 100644 --- a/README.org +++ b/README.org @@ -4,7 +4,7 @@ A small Emacs library to create and display various SVG objects, namely tags, progress bars, progress pies and icons. Each object is guaranteed to fit nicely in a text buffer ensuring width is an integer -multiple of charater width. +multiple of character width. *** Installation
[elpa] externals/svg-lib 692585e 2/2: Merge pull request #11 from agsdot/patch-1
branch: externals/svg-lib commit 692585eeed1ac1f69b3e4a6afd8b37fefdd9dd2e Merge: da9f6e9 a7326b4 Author: Nicolas P. Rougier Commit: GitHub Merge pull request #11 from agsdot/patch-1 charater -> character --- README.org | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.org b/README.org index 1ff0eb0..912603e 100644 --- a/README.org +++ b/README.org @@ -4,7 +4,7 @@ A small Emacs library to create and display various SVG objects, namely tags, progress bars, progress pies and icons. Each object is guaranteed to fit nicely in a text buffer ensuring width is an integer -multiple of charater width. +multiple of character width. *** Installation
[nongnu] elpa/markdown-mode acede52 1/2: Fix emacs 29 byte-compile warning issue
branch: elpa/markdown-mode commit acede5244d948695f64712cb1f5b040c094a1b49 Author: Shohei YOSHIDA Commit: Shohei YOSHIDA Fix emacs 29 byte-compile warning issue --- markdown-mode.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index bd4f8d2..2b0794c 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -2656,7 +2656,8 @@ intact additional processing." (match-beginning 5) (match-end 5) (defun markdown-get-defined-references () - "Return all defined reference labels and their line numbers (not including square brackets)." + "Return all defined reference labels and their line numbers. +They does not include square brackets)." (save-excursion (goto-char (point-min)) (let (refs) @@ -3916,7 +3917,7 @@ This is an internal function called by (markdown-insert-uri uri)) (defun markdown-insert-link () - "Insert new or update an existing link, with interactive prompts. + "Insert new or update an existing link, with interactive prompt. If the point is at an existing link or URL, update the link text, URL, reference label, and/or title. Otherwise, insert a new link. The type of link inserted (inline, reference, or plain URL) @@ -3951,7 +3952,7 @@ selectively adding or removing information via the prompts." (markdown--insert-link-or-image nil)) (defun markdown-insert-image () - "Insert new or update an existing image, with interactive prompts. + "Insert new or update an existing image, with interactive prompt. If the point is at an existing image, update the alt text, URL, reference label, and/or title. Otherwise, insert a new image. The type of image inserted (inline or reference) depends on which
[nongnu] elpa/markdown-mode 7360efc 2/2: Merge pull request #665 from jrblevin/emacs-29-warning
branch: elpa/markdown-mode commit 7360efc6bcfd4eb01aa5a8330f8073fa7e64805a Merge: a18ba97 acede52 Author: Shohei YOSHIDA Commit: GitHub Merge pull request #665 from jrblevin/emacs-29-warning Fix emacs 29 byte-compile warning issue --- markdown-mode.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index bd4f8d2..2b0794c 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -2656,7 +2656,8 @@ intact additional processing." (match-beginning 5) (match-end 5) (defun markdown-get-defined-references () - "Return all defined reference labels and their line numbers (not including square brackets)." + "Return all defined reference labels and their line numbers. +They does not include square brackets)." (save-excursion (goto-char (point-min)) (let (refs) @@ -3916,7 +3917,7 @@ This is an internal function called by (markdown-insert-uri uri)) (defun markdown-insert-link () - "Insert new or update an existing link, with interactive prompts. + "Insert new or update an existing link, with interactive prompt. If the point is at an existing link or URL, update the link text, URL, reference label, and/or title. Otherwise, insert a new link. The type of link inserted (inline, reference, or plain URL) @@ -3951,7 +3952,7 @@ selectively adding or removing information via the prompts." (markdown--insert-link-or-image nil)) (defun markdown-insert-image () - "Insert new or update an existing image, with interactive prompts. + "Insert new or update an existing image, with interactive prompt. If the point is at an existing image, update the alt text, URL, reference label, and/or title. Otherwise, insert a new image. The type of image inserted (inline or reference) depends on which
[elpa] externals/coterm d8321cb: Version 1.2
branch: externals/coterm commit d8321cb62610b068bb0f3318a6021b94101307a5 Author: Miha Rihtaršič Commit: Miha Rihtaršič Version 1.2 --- coterm.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coterm.el b/coterm.el index 9848b49..d3ade99 100644 --- a/coterm.el +++ b/coterm.el @@ -4,7 +4,7 @@ ;; Filename: coterm.el ;; Author: jakanakaevangeli -;; Version: 1.1 +;; Version: 1.2 ;; Keywords: processes ;; Package-Requires: ((emacs "26.1")) ;; URL: https://repo.or.cz/emacs-coterm.git
[elpa] externals-release/org 37791bb: org-manual: Fix one kindex entry
branch: externals-release/org
commit 37791bb4fc1ca0a613abdeb9710bd1bdb8f8ca35
Author: Marco Wahl
Commit: Marco Wahl
org-manual: Fix one kindex entry
Reminder: the kindex can be accessed via key "i" in info. This fixes
also the pdf generation.
---
doc/org-manual.org | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 8a3a2b8..96ee069 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -16543,7 +16543,7 @@ more "bibliography" keywords.
#+bibliography: "/some/file/with spaces/in its name.bib"
#+end_example
-#+kindex: C-c C-x @
+#+kindex: C-c C-x @@
#+findex: org-cite-insert
One can then insert and edit citations using ~org-cite-insert~, called
with {{{kbd(C-c C-x @)}}}.
[elpa] externals/org updated (8219776 -> 7810804)
elpasync pushed a change to branch externals/org. from 8219776 org-agenda-get-scheduled: Make sure that 'org-marker is at timestamp new d574186 Disable cache persistence during build new 37791bb org-manual: Fix one kindex entry new 7810804 Merge branch 'bugfix' into main Summary of changes: doc/org-manual.org | 2 +- mk/default.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
[elpa] externals/org d574186 1/2: Disable cache persistence during build
branch: externals/org commit d574186448b8483168ea2e8fc12d1abf3b02c5b6 Author: Ihor Radchenko Commit: Ihor Radchenko Disable cache persistence during build * mk/default.mk (BATCH): Set `org-element-cache-persistent' to nil when running make. --- mk/default.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mk/default.mk b/mk/default.mk index 4ffb076..c8a15bd 100644 --- a/mk/default.mk +++ b/mk/default.mk @@ -85,7 +85,7 @@ EMACSQ = $(EMACS) -Q # Using emacs in batch mode. BATCH = $(EMACSQ) -batch \ - --eval '(setq vc-handled-backends nil org-startup-folded nil)' + --eval '(setq vc-handled-backends nil org-startup-folded nil org-element-cache-persistent nil)' # Emacs must be started in toplevel directory BATCHO = $(BATCH) \
[elpa] externals/org 7810804 2/2: Merge branch 'bugfix' into main
branch: externals/org
commit 7810804222f3312a33f79985daebc10f491ce71b
Merge: d574186 37791bb
Author: Marco Wahl
Commit: Marco Wahl
Merge branch 'bugfix' into main
---
doc/org-manual.org | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/org-manual.org b/doc/org-manual.org
index 2cb5389..6273ec9 100644
--- a/doc/org-manual.org
+++ b/doc/org-manual.org
@@ -16550,7 +16550,7 @@ more "bibliography" keywords.
#+bibliography: "/some/file/with spaces/in its name.bib"
#+end_example
-#+kindex: C-c C-x @
+#+kindex: C-c C-x @@
#+findex: org-cite-insert
One can then insert and edit citations using ~org-cite-insert~, called
with {{{kbd(C-c C-x @)}}}.
[elpa] externals/boxy-headings 9f06db3 1/2: Use #+TITLE property if it exists
branch: externals/boxy-headings
commit 9f06db3ab16cd0e78624d4d1841031649916f364
Author: Tyler Grinn
Commit: Tyler Grinn
Use #+TITLE property if it exists
---
.gitlab-ci.yml | 5 -
boxy-headings.el | 8 +++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74e6f75..b963070 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,10 @@ package:
- curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev
| sh
- export PATH=$PATH:/root/.eldev/bin
script:
-- eldev lint
+- eldev lint doc
+- eldev lint re
+# TODO package-lint erroneously says emacs 26 doesn't support
org-collect-keywords
+# - eldev lint package
- eldev compile -W
- eldev test
- eldev package
diff --git a/boxy-headings.el b/boxy-headings.el
index 6760483..065f4fe 100644
--- a/boxy-headings.el
+++ b/boxy-headings.el
@@ -5,7 +5,7 @@
;; Author: Tyler Grinn
;; Version: 2.1.2
;; File: boxy-headings.el
-;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.3"))
+;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.4"))
;; Keywords: tools
;; URL: https://gitlab.com/tygrdev/boxy-headings
@@ -304,11 +304,9 @@ diagram."
"Create a `boxy-box' from the current buffer's headings."
(org-columns-get-format)
(let* ((headings (cddr (org-element-parse-buffer 'headline)))
- (filename (buffer-name))
- (title (or (concat (file-name-base filename) "." (file-name-extension
filename))
-"Document"))
+ (title (cadr (car (org-collect-keywords '("title")
(world (boxy-box))
- (document (boxy-box :name title
+ (document (boxy-box :name (or title (buffer-name) "Document")
:tooltip ""
:markers (list (point-min-marker)
(boxy-add-next document world)
[nongnu] elpa/git-commit 451438d 2/4: magit-repolist-column-branch: Dim main branch
branch: elpa/git-commit commit 451438dc900f50fd60474d5b1dd8f537157ca0b0 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-repolist-column-branch: Dim main branch The idea is to make it easier to see in which repositories a feature branch is checked out. --- Documentation/RelNotes/3.4.0.org | 2 ++ lisp/magit-repos.el | 5 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/RelNotes/3.4.0.org b/Documentation/RelNotes/3.4.0.org index 96365c2..472cda1 100644 --- a/Documentation/RelNotes/3.4.0.org +++ b/Documentation/RelNotes/3.4.0.org @@ -5,6 +5,8 @@ - Added new function ~git-commit-turn-on-orglink~ intended for use in ~git-commit-setup-hook~. +- Some repository and submodule list columns got a bit fancier. + ** Fixes since v3.3.0 - Automatic saving of file-visiting buffers was broken inside remote diff --git a/lisp/magit-repos.el b/lisp/magit-repos.el index f803ff5..24b7ed5 100644 --- a/lisp/magit-repos.el +++ b/lisp/magit-repos.el @@ -249,7 +249,10 @@ Usually this is just its basename." (defun magit-repolist-column-branch (_) "Insert the current branch." - (magit-get-current-branch)) + (let ((branch (magit-get-current-branch))) +(if (member branch magit-main-branch-names) +(magit--propertize-face branch 'shadow) + branch))) (defun magit-repolist-column-upstream (_) "Insert the upstream branch of the current branch."
[nongnu] elpa/git-commit 3f39807 1/4: magit-repolist-column-version: Highlight count and dim hash
branch: elpa/git-commit commit 3f3980735f1b70bca17049bd397fe1475ffbd667 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-repolist-column-version: Highlight count and dim hash The idea is to make it easier to see which repositories could do with another release. --- lisp/magit-repos.el | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/magit-repos.el b/lisp/magit-repos.el index 271b80a..f803ff5 100644 --- a/lisp/magit-repos.el +++ b/lisp/magit-repos.el @@ -234,10 +234,17 @@ Usually this is just its basename." (magit-git-string "show" "--no-patch" "--format=%cd-g%h" "--date=format:%Y%m%d.%H%M" (save-match-data - (when (string-match "-dirty\\'" v) -(magit--put-face (1+ (match-beginning 0)) (length v) 'error v)) + (when (string-match + "\\(?:-\\([0-9]*\\)-g[a-z0-9]*\\)?\\(?:-\\(dirty\\)\\)?\\'" v) +(magit--put-face (match-beginning 0) (match-end 0) 'shadow v) +(when (match-end 1) + (magit--put-face (match-beginning 1) (match-end 1) 'bold v)) +(when (match-end 2) + (magit--put-face (match-beginning 2) (match-end 2) 'error v))) (if (and v (string-match "\\`[0-9]" v)) (concat " " v) +(when (and v (string-match "\\`[^0-9]+" v)) + (magit--put-face 0 (match-end 0) 'shadow v)) v (defun magit-repolist-column-branch (_)
[nongnu] elpa/magit-section updated (ecfaa32 -> ceab312)
elpasync pushed a change to branch elpa/magit-section.
from ecfaa32 Fix gravatar image size again
adds 3f39807 magit-repolist-column-version: Highlight count and dim
hash
adds 451438d magit-repolist-column-branch: Dim main branch
adds 1feda0c magit-{repolist,submodule-list}-refresh: Remember position
adds ceab312 magit-submodule-list-predicate: New variable
No new revisions were added by this update.
Summary of changes:
Documentation/RelNotes/3.4.0.org | 5 +
lisp/magit-repos.el | 18 ++
lisp/magit-submodule.el | 9 +++--
3 files changed, 26 insertions(+), 6 deletions(-)
[nongnu] elpa/git-commit 1feda0c 3/4: magit-{repolist, submodule-list}-refresh: Remember position
branch: elpa/git-commit
commit 1feda0cb1cf25dfc68a9425af23ac638144f3138
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-{repolist,submodule-list}-refresh: Remember position
---
Documentation/RelNotes/3.4.0.org | 3 +++
lisp/magit-repos.el | 2 +-
lisp/magit-submodule.el | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Documentation/RelNotes/3.4.0.org b/Documentation/RelNotes/3.4.0.org
index 472cda1..01f6d84 100644
--- a/Documentation/RelNotes/3.4.0.org
+++ b/Documentation/RelNotes/3.4.0.org
@@ -7,6 +7,9 @@
- Some repository and submodule list columns got a bit fancier.
+- Refreshing a repository or submodule list buffer now restores the
+ previous position.
+
** Fixes since v3.3.0
- Automatic saving of file-visiting buffers was broken inside remote
diff --git a/lisp/magit-repos.el b/lisp/magit-repos.el
index 24b7ed5..0224708 100644
--- a/lisp/magit-repos.el
+++ b/lisp/magit-repos.el
@@ -213,7 +213,7 @@ repositories are displayed."
(magit-list-repos)
(message "Listing repositories...")
(tabulated-list-init-header)
- (tabulated-list-print)
+ (tabulated-list-print t)
(message "Listing repositories...done"))
Columns
diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el
index 9458f64..20ef379 100644
--- a/lisp/magit-submodule.el
+++ b/lisp/magit-submodule.el
@@ -659,7 +659,7 @@ These sections can be expanded to show the respective
commits."
(magit-list-module-paths)))
(message "Listing submodules...")
(tabulated-list-init-header)
- (tabulated-list-print)
+ (tabulated-list-print t)
(message "Listing submodules...done"))
(defun magit-modulelist-column-path (spec)
[nongnu] elpa/git-commit ceab312 4/4: magit-submodule-list-predicate: New variable
branch: elpa/git-commit commit ceab3124fb6b590d3cecefe381b6e2d29dcc2bf8 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-submodule-list-predicate: New variable This can be used to implement commands that only list a subset of submodules. Such commands must set the predicate by passing it to `magit-submodule-list-setup', using its new PREDICATE argument. --- lisp/magit-submodule.el | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el index 20ef379..54edf56 100644 --- a/lisp/magit-submodule.el +++ b/lisp/magit-submodule.el @@ -621,13 +621,16 @@ These sections can be expanded to show the respective commits." (setq imenu-extract-index-name-function #'magit-imenu--submodule-extract-index-name-function)) -(defun magit-submodule-list-setup (columns) +(defvar-local magit-submodule-list-predicate nil) + +(defun magit-submodule-list-setup (columns &optional predicate) (magit-display-buffer (or (magit-get-mode-buffer 'magit-submodule-list-mode) (magit-with-toplevel (magit-generate-new-buffer 'magit-submodule-list-mode (magit-submodule-list-mode) (setq-local magit-repolist-columns columns) + (setq-local magit-submodule-list-predicate predicate) (magit-submodule-list-refresh)) (defun magit-submodule-list-refresh () @@ -647,6 +650,8 @@ These sections can be expanded to show the respective commits." (let ((default-directory (expand-file-name (file-name-as-directory module (and (file-exists-p ".git") +(or (not magit-submodule-list-predicate) +(funcall magit-submodule-list-predicate module)) (list module (vconcat (mapcar (pcase-lambda (`(,title ,width ,fn ,props))
[elpa] externals/boxy-headings 1e3e624 2/2: Merge branch 'next' into 'main'
branch: externals/boxy-headings
commit 1e3e62410e99f2665f40e6aa3638f267aa7eb7eb
Merge: 8eacc56 9f06db3
Author: Tyler Grinn
Commit: Tyler Grinn
Merge branch 'next' into 'main'
Use #+TITLE property if it exists
Closes #3
See merge request tygrdev/boxy-headings!7
---
.gitlab-ci.yml | 5 -
boxy-headings.el | 8 +++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74e6f75..b963070 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,10 @@ package:
- curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev
| sh
- export PATH=$PATH:/root/.eldev/bin
script:
-- eldev lint
+- eldev lint doc
+- eldev lint re
+# TODO package-lint erroneously says emacs 26 doesn't support
org-collect-keywords
+# - eldev lint package
- eldev compile -W
- eldev test
- eldev package
diff --git a/boxy-headings.el b/boxy-headings.el
index 6760483..065f4fe 100644
--- a/boxy-headings.el
+++ b/boxy-headings.el
@@ -5,7 +5,7 @@
;; Author: Tyler Grinn
;; Version: 2.1.2
;; File: boxy-headings.el
-;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.3"))
+;; Package-Requires: ((emacs "26.1") (boxy "1.0") (org "9.4"))
;; Keywords: tools
;; URL: https://gitlab.com/tygrdev/boxy-headings
@@ -304,11 +304,9 @@ diagram."
"Create a `boxy-box' from the current buffer's headings."
(org-columns-get-format)
(let* ((headings (cddr (org-element-parse-buffer 'headline)))
- (filename (buffer-name))
- (title (or (concat (file-name-base filename) "." (file-name-extension
filename))
-"Document"))
+ (title (cadr (car (org-collect-keywords '("title")
(world (boxy-box))
- (document (boxy-box :name title
+ (document (boxy-box :name (or title (buffer-name) "Document")
:tooltip ""
:markers (list (point-min-marker)
(boxy-add-next document world)
[nongnu] elpa/git-commit updated (ecfaa32 -> ceab312)
elpasync pushed a change to branch elpa/git-commit.
from ecfaa32 Fix gravatar image size again
new 3f39807 magit-repolist-column-version: Highlight count and dim
hash
new 451438d magit-repolist-column-branch: Dim main branch
new 1feda0c magit-{repolist,submodule-list}-refresh: Remember position
new ceab312 magit-submodule-list-predicate: New variable
Summary of changes:
Documentation/RelNotes/3.4.0.org | 5 +
lisp/magit-repos.el | 18 ++
lisp/magit-submodule.el | 9 +++--
3 files changed, 26 insertions(+), 6 deletions(-)
[nongnu] elpa/magit updated (ecfaa32 -> ceab312)
elpasync pushed a change to branch elpa/magit.
from ecfaa32 Fix gravatar image size again
adds 3f39807 magit-repolist-column-version: Highlight count and dim
hash
adds 451438d magit-repolist-column-branch: Dim main branch
adds 1feda0c magit-{repolist,submodule-list}-refresh: Remember position
adds ceab312 magit-submodule-list-predicate: New variable
No new revisions were added by this update.
Summary of changes:
Documentation/RelNotes/3.4.0.org | 5 +
lisp/magit-repos.el | 18 ++
lisp/magit-submodule.el | 9 +++--
3 files changed, 26 insertions(+), 6 deletions(-)
[elpa] main 790fc46: * elpa-packages (comint-mine): Uncomment
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] branch externals/comint-mime created (now d9cdad5)
elpasync pushed a change to branch externals/comint-mime. at d9cdad5 Convert README to org format This branch includes the following new commits: new a8b0f67 Initial commit new 95d9d34 Improve Matplotlib setup from IPython new bb9a1ad Hide setup from shell history, at least when "ignorespace" is set new 9cf131d Disable LaTeX rendering by default for now new 6b95376 Reduce Emacs version requirement to 28 (from 28.1) new e7c847a Fix interaction between HTML rendering and process mark new 3e02807 Update copyright assignment new d9cdad5 Convert README to org format
[elpa] externals/comint-mime 6b95376 5/8: Reduce Emacs version requirement to 28 (from 28.1)
branch: externals/comint-mime commit 6b95376bc0ef951e622d3500e76a289aa9a13e57 Author: Augusto Stoffel Commit: Augusto Stoffel Reduce Emacs version requirement to 28 (from 28.1) --- comint-mime.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comint-mime.el b/comint-mime.el index ea1fa95..9192bb1 100644 --- a/comint-mime.el +++ b/comint-mime.el @@ -6,7 +6,7 @@ ;; Keywords: processes, multimedia ;; Version: 0 ;; Homepage: https://github.com/astoff/comint-mime -;; Package-Requires: ((emacs "28.1")) +;; Package-Requires: ((emacs "28")) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by
[elpa] externals/comint-mime 3e02807 7/8: Update copyright assignment
branch: externals/comint-mime commit 3e02807517e44f4e5938ee9cc533df458b71762a Author: Augusto Stoffel Commit: Augusto Stoffel Update copyright assignment --- comint-mime.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/comint-mime.el b/comint-mime.el index 9e3e03c..22ef10d 100644 --- a/comint-mime.el +++ b/comint-mime.el @@ -1,12 +1,12 @@ ;;; comint-mime.el --- Display content of various MIME types in comint buffers -*- lexical-binding: t; -*- -;; Copyright (C) 2021 Augusto Stoffel +;; Copyright (C) 2021 Free Software Foundation, Inc. ;; Author: Augusto Stoffel +;; Homepage: https://github.com/astoff/comint-mime ;; Keywords: processes, multimedia +;; Package-Requires: ((emacs "28.0.60")) ;; Version: 0 -;; Homepage: https://github.com/astoff/comint-mime -;; Package-Requires: ((emacs "28")) ;; This program is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by
[elpa] externals/comint-mime 95d9d34 2/8: Improve Matplotlib setup from IPython
branch: externals/comint-mime
commit 95d9d346a07c77c4dd267262d6bea541d94afbd5
Author: Augusto Stoffel
Commit: Augusto Stoffel
Improve Matplotlib setup from IPython
---
comint-mime.py | 17 +++--
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/comint-mime.py b/comint-mime.py
index 86584f4..323ef67 100644
--- a/comint-mime.py
+++ b/comint-mime.py
@@ -2,19 +2,15 @@
def __COMINT_MIME_setup(types):
try:
-import IPython, matplotlib
-ipython = IPython.get_ipython()
-matplotlib.use('module://ipykernel.pylab.backend_inline')
+ipython = get_ipython()
+assert ipython
except:
-print("`comint-mime': error setting up")
+print("`comint-mime' error: IPython is required")
return
from base64 import encodebytes
-from json import dumps as to_json
from functools import partial
-
-OSC = '\033]5151;'
-ST = '\033\\'
+from json import dumps as to_json
MIME_TYPES = {
"image/png": None,
@@ -23,7 +19,7 @@ def __COMINT_MIME_setup(types):
"text/html": str.encode,
"application/json": lambda d: to_json(d).encode(),
}
-
+
if types == "all":
types = MIME_TYPES
else:
@@ -35,8 +31,9 @@ def __COMINT_MIME_setup(types):
data = encoder(data)
header = to_json({**meta, "type": type})
payload = encodebytes(data).decode()
-print(f'{OSC}{header}\n{payload}{ST}')
+print(f"\033]5151;{header}\n{payload}\033\\")
+ipython.enable_matplotlib("inline")
ipython.display_formatter.active_types = list(MIME_TYPES.keys())
for mime, encoder in MIME_TYPES.items():
ipython.display_formatter.formatters[mime].enabled = mime in types
[elpa] externals/comint-mime e7c847a 6/8: Fix interaction between HTML rendering and process mark
branch: externals/comint-mime commit e7c847af897d14c560a7eceedc9bad2e51e87e55 Author: Augusto Stoffel Commit: Augusto Stoffel Fix interaction between HTML rendering and process mark --- comint-mime.el | 27 +++ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/comint-mime.el b/comint-mime.el index 9192bb1..9e3e03c 100644 --- a/comint-mime.el +++ b/comint-mime.el @@ -144,18 +144,21 @@ from `comint-mode', or interactively after starting the comint." (defun comint-mime-render-html (header data) "Render HTML from HEADER and DATA provided by `comint-mime-osc-handler'." (insert - (with-temp-buffer - (insert data) - (decode-coding-region (point-min) (point-max) 'utf-8) - (shr-render-region (point-min) (point-max)) - ;; Don't let font-lock override those faces - (goto-char (point-min)) - (let (match) - (while (setq match (text-property-search-forward 'face)) - (put-text-property (prop-match-beginning match) (prop-match-end match) -'font-lock-face (prop-match-value match - (put-text-property (point-min) (point-max) 'comint-mime header) - (buffer-string + ;; FIXME: This `save-excursion' is needed since the patch fixing + ;; bug#51009. Is this reliable or are there better solutions? + (save-excursion + (with-temp-buffer + (insert data) + (decode-coding-region (point-min) (point-max) 'utf-8) + (shr-render-region (point-min) (point-max)) + ;; Don't let font-lock override those faces + (goto-char (point-min)) + (let (match) + (while (setq match (text-property-search-forward 'face)) + (put-text-property (prop-match-beginning match) (prop-match-end match) + 'font-lock-face (prop-match-value match + (put-text-property (point-min) (point-max) 'comint-mime header) + (buffer-string) LaTeX (autoload 'org-format-latex "org")
[elpa] externals/comint-mime 9cf131d 4/8: Disable LaTeX rendering by default for now
branch: externals/comint-mime
commit 9cf131d7a208b6a9a21bc8a9db046edbb655df17
Author: Augusto Stoffel
Commit: Augusto Stoffel
Disable LaTeX rendering by default for now
TeX can execute arbitrary code depending on the settings. This needs
some more thought.
---
comint-mime.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/comint-mime.el b/comint-mime.el
index 04f53a6..ea1fa95 100644
--- a/comint-mime.el
+++ b/comint-mime.el
@@ -61,7 +61,8 @@ ignores this option altogether.")
'(("^image/svg+xml\\>" . comint-mime-render-svg)
("^image\\>" . comint-mime-render-image)
("^text/html" . comint-mime-render-html)
-("^text/latex" . comint-mime-render-latex)
+;; Disable this by default until we are sure about the security
implications
+;; ("^text/latex" . comint-mime-render-latex)
("^text\\>" . comint-mime-render-plain-text)
("." . comint-mime-render-literally))
"Alist associating MIME types to rendering functions.
[elpa] externals/comint-mime d9cdad5 8/8: Convert README to org format
branch: externals/comint-mime commit d9cdad5e8851c1f6d85babca6233e7d39ea5cd04 Author: Augusto Stoffel Commit: Augusto Stoffel Convert README to org format --- README.md | 93 -- README.org | 90 2 files changed, 90 insertions(+), 93 deletions(-) diff --git a/README.md b/README.md deleted file mode 100644 index 650c2a7..000 --- a/README.md +++ /dev/null @@ -1,93 +0,0 @@ -comint-mime.el -== - -This Emacs package provides a mechanism for REPLs (or comint buffers, -in Emacs parlance) to display graphics and other types of special -content. - -![comint-mime in Python][python] - -The main motivation behind this package is to display plots in the -Python shell. However, it does more that that. - -First, it is not constrained to graphics, and can display other “MIME -attachments” such as HTML and LaTeX content. In fact, the Python -backend of the package implements IPython's [rich display -interface][ipython_repr]. A use-case beyond the displaying of -graphics would be to render dataframes as HTML tables; this opens up -the possibility of typographical improvements over the usual pure-text -representation. You can also easily define rich representations for -your own classes. - -Second, the package defines a flexible communication protocol between -Emacs and the inferior process, and, consequently, can be extended to -other comint types. Currently, besides Python, there is support for -the regular (Unix) shell. In this case, a special command, `mimecat`, -is provided to display content. Again, this works for images, HTML, -LaTeX snippets, etc. - -![comint-mime in Bash][bash] - -Usage -- - -To start enjoying comint-mime, simply call `M-x comint-mime-setup` -from a supported buffer (which, at the moment, are the `M-x shell` and -`M-x run-python` buffers). To apply this permanently, add that same -function to the appropriate mode hook: - -``` elisp -(add-hook 'shell-mode-hook 'comint-mime-setup) -(add-hook 'inferior-python-mode-hook 'comint-mime-setup) -``` - -Note that for Python it is important to use the IPython interpreter. -It can be configured to have the same look-and-feel as the classic -`python` program as follows. - -``` elisp -(when (executable-find "ipython3") - (setq python-shell-interpreter "ipython3" -python-shell-interpreter-args "--simple-prompt --classic")) -``` - -Extending -- - -To add support for new MIME types, see `comint-mime-renderer-alist`. - -To add support for new comints, an entry should be added to -`comint-mime-setup-function-alist`. This function should arrange for -the inferior process to emit an escape sequence whenever some MIME -content is to be displayed. - -The escape sequence has the following shape: - -``` -ESC ] 5 1 5 1 ; header LF payload ESC \ -``` - -Here, `header` is a JSON object containing, at least, the entry -`type`, which should be the name of a MIME type. Other header entries -can be passed; the interpretation is up to the rendering function. - -The `payload` can be either the content of the attachment, encoded in -base64 (which is decoded before being passed to the selected -renderer), or a `file://` URL (whose content is read and passed to the -renderer), or yet a `tmpfile://` URL, which indicates that the file -should be deleted after it is read. - -Note that it can take considerable time to insert large amounts of -data in a comint buffer, specially if it contains long lines. -Consider using a temporary file for large data transfers. - -Todos -- - -- [ ] It should be possible to support at least Matplotlib in the - classic `python` interpreter. -- [ ] Improve the HTML rendering for numeric tables - -[python]: https://user-images.githubusercontent.com/6500902/133823411-ca75122d-4a39-4e3c-ac55-b2a1f974ff5e.png -[bash]: https://user-images.githubusercontent.com/6500902/133823494-696ee5a7-f0b0-47a3-9ccb-29ab9f36c3a9.png -[ipython_repr]: https://ipython.readthedocs.io/en/stable/config/integrating.html#rich-display diff --git a/README.org b/README.org new file mode 100644 index 000..0eaf525 --- /dev/null +++ b/README.org @@ -0,0 +1,90 @@ +#+title: comint-mime.el +#+author: Augusto Stoffel + +#+html: http://elpa.gnu.org/devel/comint-mime.html";>https://elpa.gnu.org/devel/comint-mime.svg"/> + +This Emacs package provides a mechanism for REPLs (or comint buffers, +in Emacs parlance) to display graphics and other types of special +content. + +#+caption: comint-mime in Python +[[https://user-images.githubusercontent.com/6500902/133823411-ca75122d-4a39-4e3c-ac55-b2a1f974ff5e.png]] + +The main motivation behind this package is to display plots in the +Python shell. However, it does more that that. + +First, it is not constrained to graphics, and can display other "MIME +attachments" such as HTML and LaTeX content. In fact, the Python +backend of the package implements IPython's [[http
[elpa] externals/comint-mime bb9a1ad 3/8: Hide setup from shell history, at least when "ignorespace" is set
branch: externals/comint-mime commit bb9a1adba84d6bba8b75039d0797b4a02c8c6614 Author: Augusto Stoffel Commit: Augusto Stoffel Hide setup from shell history, at least when "ignorespace" is set --- comint-mime.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/comint-mime.el b/comint-mime.el index 6071730..04f53a6 100644 --- a/comint-mime.el +++ b/comint-mime.el @@ -219,9 +219,9 @@ from `comint-mode', or interactively after starting the comint." (add-hook 'comint-output-filter-functions 'comint-mime-setup-shell nil t) (remove-hook 'comint-output-filter-functions 'comint-mime-setup-shell t) (comint-redirect-send-command - (format ". %s\n" (shell-quote-argument - (expand-file-name "comint-mime.sh" - comint-mime-setup-script-dir))) + (format " . %s\n" (shell-quote-argument +(expand-file-name "comint-mime.sh" + comint-mime-setup-script-dir))) nil nil t))) (push '(shell-mode . comint-mime-setup-shell)
[elpa] externals/comint-mime a8b0f67 1/8: Initial commit
branch: externals/comint-mime commit a8b0f6769d3b93b87a07aa333527f12bc6e3b05f Author: Augusto Stoffel Commit: Augusto Stoffel Initial commit --- .gitignore | 2 + README.md | 93 +++ comint-mime.el | 231 + comint-mime.py | 49 comint-mime.sh | 29 5 files changed, 404 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..a7827ee --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.elc +autoloads.el diff --git a/README.md b/README.md new file mode 100644 index 000..650c2a7 --- /dev/null +++ b/README.md @@ -0,0 +1,93 @@ +comint-mime.el +== + +This Emacs package provides a mechanism for REPLs (or comint buffers, +in Emacs parlance) to display graphics and other types of special +content. + +![comint-mime in Python][python] + +The main motivation behind this package is to display plots in the +Python shell. However, it does more that that. + +First, it is not constrained to graphics, and can display other “MIME +attachments” such as HTML and LaTeX content. In fact, the Python +backend of the package implements IPython's [rich display +interface][ipython_repr]. A use-case beyond the displaying of +graphics would be to render dataframes as HTML tables; this opens up +the possibility of typographical improvements over the usual pure-text +representation. You can also easily define rich representations for +your own classes. + +Second, the package defines a flexible communication protocol between +Emacs and the inferior process, and, consequently, can be extended to +other comint types. Currently, besides Python, there is support for +the regular (Unix) shell. In this case, a special command, `mimecat`, +is provided to display content. Again, this works for images, HTML, +LaTeX snippets, etc. + +![comint-mime in Bash][bash] + +Usage +- + +To start enjoying comint-mime, simply call `M-x comint-mime-setup` +from a supported buffer (which, at the moment, are the `M-x shell` and +`M-x run-python` buffers). To apply this permanently, add that same +function to the appropriate mode hook: + +``` elisp +(add-hook 'shell-mode-hook 'comint-mime-setup) +(add-hook 'inferior-python-mode-hook 'comint-mime-setup) +``` + +Note that for Python it is important to use the IPython interpreter. +It can be configured to have the same look-and-feel as the classic +`python` program as follows. + +``` elisp +(when (executable-find "ipython3") + (setq python-shell-interpreter "ipython3" +python-shell-interpreter-args "--simple-prompt --classic")) +``` + +Extending +- + +To add support for new MIME types, see `comint-mime-renderer-alist`. + +To add support for new comints, an entry should be added to +`comint-mime-setup-function-alist`. This function should arrange for +the inferior process to emit an escape sequence whenever some MIME +content is to be displayed. + +The escape sequence has the following shape: + +``` +ESC ] 5 1 5 1 ; header LF payload ESC \ +``` + +Here, `header` is a JSON object containing, at least, the entry +`type`, which should be the name of a MIME type. Other header entries +can be passed; the interpretation is up to the rendering function. + +The `payload` can be either the content of the attachment, encoded in +base64 (which is decoded before being passed to the selected +renderer), or a `file://` URL (whose content is read and passed to the +renderer), or yet a `tmpfile://` URL, which indicates that the file +should be deleted after it is read. + +Note that it can take considerable time to insert large amounts of +data in a comint buffer, specially if it contains long lines. +Consider using a temporary file for large data transfers. + +Todos +- + +- [ ] It should be possible to support at least Matplotlib in the + classic `python` interpreter. +- [ ] Improve the HTML rendering for numeric tables + +[python]: https://user-images.githubusercontent.com/6500902/133823411-ca75122d-4a39-4e3c-ac55-b2a1f974ff5e.png +[bash]: https://user-images.githubusercontent.com/6500902/133823494-696ee5a7-f0b0-47a3-9ccb-29ab9f36c3a9.png +[ipython_repr]: https://ipython.readthedocs.io/en/stable/config/integrating.html#rich-display diff --git a/comint-mime.el b/comint-mime.el new file mode 100644 index 000..6071730 --- /dev/null +++ b/comint-mime.el @@ -0,0 +1,231 @@ +;;; comint-mime.el --- Display content of various MIME types in comint buffers -*- lexical-binding: t; -*- + +;; Copyright (C) 2021 Augusto Stoffel + +;; Author: Augusto Stoffel +;; Keywords: processes, multimedia +;; Version: 0 +;; Homepage: https://github.com/astoff/comint-mime +;; Package-Requires: ((emacs "28.1")) + +;; This program is free software; you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any l
[elpa] externals/nano-theme bd5f630 1/2: Added magit (WIP)
branch: externals/nano-theme commit bd5f630a7d273f1093372a569808c3bc748a59c4 Author: Nicolas P. Rougier Commit: Nicolas P. Rougier Added magit (WIP) --- nano-theme.el | 134 -- 1 file changed, 130 insertions(+), 4 deletions(-) diff --git a/nano-theme.el b/nano-theme.el index 433f047..6739153 100644 --- a/nano-theme.el +++ b/nano-theme.el @@ -183,7 +183,7 @@ "Salient color is used for information that are important." :type 'color :group 'nano-theme-light) -(defcustom nano-light-strong "#00" ;; Black +(defcustom nano-light-strong "#263238" ;; Blue Grey / L900 "Strong color is used for information of a structural nature." :type 'color :group 'nano-theme-light) @@ -514,8 +514,8 @@ background color that is barely perceptible." :weight ,(face-attribute 'nano-mono :weight) :height ,(face-attribute 'nano-mono :height) :family ,(face-attribute 'nano-mono :family) - `(nano-strong ((,light (:weight normal :foreground ,nano-light-strong)) -(,dark (:weight normal :foreground ,nano-dark-strong + `(nano-strong ((,light (:weight normal )) +(,dark (:weight normal `(variable-pitch ((t (:weight ,(face-attribute 'nano-sans :weight) :height ,(face-attribute 'nano-sans :height) :family ,(face-attribute 'nano-sans :family))) @@ -823,7 +823,20 @@ background color that is barely perceptible." '(nano-modeline-inactive-status-RO ((t (:inherit (nano-popout nano-modeline-inactive) '(nano-modeline-inactive-status-RW ((t (:inherit (nano-faded nano-modeline-inactive) '(nano-modeline-inactive-status-** ((t (:inherit (nano-critical-i nano-modeline-inactive) - + + ;; --- nano agenda - + '(nano-agenda-button ((t (:inherit (nano-faded) + '(nano-agenda-day-name ((t (:inherit (nano-faded) + '(nano-agenda-default ((t (:inherit (nano-default) + '(nano-agenda-holidays ((t (:inherit (nano-faded) + '(nano-agenda-month-name ((t (:inherit (nano-strong) + '(nano-agenda-mouse((t (:inherit (nano-highlight) + '(nano-agenda-outday ((t (:inherit (nano-subtle-i) + '(nano-agenda-selected ((t (:inherit (nano-default-i) + '(nano-agenda-selected-today ((t (:inherit (nano-popout-i nano-strong) + '(nano-agenda-today((t (:inherit (nano-popout nano-strong) + '(nano-agenda-weekend ((t (:inherit (nano-faded) + ;; --- EPA -- '(epa-field-body ((t (:inherit nano-default '(epa-field-name ((t (:inherit nano-strong @@ -1169,6 +1182,119 @@ background color that is barely perceptible." '(markdown-table-face ((t (:inherit nano-default '(markdown-url-face ((t (:inherit nano-salient +;; --- Magit (WIP) --- +'(magit-blame-highlight ((t (:inherit (highlight) +'(magit-diff-added-highlight ((t (:inherit (highlight nano-salient nano-strong) +'(magit-diff-base-highlight ((t (:inherit (highlight) +'(magit-diff-context-highlight ((t (:inherit (highlight nano-faded) +'(magit-diff-file-heading-highlight ((t (:inherit (highlight nano-strong) +'(magit-diff-hunk-heading-highlight ((t (:inherit (nano-default) +'(magit-diff-our-highlight ((t (:inherit (highlight) +'(magit-diff-removed-highlight ((t (:inherit (highlight nano-popout nano-strong) +'(magit-diff-revision-summary-highlight ((t (:inherit () +'(magit-diff-their-highlight ((t (:inherit (highlight) +'(magit-section-highlight((t (:inherit (highlight) + +'(magit-blame-heading((t (:inherit (nano-subtle nano-strong) +'(magit-diff-conflict-heading((t (:inherit (nano-subtle nano-strong) +'(magit-diff-file-heading((t (:inherit (nano-strong) +'(magit-diff-hunk-heading((t (:inherit (nano-subtle nano-default) +'(magit-diff-lines-heading ((t (:inherit (nano-subtle nano-strong) +'(magit-section-heading ((t (:inherit (nano-salient nano-strong) + +'(magit-bisect-bad ((t (:inherit nano-default +'(magit-bisect-good ((t (:inherit nano-default +'(magit-bisect-skip ((t (:i
[elpa] externals/nano-theme updated (5aea8a1 -> 815f662)
elpasync pushed a change to branch externals/nano-theme. from 5aea8a1 Disable ugly widgets and adjust underline position new bd5f630 Added magit (WIP) new 815f662 Tentative fix for light/dark new frames Summary of changes: nano-dark-theme.el | 1 - nano-light-theme.el | 9 --- nano-theme.el | 197 +++- 3 files changed, 179 insertions(+), 28 deletions(-)
[elpa] externals/nano-theme 815f662 2/2: Tentative fix for light/dark new frames
branch: externals/nano-theme commit 815f66209e0d38127d7923b67c922fff263c0813 Author: Nicolas P. Rougier Commit: Nicolas P. Rougier Tentative fix for light/dark new frames --- nano-dark-theme.el | 1 - nano-light-theme.el | 9 nano-theme.el | 63 + 3 files changed, 49 insertions(+), 24 deletions(-) diff --git a/nano-dark-theme.el b/nano-dark-theme.el index cf5e7da..7dd9c40 100644 --- a/nano-dark-theme.el +++ b/nano-dark-theme.el @@ -39,7 +39,6 @@ (deftheme nano-dark "N Λ N O dark theme") - (set-foreground-color nano-dark-foreground) (set-background-color nano-dark-background) (nano-theme 'dark) diff --git a/nano-light-theme.el b/nano-light-theme.el index cd7d719..657e605 100644 --- a/nano-light-theme.el +++ b/nano-light-theme.el @@ -43,15 +43,6 @@ (set-background-color nano-light-background) (nano-theme 'light) - -(defun nano-light () - "Nano theme light" - - (interactive) - (set-foreground-color nano-light-foreground) - (set-background-color nano-light-background) - (load-theme 'nano-light t)) - ;;;###autoload (when load-file-name (add-to-list 'custom-theme-load-path diff --git a/nano-theme.el b/nano-theme.el index 6739153..690d837 100644 --- a/nano-theme.el +++ b/nano-theme.el @@ -463,17 +463,36 @@ background color that is barely perceptible." "Load the nano dark theme on current frame." (interactive) - (set-foreground-color nano-dark-foreground) - (set-background-color nano-dark-background) - (load-theme 'nano-dark t)) + ;; (setq inhibit-frame-set-background-mode nil) + ;; (setq frame-background-mode nil) + ;; (let ((parent (selected-frame)) + ;;(children (frame-list))) + ;;(dolist (child children) + ;; (when (eq (frame-parameter child 'parent-frame) parent) + ;;(with-selected-frame child + ;; (load-theme 'nano-dark t) + ;; (setq frame-background-mode 'dark) + ;; (set-foreground-color nano-dark-foreground) + ;; (set-background-color nano-dark-background) + (load-theme 'nano-dark t) + (setq frame-background-mode 'dark)) (defun nano-light () "Load the nano light theme on current frame." (interactive) - (set-foreground-color nano-light-foreground) - (set-background-color nano-light-background) - (load-theme 'nano-light t)) + ;; (setq inhibit-frame-set-background-mode t) + ;; (setq frame-background-mode nil) + ;; (let ((parent (selected-frame)) + ;; (children (frame-list))) + ;; (dolist (child children) + ;; (when (eq (frame-parameter child 'parent-frame) parent) + ;; (with-selected-frame child + ;; (load-theme 'nano-light t) +;; (set-foreground-color nano-light-foreground) +;; (set-background-color nano-light-background) +(load-theme 'nano-light t) +(setq frame-background-mode 'light)) (defvar nano-theme--current 'light "Current nano theme") @@ -494,16 +513,26 @@ background color that is barely perceptible." (dark '((background dark))) (theme (if (eq mode 'dark) 'nano-dark - 'nano-light))) + 'nano-light))) + + + +;; (add-to-list 'default-frame-alist `(background-mode . ,mode)) +(add-to-list 'default-frame-alist `(background-color . ,(if (eq mode 'light) + nano-light-background + nano-dark-background))) +(add-to-list 'default-frame-alist `(foreground-color . ,(if (eq mode 'light) + nano-light-foreground + nano-dark-foreground))) (custom-set-variables '(widget-image-enable nil) '(x-underline-at-descent-line t)) - -(set-frame-parameter nil 'background-mode mode) -(setq frame-background-mode mode) -(setq nano-theme--current mode) -(frame-set-background-mode (selected-frame)) +(set-frame-parameter nil 'background-mode mode) +;;(setq frame-background-mode mode) +;;(setq nano-theme--current mode) +;;(frame-set-background-mode (selected-frame)) + (when nano-fonts-use (custom-theme-set-faces theme `(default ((,light (:foreground ,nano-light-foreground @@ -531,6 +560,12 @@ background color that is barely perceptible." (custom-theme-set-faces theme ;; --- Base - + + `(default ((,light (:background ,nano-light-background +:foreground ,nano-light-foreground)) + (,dark (:background ,nano-dark-background + :foreground ,nano-dark-foreground + `(cursor ((,light (:foreground ,nano-light-background :background ,nano-light-foreground)) (,dark (:foreground ,n
[elpa] externals/consult d8c925b: consult-register: Add support for file values (Fix #449)
branch: externals/consult commit d8c925b9c62cd90ebd0970d944bdc6e0129ecce3 Author: Daniel Mendler Commit: Daniel Mendler consult-register: Add support for file values (Fix #449) --- consult-register.el | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/consult-register.el b/consult-register.el index 089fb6d..873cbde 100644 --- a/consult-register.el +++ b/consult-register.el @@ -28,11 +28,12 @@ (defcustom consult-register-narrow `((?n "Number" ,#'numberp) (?s "String" ,#'stringp) +(?p "Point" ,#'markerp) (?r "Rectangle" ,(lambda (x) (stringp (car-safe x ;; frameset-register-p and kmacro-register-p exists since 27.1 -(?f "Frameset" ,(lambda (x) (eq (type-of x) 'frameset-register))) +(?t "Frameset" ,(lambda (x) (eq (type-of x) 'frameset-register))) (?k "Kmacro" ,(lambda (x) (eq (type-of x) 'kmacro-register))) -(?p "Point" ,(lambda (x) (or (markerp x) (eq (car-safe x) 'file-query +(?f "File" ,(lambda (x) (memq (car-safe x) '(file file-query (?w "Window" ,(lambda (x) (window-configuration-p (car-safe x) "Register narrowing configuration. @@ -96,6 +97,9 @@ This function can be used as `register-preview-function'." (format "%s at position %d" (propertize (abbreviate-file-name (cadr val)) 'face 'consult-file) (caddr val))) +;; Display 'file +((eq (car-safe val) 'file) + (propertize (abbreviate-file-name (cdr val)) 'face 'consult-file)) ;; Display full line of buffer ((and (markerp val) (marker-buffer val)) (with-current-buffer (marker-buffer val)
[elpa] externals/consult 67fa3a2: consult-register-store: Add support to create file register value
branch: externals/consult
commit 67fa3a253e838fe496a2376123a867d8ba15f857
Author: Daniel Mendler
Commit: Daniel Mendler
consult-register-store: Add support to create file register value
See #449
---
consult-register.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/consult-register.el b/consult-register.el
index 873cbde..c0e5fb8 100644
--- a/consult-register.el
+++ b/consult-register.el
@@ -257,7 +257,8 @@ number. Otherwise store point, frameset, window or kmacro."
(t
`("Store"
(?p "point" "Point to register: " ,#'point-to-register)
- (?f "frameset" "Frameset to register: " ,#'frameset-to-register)
+ (?f "file" "File to register: " ,(lambda (r) (set-register r `(file .
,(buffer-file-name)
+ (?t "frameset" "Frameset to register: " ,#'frameset-to-register)
(?w "window" "Window to register: " ,#'window-configuration-to-register)
,@(and last-kbd-macro `((?k "kmacro" "Kmacro to register: "
,#'kmacro-to-register
[elpa] externals/coterm a14ace9: Pass through sequence "\e\e", used by package 'bash-completion'
branch: externals/coterm commit a14ace9fc317052d0c6b281ccec2f8ee7f4925ea Author: Miha Rihtaršič Commit: Miha Rihtaršič Pass through sequence "\e\e", used by package 'bash-completion' --- coterm.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coterm.el b/coterm.el index d3ade99..3dab751 100644 --- a/coterm.el +++ b/coterm.el @@ -568,12 +568,13 @@ is the process mark." ;; Removed: \032 (\C-z) ;; Added: OSC sequence \e] ... ; ... \e\\ (or \a) ;; Added: sequences \e= and \e> + ;; Added: Invalid sequence \e\e, used by package `bash-completion' (concat ;; A control character, "\\(?:[\n\000\007\t\b\016\017]\\|\r\n?\\|" ;; a C1 escape coded character (see [ECMA-48] section 5.3 "Elements ;; of the C1 set"), - "\e\\(?:[DM78c=>]\\|" + "\e\\(?:[DM78c=>\e]\\|" ;; Emacs specific control sequence from term.el. In coterm, we simply ;; ignore them. "AnSiT[^\n]+\n\\|"
[nongnu] elpa/git-commit 1b83f8e: magit-push-implicitly: Protect doc-string quotes
branch: elpa/git-commit commit 1b83f8ee1c5aa069f2f846e25d99df3d415d9657 Author: Kyle Meyer Commit: Kyle Meyer magit-push-implicitly: Protect doc-string quotes Prevent these from being rendered according to text-quoting-style. --- lisp/magit-push.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/magit-push.el b/lisp/magit-push.el index aae8d8c..f45a65b 100644 --- a/lisp/magit-push.el +++ b/lisp/magit-push.el @@ -286,8 +286,8 @@ If you add this suffix to a transient prefix without explicitly specifying the description, then an attempt is made to predict what this command will do. For example: - (transient-insert-suffix 'magit-push \"p\" -'(\"i\" magit-push-implicitly))" + (transient-insert-suffix \\='magit-push \"p\" +\\='(\"i\" magit-push-implicitly))" :description 'magit-push-implicitly--desc (interactive (list (magit-push-arguments))) (run-hooks 'magit-credential-hook)
[nongnu] elpa/magit updated (ceab312 -> 1b83f8e)
elpasync pushed a change to branch elpa/magit. from ceab312 magit-submodule-list-predicate: New variable adds 1b83f8e magit-push-implicitly: Protect doc-string quotes No new revisions were added by this update. Summary of changes: lisp/magit-push.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[nongnu] elpa/magit-section updated (ceab312 -> 1b83f8e)
elpasync pushed a change to branch elpa/magit-section. from ceab312 magit-submodule-list-predicate: New variable adds 1b83f8e magit-push-implicitly: Protect doc-string quotes No new revisions were added by this update. Summary of changes: lisp/magit-push.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
