[elpa] externals/ef-themes 48dc905d4b: Revise the 'prompt' value to avoid conflict with 'keybind'

2023-07-07 Thread ELPA Syncer
branch: externals/ef-themes
commit 48dc905d4b8eebbdd8a928898c9dc56ee5216965
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Revise the 'prompt' value to avoid conflict with 'keybind'

We do not want the prompt to ever look the same as keybindings.  This
can happen in various minibuffer prompts, such as the case reported by
Steve Molinor in issue 24 on the GitHub mirror:
.
---
 ef-bio-theme.el   | 2 +-
 ef-deuteranopia-dark-theme.el | 2 +-
 ef-duo-light-theme.el | 2 +-
 ef-elea-dark-theme.el | 2 +-
 ef-elea-light-theme.el| 2 +-
 ef-frost-theme.el | 2 +-
 ef-night-theme.el | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ef-bio-theme.el b/ef-bio-theme.el
index 49843ca656..86d44d6630 100644
--- a/ef-bio-theme.el
+++ b/ef-bio-theme.el
@@ -176,7 +176,7 @@
   (name green)
   (keybind green)
   (identifier magenta-faint)
-  (prompt green-warmer)
+  (prompt cyan-cooler)
 
  Code mappings
 
diff --git a/ef-deuteranopia-dark-theme.el b/ef-deuteranopia-dark-theme.el
index c09ceb2425..93a1295709 100644
--- a/ef-deuteranopia-dark-theme.el
+++ b/ef-deuteranopia-dark-theme.el
@@ -179,7 +179,7 @@
   (name blue-warmer)
   (keybind yellow-warmer)
   (identifier cyan-faint)
-  (prompt yellow)
+  (prompt blue-cooler)
 
  Code mappings
 
diff --git a/ef-duo-light-theme.el b/ef-duo-light-theme.el
index d07256bf7a..550ce1ec90 100644
--- a/ef-duo-light-theme.el
+++ b/ef-duo-light-theme.el
@@ -179,7 +179,7 @@
   (name blue)
   (keybind blue-cooler)
   (identifier red-faint)
-  (prompt blue)
+  (prompt blue-warmer)
 
  Code mappings
 
diff --git a/ef-elea-dark-theme.el b/ef-elea-dark-theme.el
index 2b4244d385..680988121c 100644
--- a/ef-elea-dark-theme.el
+++ b/ef-elea-dark-theme.el
@@ -176,7 +176,7 @@
   (name green)
   (keybind magenta)
   (identifier magenta-faint)
-  (prompt magenta)
+  (prompt magenta-cooler)
 
  Code mappings
 
diff --git a/ef-elea-light-theme.el b/ef-elea-light-theme.el
index bc22800ce1..d8f7bb9763 100644
--- a/ef-elea-light-theme.el
+++ b/ef-elea-light-theme.el
@@ -176,7 +176,7 @@
   (name green-warmer)
   (keybind magenta)
   (identifier magenta-faint)
-  (prompt magenta)
+  (prompt magenta-warmer)
 
  Code mappings
 
diff --git a/ef-frost-theme.el b/ef-frost-theme.el
index 64b5461c12..2e5b777065 100644
--- a/ef-frost-theme.el
+++ b/ef-frost-theme.el
@@ -176,7 +176,7 @@
   (name cyan-warmer)
   (keybind blue-cooler)
   (identifier magenta-faint)
-  (prompt blue)
+  (prompt cyan)
 
  Code mappings
 
diff --git a/ef-night-theme.el b/ef-night-theme.el
index 250141a4b9..fcb4ff6c54 100644
--- a/ef-night-theme.el
+++ b/ef-night-theme.el
@@ -176,7 +176,7 @@
   (name blue-warmer)
   (keybind green-cooler)
   (identifier magenta-faint)
-  (prompt cyan-cooler)
+  (prompt cyan-warmer)
 
  Code mappings
 



[elpa] externals/modus-themes 4e331d27de: Revise bg-hover hue in all themes except tritanopia

2023-07-07 Thread ELPA Syncer
branch: externals/modus-themes
commit 4e331d27dec9eb6d61a0fdf87aba1942966efbdf
Author: Protesilaos Stavrou 
Commit: Protesilaos Stavrou 

Revise bg-hover hue in all themes except tritanopia

The previous colour was not sufficiently distinct from bg-completion.
This would make it hard to spot the difference while, for example,
using 'vertico-mode' in tandem with 'vertico-mouse-mode'.

Same principle for the difference between the mouse hover and lazy
isearch highlights (e.g. in Dired or Occur buffers).

Changing the hue here follows the same principle that underpinned the
redesign of the grey backgrounds for version 4 of the project:
depending on hardware capabilities, colour reproduction may not be
optimal, so we need to be more considerate with the choice of colour
values.

The tritanopia themes are not affected by this, as they already use
highly distinct hues.

Thanks to Daniel Mendler[1] for bringing this matter to my attention
and for testing the proposed alternatives.  This was done via a
private channel and the information is shared with permission.

[1] 
---
 modus-operandi-deuteranopia-theme.el | 2 +-
 modus-operandi-theme.el  | 2 +-
 modus-operandi-tinted-theme.el   | 2 +-
 modus-vivendi-deuteranopia-theme.el  | 2 +-
 modus-vivendi-theme.el   | 2 +-
 modus-vivendi-tinted-theme.el| 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modus-operandi-deuteranopia-theme.el 
b/modus-operandi-deuteranopia-theme.el
index 4f70a84ebe..3bd7686401 100644
--- a/modus-operandi-deuteranopia-theme.el
+++ b/modus-operandi-deuteranopia-theme.el
@@ -155,7 +155,7 @@ standard).")
 ;;; Special purpose
 
   (bg-completion   "#c0deff")
-  (bg-hover"#97dfed")
+  (bg-hover"#b2e4dc")
   (bg-hover-secondary  "#f5d0a0")
   (bg-hl-line  "#dae5ec")
   (bg-region   "#bdbdbd")
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index e47258fe3e..7fabce3e74 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -153,7 +153,7 @@ which corresponds to a minimum contrast in relative 
luminance of
 ;;; Special purpose
 
   (bg-completion   "#c0deff")
-  (bg-hover"#94d4ff")
+  (bg-hover"#b2e4dc")
   (bg-hover-secondary  "#f5d0a0")
   (bg-hl-line  "#dae5ec")
   (bg-region   "#bdbdbd")
diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el
index dd7ea4a5d9..07e14cd70b 100644
--- a/modus-operandi-tinted-theme.el
+++ b/modus-operandi-tinted-theme.el
@@ -152,7 +152,7 @@ which corresponds to a minimum contrast in relative 
luminance of
 ;;; Special purpose
 
   (bg-completion   "#f0c1cf")
-  (bg-hover"#94d4ff")
+  (bg-hover"#b2e4dc")
   (bg-hover-secondary  "#f5d0a0")
   (bg-hl-line  "#f1d5d0")
   (bg-region   "#c2bcb5")
diff --git a/modus-vivendi-deuteranopia-theme.el 
b/modus-vivendi-deuteranopia-theme.el
index 2c3a92f18a..7a10073f53 100644
--- a/modus-vivendi-deuteranopia-theme.el
+++ b/modus-vivendi-deuteranopia-theme.el
@@ -154,7 +154,7 @@ standard).")
 ;;; Special purpose
 
   (bg-completion   "#2f447f")
-  (bg-hover"#004f70")
+  (bg-hover"#45605e")
   (bg-hover-secondary  "#654a39")
   (bg-hl-line  "#2f3849")
   (bg-region   "#5a5a5a")
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index 1c0f6cfebf..2ee7e5ebf6 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -152,7 +152,7 @@ which corresponds to a minimum contrast in relative 
luminance of
 ;;; Special purpose
 
   (bg-completion   "#2f447f")
-  (bg-hover"#004f70")
+  (bg-hover"#45605e")
   (bg-hover-secondary  "#654a39")
   (bg-hl-line  "#2f3849")
   (bg-region   "#5a5a5a")
diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el
index d16b96a3b6..683e018a25 100644
--- a/modus-vivendi-tinted-theme.el
+++ b/modus-vivendi-tinted-theme.el
@@ -146,7 +146,7 @@ which corresponds to a minimum contrast in relative 
luminance of
 ;;; Special purpose
 
   (bg-completion   "#483d8a")
-  (bg-hover"#004f70")
+  (bg-hover"#45605e")
   (bg-hover-secondary  "#654a39")
   (bg-hl-line  "#303a6f")
   (bg-region   "#555a66")



[nongnu] elpa/cider ec787321f2 1/2: Tweak markup

2023-07-07 Thread ELPA Syncer
branch: elpa/cider
commit ec787321f2301147ac1cddbc0118b4bf20202ab7
Author: Bozhidar Batsov 
Commit: Bozhidar Batsov 

Tweak markup
---
 doc/modules/ROOT/pages/debugging/logging.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/modules/ROOT/pages/debugging/logging.adoc 
b/doc/modules/ROOT/pages/debugging/logging.adoc
index ccb198f11a..cd30b0e105 100644
--- a/doc/modules/ROOT/pages/debugging/logging.adoc
+++ b/doc/modules/ROOT/pages/debugging/logging.adoc
@@ -33,7 +33,7 @@ https://github.com/doublep/logview[Logview] is an optional 
dependency
 of CIDER Log Mode. We recommend using it, since it is responsible for
 coloring the log events and it provides other useful features, such as
 syntax highlighting, filtering and more. It is used automatically when
-available and its use can be customized via `+cider-log-use-logview+`.
+available and its use can be customized via `cider-log-use-logview`.
 
 == Usage
 



[nongnu] elpa/cider updated (5920aa7d95 -> bc8903b0c8)

2023-07-07 Thread ELPA Syncer
elpasync pushed a change to branch elpa/cider.

  from  5920aa7d95 Make logview optional
   new  ec787321f2 Tweak markup
   new  bc8903b0c8 Add a link to the docs in cider-log.el


Summary of changes:
 cider-log.el  | 3 +++
 doc/modules/ROOT/pages/debugging/logging.adoc | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)



[nongnu] elpa/cider bc8903b0c8 2/2: Add a link to the docs in cider-log.el

2023-07-07 Thread ELPA Syncer
branch: elpa/cider
commit bc8903b0c85cf0891f106337eabfc6f747d262a1
Author: Bozhidar Batsov 
Commit: Bozhidar Batsov 

Add a link to the docs in cider-log.el
---
 cider-log.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cider-log.el b/cider-log.el
index 1f039e1660..fbe0106b89 100644
--- a/cider-log.el
+++ b/cider-log.el
@@ -22,6 +22,9 @@
 ;;; Commentary:
 
 ;; Log inspection functionality for Clojure.
+;;
+;; Please, refer to the online documentation for more details
+;; https://docs.cider.mx/cider/debugging/logging.html.
 
 ;;; Code:
 



[nongnu] elpa/helm 25461b0463 4/4: Remove thumbnailed directories from cache when cleaning

2023-07-07 Thread ELPA Syncer
branch: elpa/helm
commit 25461b0463845efa7f0eb710879f26543c4a4dae
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Remove thumbnailed directories from cache when cleaning
---
 helm-files.el | 4 
 1 file changed, 4 insertions(+)

