[nongnu] elpa/git-commit updated (16316ed -> 0348f1f)
elpasync pushed a change to branch elpa/git-commit. from 16316ed magit-merge: Add -Xignore-space-change and -Xignore-all-space new 0704a84 Fix typos new 0348f1f magit-version: If installed from Melpa then also show base version Summary of changes: Documentation/magit.org | 8 Documentation/magit.texi | 8 lisp/magit-mode.el | 4 ++-- lisp/magit.el| 13 - 4 files changed, 22 insertions(+), 11 deletions(-)
[nongnu] elpa/git-commit 0348f1f 2/2: magit-version: If installed from Melpa then also show base version
branch: elpa/git-commit commit 0348f1f87c9eb923a63aa6ca1d06af9093310409 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-version: If installed from Melpa then also show base version --- lisp/magit.el | 13 - 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lisp/magit.el b/lisp/magit.el index b8f7df4..13a5a14 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -534,8 +534,19 @@ and Emacs to it." (magit-git-string "rev-parse" "HEAD" (if (stringp magit-version) (when print-dest - (princ (format "Magit %s, Git %s, Emacs %s, %s" + (princ (format "Magit %s%s, Git %s, Emacs %s, %s" (or magit-version "(unknown)") + (or (and (ignore-errors (version< "2008" magit-version)) + (ignore-errors +(require 'lisp-mnt) +(and (fboundp 'lm-header) + (format + " [>= %s]" + (with-temp-buffer +(insert-file-contents + (locate-library "magit.el" t)) +(lm-header "Package-Version")) + "") (or (let ((magit-git-debug (lambda (err) (display-warning '(magit git)
[nongnu] elpa/git-commit 0704a84 1/2: Fix typos
branch: elpa/git-commit
commit 0704a84c840752dd983aca8d9d83f1f2787d1049
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
Fix typos
---
Documentation/magit.org | 8
Documentation/magit.texi | 8
lisp/magit-mode.el | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/Documentation/magit.org b/Documentation/magit.org
index ae5ad97..1f510f1 100644
--- a/Documentation/magit.org
+++ b/Documentation/magit.org
@@ -8,7 +8,7 @@
#+TEXINFO_DIR_CATEGORY: Emacs
#+TEXINFO_DIR_TITLE: Magit: (magit).
#+TEXINFO_DIR_DESC: Using Git from Emacs with Magit.
-#+SUBTITLE: for version 3.2.1
+#+SUBTITLE: for version 3.2.1 (v3.2.1-11-g16316ed16+1)
#+TEXINFO_DEFFN: t
#+OPTIONS: H:4 num:3 toc:2
@@ -25,7 +25,7 @@ directly from within Emacs. While many fine Git clients
exist, only
Magit and Git itself deserve to be called porcelains.
#+TEXINFO: @noindent
-This manual is for Magit version 3.2.1.
+This manual is for Magit version 3.2.1 (v3.2.1-11-g16316ed16+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2021 Jonas Bernoulli
@@ -1364,7 +1364,7 @@ Valid values for both of the above options are:
#+TEXINFO: @noindent
I am afraid it gets more complicated still:
-- The global diff and log arguments are set for each support mode
+- The global diff and log arguments are set for each supported mode
individually. The diff arguments for example have different values
in ~magit-diff-mode~, ~magit-revision-mode~, ~magit-merge-preview-mode~
and ~magit-status-mode~ buffers. Setting or saving the value for one
@@ -1373,7 +1373,7 @@ I am afraid it gets more complicated still:
- When ~magit-show-commit~ is invoked directly from a log buffer, then
the file filter is picked up from that buffer, not from the revision
- buffer and or the mode's global diff arguments.
+ buffer or the mode's global diff arguments.
- Even though they are suffixes of the diff prefix ~magit-show-commit~
and ~magit-stash-show~ do not use the diff buffer used by the diff
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index 699913a..df73be4 100644
--- a/Documentation/magit.texi
+++ b/Documentation/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
-@subtitle for version 3.2.1
+@subtitle for version 3.2.1 (v3.2.1-11-g16316ed16+1)
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients
exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
-This manual is for Magit version 3.2.1.
+This manual is for Magit version 3.2.1 (v3.2.1-11-g16316ed16+1).
@quotation
Copyright (C) 2015-2021 Jonas Bernoulli
@@ -1891,7 +1891,7 @@ I am afraid it gets more complicated still:
@itemize
@item
-The global diff and log arguments are set for each support mode
+The global diff and log arguments are set for each supported mode
individually. The diff arguments for example have different values
in @code{magit-diff-mode}, @code{magit-revision-mode},
@code{magit-merge-preview-mode}
and @code{magit-status-mode} buffers. Setting or saving the value for one
@@ -1902,7 +1902,7 @@ is shared.
@item
When @code{magit-show-commit} is invoked directly from a log buffer, then
the file filter is picked up from that buffer, not from the revision
-buffer and or the mode's global diff arguments.
+buffer or the mode's global diff arguments.
@item
diff --git a/lisp/magit-mode.el b/lisp/magit-mode.el
index efa1614..bf8f21c 100644
--- a/lisp/magit-mode.el
+++ b/lisp/magit-mode.el
@@ -226,7 +226,7 @@ Valid values are:
buffer.
For more information see info node `(magit)Transient Arguments
-and Buffer Arguments'."
+and Buffer Variables'."
:package-version '(magit . "3.0.0")
:group 'magit-buffers
:group 'magit-commands
@@ -259,7 +259,7 @@ Valid values are:
buffer.
For more information see info node `(magit)Transient Arguments
-and Buffer Arguments'."
+and Buffer Variables'."
:package-version '(magit . "3.0.0")
:group 'magit-buffers
:group 'magit-commands
[nongnu] elpa/magit updated (16316ed -> 0348f1f)
elpasync pushed a change to branch elpa/magit. from 16316ed magit-merge: Add -Xignore-space-change and -Xignore-all-space adds 0704a84 Fix typos adds 0348f1f magit-version: If installed from Melpa then also show base version No new revisions were added by this update. Summary of changes: Documentation/magit.org | 8 Documentation/magit.texi | 8 lisp/magit-mode.el | 4 ++-- lisp/magit.el| 13 - 4 files changed, 22 insertions(+), 11 deletions(-)
[nongnu] elpa/magit-section updated (16316ed -> 0348f1f)
elpasync pushed a change to branch elpa/magit-section. from 16316ed magit-merge: Add -Xignore-space-change and -Xignore-all-space adds 0704a84 Fix typos adds 0348f1f magit-version: If installed from Melpa then also show base version No new revisions were added by this update. Summary of changes: Documentation/magit.org | 8 Documentation/magit.texi | 8 lisp/magit-mode.el | 4 ++-- lisp/magit.el| 13 - 4 files changed, 22 insertions(+), 11 deletions(-)
[nongnu] elpa/evil dceb736: Do not try to switch file/buffer when jumping inside same file (#1506)
branch: elpa/evil commit dceb73603d397f7e42a541976d8ec0711248d38c Author: Konstantin Kharlamov Commit: GitHub Do not try to switch file/buffer when jumping inside same file (#1506) The vast majority of jumps will end up within the current opened file/buffer, simply because usually users do more movement inside a buffer rather than across buffers. There is even a special case when evil-jumps-cross-buffers is set to nil, which causes jumps never ever switch buffers. So, let's do a small optimization, and not try to call find-file or switch-to-buffer if we know it is unnecessary. As a side-effect, this should also help to users to stumble less upon https://github.com/emacs-evil/evil/issues/1504 bug (it has its own upstream fix, but until that landed, this small optimization is known to help as well). --- evil-jumps.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/evil-jumps.el b/evil-jumps.el index a448ee8..55617e0 100644 --- a/evil-jumps.el +++ b/evil-jumps.el @@ -156,9 +156,10 @@ (pos (car place)) (file-name (cadr place))) (setq evil--jumps-jumping t) - (if (string-match-p evil--jumps-buffer-targets file-name) - (switch-to-buffer file-name) -(find-file file-name)) + (unless (string= current-file-name file-name) +(if (string-match-p evil--jumps-buffer-targets file-name) +(switch-to-buffer file-name) + (find-file file-name))) (setq evil--jumps-jumping nil) (goto-char pos) (setf (evil-jumps-struct-idx (evil--jumps-get-current)) idx)
[elpa] externals/corfu updated (1c1a176 -> 5164177)
elpasync pushed a change to branch externals/corfu. from 1c1a176 Correct docstring new 68ea28e corfu-complete: Insert first candidate, when try-completion did not make progress new 5164177 Refine the corfu-complete criterion Summary of changes: corfu.el | 19 --- 1 file changed, 16 insertions(+), 3 deletions(-)
[elpa] externals/corfu 68ea28e 1/2: corfu-complete: Insert first candidate, when try-completion did not make progress
branch: externals/corfu commit 68ea28e987f4079f45916800f1a7b9530600a198 Author: Daniel Mendler Commit: Daniel Mendler corfu-complete: Insert first candidate, when try-completion did not make progress Check if last-command=corfu-complete --- corfu.el | 18 +++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/corfu.el b/corfu.el index 38c0113..7364887 100644 --- a/corfu.el +++ b/corfu.el @@ -799,16 +799,28 @@ completion began less than that number of seconds ago." "Try to complete current input." (interactive) (cond - (completion-cycling (completion-at-point)) ;; Proceed with cycling - ((>= corfu--index 0) (corfu--insert nil)) ;; Continue completion + ;; Proceed with cycling + (completion-cycling (completion-at-point)) + ;; Continue completion with selected candidate + ((>= corfu--index 0) (corfu--insert nil)) + ;; Try to complete the current input string (t (pcase-let* ((`(,beg ,end ,table ,pred) completion-in-region--data) (pt (max 0 (- (point) beg))) (str (buffer-substring-no-properties beg end)) (metadata (completion-metadata (substring str 0 pt) table pred))) (pcase (completion-try-completion str table pred pt metadata) + ;; Prefix completion made progress. ((and `(,newstr . ,newpt) (guard (not (equal str newstr (completion--replace beg end newstr) - (goto-char (+ beg newpt + (goto-char (+ beg newpt))) + ;; When the last command was `corfu-complete' and we didn't make progress, + ;; insert the first candidate. + ((guard (and (eq last-command #'corfu-complete) (> corfu--total 0))) + (completion--replace beg end +(concat (substring str 0 corfu--base) +(substring-no-properties + (car corfu--candidates)) + (defun corfu--insert (status) "Insert current candidate, exit with STATUS if non-nil."
[elpa] externals/corfu 5164177 2/2: Refine the corfu-complete criterion
branch: externals/corfu commit 5164177638322420eca16c0cb94b9b19e3fba67a Author: Daniel Mendler Commit: Daniel Mendler Refine the corfu-complete criterion --- corfu.el | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/corfu.el b/corfu.el index 7364887..5acfa03 100644 --- a/corfu.el +++ b/corfu.el @@ -813,15 +813,16 @@ completion began less than that number of seconds ago." ((and `(,newstr . ,newpt) (guard (not (equal str newstr (completion--replace beg end newstr) (goto-char (+ beg newpt))) - ;; When the last command was `corfu-complete' and we didn't make progress, - ;; insert the first candidate. - ((guard (and (eq last-command #'corfu-complete) (> corfu--total 0))) + ;; If we didn't make progress, the last command was `corfu-complete' + ;; and we are not at completion boundary, continue with the first candidate. + ((guard (and (eq last-command #'corfu-complete) + (> (length str) corfu--base) + (> corfu--total 0))) (completion--replace beg end (concat (substring str 0 corfu--base) (substring-no-properties (car corfu--candidates)) - (defun corfu--insert (status) "Insert current candidate, exit with STATUS if non-nil." (pcase-let* ((`(,beg ,end ,table ,pred) completion-in-region--data)
[elpa] externals/javaimp 8d518d7: * javaimp-parse.el: Some performance fixes
branch: externals/javaimp
commit 8d518d7d22a5262c6671483373aff483a3d016ea
Author: Filipp Gunbin
Commit: Filipp Gunbin
* javaimp-parse.el: Some performance fixes
---
javaimp-parse.el | 114 ++-
1 file changed, 62 insertions(+), 52 deletions(-)
diff --git a/javaimp-parse.el b/javaimp-parse.el
index 0c31506..bb0fe24 100644
--- a/javaimp-parse.el
+++ b/javaimp-parse.el
@@ -28,6 +28,8 @@
'("if" "for" "while" "switch" "try" "catch" "finally"
"static"; static initializer block
))
+(defconst javaimp--parse-stmt-keyword-maxlen
+ (seq-max (mapcar #'length javaimp--parse-stmt-keywords)))
(defvar-local javaimp--parse-dirty-pos nil
"Buffer position after which all parsed information should be
@@ -187,6 +189,8 @@ is unchanged."
(while (javaimp--parse-rsb-keyword regexp bound t)
(let ((scan-pos (match-end 0)))
(javaimp--parse-with-syntax-table javaimp--arglist-syntax-table
scan-pos
+;; Skip over any number of lists, which may be
+;; exceptions in "throws", or something like that
(while (and scan-pos (<= scan-pos (nth 1 state)))
(if (ignore-errors
(= (scan-lists scan-pos 1 -1) ;As in
javaimp--parse-preceding
@@ -239,23 +243,23 @@ those may later become 'local-class' (see
`javaimp--parse-scopes')."
:open-brace (nth 1 state)))
(defun javaimp--parse-scope-simple-stmt (state)
- "Attempts to parse `simple-statement' scope."
+ "Attempts to parse 'simple-statement' scope."
(save-excursion
(and (javaimp--parse-skip-back-until)
- (looking-back (concat
-(regexp-opt javaimp--parse-stmt-keywords 'words)
-"\\|->")
- nil t)
- (make-javaimp-scope
- :type 'simple-statement
- :name (or (match-string 1)
-"lambda")
- :start (or (match-beginning 1)
- (- (point) 2))
- :open-brace (nth 1 state)
+ (or (and (= (char-before (1- (point))) ?-) ; ->
+ (= (char-before) ?>))
+ (looking-back (regexp-opt javaimp--parse-stmt-keywords 'words)
+ (- (point) javaimp--parse-stmt-keyword-maxlen)
nil)))
+(make-javaimp-scope
+ :type 'simple-statement
+ :name (or (match-string 1)
+ "lambda")
+ :start (or (match-beginning 1)
+(- (point) 2))
+ :open-brace (nth 1 state
(defun javaimp--parse-scope-anonymous-class (state)
- "Attempts to parse `anonymous-class' scope."
+ "Attempts to parse 'anonymous-class' scope."
(save-excursion
;; skip arg-list and ws
(when (and (progn
@@ -276,46 +280,52 @@ those may later become 'local-class' (see
`javaimp--parse-scopes')."
:open-brace (nth 1 state
(defun javaimp--parse-scope-method-or-stmt (state)
- "Attempts to parse `method' or `statement' scope."
+ "Attempts to parse 'method' or 'statement' scope."
(save-excursion
-(let ((throws-args
- (let ((pos (javaimp--parse-decl-suffix "\\" state)))
- (when pos
- (or (javaimp--parse-arglist pos (nth 1 state) t)
- t)
- (when (and (not (eq throws-args t))
- (progn
- (javaimp--parse-skip-back-until)
- (= (char-before) ?\)))
- (ignore-errors
- ;; for method this is arglist
- (goto-char
-(scan-lists (point) -1 0
-(let* (;; leave open/close parens out
- (arglist-region (cons (1+ (point))
- (1- (scan-lists (point) 1 0
- (count (progn
-(javaimp--parse-skip-back-until)
-(skip-syntax-backward "w_")))
- (name (and (< count 0)
- (buffer-substring-no-properties
- (point) (+ (point) (abs count)
- (type (when name
- (if (and (member name javaimp--parse-stmt-keywords)
-(not throws-args))
- 'statement 'method
- (when type
-(make-javaimp-scope
- :type type
- :name (if (eq type 'statement)
- name
- (funcall javaimp-format-method-name
- name
- (javaimp--parse-arglist (car arglist-region)
- (cdr arglist-region))
- throws-args))
- :start (point)
- :open-brace (nth 1 state
+(let (;; take the closest preceding closing paren as the bound
+ (search-bound (save-excursion
[elpa] externals/flymake-proselint updated (aa65049 -> 59745cb)
elpasync pushed a change to branch externals/flymake-proselint. from aa65049 Update copyright new a78b140 Simplify and mention ELPA new 59745cb Fix link Summary of changes: README.md | 21 +++-- 1 file changed, 3 insertions(+), 18 deletions(-)
[elpa] externals/flymake-proselint 59745cb 2/2: Fix link
branch: externals/flymake-proselint commit 59745cb2d71c50dfba6a26f2f2d2a3503f90f41b Author: Manuel Uberti Commit: Manuel Uberti Fix link --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a96d4ab..7dd47b3 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ This package makes it possible to use [proselint](http://proselint.com/) with Em ## Getting started -`flymake-proselint` is listed on [ELPA](http://elpa.gnu.org/packages/vertico.html), so you can use M-x list-packages to install -it. +`flymake-proselint` is listed on [GNU ELPA](http://elpa.gnu.org/packages/flymake-proselint.html), so you can use M-x list-packages to +install it. Then you just need to activate it in the modes you want your prose to be checked with something like:
[elpa] externals/consult dfa3079: README: Remove mentioning of space splitting style
branch: externals/consult commit dfa3079f38e7a5313762a9c96deef6f96f943ac3 Author: Daniel Mendler Commit: Daniel Mendler README: Remove mentioning of space splitting style --- README.org | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.org b/README.org index fdc3421..e7c51b2 100644 --- a/README.org +++ b/README.org @@ -518,14 +518,13 @@ their descriptions. This two-level filtering is possible by splitting the input string. Part of the input string is treated as input to grep and part of the input is used for filtering. There are multiple splitting styles available, configured in - ~consult-async-split-styles-alist~: =nil=, =space=, =comma=, =semicolon= and =perl=. - The default splitting style is configured with the variable - ~consult-async-split-style~. - - With the =space=, =comma= and =semicolon= splitting styles, the first word - before the space/comma/semicolon is passed to grep, the remaining string is - used for filtering. The =nil= splitting style does not perform any splitting, - the whole input is passed to grep. + ~consult-async-split-styles-alist~: =nil=, =comma=, =semicolon= and =perl=. The default + splitting style is configured with the variable ~consult-async-split-style~. + + With the =comma= and =semicolon= splitting styles, the first word before the comma + or semicolon is passed to grep, the remaining string is used for filtering. The + =nil= splitting style does not perform any splitting, the whole input is passed + to grep. The =perl= splitting style splits the input string at a punctuation character, using a similar syntax as Perl regular expressions.
[elpa] externals/flymake-proselint a78b140 1/2: Simplify and mention ELPA
branch: externals/flymake-proselint commit a78b140d199508a34715336630c68e2821882737 Author: Manuel Uberti Commit: Manuel Uberti Simplify and mention ELPA --- README.md | 21 +++-- 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 0223194..a96d4ab 100644 --- a/README.md +++ b/README.md @@ -1,29 +1,14 @@ - - - # flymake-proselint This package makes it possible to use [proselint](http://proselint.com/) with Emacs built-in Flymake. ## Getting started -`flymake-proselint` is listed on MELPA. If you use `use-package` you could install -it with something like: - -``` emacs-lisp -(use-package flymake-proselint - :ensure t) -``` - -Or you can use [`straight.el`](https://github.com/raxod502/straight.el) to install it from this repository instead: - -``` emacs-lisp -(straight-use-package - '(flymake-proselint :host github :repo "manuel-uberti/flymake-proselint")) -``` +`flymake-proselint` is listed on [ELPA](http://elpa.gnu.org/packages/vertico.html), so you can use M-x list-packages to install +it. Then you just need to activate it in the modes you want your prose to be -checked: +checked with something like: ``` emacs-lisp (add-hook 'text-mode-hook (lambda ()
[elpa] externals/consult 7f0a8c7: consult--default-regexp-compiler: Allow escaping spaces (See #393)
branch: externals/consult commit 7f0a8c72abf606624e5ced6070f864ed4c81723b Author: Daniel Mendler Commit: Daniel Mendler consult--default-regexp-compiler: Allow escaping spaces (See #393) --- README.org | 3 ++- consult.el | 12 +++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/README.org b/README.org index e7c51b2..12c2dfe 100644 --- a/README.org +++ b/README.org @@ -251,7 +251,8 @@ their descriptions. character is a punctuation character, like =#=. For example =#grep-regexps#filter-string=, is split at the second =#=. The string =grep-regexps= is passed to Grep. If you enter multiple regular expressions - separated by space only lines matching all regular expressions are shown. The + separated by space only lines matching all regular expressions are shown. In + order to match space literally, escape the space with a backslash. The =filter-string= is passed to the /fast/ Emacs filtering to further narrow down the list of matches. This is particularly useful if you are using an advanced completion style like orderless. =consult-grep= supports preview. If the diff --git a/consult.el b/consult.el index c1bf880..6517388 100644 --- a/consult.el +++ b/consult.el @@ -608,12 +608,22 @@ The function should return a pair, the list of regular expressions and a highlight function. The highlight function should take a single argument, the string to highlight given the INPUT. TYPE is the desired type of regular expression, which can be `basic', `extended', `emacs' or `pcre'." - (setq input (split-string input nil 'omit-nulls)) + (setq input (consult--split-escaped input)) (cons (mapcar (lambda (x) (consult--convert-regexp x type)) input) (when-let (regexps (seq-filter #'consult--valid-regexp-p input)) (lambda (str) (consult--highlight-regexps regexps str) +(defun consult--split-escaped (str) + "Split STR at spaces, which can be escaped with backslash." + (mapcar + (lambda (x) (replace-regexp-in-string (string 0) " " x)) + (split-string (replace-regexp-in-string + "\\| " + (lambda (x) (if (equal x "\\ ") (string 0) x)) + str) + " +" t))) + (defun consult--join-regexps (regexps type) "Join REGEXPS of TYPE." ;; Add lookahead wrapper only if there is more than one regular expression
[elpa] externals/flymake-proselint 6509e5c: Bump version
branch: externals/flymake-proselint commit 6509e5c8fc15acd85f036f06e235ef96b3afa0e0 Author: Manuel Uberti Commit: Manuel Uberti Bump version --- flymake-proselint.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flymake-proselint.el b/flymake-proselint.el index c8173d0..6d73882 100644 --- a/flymake-proselint.el +++ b/flymake-proselint.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2021 Free Software Foundation, Inc. ;; ;; Author: Manuel Uberti -;; Version: 0.2.0 +;; Version: 0.2.1 ;; Keywords: convenience ;; Package-Requires: ((emacs "26.1")) ;; URL: https://github.com/manuel-uberti/flymake-proselint
[elpa] elpa-admin 6afe3b7: * elpa-admin.el (elpaa--make-one-tarball): Be a bit more verbose
branch: elpa-admin
commit 6afe3b7213a23b7c879f8db2b014c3f338672cc7
Author: Stefan Monnier
Commit: Stefan Monnier
* elpa-admin.el (elpaa--make-one-tarball): Be a bit more verbose
(elpaa--make-one-tarball-1): New function, extracted from
`elpaa--make-one-tarball`.
(elpaa--make-one-tarball, elpaa--make-one-package):
Rename `one-tarball` to `tarball-only`.
---
elpa-admin.el | 199 +++---
1 file changed, 105 insertions(+), 94 deletions(-)
diff --git a/elpa-admin.el b/elpa-admin.el
index fa01001..e97b649 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -493,7 +493,7 @@ Do it without leaving the current branch."
oldtarballs)
(defun elpaa--make-one-tarball ( tarball dir pkg-spec metadata
- &optional revision-function one-tarball
no-symlink)
+ &optional revision-function tarball-only
no-symlink)
"Create file TARBALL for PKGNAME if not done yet.
Return non-nil if a new tarball was created."
(elpaa--message "Building tarball %s..." tarball)
@@ -503,92 +503,103 @@ Return non-nil if a new tarball was created."
(progn
(elpaa--message "Tarball %s already built!" tarball)
nil)
-(elpaa--with-temp-files
-dir
- (let* ((destdir (file-name-directory tarball))
- (pkgname (car pkg-spec))
- (_ (when (and destdir (not (file-directory-p destdir)))
- (make-directory destdir)))
- (vers (nth 1 metadata))
- (elpaignore (expand-file-name ".elpaignore" dir))
- (ignores (elpaa--spec-get pkg-spec :ignored-files))
- (renames (elpaa--spec-get pkg-spec :renames))
- (ldir(elpaa--spec-get pkg-spec :lisp-dir))
- (re (concat "\\`" (regexp-quote pkgname)
-
"-\\([0-9].*\\)\\.\\(tar\\|el\\)\\(\\.[a-z]*z\\)?\\'"))
- (oldtarballs
- (unless one-tarball
-(mapcar
- (lambda (file)
- (string-match re file)
- (cons (match-string 1 file) file))
- (directory-files destdir nil re)
-(when ldir
- (cl-pushnew (list (file-name-as-directory ldir) "") renames
- :test #'equal))
-(when revision-function
- (elpaa--select-revision dir pkg-spec (funcall revision-function)))
-(elpaa--copyright-check pkg-spec)
-;; Run `make' before building the Info file, so that the `make' rule
-;; can be used to build the Info/Texinfo file.
-(elpaa--make pkg-spec dir)
-(elpaa--build-Info pkg-spec dir)
-(elpaa--write-pkg-file dir pkgname metadata)
-;; FIXME: Allow renaming files or selecting a subset of the files!
-(cl-assert (not (string-match "[][*\\|?]" pkgname)))
-(cl-assert (not (string-match "[][*\\|?]" vers)))
-(apply #'elpaa--call
- nil "tar"
- `("--exclude-vcs"
- ,@(cond
-(ignores
- (mapcar (lambda (i) (format "--exclude=packages/%s/%s"
pkgname i))
- ignores))
-((file-readable-p elpaignore) `("-X" ,elpaignore)))
- ,@(mapcar (lambda (r) (elpaa--make-tar-transform pkgname r))
- renames)
- "--transform"
- ,(format "s|^packages/%s|%s-%s|" pkgname pkgname vers)
- "-chf" ,tarball
- ,(concat "packages/" pkgname)))
-(unless one-tarball
- (let* ((pkgdesc
- ;; FIXME: `elpaa--write-pkg-file' wrote the metadata to
- ;; -pkg.el and then `elpaa--process-multi-file-package'
- ;; reads it back. We could/should skip the middle man.
- (elpaa--process-multi-file-package
- dir pkgname 'dont-rename)))
-(elpaa--message "%s: %S" pkgname pkgdesc)
-(elpaa--update-archive-contents pkgdesc destdir)
-(when (and nil revision-function) ;FIXME: Circumstantial evidence.
- ;; Various problems:
- ;; - If "make build/foo" is used by the developers in order to
test
- ;; the build of their package, they'll end up with those
spurious
- ;; tags which may end up spreading to unintended places.
- ;; - The tags created in elpa.gnu.org won't spread to nongnu.git
- ;; because that account can't push to git.sv.gnu.org anyway.
- (let ((default-directory (elpaa--dirname dir)))
-(elpaa--call nil "git" "tag" "-f"
- (format "%s-release/%s-%s"
- elpaa--name pkgname vers
- (unless no-symlink
- (let ((link (expand-file-name (format "%s.tar" pkgname)
destdir)))
-
[elpa] externals/javaimp 4e6ed4f: Fixes
branch: externals/javaimp
commit 4e6ed4fdcc92d41c5cba08bf229609493be79af9
Author: Filipp Gunbin
Commit: Filipp Gunbin
Fixes
---
javaimp-parse.el | 88
javaimp-tests.el | 12 ++--
javaimp.el | 1 +
3 files changed, 49 insertions(+), 52 deletions(-)
diff --git a/javaimp-parse.el b/javaimp-parse.el
index bb0fe24..cb26b81 100644
--- a/javaimp-parse.el
+++ b/javaimp-parse.el
@@ -25,7 +25,7 @@
javaimp--classlike-scope-types))
(defconst javaimp--parse-stmt-keywords
- '("if" "for" "while" "switch" "try" "catch" "finally"
+ '("if" "else" "for" "while" "do" "switch" "try" "catch" "finally"
"static"; static initializer block
))
(defconst javaimp--parse-stmt-keyword-maxlen
@@ -36,18 +36,6 @@
considered as stale. Usually set by modification change hooks.
Should be set to (point-min) in major mode hook.")
-
-(defmacro javaimp--parse-with-syntax-table (syntax-table beg &rest body)
- (declare (debug t)
- (indent 2))
- (let ((begin (make-symbol "begin")))
-`(let ((,begin ,beg))
- (syntax-ppss-flush-cache ,begin)
- (unwind-protect
- (with-syntax-table ,syntax-table
- ,@body)
- (syntax-ppss-flush-cache ,begin)
-
(defsubst javaimp--parse-substr-before-< (str)
(let ((end (string-search "<" str)))
(if end
@@ -71,11 +59,10 @@ point is outside of any context initially."
"Parse arg list between BEG and END, of the form 'TYPE NAME,
...'. Return list of conses (TYPE . NAME). If ONLY-TYPE is
non-nil, then name parsing is skipped."
- (javaimp--parse-with-syntax-table javaimp--arglist-syntax-table beg
-(save-excursion
- (save-restriction
-(narrow-to-region beg end)
-(goto-char (point-max))
+ (let ((substr (buffer-substring-no-properties beg end)))
+(with-temp-buffer
+ (insert substr)
+ (with-syntax-table javaimp--arglist-syntax-table
(ignore-errors
(let (res)
(while (progn
@@ -188,9 +175,9 @@ is unchanged."
(catch 'found
(while (javaimp--parse-rsb-keyword regexp bound t)
(let ((scan-pos (match-end 0)))
- (javaimp--parse-with-syntax-table javaimp--arglist-syntax-table
scan-pos
-;; Skip over any number of lists, which may be
-;; exceptions in "throws", or something like that
+ (with-syntax-table javaimp--arglist-syntax-table
+;; Skip over any number of lists, which may be exceptions
+;; in "throws", or something like that
(while (and scan-pos (<= scan-pos (nth 1 state)))
(if (ignore-errors
(= (scan-lists scan-pos 1 -1) ;As in
javaimp--parse-preceding
@@ -249,14 +236,14 @@ those may later become 'local-class' (see
`javaimp--parse-scopes')."
(or (and (= (char-before (1- (point))) ?-) ; ->
(= (char-before) ?>))
(looking-back (regexp-opt javaimp--parse-stmt-keywords 'words)
- (- (point) javaimp--parse-stmt-keyword-maxlen)
nil)))
-(make-javaimp-scope
- :type 'simple-statement
- :name (or (match-string 1)
- "lambda")
- :start (or (match-beginning 1)
-(- (point) 2))
- :open-brace (nth 1 state
+ (- (point) javaimp--parse-stmt-keyword-maxlen) nil))
+ (make-javaimp-scope
+ :type 'simple-statement
+ :name (or (match-string 1)
+"lambda")
+ :start (or (match-beginning 1)
+ (- (point) 2))
+ :open-brace (nth 1 state)
(defun javaimp--parse-scope-anonymous-class (state)
"Attempts to parse 'anonymous-class' scope."
@@ -382,24 +369,26 @@ nil then goes all the way up. Examines and sets property
res))
(defun javaimp--parse-all-scopes ()
- "Entry point to the scope parsing. Parses scopes in this buffer
-which are after `javaimp--parse-dirty-pos', if it is non-nil.
-Resets this variable after parsing is done."
+ "Entry point to the scope parsing. Parses scopes in this
+buffer which are after `javaimp--parse-dirty-pos', if it is
+non-nil. Resets this variable after parsing is done."
+ ;; FIXME Set parse-sexp-.. vars, as well as syntax-table and
+ ;; syntax-ppss-table, in major mode function. Remove let-binding of
+ ;; inhibit-modification-hooks here.
(when javaimp--parse-dirty-pos
-(remove-text-properties javaimp--parse-dirty-pos (point-max)
-'(javaimp-parse-scope nil))
-(goto-char (point-max))
-;; FIXME With major mode we could set these, as well as syntax
-;; table, in mode function.
-(let ((parse-sexp-ignore-comments t)
- (parse-sexp-lookup-properties nil))
- (javaimp--parse-with-syntax-table javaimp-syntax-table (point-min)
-(while (javaimp--parse-rsb-keyword "{" javaimp--parse-dirty-pos t)
- (save-e
[elpa] externals/javaimp e1e233e: Improve javaimp-help-show-scopes
branch: externals/javaimp commit e1e233ed3e04a00f321dd2c64510a743fa4bbfa2 Author: Filipp Gunbin Commit: Filipp Gunbin Improve javaimp-help-show-scopes --- javaimp-util.el | 12 javaimp.el | 12 ++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/javaimp-util.el b/javaimp-util.el index d058e82..588e8bf 100644 --- a/javaimp-util.el +++ b/javaimp-util.el @@ -42,6 +42,18 @@ '(anonymous-class statement simple-statement array unknown) javaimp--named-scope-types)) +(defconst javaimp--help-scope-type-abbrevs + '((anonymous-class . "ac") +(statement . "st") +(simple-statement . "ss") +(array . "ar") +(unknown . "un") +(local-class . "lc") +(method . "me") +(class . "cl") +(interface . "in") +(enum . "en"))) + ;; Structs diff --git a/javaimp.el b/javaimp.el index e6cae7a..4b69d71 100644 --- a/javaimp.el +++ b/javaimp.el @@ -719,11 +719,9 @@ start (`javaimp-scope-start') instead." (javaimp-scope-start scope) (javaimp-scope-open-brace scope))) - -(defun javaimp-help-reparse-and-show-scopes () - "Reparse scopes and show them in a *javaimp-scopes* buffer." +(defun javaimp-help-show-scopes () + "Show scopes in a *javaimp-scopes* buffer." (interactive) - (setq javaimp--parse-dirty-pos (point-min)) (let ((scopes (save-excursion (javaimp--parse-get-all-scopes))) (file buffer-file-name) @@ -739,9 +737,11 @@ start (`javaimp-scope-start') instead." (while (setq tmp (javaimp-scope-parent tmp)) (setq depth (1+ depth))) (insert (propertize - (format "%d: %010s %s\n" + (format "%d %s: %s%s\n" depth - (symbol-name (javaimp-scope-type scope)) + (cdr (assq (javaimp-scope-type scope) + javaimp--help-scope-type-abbrevs)) + (make-string depth ? ) (javaimp-scope-name scope)) 'mouse-face 'highlight 'help-echo "mouse-2: go to this scope"
[elpa] externals/org updated (926dbaf -> 01877f4)
elpasync pushed a change to branch externals/org. from 926dbaf Merge branch 'km/from-emacs-master' new 81eb8c5 attach: Fix for Emacs<28 new 01877f4 org-compat: Fix org-directory-empty-p Summary of changes: etc/ORG-NEWS | 2 ++ lisp/org-attach.el | 2 +- lisp/org-compat.el | 10 ++ 3 files changed, 13 insertions(+), 1 deletion(-)
[elpa] externals/org 01877f4 2/2: org-compat: Fix org-directory-empty-p
branch: externals/org commit 01877f4804207eebb972ff16fd0b39494b3b7875 Author: Marco Wahl Commit: Marco Wahl org-compat: Fix org-directory-empty-p * lisp/org-compat.el: Remove COUNT parameter in call of directory-files. COUNT not available in Emacs < 28. --- lisp/org-compat.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 866e2c3..81a8cf1 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -78,7 +78,7 @@ (defun org-directory-empty-p (dir) "Return t if DIR names an existing directory containing no other files." (and (file-directory-p dir) - (null (directory-files dir nil directory-files-no-dot-files-regexp t 1 + (null (directory-files dir nil directory-files-no-dot-files-regexp t (defalias 'org-directory-empty-p #'directory-empty-p))
[elpa] externals/org 81eb8c5 1/2: attach: Fix for Emacs<28
branch: externals/org commit 81eb8c5f9e4e8fe7e97c7358691edad7e694372b Author: Marco Wahl Commit: Marco Wahl attach: Fix for Emacs<28 * lisp/org-compat.el: Introduce org-directory-empty-p which is directory-empty-p from Emacs 28. * lisp/org-attach.el (org-attach-sync): Use org-directory-empty-p instead of directory-empty-p. * etc/ORG-NEWS: Note about org-directory-empty-p. Thanks Kyle identifying the issue. Thanks Arthur for suggesting a fix. --- etc/ORG-NEWS | 2 ++ lisp/org-attach.el | 2 +- lisp/org-compat.el | 10 ++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS index 78a57ba..83a67da 100644 --- a/etc/ORG-NEWS +++ b/etc/ORG-NEWS @@ -421,6 +421,8 @@ Tag completion now uses =completing-read-multiple= with a simple completion table, which should allow better interoperability with custom completion functions. +*** Providing =directory-empty-p= from Emacs 28 as =org-directory-empty-p= + * Version 9.4 ** Incompatible changes *** Possibly broken internal file links: please check and fix diff --git a/lisp/org-attach.el b/lisp/org-attach.el index e8e8ade..f184531 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -622,7 +622,7 @@ empty attachment directories." (let ((files (org-attach-file-list attach-dir))) (org-attach-tag (not files))) (when org-attach-sync-delete-empty-dir -(when (and (directory-empty-p attach-dir) +(when (and (org-directory-empty-p attach-dir) (if (eq 'query org-attach-sync-delete-empty-dir) (yes-or-no-p "Attachment directory is empty. Delete?") t)) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index ff992f3..866e2c3 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -72,6 +72,16 @@ (defvar org-table1-hline-regexp) +;;; Emacs < 28.1 compatibility + +(if (version< emacs-version "28") +(defun org-directory-empty-p (dir) + "Return t if DIR names an existing directory containing no other files." + (and (file-directory-p dir) + (null (directory-files dir nil directory-files-no-dot-files-regexp t 1 + (defalias 'org-directory-empty-p #'directory-empty-p)) + + ;;; Emacs < 27.1 compatibility (unless (fboundp 'proper-list-p)
[elpa] externals/company updated (6b66407 -> 1374a09)
elpasync pushed a change to branch externals/company. from 6b66407 Merge pull request #1163 from yuchunzhou/master new 05cd0bc Fix compilation warnings on Emacs 25-26 new a5221f9 Merge pull request #1164 from yugaego/omit-warnings new 0bcdfda Add GitHub Actions checks new 1374a09 Merge pull request #1161 from yugaego/gh-ci Summary of changes: .github/workflows/ci.yml | 42 ++ Makefile | 7 ++- company-gtags.el | 7 +-- test/core-tests.el | 4 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci.yml
[elpa] externals/company 0bcdfda 1/4: Add GitHub Actions checks
branch: externals/company
commit 0bcdfda608b8878836d12f602874ac1d7159477d
Author: YE
Commit: YE
Add GitHub Actions checks
---
.github/workflows/ci.yml | 42 ++
Makefile | 7 ++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000..fff44e9
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,42 @@
+name: CI
+
+on:
+ push:
+paths:
+ - '**.el'
+ - '**ci.yml'
+ - 'Makefile'
+branches:
+ - master
+
+ pull_request:
+paths:
+ - '**.el'
+ - '**ci.yml'
+ - 'Makefile'
+branches:
+ - master
+
+jobs:
+ check:
+runs-on: ubuntu-20.04
+
+strategy:
+ fail-fast: false
+ matrix:
+emacs_version: [25.1, 25.3, 26.3, 27.2, snapshot]
+
+steps:
+ - name: Setup Emacs
+uses: purcell/setup-emacs@v3.0
+with:
+ version: ${{ matrix.emacs_version }}
+
+ - name: Checkout Company
+uses: actions/checkout@v2
+
+ - name: Run tests
+run: make test-batch
+
+ - name: Run compilation
+run: make compile-warn
diff --git a/Makefile b/Makefile
index 9357506..cd3e1d6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ elpa: *.el
tar cvf company-$$version.tar --mode 644 "$$dir"
clean:
- @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el
+ @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el
test/*.elc
test:
${EMACS} -Q -nw -L . -l test/all.el \
@@ -33,3 +33,8 @@ test-batch:
compile:
${EMACS} -Q --batch -L . -f batch-byte-compile company.el company-*.el
+
+compile-warn:
+ ${EMACS} -Q --batch -L . \
+ --eval "(setq byte-compile-error-on-warn t)" \
+ -f batch-byte-compile company*.el test/*.el
[elpa] externals/company a5221f9 3/4: Merge pull request #1164 from yugaego/omit-warnings
branch: externals/company commit a5221f9e94e33b2a31715526925162b7b012d7e9 Merge: 6b66407 05cd0bc Author: Dmitry Gutov Commit: GitHub Merge pull request #1164 from yugaego/omit-warnings Fix compilation warnings on Emacs 25-26 --- company-gtags.el | 7 +-- test/core-tests.el | 4 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/company-gtags.el b/company-gtags.el index d1eaa4f..7599e40 100644 --- a/company-gtags.el +++ b/company-gtags.el @@ -67,8 +67,11 @@ completion." (cond ((not (eq company-gtags--executable 'unknown)) ;; the value is already cached company-gtags--executable) - ((and (version<= "27" emacs-version) ;; can search remotely to set - (file-remote-p default-directory)) + ((and ;; Run remotely on supported versions of Emacs. + (fboundp 'with-connection-local-variables) + (fboundp 'connection-local-set-profile-variables) + (fboundp 'connection-local-set-profiles) + (file-remote-p default-directory)) (with-connection-local-variables (if (boundp 'company-gtags--executable-connection) diff --git a/test/core-tests.el b/test/core-tests.el index 279b784..7943755 100644 --- a/test/core-tests.el +++ b/test/core-tests.el @@ -586,6 +586,10 @@ (setq header-line-format "aaa") (should (= (company--row) 0) +;; Avoid compilation warnings on Emacs 25. +(declare-function display-line-numbers-mode "ext:display-line-numbers") +(declare-function line-number-display-width "indent.c") + (ert-deftest company-column-with-line-numbers-display () :tags '(interactive) (skip-unless (fboundp 'display-line-numbers-mode))
[elpa] externals/diff-hl dbd46bf: Fix a warning
branch: externals/diff-hl commit dbd46bf23c2efc466a640a7e398ca39a51c1145e Author: Dmitry Gutov Commit: Dmitry Gutov Fix a warning Closes #168 --- diff-hl.el | 1 + 1 file changed, 1 insertion(+) diff --git a/diff-hl.el b/diff-hl.el index 2c7943c..1c1bf51 100644 --- a/diff-hl.el +++ b/diff-hl.el @@ -899,6 +899,7 @@ the `diff-program' to be in your `exec-path'." (turn-on-diff-hl-mode))) (declare-function vc-annotate-extract-revision-at-line "vc-annotate") +(declare-function diff-hl-amend-mode "diff-hl-amend") ;;;###autoload (defun diff-hl-set-reference-rev (rev)
[elpa] externals/company 1374a09 4/4: Merge pull request #1161 from yugaego/gh-ci
branch: externals/company
commit 1374a090c468ed2f3c611ae1c3c3158f092bf890
Merge: a5221f9 0bcdfda
Author: Dmitry Gutov
Commit: GitHub
Merge pull request #1161 from yugaego/gh-ci
Add GitHub Actions checks
---
.github/workflows/ci.yml | 42 ++
Makefile | 7 ++-
2 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000..fff44e9
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,42 @@
+name: CI
+
+on:
+ push:
+paths:
+ - '**.el'
+ - '**ci.yml'
+ - 'Makefile'
+branches:
+ - master
+
+ pull_request:
+paths:
+ - '**.el'
+ - '**ci.yml'
+ - 'Makefile'
+branches:
+ - master
+
+jobs:
+ check:
+runs-on: ubuntu-20.04
+
+strategy:
+ fail-fast: false
+ matrix:
+emacs_version: [25.1, 25.3, 26.3, 27.2, snapshot]
+
+steps:
+ - name: Setup Emacs
+uses: purcell/setup-emacs@v3.0
+with:
+ version: ${{ matrix.emacs_version }}
+
+ - name: Checkout Company
+uses: actions/checkout@v2
+
+ - name: Run tests
+run: make test-batch
+
+ - name: Run compilation
+run: make compile-warn
diff --git a/Makefile b/Makefile
index 9357506..cd3e1d6 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ elpa: *.el
tar cvf company-$$version.tar --mode 644 "$$dir"
clean:
- @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el
+ @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el
test/*.elc
test:
${EMACS} -Q -nw -L . -l test/all.el \
@@ -33,3 +33,8 @@ test-batch:
compile:
${EMACS} -Q --batch -L . -f batch-byte-compile company.el company-*.el
+
+compile-warn:
+ ${EMACS} -Q --batch -L . \
+ --eval "(setq byte-compile-error-on-warn t)" \
+ -f batch-byte-compile company*.el test/*.el
[elpa] externals/company 05cd0bc 2/4: Fix compilation warnings on Emacs 25-26
branch: externals/company commit 05cd0bcfb360d6953ef056078f8c3fe76866ecb9 Author: YE Commit: YE Fix compilation warnings on Emacs 25-26 --- company-gtags.el | 7 +-- test/core-tests.el | 4 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/company-gtags.el b/company-gtags.el index d1eaa4f..7599e40 100644 --- a/company-gtags.el +++ b/company-gtags.el @@ -67,8 +67,11 @@ completion." (cond ((not (eq company-gtags--executable 'unknown)) ;; the value is already cached company-gtags--executable) - ((and (version<= "27" emacs-version) ;; can search remotely to set - (file-remote-p default-directory)) + ((and ;; Run remotely on supported versions of Emacs. + (fboundp 'with-connection-local-variables) + (fboundp 'connection-local-set-profile-variables) + (fboundp 'connection-local-set-profiles) + (file-remote-p default-directory)) (with-connection-local-variables (if (boundp 'company-gtags--executable-connection) diff --git a/test/core-tests.el b/test/core-tests.el index 279b784..7943755 100644 --- a/test/core-tests.el +++ b/test/core-tests.el @@ -586,6 +586,10 @@ (setq header-line-format "aaa") (should (= (company--row) 0) +;; Avoid compilation warnings on Emacs 25. +(declare-function display-line-numbers-mode "ext:display-line-numbers") +(declare-function line-number-display-width "indent.c") + (ert-deftest company-column-with-line-numbers-display () :tags '(interactive) (skip-unless (fboundp 'display-line-numbers-mode))
[elpa] externals/company updated (1374a09 -> ccb34db)
elpasync pushed a change to branch externals/company. from 1374a09 Merge pull request #1161 from yugaego/gh-ci new 0eee1fa It's not "ext:" new 7b11c17 Switch over the CI badge new ccb34db Drop Travis settings Summary of changes: .travis.yml| 23 --- README.md | 2 +- test/core-tests.el | 2 +- 3 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 .travis.yml
[elpa] externals/company 0eee1fa 1/3: It's not "ext:"
branch: externals/company commit 0eee1fa35486e13136623d3af12cc73fdfe50fb6 Author: Dmitry Gutov Commit: Dmitry Gutov It's not "ext:" --- test/core-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/core-tests.el b/test/core-tests.el index 7943755..4c48cbd 100644 --- a/test/core-tests.el +++ b/test/core-tests.el @@ -587,7 +587,7 @@ (should (= (company--row) 0) ;; Avoid compilation warnings on Emacs 25. -(declare-function display-line-numbers-mode "ext:display-line-numbers") +(declare-function display-line-numbers-mode "display-line-numbers") (declare-function line-number-display-width "indent.c") (ert-deftest company-column-with-line-numbers-display ()
[elpa] externals/company ccb34db 3/3: Drop Travis settings
branch: externals/company
commit ccb34dbb9672c6b6acf3f7d28defc5d2e1653fcd
Author: Dmitry Gutov
Commit: Dmitry Gutov
Drop Travis settings
---
.travis.yml | 23 ---
1 file changed, 23 deletions(-)
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 5d79d12..000
--- a/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: generic
-
-env:
- global:
-- CURL="curl -fsSkL --retry 9 --retry-delay 9"
- matrix:
-- EMACS_VERSION=25.3
-- EMACS_VERSION=26.1
-- EMACS_VERSION=27.1
-- EMACS_VERSION=master
-
-matrix:
- allow_failures:
-- env: EMACS_VERSION=master
-
-install:
- - $CURL -O
https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz
- - tar -xaf emacs-bin-${EMACS_VERSION}.tar.gz -C /
- - export EMACS=/tmp/emacs/bin/emacs
- - $EMACS --version
-
-script:
- make test-batch EMACS=${EMACS}
[elpa] externals/company 7b11c17 2/3: Switch over the CI badge
branch: externals/company commit 7b11c17758e18e09a27d03fdb2d4b4c18f37b8a9 Author: Dmitry Gutov Commit: Dmitry Gutov Switch over the CI badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index be3bde8..8713bfb 100644 --- a/README.md +++ b/README.md @@ -4,5 +4,5 @@ File a bug report in [Issues](https://github.com/company-mode/company-mode/issue Ask a question or suggest a feature in [Discussions](https://github.com/company-mode/company-mode/discussions/). -[](https://travis-ci.org/company-mode/company-mode) +[](https://github.com/company-mode/company-mode/actions/workflows/ci.yml) [](https://melpa.org/#/company)
[elpa] externals/eev 5befc96: Added `ee-0x0-upload-region' (a.k.a. `u0').
branch: externals/eev
commit 5befc963101b71e8114b132cd6b42c2583221534
Author: Eduardo Ochs
Commit: Eduardo Ochs
Added `ee-0x0-upload-region' (a.k.a. `u0').
---
ChangeLog | 7 +++
VERSION | 4 ++--
eev-env.el| 37 +++--
eev-tlinks.el | 67 +++
4 files changed, 97 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f4f8dcc..2687a70 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2021-08-10 Eduardo Ochs
+
+ * eev-tlinks.el (ee-0x0-url): new variable.
+ (ee-0x0-upload-region, find-0x0-links): new functions.
+
+ * eev-env.el: added a "(require 'eepitch)".
+
2021-08-08 Eduardo Ochs
* eepitch.el (find-vtermprocess): new function.
diff --git a/VERSION b/VERSION
index 4c5141a..4cd5ae8 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-Sun Aug 8 06:08:09 GMT 2021
-Sun Aug 8 03:08:09 -03 2021
+Wed Aug 11 01:45:06 GMT 2021
+Tue Aug 10 22:45:06 -03 2021
diff --git a/eev-env.el b/eev-env.el
index a406847..3a9e0b5 100644
--- a/eev-env.el
+++ b/eev-env.el
@@ -1,6 +1,6 @@
;;; eev-env.el -- set some environment variables.
-;; Copyright (C) 2012-2019 Free Software Foundation, Inc.
+;; Copyright (C) 2012-2021 Free Software Foundation, Inc.
;;
;; This file is part of GNU eev.
;;
@@ -19,7 +19,7 @@
;;
;; Author: Eduardo Ochs
;; Maintainer: Eduardo Ochs
-;; Version:20190302
+;; Version:20210810
;; Keywords: e-scripts
;;
;; Latest version: <http://angg.twu.net/eev-current/eev-env.el>
@@ -34,12 +34,11 @@
;;; Commentary:
-;; Used by: (find-eev "eev-prepared.el")
-;;
-;; Related but obsolete files:
-;; <http://angg.twu.net/eev-current/README.html>
-;; <http://angg.twu.net/eev-current/eev-langs.el.html>
-;; <http://angg.twu.net/eev-current/eev-rctool.html>
+;; This file defines the environment variable $S
+;; and a few other things.
+
+;; For: (find-eev "eepitch.el" "ee-expand")
+(require 'eepitch)
@@ -53,19 +52,25 @@
;;; Set some environment variables (for ee-expand, getenv,
;;; shell buffers, xterms started from Emacs, etc).
-;; (find-eevrcfile ".bashrc")
-;; (find-eevrcfile ".zshrc")
-
-;; Note: `ee-setenv' and its calls for "S" and "EEVDIR" were moved to:
-;; (find-eev "eev.el" "ee-setenv")
-;;
(defun ee-setenv (envvar value)
"In case the environment variable ENVVAR was not set set it to VALUE."
(if (null (getenv envvar))
(setenv envvar (ee-expand value
-(ee-setenv "S" "~/snarf") ; for `find-psne-links'
+
+;; The variable $S is used by:
+;; (find-psne-intro "4. The environment variable $S")
+;;
+(ee-setenv "S" "~/snarf")
+
+
+;; Used by some deprecated features... compare with:
+;; (find-eev "eev-code.el" "code-c-d-s")
+;; (find-eev "eev-code.el" "code-c-d-s" "ee-eev-source-directory")
+;; These deprecated features are (very badly) explained here:
+;; (find-eev-intro "that require extra setup:")
+;;
(ee-setenv "EEVDIR"
(let ((fname (locate-library "eev")))
(if fname (directory-file-name (file-name-directory fname))
@@ -80,7 +85,7 @@
;;; | __/ __/_\ V V /| | |_| | | |_| __/ | | \ V /
;;; \___|\___| \_/\_/ |_|\__|_| |_| \___|_| |_|\_/
;;;
-;; `ee-with-env' run a sexp in a modified environment.
+;; `ee-with-env' runs a sexp in a modified environment.
;; Tests:
;;
;; (ee-with-env '(("FOO" "~/foo") ("FOOL" "oo")) '(find-sh0 "set | grep -a
FOO"))
diff --git a/eev-tlinks.el b/eev-tlinks.el
index 867726d..f18c02d 100644
--- a/eev-tlinks.el
+++ b/eev-tlinks.el
@@ -90,6 +90,8 @@
;; «.find-eeit-links» (to "find-eeit-links")
;; «.find-texlive-links» (to "find-texlive-links")
;; «.find-newbrowser-links»(to "find-newbrowser-links")
+;; «.ee-0x0-upload-region» (to "ee-0x0-upload-region")
+;; «.find-0x0-links» (to "find-0x0-links")
(require 'eev-env)
@@ -2306,6 +2308,71 @@ sudo ./install-tl -select-repository
+;;; ______
+;;; / _ \__ __/ _ \
+;;; | | | \ \/ / | | |
+;;; | |_| |> <| |_| |
+;;; \___//_/\_\\___/
+;;;
+;; «ee-0x0-upload-region» (to ".ee-0x0-upload-region")
+;; Needs: https://melpa.org/#/0x0
+;; See: https://lists.gnu.org/archive/html/eev/2021-08/msg0.html
+;;
+(defvar ee-0x0-url nil
+ "The last URL generated by a call to `ee-0x0-upload-region'.")
+
+(defun ee-0x0-upload-region (b e
[elpa] externals/company af854a1 1/2: Prefer declare-function over fboundp
branch: externals/company commit af854a1e02db8829313c4ff4568d320af3564306 Author: Dmitry Gutov Commit: Dmitry Gutov Prefer declare-function over fboundp #1164 --- company-gtags.el | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/company-gtags.el b/company-gtags.el index 7599e40..91b3121 100644 --- a/company-gtags.el +++ b/company-gtags.el @@ -63,15 +63,17 @@ completion." (locate-dominating-file buffer-file-name "GTAGS")) company-gtags--tags-available-p)) +;; Avoid byte-compilation warnings on Emacs < 27. +(declare-function with-connection-local-variables "files-x") +(declare-function connection-local-set-profile-variables "files-x") +(declare-function connection-local-set-profiles "files-x") + (defun company-gtags--executable () (cond ((not (eq company-gtags--executable 'unknown)) ;; the value is already cached company-gtags--executable) - ((and ;; Run remotely on supported versions of Emacs. - (fboundp 'with-connection-local-variables) - (fboundp 'connection-local-set-profile-variables) - (fboundp 'connection-local-set-profiles) - (file-remote-p default-directory)) + ((and (version<= "27" emacs-version) ;; can search remotely to set + (file-remote-p default-directory)) (with-connection-local-variables (if (boundp 'company-gtags--executable-connection)
[elpa] externals/company df218ec 2/2: New user option: company-icon-margin
branch: externals/company commit df218ec1f181a9600ccdb245fb55b10bee2e5e3f Author: Dmitry Gutov Commit: Dmitry Gutov New user option: company-icon-margin Requested in https://www.reddit.com/r/emacs/comments/p1lcgv/companymode_posframe_icons/. --- NEWS.md| 1 + company.el | 11 --- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/NEWS.md b/NEWS.md index 21d9ec2..d6e294ef 100644 --- a/NEWS.md +++ b/NEWS.md @@ -2,6 +2,7 @@ ## Next +* New user option `company-icon-margin`. * `company-show-numbers` has been renamed to `company-show-quick-access` ([#1115](https://github.com/company-mode/company-mode/pull/1115)). New user options `company-quick-access-keys` and diff --git a/company.el b/company.el index d35698f..1fffe96 100644 --- a/company.el +++ b/company.el @@ -1551,6 +1551,10 @@ end of the match." (const auto-scale) (integer :value 16 +(defcustom company-icon-margin 2 + "Width of the margin that shows the icons, in characters." + :type 'integer) + (defun company--render-icons-margin (icon-mapping root-dir candidate selected) (if-let ((ws (window-system)) (candidate candidate) @@ -1575,7 +1579,7 @@ end of the match." (if (> dfh (* 2 base-size)) (* 2 base-size) base-size) - (* 2 dfw)) + (* company-icon-margin dfw)) (spec (list 'image :file (expand-file-name icon-file root-dir) :type 'svg @@ -1584,10 +1588,11 @@ end of the match." :ascent 'center :background (unless (eq bkg 'unspecified) bkg))) - (spacer-px-width (- (* 2 dfw) icon-size))) + (spacer-px-width (- (* company-icon-margin dfw) icon-size))) (concat (propertize " " 'display spec) - (propertize " " 'display `(space . (:width (,spacer-px-width)) + (propertize (company-space-string (1- company-icon-margin)) + 'display `(space . (:width (,spacer-px-width)) nil)) (defun company-vscode-dark-icons-margin (candidate selected)
[elpa] externals/company updated (ccb34db -> df218ec)
elpasync pushed a change to branch externals/company. from ccb34db Drop Travis settings new af854a1 Prefer declare-function over fboundp new df218ec New user option: company-icon-margin Summary of changes: NEWS.md | 1 + company-gtags.el | 12 +++- company.el | 11 --- 3 files changed, 16 insertions(+), 8 deletions(-)
[elpa] externals/consult 9acd32a: Version 0.10
branch: externals/consult commit 9acd32a764b6990d89eb1c9d74e1c43f6eaa24aa Author: Daniel Mendler Commit: Daniel Mendler Version 0.10 --- CHANGELOG.org | 2 +- consult.el| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.org b/CHANGELOG.org index 578c88e..d6e9f6c 100644 --- a/CHANGELOG.org +++ b/CHANGELOG.org @@ -2,7 +2,7 @@ #+author: Daniel Mendler #+language: en -* Development +* Version 0.10 (2021-08-11) - =consult-mark=, =consult-global-mark=: Add optional marker list argument - =consult-completing-read-multiple=: New function diff --git a/consult.el b/consult.el index 6517388..4f29bcf 100644 --- a/consult.el +++ b/consult.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler and Consult contributors ;; Maintainer: Daniel Mendler ;; Created: 2020 -;; Version: 0.9 +;; Version: 0.10 ;; Package-Requires: ((emacs "26.1")) ;; Homepage: https://github.com/minad/consult
[elpa] externals/corfu 9f3e1aa: Version 0.11
branch: externals/corfu commit 9f3e1aa2308fcd60ec2e4cee204622e4e110eaaa Author: Daniel Mendler Commit: Daniel Mendler Version 0.11 --- corfu.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/corfu.el b/corfu.el index 5acfa03..b987edb 100644 --- a/corfu.el +++ b/corfu.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler ;; Maintainer: Daniel Mendler ;; Created: 2021 -;; Version: 0.10 +;; Version: 0.11 ;; Package-Requires: ((emacs "27.1")) ;; Homepage: https://github.com/minad/corfu
[elpa] externals/marginalia b65d66e: Version 0.8
branch: externals/marginalia commit b65d66e9301f9a0e3012568ca6721ae4ec276ebc Author: Daniel Mendler Commit: Daniel Mendler Version 0.8 --- marginalia.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marginalia.el b/marginalia.el index 223cdb2..1e8e87d 100644 --- a/marginalia.el +++ b/marginalia.el @@ -5,7 +5,7 @@ ;; Author: Omar Antolín Camarena , Daniel Mendler ;; Maintainer: Omar Antolín Camarena , Daniel Mendler ;; Created: 2020 -;; Version: 0.7 +;; Version: 0.8 ;; Package-Requires: ((emacs "26.1")) ;; Homepage: https://github.com/minad/marginalia
[elpa] externals/vertico d00ad06: Version 0.14
branch: externals/vertico commit d00ad0697024aa9555972ea2bce678080272d633 Author: Daniel Mendler Commit: Daniel Mendler Version 0.14 --- vertico.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vertico.el b/vertico.el index e69c8f7..4fe876e 100644 --- a/vertico.el +++ b/vertico.el @@ -5,7 +5,7 @@ ;; Author: Daniel Mendler ;; Maintainer: Daniel Mendler ;; Created: 2021 -;; Version: 0.13 +;; Version: 0.14 ;; Package-Requires: ((emacs "27.1")) ;; Homepage: https://github.com/minad/vertico
[elpa] externals/consult 7b0137b: Add some links to bugs
branch: externals/consult commit 7b0137b6d8c16c4b5be194a8ad0b7aa33255c88f Author: Daniel Mendler Commit: Daniel Mendler Add some links to bugs --- consult.el | 3 +++ 1 file changed, 3 insertions(+) diff --git a/consult.el b/consult.el index 4f29bcf..ba75905 100644 --- a/consult.el +++ b/consult.el @@ -1251,12 +1251,14 @@ See `consult--with-preview' for the arguments PREVIEW-KEY, STATE, TRANSFORM and (setq last-preview new-preview))) (funcall state transformed nil) (setq last-preview new-preview + ;; symbol indirection because of bug#46407 (let ((post-command-sym (make-symbol "consult--preview-post-command"))) (fset post-command-sym (lambda () (setq input (minibuffer-contents-no-properties)) (funcall consult--preview-function))) (add-hook 'post-command-hook post-command-sym nil 'local))) (lambda () +;; symbol indirection because of bug#46407 (let ((post-command-sym (make-symbol "consult--preview-post-command"))) (fset post-command-sym (lambda () (setq input (minibuffer-contents-no-properties (add-hook 'post-command-hook post-command-sym nil 'local @@ -1456,6 +1458,7 @@ BIND is the asynchronous function binding." (funcall ,async 'setup) ;; Push input string to request refresh. ;; We use a symbol in order to avoid adding lambdas to the hook variable. + ;; Symbol indirection because of bug#46407. (let ((sym (make-symbol "consult--async-after-change"))) (fset sym (lambda (&rest _) (funcall ,async (minibuffer-contents-no-properties (run-at-time 0 nil sym)
[elpa] externals/web-server 5dbb1f9 2/2: Merge commit '6357a1c2d1' into externals/web-server
branch: externals/web-server commit 5dbb1f956e7efe2065e66e3d95fe74c8b8697b86 Merge: de9f6ba 6357a1c Author: Stefan Monnier Commit: Stefan Monnier Merge commit '6357a1c2d1' into externals/web-server --- web-server-status-codes.el | 4 ++-- web-server-test.el | 9 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web-server-status-codes.el b/web-server-status-codes.el index f3f07fc..158b596 100644 --- a/web-server-status-codes.el +++ b/web-server-status-codes.el @@ -1,6 +1,6 @@ -;;; web-server-status-codes.el --- Emacs Web Server HTML status codes +;;; web-server-status-codes.el --- Emacs Web Server HTML status codes -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This software is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/web-server-test.el b/web-server-test.el index 5ec99b3..126726b 100644 --- a/web-server-test.el +++ b/web-server-test.el @@ -1,6 +1,6 @@ -;;; web-server-test.el --- Test the Emacs Web Server +;;; web-server-test.el --- Test the Emacs Web Server -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte @@ -20,7 +20,6 @@ ;;; Code: (require 'web-server) (require 'cl-lib) -(eval-when-compile (require 'cl)) (require 'ert) (defvar ws-test-port 8999) @@ -314,9 +313,9 @@ Content-Type: application/octet-stream 0-125, 126-64k, 64k-2^64." (should (string= (ws-web-socket-frame "short") "\201short")) (should (string= (substring (ws-web-socket-frame (make-string 126 ?a)) - 0 5) "\201~
[elpa] externals/web-server 6357a1c 1/2: Fix NUL byte that confuses `grep`s binary file detection
branch: externals/web-server commit 6357a1c2d1718778503f7ee0909585094117525b Author: Stefan Monnier Commit: Eric Schulte Fix NUL byte that confuses `grep`s binary file detection While at it, convert to lexical-binding and remove unneeded `require`. --- web-server-status-codes.el | 4 ++-- web-server-test.el | 9 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/web-server-status-codes.el b/web-server-status-codes.el index f3f07fc..158b596 100644 --- a/web-server-status-codes.el +++ b/web-server-status-codes.el @@ -1,6 +1,6 @@ -;;; web-server-status-codes.el --- Emacs Web Server HTML status codes +;;; web-server-status-codes.el --- Emacs Web Server HTML status codes -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; This software is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by diff --git a/web-server-test.el b/web-server-test.el index 5ec99b3..126726b 100644 --- a/web-server-test.el +++ b/web-server-test.el @@ -1,6 +1,6 @@ -;;; web-server-test.el --- Test the Emacs Web Server +;;; web-server-test.el --- Test the Emacs Web Server -*- lexical-binding: t; -*- -;; Copyright (C) 2013-2014 Free Software Foundation, Inc. +;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Author: Eric Schulte @@ -20,7 +20,6 @@ ;;; Code: (require 'web-server) (require 'cl-lib) -(eval-when-compile (require 'cl)) (require 'ert) (defvar ws-test-port 8999) @@ -314,9 +313,9 @@ Content-Type: application/octet-stream 0-125, 126-64k, 64k-2^64." (should (string= (ws-web-socket-frame "short") "\201short")) (should (string= (substring (ws-web-socket-frame (make-string 126 ?a)) - 0 5) "\201~
[elpa] elpa-admin 9b28c79: * elpa-admin.el (elpaa--make-one-tarball-1): Return non-nil when built
branch: elpa-admin commit 9b28c79bdde8dc15285e19b7b813ec730496de2f Author: Stefan Monnier Commit: Stefan Monnier * elpa-admin.el (elpaa--make-one-tarball-1): Return non-nil when built (elpaa--make-one-tarball): Print errors here. (elpaa--make-one-package): Avoid some errors if the HTML files aren't created yet. --- elpa-admin.el | 24 ++-- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/elpa-admin.el b/elpa-admin.el index e97b649..1c71c97 100644 --- a/elpa-admin.el +++ b/elpa-admin.el @@ -503,14 +503,16 @@ Return non-nil if a new tarball was created." (progn (elpaa--message "Tarball %s already built!" tarball) nil) -(message " Building tarball %s... " tarball) +(message " Building tarball %s..." tarball) (let ((res nil)) (unwind-protect - (setq res (elpaa--make-one-tarball-1 - tarball dir pkg-spec metadata - revision-function tarball-only no-symlink)) -(message (if res " Built new package %s!" - " Build of package %s FAILED!!") + (condition-case err + (setq res (elpaa--make-one-tarball-1 + tarball dir pkg-spec metadata + revision-function tarball-only no-symlink)) +(error (message "Build error for %s: %S" tarball err))) +(message (if res " Built new package %s!" + " Build of package %s FAILED!!") tarball) (defun elpaa--make-one-tarball-1 ( tarball dir pkg-spec metadata @@ -598,8 +600,8 @@ Return non-nil if a new tarball was created." (elpaa--html-make-pkg pkgdesc pkg-spec `((,vers . ,(file-name-nondirectory tarball)) . ,oldtarballs) - dir)) - 'new) + dir + 'new))) (defun elpaa--get-devel-version (dir pkg-spec) "Compute the date-based pseudo-version used for devel builds." @@ -868,12 +870,14 @@ If DEVEL-ONLY is non-nil, only build the devel tarball." (devel-badge (format "%s/%s.svg" elpaa--devel-subdir pkgname)) (release-html (format "%s/%s.html" elpaa--release-subdir pkgname)) (devel-html (format "%s/%s.html" elpaa--devel-subdir pkgname))) - (unless (file-exists-p devel-badge) + (unless (or (file-exists-p devel-badge) + (not (file-exists-p devel-html))) (elpaa--make-badge devel-badge (format "%s-devel ELPA" elpaa--name) (format "%s %s" pkgname devel-vers)) (elpaa--add-badge-link devel-html pkgname)) - (unless (file-exists-p release-badge) + (unless (or (file-exists-p release-badge) + (not (file-exists-p release-html))) (elpaa--make-badge release-badge (format "%s ELPA" elpaa--name) (format "%s %s" pkgname vers))