diff --git a/helm-files.el b/helm-files.el
index 41f9761617..809844d213 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5442,6 +5442,10 @@ source is `helm-source-find-files'."
   helm-ff-update-when-only-one-matched
   helm-ff-move-to-first-real-candidate
   helm-ff-clean-initial-input))
+  (maphash (lambda (k _v)
+ (when (member k helm-ff--thumbnailed-directories)
+   (remhash k helm-ff--list-directory-cache)))
+   helm-ff--list-directory-cache)
   (setq helm-ff--show-directories-only nil
 helm-ff--show-files-only nil
 helm-ff--show-thumbnails nil



[nongnu] elpa/helm c667715fbd 1/4: Check basedir for icon in helm bookmark

2023-07-07 Thread ELPA Syncer
branch: elpa/helm
commit c667715fbd4277bd8662edb9404ee7dc37b63aee
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Check basedir for icon in helm bookmark
---
 helm-bookmark.el | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/helm-bookmark.el b/helm-bookmark.el
index d4831cc07c..848da91a13 100644
--- a/helm-bookmark.el
+++ b/helm-bookmark.el
@@ -611,9 +611,12 @@ If `browse-url-browser-function' is set to something else 
than
 i)
   for icon = (when helm-bookmark-use-icon
(cond ((and isfile hff)
-  (helm-aif (all-the-icons-match-to-alist
- (helm-basename isfile)
- all-the-icons-dir-icon-alist)
+  (helm-aif (or (all-the-icons-match-to-alist
+ (helm-basename (helm-basedir 
isfile t))
+ all-the-icons-dir-icon-alist)
+(all-the-icons-match-to-alist
+ (helm-basename isfile)
+ all-the-icons-dir-icon-alist))
   (apply (car it) (cdr it))
 (all-the-icons-octicon "file-directory")))
  ((and isfile isinfo) (all-the-icons-octicon 
"info"))



[nongnu] elpa/helm updated (c46c04cd55 -> 25461b0463)

2023-07-07 Thread ELPA Syncer
elpasync pushed a change to branch elpa/helm.

  from  c46c04cd55 Same icons in bookmarks for dirs as in HFF
   new  c667715fbd Check basedir for icon in helm bookmark
   new  37bf5e6d7c Fix displaying thumbnails with icons in HFF
   new  b0e9630186 Untabify no code change
   new  25461b0463 Remove thumbnailed directories from cache when cleaning


Summary of changes:
 helm-bookmark.el |  9 ++---
 helm-files.el| 39 +++
 2 files changed, 29 insertions(+), 19 deletions(-)



[nongnu] elpa/helm-core updated (c46c04cd55 -> 25461b0463)

2023-07-07 Thread ELPA Syncer
elpasync pushed a change to branch elpa/helm-core.

  from  c46c04cd55 Same icons in bookmarks for dirs as in HFF
  adds  c667715fbd Check basedir for icon in helm bookmark
  adds  37bf5e6d7c Fix displaying thumbnails with icons in HFF
  adds  b0e9630186 Untabify no code change
  adds  25461b0463 Remove thumbnailed directories from cache when cleaning

No new revisions were added by this update.

Summary of changes:
 helm-bookmark.el |  9 ++---
 helm-files.el| 39 +++
 2 files changed, 29 insertions(+), 19 deletions(-)



[nongnu] elpa/helm 37bf5e6d7c 2/4: Fix displaying thumbnails with icons in HFF

2023-07-07 Thread ELPA Syncer
branch: elpa/helm
commit 37bf5e6d7c9ec21a60ff63a98ef5c2d6bc52c04c
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Fix displaying thumbnails with icons in HFF

Don't show both, replace icon by thumbnail and vice versa.
---
 helm-files.el | 27 +++
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index 3852d47ad3..e5cb5caac5 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5045,16 +5045,18 @@ Special commands:
  (let ((thumbnail (plist-get
(cdr 
(helm-ff--image-dired-get-thumbnail-image img))
:file)))
-   (cons (concat (propertize " "
- 'display `(image
-:type ,type
-:margin 5
-:file ,thumbnail)
- 'rear-nonsticky '(display))
- disp)
- img))
- else collect (cons disp img)))
-candidates))
+   ;; When icons are displayed the leading space handling disp
+   ;; prop is already here, just replace icon with the 
thumbnail.
+   (unless helm-ff-icon-mode (setq disp (concat " " disp)))
+   (add-text-properties 0 1 `(display (image
+   :type ,type
+   :margin 5
+   :file ,thumbnail)
+  rear-nonsticky 
'(display))
+disp)
+   (cons disp img))
+   else collect (cons disp img)))
+candidates))
 
 ;; Same as `image-dired-get-thumbnail-image' but use
 ;; `helm-ff--image-dired-thumb-name' which cache thumbnails for further use.
@@ -5094,8 +5096,9 @@ Special commands:
  helm-ff--thumbnailed-directories))
 (setq helm-ff--thumbnailed-directories
   (delete helm-ff-default-directory helm-ff--thumbnailed-directories)))
-  (helm-update (regexp-quote (replace-regexp-in-string
-  "\\`[[:multibyte:] ]*" "" (helm-get-selection 
nil t)
+  (helm-force-update (regexp-quote (replace-regexp-in-string
+"\\`[[:multibyte:] ]*" ""
+(helm-get-selection nil t)
 (put 'helm-ff-toggle-thumbnails 'no-helm-mx t)
 
 ;;;###autoload



[nongnu] elpa/helm b0e9630186 3/4: Untabify no code change

2023-07-07 Thread ELPA Syncer
branch: elpa/helm
commit b0e96301860da5594ee6eea8a98b0b2864e52fe7
Author: Thierry Volpiatto 
Commit: Thierry Volpiatto 

Untabify no code change
---
 helm-files.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/helm-files.el b/helm-files.el
index e5cb5caac5..41f9761617 100644
--- a/helm-files.el
+++ b/helm-files.el
@@ -5065,11 +5065,11 @@ Special commands:
   (unless (string-match-p (image-file-name-regexp) file)
 (error "%s is not a valid image file" file))
   (let* ((thumb-file (helm-ff--image-dired-thumb-name file))
-(thumb-attr (file-attributes thumb-file)))
+ (thumb-attr (file-attributes thumb-file)))
 (when (or (not thumb-attr)
- (time-less-p (file-attribute-modification-time thumb-attr)
-  (file-attribute-modification-time
-   (file-attributes file
+  (time-less-p (file-attribute-modification-time thumb-attr)
+   (file-attribute-modification-time
+(file-attributes file
   (image-dired-create-thumb file thumb-file))
 (create-image thumb-file)))
 



[elpa] externals/org 2e2ed40553: org-src.el: Use native value of `indent-tabs-mode' for indentation

2023-07-07 Thread ELPA Syncer
branch: externals/org
commit 2e2ed405530bacc674c00e5db34ead3941b0b7ef
Author: Sébastien Miquel 
Commit: Ihor Radchenko 

org-src.el: Use native value of `indent-tabs-mode' for indentation

* lisp/org.el (org-indent-line): Simplify native indentation inside
src block.  Ensure we add the org indentation if the line is empty.
* lisp/org-macs.el (org-do-remove-indentation): Preserve
indentation (spaces vs tabs) past the common indentation to remove.
Do not empty blank lines.
* lisp/org-src.el (org-src--contents-for-write-back): Preserve the
native indentation (spaces vs tabs).  If necessary, add a common org
indentation to the block according to org's `indent-tabs-mode'.
(org-src-font-lock-fontify-block): Display the native indentation tab
characters with a fixed width, according to the native tab width
value, to preserve vertical alignement in the org buffer.
* testing/lisp/test-org-src.el (test-org-src/indented-blocks): Update
tests.  Indentation no longer obeys `indent-tabs-mode' from the org
buffer, but is separated in an eventual org part, and the native part.

Link: https://list.orgmode.org/87a5wcez7e.fsf@localhost/T/#t
---
 lisp/org-macs.el |  9 --
 lisp/org-src.el  | 57 +++--
 lisp/org.el  | 23 +-
 testing/lisp/test-org-src.el | 75 +++-
 4 files changed, 94 insertions(+), 70 deletions(-)

diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index d6879e8cf8..aa5c4845e6 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -402,9 +402,12 @@ line.  Return nil if it fails."
 (when skip-fl (forward-line))
(while (not (eobp))
  (let ((ind (progn (skip-chars-forward " \t") (current-column
-   (cond ((eolp) (delete-region (line-beginning-position) (point)))
- ((< ind n) (throw :exit nil))
- (t (indent-line-to (- ind n
+   (cond ((< ind n)
+   (if (eolp) (delete-region (line-beginning-position) (point))
+ (throw :exit nil)))
+ (t (delete-region (line-beginning-position)
+(progn (move-to-column n t)
+   (point)
(forward-line)))
;; Signal success.
t
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 3176828446..e1f7d50dcf 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -326,9 +326,6 @@ is 0.")
   "File name associated to Org source buffer, or nil.")
 (put 'org-src-source-file-name 'permanent-local t)
 
-(defvar-local org-src--preserve-blank-line nil)
-(put 'org-src--preserve-blank-line 'permanent-local t)
-
 (defun org-src--construct-edit-buffer-name (org-buffer-name lang)
   "Construct the buffer name for a source editing buffer.
 Format is \"*Org Src ORG-BUFFER-NAME[ LANG ]*\"."
@@ -481,12 +478,17 @@ Assume point is in the corresponding edit buffer."
  (list (buffer-substring (point-min) eol)
(buffer-substring eol (point-max))
(write-back org-src--allow-write-back)
-(preserve-blank-line org-src--preserve-blank-line)
-marker)
+marker indent-str)
+;; Compute the exact sequence of tabs and spaces used to indent up
+;; to `indentation-offset' in the Org buffer.
+(setq indent-str
+  (with-temp-buffer
+;; Reproduce indentation parameters from org buffer.
+(setq indent-tabs-mode use-tabs?)
+(when (> source-tab-width 0) (setq tab-width source-tab-width))
+(indent-to indentation-offset)
+(buffer-string)))
 (with-current-buffer write-back-buf
-  ;; Reproduce indentation parameters from source buffer.
-  (setq indent-tabs-mode use-tabs?)
-  (when (> source-tab-width 0) (setq tab-width source-tab-width))
   ;; Apply WRITE-BACK function on edit buffer contents.
   (insert (org-no-properties (car contents)))
   (setq marker (point-marker))
@@ -496,15 +498,14 @@ Assume point is in the corresponding edit buffer."
   ;; Add INDENTATION-OFFSET to every line in buffer,
   ;; unless indentation is meant to be preserved.
   (when (> indentation-offset 0)
-   (when preserve-fl (forward-line))
+;; LaTeX-fragments are inline. Do not add indentation to their
+;; first line.
+(when preserve-fl (forward-line))
 (while (not (eobp))
- (skip-chars-forward " \t")
-  (when (or (not (eolp))   ; not a blank 
line
-(and (eq (point) (marker-position marker)) ; current line
- preserve-blank-line))
-   (let ((i (current-column)))
- (delete-region (line-beginning-position) (point))
- (indent-to (+ i indentation-offset
+  ;; Keep empty src lines e

[elpa] externals/emacs-gc-stats a9acd357aa 2/2: Bump version to 1.4

2023-07-07 Thread ELPA Syncer
branch: externals/emacs-gc-stats
commit a9acd357aa49dd98bf95e767519efa4d7fb98537
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Bump version to 1.4
---
 README.md | 5 +
 README.org| 3 +++
 emacs-gc-stats.el | 2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dbb658f012..6ebb9d0e26 100644
--- a/README.md
+++ b/README.md
@@ -71,6 +71,11 @@ You can pause the logging any time by disabling 
`emacs-gc-stats-mode`
 # News
 
 
+## Version 1.4
+
+-   `emacs-gc-stats-file` is now compressed, when possible.
+
+
 ## Version 1.3
 
 -   New customization: `emacs-gc-stats-inhibit-command-name-logging` to
diff --git a/README.org b/README.org
index 4137998dc9..7af5ec0458 100644
--- a/README.org
+++ b/README.org
@@ -67,6 +67,9 @@ You can pause the logging any time by disabling 
~emacs-gc-stats-mode~
 (=M-x emacs-gc-stats-mode=).
 
 * News
+** Version 1.4
+
+- ~emacs-gc-stats-file~ is now compressed, when possible.
 
 ** Version 1.3
 
diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index 99b0f37553..07f21c2144 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -7,7 +7,7 @@
 ;; URL: https://git.sr.ht/~yantar92/emacs-gc-stats
 ;; Package-Requires: ((emacs "25.1"))
 
-;; Version: 1.3
+;; Version: 1.4
 
 ;; 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/emacs-gc-stats updated (f17fd30098 -> a9acd357aa)

2023-07-07 Thread ELPA Syncer
elpasync pushed a change to branch externals/emacs-gc-stats.

  from  f17fd30098 Bump version to 1.3
   new  babd865670 Compress `emacs-gc-stats-file' on save
   new  a9acd357aa Bump version to 1.4


Summary of changes:
 README.md |  5 +
 README.org|  3 +++
 emacs-gc-stats.el | 48 +---
 3 files changed, 45 insertions(+), 11 deletions(-)



[elpa] externals/emacs-gc-stats babd865670 1/2: Compress `emacs-gc-stats-file' on save

2023-07-07 Thread ELPA Syncer
branch: externals/emacs-gc-stats
commit babd8656709129eb91c93396b361f268dd3540f1
Author: Ihor Radchenko 
Commit: Ihor Radchenko 

Compress `emacs-gc-stats-file' on save

* emacs-gc-stats.el (emacs-gc-stats--compress):
(emacs-gc-stats--uncompress): New functions to compress/uncompress the
file.
(emacs-gc-stats--get-repvious-session-data): Uncompress compressed
`emacs-gc-stats-file', if possible.
(emacs-gc-stats-save-session): Compress on save.
---
 emacs-gc-stats.el | 46 --
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/emacs-gc-stats.el b/emacs-gc-stats.el
index 580b9d9424..99b0f37553 100644
--- a/emacs-gc-stats.el
+++ b/emacs-gc-stats.el
@@ -44,6 +44,8 @@
 ;; 
 ;;; Code:
 
+(require 'dired-aux)
+
 (defgroup emacs-gc-stats nil
   "Collect and share Emacs GC statistics."
   :tag "GC stats"
@@ -180,12 +182,33 @@ Otherwise, collect symbol."
   emacs-gc-stats-summary-vars)
emacs-gc-stats--data))
 
+(defun emacs-gc-stats--compress ()
+  "Compress `emacs-gc-stats-file' and return non-nil on success."
+  (when (file-readable-p emacs-gc-stats-file)
+(ignore-errors ; If compression failed, just leave it be.
+  ;; Confirm overwrite.
+  (cl-letf (((symbol-function 'y-or-n-p) (lambda (&rest _) t)))
+   (dired-compress-file emacs-gc-stats-file)
+
+(defun emacs-gc-stats--uncompress ()
+  "Uncompress `emacs-gc-stats-file' and return non-nil on success."
+  (let ((compressed
+(concat emacs-gc-stats-file
+(or dired-compress-file-default-suffix ".gz"
+(when (file-readable-p compressed)
+  ;; Extract archive.
+  (dired-compress-file compressed
+
 (defun emacs-gc-stats--get-repvious-session-data ()
   "Return previously saved session data."
-  (and (file-readable-p emacs-gc-stats-file)
-   (with-temp-buffer
- (insert-file-contents emacs-gc-stats-file)
- (ignore-errors (read (current-buffer))
+  (and (or (file-readable-p emacs-gc-stats-file)
+  (emacs-gc-stats--uncompress))
+   (unwind-protect
+  (with-temp-buffer
+ (insert-file-contents emacs-gc-stats-file)
+ (ignore-errors (read (current-buffer
+ (emacs-gc-stats--compress)
+ nil)))
 
 (defun emacs-gc-stats-save-session ()
   "Save stats to disk."
@@ -213,12 +236,15 @@ Otherwise, collect symbol."
 (setcdr (cdr existing) (cdr session))
   (push session previous-sessions)))
   (prin1 previous-sessions (current-buffer)))
-(when
-   (and (called-interactively-p 'interactive)
-(yes-or-no-p
- (format "GC stats saved to \"%s\".  Send email to 
emacs-gc-st...@gnu.org? " emacs-gc-stats-file)))
-  (browse-url "mailto:emacs-gc-st...@gnu.org";))
-(message "GC stats saved to \"%s\".  You can share the file by sending 
email to emacs-gc-st...@gnu.org" emacs-gc-stats-file)))
+;; Attempt to compress the file.
+(let ((emacs-gc-stats-file
+  (or (emacs-gc-stats--compress)
+   emacs-gc-stats-file)))
+  (if (and (called-interactively-p 'interactive)
+  (yes-or-no-p
+   (format "GC stats saved to \"%s\".  Send email to 
emacs-gc-st...@gnu.org? " emacs-gc-stats-file)))
+ (browse-url "mailto:emacs-gc-st...@gnu.org";)
+   (message "GC stats saved to \"%s\".  You can share the file by sending 
email to emacs-gc-st...@gnu.org" emacs-gc-stats-file)
 
 (defvar emacs-gc-stats-mode) ; defined later
 (defun emacs-gc-stats-clear ()



[nongnu] elpa/geiser-chez updated (04ab4387fe -> 605a81ff7b)

2023-07-07 Thread ELPA Syncer
elpasync pushed a change to branch elpa/geiser-chez.

  from  04ab4387fe doc browser: links to TSPL and User Manual in 
documentation window
   new  988d9f7e24 Fix version number in library header
   new  b403d161db Fix single quoting style in docstrings
   new  4227aacd5b Move alias definition so it comes before defcustom
   new  605a81ff7b Fix a couple typos


Summary of changes:
 geiser-chez.el | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)



[nongnu] elpa/geiser-chez 4227aacd5b 3/4: Move alias definition so it comes before defcustom

2023-07-07 Thread ELPA Syncer
branch: elpa/geiser-chez
commit 4227aacd5b48072b66a69703cee781b474e34a7c
Author: Macon Gambill 
Commit: Macon Gambill 

Move alias definition so it comes before defcustom
---
 geiser-chez.el | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/geiser-chez.el b/geiser-chez.el
index b76ad59a77..9c0b09fbc0 100644
--- a/geiser-chez.el
+++ b/geiser-chez.el
@@ -58,13 +58,13 @@ host."
   "Extra keywords highlighted in Chez Scheme buffers."
   :type '(repeat string))
 
+(define-obsolete-variable-alias 'geiser-chez-debug-on-exception-p
+  'geiser-chez-debug-on-exception "0.18")
+
 (geiser-custom--defcustom geiser-chez-debug-on-exception nil
   "Whether to automatically enter the debugger when an evaluation throws."
   :type 'boolean)
 
-(define-obsolete-variable-alias 'geiser-chez-debug-on-exception-p
-  'geiser-chez-debug-on-exception "0.18")
-
 (geiser-custom--defcustom geiser-chez-browse-function #'eww
   "Function used to open HTML pages for the manuals."
   :type 'function)



[nongnu] elpa/geiser-chez b403d161db 2/4: Fix single quoting style in docstrings

2023-07-07 Thread ELPA Syncer
branch: elpa/geiser-chez
commit b403d161dbc29d941487f07ffe47463b27207349
Author: Macon Gambill 
Commit: Macon Gambill 

Fix single quoting style in docstrings
---
 geiser-chez.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geiser-chez.el b/geiser-chez.el
index 6c560e2231..b76ad59a77 100644
--- a/geiser-chez.el
+++ b/geiser-chez.el
@@ -74,7 +74,7 @@ host."
   "Base URL for the Chez Scheme User's Guide HTML documents.
 
 Set it to a local file URI such as
-'file:///usr/share/doc/chezscheme-doc/html/' for quicker offline
+`file:///usr/share/doc/chezscheme-doc/html/' for quicker offline
 access."
   :type 'string)
 
@@ -83,7 +83,7 @@ access."
   "Base URL for the The Scheme Programming Languange HTML version.
 
 Set it to a local file URI such as
-'file:///usr/share/doc/tlsp/html/' for quicker offline access."
+`file:///usr/share/doc/tlsp/html/' for quicker offline access."
   :type 'string)
 
 (defconst geiser-chez-minimum-version "9.4")



[nongnu] elpa/geiser-chez 988d9f7e24 1/4: Fix version number in library header

2023-07-07 Thread ELPA Syncer
branch: elpa/geiser-chez
commit 988d9f7e24b8634755cdb7b110e3e399bdb55df3
Author: Macon Gambill 
Commit: Macon Gambill 

Fix version number in library header
---
 geiser-chez.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/geiser-chez.el b/geiser-chez.el
index a96b357e5d..6c560e2231 100644
--- a/geiser-chez.el
+++ b/geiser-chez.el
@@ -6,7 +6,7 @@
 ;; Homepage: https://gitlab.com/emacs-geiser/chez
 ;; Package-Requires: ((emacs "26.1") (geiser "0.19"))
 ;; SPDX-License-Identifier: BSD-3-Clause
-;; Version: 0.17
+;; Version: 0.18
 
 ;;; Commentary:
 



[nongnu] elpa/geiser-chez 605a81ff7b 4/4: Fix a couple typos

2023-07-07 Thread ELPA Syncer
branch: elpa/geiser-chez
commit 605a81ff7b2d2b275a3ec68e3ce7e5b50f85014d
Author: Macon Gambill 
Commit: Macon Gambill 

Fix a couple typos
---
 geiser-chez.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/geiser-chez.el b/geiser-chez.el
index 9c0b09fbc0..fb310e5984 100644
--- a/geiser-chez.el
+++ b/geiser-chez.el
@@ -80,7 +80,7 @@ access."
 
 (geiser-custom--defcustom geiser-chez-tspl-url
 "https://scheme.com/tspl4/";
-  "Base URL for the The Scheme Programming Languange HTML version.
+  "Base URL for the The Scheme Programming Language HTML version.
 
 Set it to a local file URI such as
 `file:///usr/share/doc/tlsp/html/' for quicker offline access."
@@ -312,7 +312,7 @@ Return its local name."
 (geiser-chez--insert-button csug-url "· Chez Manual Entry"))
   (when tspl-url
 (insert "\n")
-(geiser-chez--insert-button tspl-url "· TSLP Entry")))
+(geiser-chez--insert-button tspl-url "· TSPL Entry")))
 t))
 
 ;;; Implementation definition:



[nongnu] elpa/xah-fly-keys 837ea68349: some key changes. now more ergo.

2023-07-07 Thread ELPA Syncer
branch: elpa/xah-fly-keys
commit 837ea683495abf31001e3f98f90e6da34afcd61b
Author: Xah Lee 
Commit: Xah Lee 

some key changes. now more ergo.
here's the new keys (all dvorak notation)
("t a" . xah-reformat-to-sentence-lines)
("t g" . goto-line)
("t n" . goto-char)
("t f" . move-to-column)

their old keys are
("t '" . xah-reformat-to-sentence-lines)
("t f" . goto-line)
("t c" . goto-char)
("t g" . move-to-column)
---
 xah-fly-keys.el | 29 +++--
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/xah-fly-keys.el b/xah-fly-keys.el
index ca15b07f8e..90cba9c224 100644
--- a/xah-fly-keys.el
+++ b/xah-fly-keys.el
@@ -4,7 +4,7 @@
 
 ;; Author: Xah Lee ( http://xahlee.info/ )
 ;; Maintainer: Xah Lee 
-;; Version: 23.11.20230626152352
+;; Version: 23.12.20230707122000
 ;; Created: 10 Sep 2013
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: convenience, emulations, vim, ergoemacs
@@ -2617,7 +2617,7 @@ Version: 2018-05-15 2023-03-15 2023-06-05"
 (copy-file xfname xbackupPath t)
 (when (boundp 'xah-recently-closed-buffers)
   (push (cons nil xbackupPath) xah-recently-closed-buffers))
-(message "Deleted. Backup at \n%s\nCall `xah-open-last-closed' to 
open." xbackupPath)
+(message "Deleted.\nBackup at \n%s\nCall `xah-open-last-closed' to 
open." xbackupPath)
 (delete-file xfname))
 (progn
   (widen)
@@ -2657,7 +2657,7 @@ Version: 2015-04-09"
  (Mac Finder, File Explorer, Linux file manager)
 This command can be called when in a file buffer or in `dired'.
 
-URL `http://xahlee.info/emacs/emacs/emacs_dired_open_file_in_ext_apps.html'
+URL `http://xahlee.info/emacs/emacs/emacs_show_in_desktop.html'
 Version: 2020-11-20 2022-08-19 2023-06-26"
   (interactive)
   (let ((xpath (if (eq major-mode 'dired-mode)
@@ -2688,9 +2688,8 @@ Version: 2020-11-20 2022-08-19 2023-06-26"
 
 (defun xah-open-in-vscode ()
   "Open current file or dir in vscode.
-
-URL `http://xahlee.info/emacs/emacs/emacs_dired_open_file_in_ext_apps.html'
-Version: 2020-02-13 2021-01-18 2022-08-04"
+URL `http://xahlee.info/emacs/emacs/emacs_open_in_vscode.html'
+Version: 2020-02-13 2021-01-18 2022-08-04 2023-06-26"
   (interactive)
   (let ((xpath (if buffer-file-name buffer-file-name (expand-file-name 
default-directory
 (message "path is %s" xpath)
@@ -2753,8 +2752,8 @@ Version: 2019-11-04 2023-04-05 2023-06-26"
   "Open the current dir in a new terminal window.
 On Microsoft Windows, which terminal it starts depends on 
`xah-fly-mswin-terminal'.
 
-URL `http://xahlee.info/emacs/emacs/emacs_dired_open_file_in_ext_apps.html'
-Version: 2020-11-21 2021-07-21 2022-08-04 2023-03-01"
+URL `http://xahlee.info/emacs/emacs/emacs_open_in_terminal.html'
+Version: 2020-11-21 2022-08-04 2023-03-01 2023-06-26"
   (interactive)
   (cond
((string-equal system-type "windows-nt")
@@ -3214,7 +3213,7 @@ Version 2022-10-31"
;; most frequently used
("t "  . xah-move-block-up)
("t "  . xah-move-block-down)
-   ("t '" . xah-reformat-to-sentence-lines)
+
("t ," . sort-numeric-fields)
("t ." . xah-sort-lines)
("t 1" . xah-append-to-register-1)
@@ -3223,19 +3222,21 @@ Version 2022-10-31"
("t 4" . xah-paste-from-register-1)
("t 7" . xah-append-to-register-1)
("t 8" . xah-clear-register-1)
-   ;; a b
-   ("t c" . goto-char)
+
+   ;; b
+   ("t a" . xah-reformat-to-sentence-lines)
("t d" . mark-defun)
("t e" . list-matching-lines)
-   ("t f" . goto-line)
-   ("t g" . move-to-column)
+   ("t f" . move-to-column)
+   ("t g" . goto-line)
("t h" . repeat-complex-command)
("t i" . delete-non-matching-lines)
("t j" . copy-to-register)
("t k" . insert-register)
("t l" . xah-escape-quotes)
("t m" . xah-make-backup-and-save)
-   ;; n
+   ("t n" . goto-char)
+   
("t o" . xah-clean-whitespace)
("t p" . query-replace-regexp)
;; q



[nongnu] elpa/geiser-stklos b4211af83d: More tests for the Emacs Lisp side

2023-07-07 Thread ELPA Syncer
branch: elpa/geiser-stklos
commit b4211af83d3662bee65db2ebbd63531bc4a9a921
Author: Jeronimo Pellegrini 
Commit: Jeronimo Pellegrini 

More tests for the Emacs Lisp side
---
 geiser-stklos-test.el | 71 +++
 1 file changed, 71 insertions(+)

diff --git a/geiser-stklos-test.el b/geiser-stklos-test.el
index 6ad4f37850..3c8d6a54de 100644
--- a/geiser-stklos-test.el
+++ b/geiser-stklos-test.el
@@ -28,7 +28,53 @@
(goto-char 10)
(geiser-stklos--find-close-par 8)
 
+;; Go to char in position 5. This is NOT inside a module, so :f should
+;; be returned.
+(ert-deftest get-module-1 ()
+  (should (eq :f
+  (with-temp-buffer
+(insert "(define x 1)\n\n(define-library y (begin (define z 
10)))\n(define w 9)")
+(goto-char 5)
+(geiser-stklos--get-module)
 
+;; Go to char in position 62. This is NOT inside a module, so :f should
+;; be returned.
+(ert-deftest get-module-2 ()
+  (should (eq :f
+  (with-temp-buffer
+(insert "(define x 1)\n\n(define-library y (begin (define z 
10)))\n(define w 9)")
+(goto-char 62)
+(geiser-stklos--get-module)) )))
+
+;; Go to char in positions 19, 33 and 43. This is NOT inside a module, so :f 
should
+;; be returned.
+(ert-deftest get-module-3 ()
+  (should (eq 'y
+  (with-temp-buffer
+(insert "(define x 1)\n\n(define-library y (begin (define z 
10)))\n(define w 9)")
+(goto-char 19)
+(geiser-stklos--get-module)
+
+(ert-deftest get-module-4 ()
+  (should (eq 'y
+  (with-temp-buffer
+(insert "(define x 1)\n\n(define-library y (begin (define z 
10)))\n(define w 9)")
+(goto-char 33)
+(geiser-stklos--get-module)
+
+(ert-deftest get-module-5 ()
+  (should (eq 'y
+  (with-temp-buffer
+(insert "(define x 1)\n\n(define-library y (begin (define z 
10)))\n(define w 9)")
+(goto-char 43)
+(geiser-stklos--get-module)
+
+(ert-deftest get-module-6 ()
+  (should (eq 'y
+  (with-temp-buffer
+(insert "(define x 1)\n\n(define-module y  (define z 
10))\n(define w 9)")
+(goto-char 29)
+(geiser-stklos--get-module)
 
 ;; this one could have many more variants
 ;; Go to char in position 7 and find the beginning of the symbol
@@ -41,4 +87,29 @@
(geiser-stklos--symbol-begin nil)
 
 
+(ert-deftest geiser-stklos--symbol-begin-2 ()
+  (should (= 14
+ (with-temp-buffer
+   (insert "(abc def (gh ijk () lmn))")
+   (goto-char 15)
+   (geiser-stklos--symbol-begin nil)
+
+(ert-deftest import-command ()
+  (let ((s (geiser-stklos--import-command "some-module")))
+(should (and (stringp s)
+ (string= s "(require \"some-module\")")
+
+(ert-deftest exit-command ()
+  (let ((s (geiser-stklos--exit-command)))
+(should (and (stringp s)
+ (string= s "(exit 0)")
+
+
+;; geiser-stklos-guess
+(ert-deftest guess ()
+  (should (eq nil
+  (with-temp-buffer
+(insert "(let* ((let 'let) (let* let)) let)")
+(goto-char 10)
+(geiser-stklos--guess)
 



[nongnu] elpa/swift-mode updated (83b691db60 -> 55da7a32c9)

2023-07-07 Thread ELPA Syncer
elpasync pushed a change to branch elpa/swift-mode.

  from  83b691db60 Fix command line option for debugging swift module
   new  629b8a52ab Add keywords for conditional compilation and annotations
   new  25e41ed7d4 Support if-expression and switch expression
   new  55da7a32c9 Bump version to 9.0.0


Summary of changes:
 swift-mode-beginning-of-defun.el  |   6 +-
 swift-mode-font-lock.el   |  14 ++-
 swift-mode-indent.el  | 171 +
 swift-mode-lexer.el   |  14 +--
 swift-mode.el |   2 +-
 test/swift-files/indent/expressions.swift | 202 ++
 test/swift-files/indent/identifiers.swift |   2 +-
 test/swift-files/indent/statements.swift  |  18 ++-
 8 files changed, 387 insertions(+), 42 deletions(-)



[nongnu] elpa/swift-mode 25e41ed7d4 2/3: Support if-expression and switch expression

2023-07-07 Thread ELPA Syncer
branch: elpa/swift-mode
commit 25e41ed7d405ea566a45fef7cdb673b86ae01701
Author: taku0 
Commit: taku0 

Support if-expression and switch expression


https://github.com/apple/swift-evolution/blob/main/proposals/0380-if-switch-expressions.md
---
 swift-mode-beginning-of-defun.el  |   6 +-
 swift-mode-indent.el  | 171 +
 swift-mode-lexer.el   |  14 +--
 test/swift-files/indent/expressions.swift | 202 ++
 test/swift-files/indent/identifiers.swift |   2 +-
 test/swift-files/indent/statements.swift  |  18 ++-
 6 files changed, 375 insertions(+), 38 deletions(-)

diff --git a/swift-mode-beginning-of-defun.el b/swift-mode-beginning-of-defun.el
index 079db0f7e7..0309055071 100644
--- a/swift-mode-beginning-of-defun.el
+++ b/swift-mode-beginning-of-defun.el
@@ -151,7 +151,7 @@ The cursor must be at the beginning of a statement."
((member (swift-mode:token:text token) '("var" "let"))
 (when (swift-mode:class-like-member-p) token))
((equal (swift-mode:token:text token) "case")
-(swift-mode:backward-sexps-until-open-curly-brace)
+(swift-mode:backward-sexps-until-open-curly-bracket)
 (swift-mode:beginning-of-statement)
 (let ((parent-token (swift-mode:find-defun-keyword-simple)))
   (when (equal (swift-mode:token:text parent-token) "enum")
@@ -201,7 +201,7 @@ The cursor must be at the beginning of a statement."
 Also return t if the cursor is on a global declaration.
 Return nil otherwise."
   (or
-   (let ((parent (swift-mode:backward-sexps-until-open-curly-brace)))
+   (let ((parent (swift-mode:backward-sexps-until-open-curly-bracket)))
  (eq (swift-mode:token:type parent) 'outside-of-buffer))
(progn
  (swift-mode:beginning-of-statement)
@@ -1391,7 +1391,7 @@ of ancestors."
   (if (bobp)
   nil
 (let ((name-token (swift-mode:current-defun-name-token)))
-  (swift-mode:backward-sexps-until-open-curly-brace)
+  (swift-mode:backward-sexps-until-open-curly-bracket)
   (if name-token
   (cons name-token (swift-mode:current-defun-name-token-list))
 (swift-mode:current-defun-name-token-list)
diff --git a/swift-mode-indent.el b/swift-mode-indent.el
index fb81534442..9dc259d322 100644
--- a/swift-mode-indent.el
+++ b/swift-mode-indent.el
@@ -308,7 +308,7 @@ Also used for regexes."
  ((and next-is-on-current-line (eq next-type '}))
   (goto-char (swift-mode:token:end next-token))
   (backward-list)
-  (swift-mode:calculate-indent-after-open-curly-brace 0))
+  (swift-mode:calculate-indent-for-curly-bracket 0))
 
  ;; Before ) or ] on the current line
  ((and next-is-on-current-line (memq next-type '(\) \])))
@@ -417,12 +417,56 @@ Also used for regexes."
  '("switch") nil '("case" "default"
 (if (equal (swift-mode:token:text parent) "switch")
 ;; Inside a switch-statement. Aligns with the "switch"
-(swift-mode:find-parent-and-align-with-next
- swift-mode:statement-parent-tokens
- swift-mode:switch-case-offset)
+(if (swift-mode:bol-other-than-comments-p)
+(swift-mode:align-with-current-line
+ swift-mode:switch-case-offset)
+  (swift-mode:find-parent-and-align-with-next
+   swift-mode:statement-parent-tokens
+   swift-mode:switch-case-offset))
   ;; Other cases. Aligns with the previous case.
   (swift-mode:align-with-current-line
 
+ ;; Before "else" on the current line
+ ((and next-is-on-current-line (equal next-text "else"))
+  (swift-mode:calculate-indent-before-else))
+
+ ;; After "else"
+ ;;
+ ;; let a =
+ ;;   if x { 1 }
+ ;;   else
+ ;; if y { 2 }
+ ;; else { 3 }
+ ;;
+ ;; let a =
+ ;;   if x { 1 } else
+ ;; if y { 2 } else
+ ;;   { 3 }
+ ;;
+ ;; let a = if x { 1 } else if y { 2 } else
+ ;;   { 3 }
+ ((equal previous-text "else")
+  (goto-char (swift-mode:token:start previous-token))
+  (if (swift-mode:bol-other-than-comments-p)
+  (swift-mode:align-with-current-line
+   swift-mode:multiline-statement-offset)
+(swift-mode:calculate-indent-before-else
+ swift-mode:multiline-statement-offset)))
+
+ ;; After "if"
+ ;;
+ ;; let a = if
+ ;;   x
+ ;; .foo() {
+ ;; 1
+ ;; } else {
+ ;; 2
+ ;; }
+ ((equal previous-text "if")
+  (goto-char (swift-mode:token:start previous-token))
+  (swift-mode:align-with-current-line
+   swift-mode:multiline-statement-offset))
+
  ;; After "catch"
  ((equal previous-text "catch")
   (swift-mode:find-parent-and-align-with-next
@@ -432,7 +476,7 @@ Also used for regexes."
  ;; After {
  ((eq previous-type '{)
   (goto-char (swift-mode:token:st

[nongnu] elpa/swift-mode 55da7a32c9 3/3: Bump version to 9.0.0

2023-07-07 Thread ELPA Syncer
branch: elpa/swift-mode
commit 55da7a32c97c84c2d12295a0eeb1f8fca8a6f71a
Author: taku0 
Commit: taku0 

Bump version to 9.0.0
---
 swift-mode.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swift-mode.el b/swift-mode.el
index 06567820d5..5b6fd1bcc8 100644
--- a/swift-mode.el
+++ b/swift-mode.el
@@ -9,7 +9,7 @@
 ;;   Arthur Evstifeev 
 ;; Maintainer: taku0 
 ;;
-;; Version: 8.6.0
+;; Version: 9.0.0
 ;; Package-Requires: ((emacs "24.4") (seq "2.3"))
 ;; Keywords: languages swift
 ;; URL: https://github.com/swift-emacs/swift-mode



[nongnu] elpa/swift-mode 629b8a52ab 1/3: Add keywords for conditional compilation and annotations

2023-07-07 Thread ELPA Syncer
branch: elpa/swift-mode
commit 629b8a52abfd81c207fe0eb35fb45a3d96f1b782
Author: taku0 
Commit: taku0 

Add keywords for conditional compilation and annotations

- `hasFeature`
  
https://github.com/apple/swift-evolution/blob/main/proposals/0362-piecemeal-future-features.md
- `hasAttribute`
  
https://github.com/apple/swift-evolution/blob/main/proposals/0367-conditional-attributes.md
- `before`
  
https://github.com/apple/swift-evolution/blob/main/proposals/0376-function-back-deployment.md
- Various environments
---
 swift-mode-font-lock.el | 14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/swift-mode-font-lock.el b/swift-mode-font-lock.el
index afb7fc8b98..bd51dd7b8d 100644
--- a/swift-mode-font-lock.el
+++ b/swift-mode-font-lock.el
@@ -549,9 +549,17 @@ Excludes true, false, and keywords begin with a number 
sign.")
 
 (defconst swift-mode:build-config-keywords
   '("os" "arch" "swift" "compiler" "canImport" "targetEnvironment"
-"OSX" "macOS" "iOS" "watchOS" "tvOS" "i386" "x86_64" "arm" "arm64"
-"iOSApplicationExtension" "OSXApplicationExtension"
-"macOSApplicationExtension" "simulator" "unavailable" "noasync")
+"i386" "x86_64" "arm" "arm64"
+"OSX" "OSXApplicationExtension"
+"macOS" "macOSApplicationExtension"
+"iOS" "iOSApplicationExtension"
+"watchOS" "watchOSApplicationExtension"
+"tvOS" "tvOSApplicationExtension"
+"macCatalyst" "macCatalystApplicationExtension"
+"Linux" "Windows"
+"simulator" "unavailable" "noasync"
+"hasFeature" "hasAttribute" "before" "introduced" "deprecated" "obsoleted"
+"message" "renamed")
   "Keywords for build configuration statements.")
 
 (defconst swift-mode:standard-precedence-groups