[elpa] externals/eev ae6e35b: Added support for test blocks in js-mode.
branch: externals/eev commit ae6e35b2acf529104061a86e8b26830592b0b03f Author: Eduardo Ochs Commit: Eduardo Ochs Added support for test blocks in js-mode. --- ChangeLog | 6 ++ README.org | 25 +++-- VERSION | 4 ++-- eev-compose-hash.el | 17 +++-- eev-intro.el| 12 eev-testblocks.el | 14 +- eev-tlinks.el | 9 - 7 files changed, 71 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31973f1..aa53522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-09-07 Eduardo Ochs + + * eev-testblocks.el (ee-insert-test-js-mode): new function. + + * eev-tlinks.el (find-debpkg-links): added a few more links. + 2021-08-22 Eduardo Ochs * eev-tlinks.el (ee-youtubedl-subtitle-p): new function. diff --git a/README.org b/README.org index 76c8ae4..dfb37fe 100644 --- a/README.org +++ b/README.org @@ -1,15 +1,20 @@ -# (find-eev "README.org") -# (defun c () (interactive) (eek "C-c C-e h h")) -# (defun v () (interactive) (brg "~/eev-current/README.html")) -# (defun e () (interactive) (find-eev "README.org")) -# (defun m () (interactive) (find-eev "README.md")) +# This file: +# https://github.com/edrx/eev/ +# http://angg.twu.net/eev-current/README.org.html +# http://angg.twu.net/eev-current/README.org +# (find-angg "eev-current/README.org") +# (find-angg "eev-current/") +# Author: Eduardo Ochs +# +# Some eev-isms: +# (defun c () (interactive) (eek "C-c C-e h h")) +# (defun o () (interactive) (find-angg "eev-current/README.org")) +# (defun v () (interactive) (brg "~/eev-current/README.html")) # (defun cv () (interactive) (c) (v)) -# (find-angg "edrxrepl/README.org") -# (find-orgsrcfile "README") -# (find-es "org" "git") - +# (find-eev "README.org") +# # (find-orgnode "Table of Contents") -#+OPTIONS: toc:nil +#+OPTIONS: toc:nil num:ni * Introduction diff --git a/VERSION b/VERSION index e01abfc..d555104 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -Mon Aug 23 02:03:12 GMT 2021 -Sun Aug 22 23:03:12 -03 2021 +Tue Sep 7 23:10:08 GMT 2021 +Tue Sep 7 20:10:08 -03 2021 diff --git a/eev-compose-hash.el b/eev-compose-hash.el index a0b7f3f..640bb05 100644 --- a/eev-compose-hash.el +++ b/eev-compose-hash.el @@ -179,6 +179,14 @@ The default ACTION is (ee-composes-do-default)." (if face (setq ee-composes-current-face (read face))) ) +(defun ee-composes-do-remove-face () + "Experimental." + (if pos (puthash keys pos ee-composes-keys-to-pos)) + (if pos (eepitch-set-glyph0 (aref pos 0) (aref pos 0) 'default)) + (if latex (puthash pos latex ee-composes-pos-to-latex)) + (if face (setq ee-composes-current-face (read face))) + ) + (defun ee-composes-do-test () "An alternative action for `ee-composes-do', for tests." (insert (format "\n;; %S %S %S / %S" pos keys latex face))) @@ -422,14 +430,15 @@ instead of inserting." ↗ NE \\nearrow ↘ SE \\searrow ↙ SW \\swarrow - ↣ ep \\epito ↣ >t \\twoheadrightarrow + ↣ ep \\epito ↤ mo \\mapsfrom ↦ mt \\mapsto ⇀ hu \\rightharpoonup ⇐ <= \\Leftarrow ⇒ => \\funto ⇔ LR \\Leftrightarrow + ⇝ s> \\squigglyarrow ∀ fa \\forall ∂ Pa \\partial ∃ ex \\exists @@ -445,8 +454,8 @@ instead of inserting." ∩ ca \\cap ∪ cu \\cup ∫ In \\int - ∼ ~1 \\sim ∼ 1~ \\sim + ∼ ~1 \\sim ≃ -~ \\simeq ≅ =~ \\cong ≈ ~~ \\approx @@ -569,6 +578,10 @@ instead of inserting." ;; (find-estring (ee-composes-to-catcodes)) ;; (find-estring (ee-composes-to-declareunicodes)) ;; (define-key eev-mode-map (kbd "M-,") 'ee-compose-pair) +;; +;; 2021aug31: +;; (ee-composes-do ee-composes-bigstr-math '(ee-composes-do-remove-face)) +;; (ee-composes-do ee-composes-bigstr-math) diff --git a/eev-intro.el b/eev-intro.el index d3533d3..c59dc16 100644 --- a/eev-intro.el +++ b/eev-intro.el @@ -12882,6 +12882,11 @@ This intro is a very quick introduction to Emacs Lisp. Its intent is not to teach people how to _write_ Elisp code, only to teach them how to _read_ Elisp code. +Different people prefer different kinds of tutorials. +Many people love the eintr, but I don't: (find-node \"(eintr)Top\") +This tutorial here is what I would have liked to have had access to +when I started learning Emacs Lisp. + TODO: integrate this with these older intros: (find-eval-intro) (find-defun-intro) @@ -13460,6 +13465,13 @@ will give you information about the current definition. + +12. Some advanced topics + +See: (find-lexical-intro) + + + " pos-spec-list))) ;; (find-elisp-intro) diff --git a/eev-testblocks.el b/eev-testblo
[nongnu] elpa/caml 7338b28 4/5: OPAM: Pass the lint test
branch: elpa/caml
commit 7338b28e20bd8a66946064fec09ce4181e0a76ab
Author: Christophe Troestler
Commit: Christophe Troestler
OPAM: Pass the lint test
---
caml-mode.opam | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/caml-mode.opam b/caml-mode.opam
index 0407fc2..ad3b8cb 100644
--- a/caml-mode.opam
+++ b/caml-mode.opam
@@ -1,6 +1,4 @@
opam-version: "2.0"
-name: "caml-mode"
-version: "VERSION"
authors: [
"Damien Doligez"
"Jacques Garrigue"
@@ -9,7 +7,7 @@ authors: [
"Ian T Zimmerman"
]
maintainer: "christophe.troest...@umons.ac.be"
-license: "GNU General Public License"
+license: "GPL-2.0-or-later"
homepage: "https://github.com/ocaml/caml-mode";
dev-repo: "git+https://github.com/ocaml/caml-mode.git";
bug-reports: "https://github.com/ocaml/caml-mode/issues";
@@ -25,5 +23,6 @@ depends: ["ocaml" "conf-emacs"]
post-messages: """
If you have not yet done so, please add in ~/.emacs.d/init.el or
in ~/.emacs to following line:
-(add-to-list 'load-path "%{share}%/emacs/site-lisp/")""" {success}
+(add-to-list 'load-path "%{share}%/emacs/site-lisp/")
+""" {success & !user-setup:installed}
synopsis: "SYNOPSIS"
[nongnu] elpa/caml 677094e 3/5: Adapt to the new ocamldebug code pointer format
branch: elpa/caml commit 677094ea308270781a79520adfc1b091a5d38524 Author: Christophe Troestler Commit: Christophe Troestler Adapt to the new ocamldebug code pointer format Fixes https://github.com/ocaml/caml-mode/issues/7 --- camldebug.el | 57 + 1 file changed, 37 insertions(+), 20 deletions(-) diff --git a/camldebug.el b/camldebug.el index 9a3822e..febc27d 100644 --- a/camldebug.el +++ b/camldebug.el @@ -253,17 +253,26 @@ representation is simply concatenated with the COMMAND." ;accumulate onto previous output (setq camldebug-filter-accumulator (concat camldebug-filter-accumulator string)) - (when (or (string-match (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+" - camldebug-goto-position - "-[0-9]+[ \t]*\\(before\\).*\n") - camldebug-filter-accumulator) -(string-match (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)" - "[ \t]+[0-9]+-" - camldebug-goto-position - "[ \t]*\\(after\\).*\n") - camldebug-filter-accumulator)) -(setq camldebug-goto-output - (match-string 2 camldebug-filter-accumulator)) + ;;Address CharactersKind Repr. + ;; 14452 64-82 before/fun + ;; 14584182-217 after/ret + ;;0: 30248 -1--1 pseudo + ;;0: 30076 64-82 before/fun + (when (or (string-match + (concat "\\(?:\n\\|\\`\\)[ \t]*" + "\\([0-9]+\\)\\(?::[ \t]*\\([0-9]+\\)\\)?[ \t]+" + camldebug-goto-position + "-[0-9]+[ \t]*before.*\n") + camldebug-filter-accumulator) +(string-match + (concat "\\(?:\n\\|\\`\\)[ \t]*" + "\\([0-9]+\\)\\(?::[ \t]*\\([0-9]+\\)\\)?[ \t]+[0-9]+-" + camldebug-goto-position + "[ \t]*after.*\n") + camldebug-filter-accumulator)) +(let ((id (match-string 1 camldebug-filter-accumulator)) + (pos (match-string 2 camldebug-filter-accumulator))) + (setq camldebug-goto-output (if pos (concat id ":" pos) id))) (setq camldebug-filter-accumulator (substring camldebug-filter-accumulator (1- (match-end 0) (when (string-match comint-prompt-regexp camldebug-filter-accumulator) @@ -295,8 +304,9 @@ buffer, then try to obtain the time from context around point." (save-selected-window (select-window (get-buffer-window current-camldebug-buffer)) (save-excursion -(if (re-search-backward "^Time : [0-9]+ - pc : [0-9]+ " -nil t (- 1 ntime)) +(if (re-search-backward + "^Time *: [0-9]+ - pc *: [0-9]+\\(?::[0-9]+\\)? " + nil t (- 1 ntime)) (camldebug-goto nil) (error "I don't have %d times in my history" (- 1 ntime @@ -305,7 +315,8 @@ buffer, then try to obtain the time from context around point." ((eobp) 0) ((save-excursion (beginning-of-line 1) - (looking-at "^Time : \\([0-9]+\\) - pc : [0-9]+ ")) + (looking-at + "^Time *: \\([0-9]+\\) - pc *: [0-9]+\\(?::[0-9]+\\)? ")) (string-to-number (match-string 1))) ((string-to-number (camldebug-format-command "%e")) (camldebug-call "goto" nil time))) @@ -323,7 +334,7 @@ buffer, then try to obtain the time from context around point." (accept-process-output proc)) (setq address (if (eq camldebug-goto-output 'fail) nil (re-search-backward - (concat "^Time : \\([0-9]+\\) - pc : " + (concat "^Time *: \\([0-9]+\\) - pc *: " camldebug-goto-output " - module " module "$") @@ -340,13 +351,17 @@ buffer, then try to obtain the time from context around point." (setq camldebug-filter-accumulator (concat camldebug-filter-accumulator string)) (when (string-match - (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+[0-9]+[ \t]*in " + ;; NumAddress Where + ;; 1 14552 file u.ml, line 5, characters 1-34 + ;; 1 0: 30176 file u.ml, line 5, characters 1-34 + (concat "\\(?:\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+" + "[0-9]+\\(?::[ \t]*[0-9]+\\)?[ \t]+file +" (regexp-quote camldebug-delete-file) ", character " camldebug-delete-position "\n") camldebug-filter-accumulator) (setq camldebug-delet
[nongnu] elpa/caml 2905a43 5/5: Version 4.9
branch: elpa/caml commit 2905a436e956c5bba16c4633a6e4c4fceefa6535 Author: Christophe Troestler Commit: Christophe Troestler Version 4.9 --- CHANGES.md | 8 caml.el| 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index c64d6ce..375e344 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,11 @@ +4.9 2021-09-7 +- + +* camldebug mode now recognize the new format of code pointers (#7). +* Make the code ready to be distributed in NonGNU ELPA. +* Many warnings fixed (thanks to Stefan Monnier) and minor code improvements. +* XEmacs is no longer supported. + Version 3.10.1 -- * use `caml-font.el` from Olivier Andrieu diff --git a/caml.el b/caml.el index 9a5dd8e..311d0f6 100644 --- a/caml.el +++ b/caml.el @@ -8,7 +8,7 @@ ;; Maintainer: Christophe Troestler ;; Created: July 1993 ;; Package-Requires: ((emacs "24.3")) -;; Version: 4.8 +;; Version: 4.9 ;; Keywords: OCaml ;; Homepage: https://github.com/ocaml/caml-mode
[nongnu] elpa/caml 2a82ccd 1/5: Add a badge for the Debian package
branch: elpa/caml commit 2a82ccd5b8081c5b708753e89b7e6e91f91507af Author: Christophe Troestler Commit: Christophe Troestler Add a badge for the Debian package --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 9b1faaf..a3a0f0d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ [](https://elpa.nongnu.org/nongnu/caml.html) [](https://melpa.org/#/caml) +[](https://packages.debian.org/stable/elpa-caml) OCaml Emacs mode
[nongnu] elpa/caml ae8202d 2/5: camldebug: Clean up code
branch: elpa/caml commit ae8202db3eb0208fc4d32475f636d7026b0923a0 Author: Christophe Troestler Commit: Christophe Troestler camldebug: Clean up code --- camldebug.el | 56 +++- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/camldebug.el b/camldebug.el index 669754f..9a3822e 100644 --- a/camldebug.el +++ b/camldebug.el @@ -73,10 +73,10 @@ (window-system (make-face 'camldebug-event) (make-face 'camldebug-underline) - (if (not (face-differs-from-default-p 'camldebug-event)) - (invert-face 'camldebug-event)) - (if (not (face-differs-from-default-p 'camldebug-underline)) - (set-face-underline 'camldebug-underline t)) + (unless (face-differs-from-default-p 'camldebug-event) +(invert-face 'camldebug-event)) + (unless (face-differs-from-default-p 'camldebug-underline) +(set-face-underline 'camldebug-underline t)) (setq camldebug-overlay-event (make-overlay 1 1)) (overlay-put camldebug-overlay-event 'face 'camldebug-event) (setq camldebug-overlay-under (make-overlay 1 1)) @@ -212,9 +212,7 @@ representation is simply concatenated with the COMMAND." ;gob up stupid questions :-) (setq camldebug-filter-accumulator (concat camldebug-filter-accumulator string)) - (if (not (string-match "\\(.* \\)(y or n) " - camldebug-filter-accumulator)) - nil + (when (string-match "\\(.* \\)(y or n) " camldebug-filter-accumulator) (setq camldebug-kill-output (cons t (match-string 1 camldebug-filter-accumulator))) (setq camldebug-filter-accumulator "")) @@ -255,23 +253,20 @@ representation is simply concatenated with the COMMAND." ;accumulate onto previous output (setq camldebug-filter-accumulator (concat camldebug-filter-accumulator string)) - (if (not (or (string-match (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+" - camldebug-goto-position - "-[0-9]+[ \t]*\\(before\\).*\n") - camldebug-filter-accumulator) - (string-match (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)" - "[ \t]+[0-9]+-" - camldebug-goto-position - "[ \t]*\\(after\\).*\n") - camldebug-filter-accumulator))) - nil + (when (or (string-match (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+" + camldebug-goto-position + "-[0-9]+[ \t]*\\(before\\).*\n") + camldebug-filter-accumulator) +(string-match (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)" + "[ \t]+[0-9]+-" + camldebug-goto-position + "[ \t]*\\(after\\).*\n") + camldebug-filter-accumulator)) (setq camldebug-goto-output (match-string 2 camldebug-filter-accumulator)) (setq camldebug-filter-accumulator (substring camldebug-filter-accumulator (1- (match-end 0) - (if (not (string-match comint-prompt-regexp - camldebug-filter-accumulator)) - nil + (when (string-match comint-prompt-regexp camldebug-filter-accumulator) (setq camldebug-goto-output (or camldebug-goto-output 'fail)) (setq camldebug-filter-accumulator "")) (if (string-match "\n\\(.*\\)\\'" camldebug-filter-accumulator) @@ -344,20 +339,17 @@ buffer, then try to obtain the time from context around point." (defun camldebug-delete-filter (string) (setq camldebug-filter-accumulator (concat camldebug-filter-accumulator string)) - (if (not (string-match -(concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+[0-9]+[ \t]*in " -(regexp-quote camldebug-delete-file) -", character " -camldebug-delete-position "\n") -camldebug-filter-accumulator)) - nil + (when (string-match + (concat "\\(\n\\|\\`\\)[ \t]*\\([0-9]+\\)[ \t]+[0-9]+[ \t]*in " + (regexp-quote camldebug-delete-file) + ", character " + camldebug-delete-position "\n") + camldebug-filter-accumulator) (setq camldebug-delete-output (match-string 2 camldebug-filter-accumulator)) (setq camldebug-filter-accumulator (substring camldebug-filter-accumulator (1- (match-end 0) - (if (not (string-match comint-prompt-regexp - camldebug-filter-accumulator)) - nil + (when (string-match comint-prompt-regexp camldebug-filter-accumulator) (setq camldebug-delete-output (or camldebug-delete-output 'fail)) (setq camldebug-filter-accumulator "")) (if (string-match "\n\\(.*\\)\\'" camldebug-filter-accumulator) @@ -435,9 +427,7 @@ around point." (setq caml
[nongnu] elpa/caml updated (3b6913e -> 2905a43)
elpasync pushed a change to branch elpa/caml. from 3b6913e Improve the instructions to install new 2a82ccd Add a badge for the Debian package new ae8202d camldebug: Clean up code new 677094e Adapt to the new ocamldebug code pointer format new 7338b28 OPAM: Pass the lint test new 2905a43 Version 4.9 Summary of changes: CHANGES.md | 8 + README.md | 1 + caml-mode.opam | 7 ++--- caml.el| 2 +- camldebug.el | 93 +++--- 5 files changed, 63 insertions(+), 48 deletions(-)
[nongnu] elpa/yasnippet-snippets 0c28a08 1/2: remove/rename a lot of duplicated snippets, and add tests
branch: elpa/yasnippet-snippets
commit 0c28a08e834001ab4c07d36f68dc160abeb02b17
Author: Andrea Crotti
Commit: Andrea Crotti
remove/rename a lot of duplicated snippets, and add tests
There were currently many snippets with the same name in the same
mode, which means they could never be activated.
With this PR we make a pretty big cleanup of all the ones that were
unusable, by removing or renaming them.
Also add a couple of tests to ensure more consistency across the board.
---
.gitignore | 1 +
report/src/core.clj | 31 -
report/test/core_test.clj | 44 +++--
snippets/bibtex-mode/mvproceedings | 19 ---
snippets/c++-mode/acl | 8 -
snippets/c++-mode/d_operator_ostream| 5 ---
snippets/c++-mode/oit | 8 -
snippets/c++-mode/rmv | 9 -
snippets/c++-mode/sti | 6
snippets/c++-mode/sto | 6
snippets/c++-mode/stv | 6
snippets/c++-mode/trm | 6
snippets/c++-mode/upr | 9 -
snippets/csharp-mode/comment.2 | 3 +-
snippets/emacs-lisp-mode/.read_me | 8 -
snippets/emacs-lisp-mode/find-replace | 18 --
snippets/emacs-lisp-mode/grabthing | 1 +
snippets/emacs-lisp-mode/traverse_dir | 7
snippets/emacs-lisp-mode/x-dired.process_marked | 18 --
snippets/emacs-lisp-mode/x-file.process | 19 ---
snippets/emacs-lisp-mode/x-file.read-lines | 19 ---
snippets/emacs-lisp-mode/x-find-replace | 19 ---
snippets/emacs-lisp-mode/x-grabstring | 6
snippets/emacs-lisp-mode/x-grabthing| 6
snippets/emacs-lisp-mode/x-traverse_dir | 8 -
snippets/emacs-lisp-mode/x-word-or-region | 29
snippets/html-mode/form | 4 +--
snippets/html-mode/script.javascript| 4 +--
snippets/html-mode/script.javascript-src| 4 +--
snippets/hy-mode/class | 4 +--
snippets/hy-mode/cond | 4 +--
snippets/hy-mode/defm | 4 +--
snippets/hy-mode/do | 4 +--
snippets/hy-mode/if | 4 +--
snippets/hy-mode/ifn| 4 +--
snippets/hy-mode/imp| 4 +--
snippets/hy-mode/main | 4 +--
snippets/hy-mode/req| 4 +--
snippets/hy-mode/unless | 4 +--
snippets/hy-mode/when | 4 +--
snippets/js-mode/type-multiline-comment | 2 +-
snippets/lisp-mode/for | 2 +-
snippets/lisp-mode/foreach | 2 +-
snippets/markdown-mode/hyphen | 2 +-
snippets/markdown-mode/plus | 2 +-
snippets/nxml-mode/form | 4 +--
snippets/php-mode/method-doc| 8 -
snippets/python-mode/assertRaises.with | 4 +--
snippets/raku-mode/raku-mode| 1 -
snippets/rust-mode/new | 2 +-
snippets/sh-mode/args | 2 +-
snippets/sh-mode/case | 2 +-
snippets/sh-mode/select | 2 +-
53 files changed, 108 insertions(+), 302 deletions(-)
diff --git a/.gitignore b/.gitignore
index c4f0816..da76e7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
**/.yas-compiled-snippets.el
/report/target/
+/report/.nrepl-port
diff --git a/report/src/core.clj b/report/src/core.clj
index 943b2e1..7f42f34 100644
--- a/report/src/core.clj
+++ b/report/src/core.clj
@@ -22,25 +22,28 @@
(defn mode-files
[mode-dir]
- (filter #(.isFile %)
- (file-seq (io/file mode-dir
+ (->> (io/file mode-dir)
+ file-seq
+ (filter #(and (.isFile %) (not (.startsWith (.getName %) "."))
(defn parse-mode
[mode-dir]
(for [f (mode-files mode-dir)]
+;; directories should be excluded from here ideally?
{:filename (.getName (io/file mode-dir f))
- :name (extract-keyword f "name")
- :key (or (extract-keyword f "key")
- (extract-keyword f "name"))
- :group (extract-keyword f "group")
- :desc (extract-keyword f "desc")}))
+ :name (extract-keyword f "name")
+ ;; FIXME: I think this is not correct, it uses the filename actually?
+ :key (or (extract-keyword f "key")
+ (extract-keyword f "name"))
+ :group(extract-keyword f "group")
+ :desc (extract-keyword f "desc")}))
(defn pa
[nongnu] elpa/yasnippet-snippets c0ef1e8 2/2: Merge pull request #429 from AndreaCrotti/remove-older
branch: elpa/yasnippet-snippets
commit c0ef1e8cfd05ef77b9240f3d9e8f0798bbcf9a58
Merge: 8bf33e9 0c28a08
Author: Andrea Crotti
Commit: GitHub
Merge pull request #429 from AndreaCrotti/remove-older
remove duplicated scripts
---
.gitignore | 1 +
report/src/core.clj | 31 -
report/test/core_test.clj | 44 +++--
snippets/bibtex-mode/mvproceedings | 19 ---
snippets/c++-mode/acl | 8 -
snippets/c++-mode/d_operator_ostream| 5 ---
snippets/c++-mode/oit | 8 -
snippets/c++-mode/rmv | 9 -
snippets/c++-mode/sti | 6
snippets/c++-mode/sto | 6
snippets/c++-mode/stv | 6
snippets/c++-mode/trm | 6
snippets/c++-mode/upr | 9 -
snippets/csharp-mode/comment.2 | 3 +-
snippets/emacs-lisp-mode/.read_me | 8 -
snippets/emacs-lisp-mode/find-replace | 18 --
snippets/emacs-lisp-mode/grabthing | 1 +
snippets/emacs-lisp-mode/traverse_dir | 7
snippets/emacs-lisp-mode/x-dired.process_marked | 18 --
snippets/emacs-lisp-mode/x-file.process | 19 ---
snippets/emacs-lisp-mode/x-file.read-lines | 19 ---
snippets/emacs-lisp-mode/x-find-replace | 19 ---
snippets/emacs-lisp-mode/x-grabstring | 6
snippets/emacs-lisp-mode/x-grabthing| 6
snippets/emacs-lisp-mode/x-traverse_dir | 8 -
snippets/emacs-lisp-mode/x-word-or-region | 29
snippets/html-mode/form | 4 +--
snippets/html-mode/script.javascript| 4 +--
snippets/html-mode/script.javascript-src| 4 +--
snippets/hy-mode/class | 4 +--
snippets/hy-mode/cond | 4 +--
snippets/hy-mode/defm | 4 +--
snippets/hy-mode/do | 4 +--
snippets/hy-mode/if | 4 +--
snippets/hy-mode/ifn| 4 +--
snippets/hy-mode/imp| 4 +--
snippets/hy-mode/main | 4 +--
snippets/hy-mode/req| 4 +--
snippets/hy-mode/unless | 4 +--
snippets/hy-mode/when | 4 +--
snippets/js-mode/type-multiline-comment | 2 +-
snippets/lisp-mode/for | 2 +-
snippets/lisp-mode/foreach | 2 +-
snippets/markdown-mode/hyphen | 2 +-
snippets/markdown-mode/plus | 2 +-
snippets/nxml-mode/form | 4 +--
snippets/php-mode/method-doc| 8 -
snippets/python-mode/assertRaises.with | 4 +--
snippets/raku-mode/raku-mode| 1 -
snippets/rust-mode/new | 2 +-
snippets/sh-mode/args | 2 +-
snippets/sh-mode/case | 2 +-
snippets/sh-mode/select | 2 +-
53 files changed, 108 insertions(+), 302 deletions(-)
diff --git a/.gitignore b/.gitignore
index c4f0816..da76e7c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
**/.yas-compiled-snippets.el
/report/target/
+/report/.nrepl-port
diff --git a/report/src/core.clj b/report/src/core.clj
index 943b2e1..7f42f34 100644
--- a/report/src/core.clj
+++ b/report/src/core.clj
@@ -22,25 +22,28 @@
(defn mode-files
[mode-dir]
- (filter #(.isFile %)
- (file-seq (io/file mode-dir
+ (->> (io/file mode-dir)
+ file-seq
+ (filter #(and (.isFile %) (not (.startsWith (.getName %) "."))
(defn parse-mode
[mode-dir]
(for [f (mode-files mode-dir)]
+;; directories should be excluded from here ideally?
{:filename (.getName (io/file mode-dir f))
- :name (extract-keyword f "name")
- :key (or (extract-keyword f "key")
- (extract-keyword f "name"))
- :group (extract-keyword f "group")
- :desc (extract-keyword f "desc")}))
+ :name (extract-keyword f "name")
+ ;; FIXME: I think this is not correct, it uses the filename actually?
+ :key (or (extract-keyword f "key")
+ (extract-keyword f "name"))
+ :group(extract-keyword f "group")
+ :desc (extract-keyword f "desc")}))
(defn parse-everything
[snippets-dir]
(into {}
(remove nil?)
(for [d (file-seq (io/file snippets-dir))]
- (when (.isDirectory d)
+ (when (and (not= (.getPath d) snippets-dir) (.isDirectory d))
{(.getName d) (parse-mode d)})))
[nongnu] elpa/magit-section updated (d173de7 -> 2fe42f6)
elpasync pushed a change to branch elpa/magit-section. from d173de7 magit-version: Make more flexible for when no *.el exists adds 9cde2b1 magit-dispatch: Add comments for seemingly unbound keys adds ee55595 magit-refs-show-commit-count: Fix doc-string adds 2fe42f6 magit-show-refs: Add magit-refs-set-show-commit-count No new revisions were added by this update. Summary of changes: Documentation/magit.org | 8 ++-- Documentation/magit.texi | 10 -- lisp/magit-refs.el | 6 -- lisp/magit.el| 18 ++ 4 files changed, 36 insertions(+), 6 deletions(-)
[nongnu] elpa/magit updated (d173de7 -> 2fe42f6)
elpasync pushed a change to branch elpa/magit. from d173de7 magit-version: Make more flexible for when no *.el exists adds 9cde2b1 magit-dispatch: Add comments for seemingly unbound keys adds ee55595 magit-refs-show-commit-count: Fix doc-string adds 2fe42f6 magit-show-refs: Add magit-refs-set-show-commit-count No new revisions were added by this update. Summary of changes: Documentation/magit.org | 8 ++-- Documentation/magit.texi | 10 -- lisp/magit-refs.el | 6 -- lisp/magit.el| 18 ++ 4 files changed, 36 insertions(+), 6 deletions(-)
[nongnu] elpa/git-commit ee55595 2/3: magit-refs-show-commit-count: Fix doc-string
branch: elpa/git-commit commit ee55595ca5816bc85ee7a341c6643e65f4a0bb56 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-refs-show-commit-count: Fix doc-string --- lisp/magit-refs.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el index d3895ea..e49c1f9 100644 --- a/lisp/magit-refs.el +++ b/lisp/magit-refs.el @@ -63,7 +63,7 @@ branch Show counts for branches only. nilNever show counts. To change the value in an existing buffer use the command -`magit-refs-show-commit-count'" +`magit-refs-set-show-commit-count'." :package-version '(magit . "2.1.0") :group 'magit-refs :safe (lambda (val) (memq val '(all branch nil)))
[nongnu] elpa/git-commit 2fe42f6 3/3: magit-show-refs: Add magit-refs-set-show-commit-count
branch: elpa/git-commit
commit 2fe42f63d558e488ad71d050e8ca5e8565c845ae
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-show-refs: Add magit-refs-set-show-commit-count
---
Documentation/magit.org | 8 ++--
Documentation/magit.texi | 10 --
lisp/magit-refs.el | 4 +++-
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/Documentation/magit.org b/Documentation/magit.org
index 9cd5ce0..8929df7 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 (v3.2.1-43-g534ef5a64+1)
+#+SUBTITLE: for version 3.2.1 (v3.2.1-57-gee55595ca+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 (v3.2.1-43-g534ef5a64+1).
+This manual is for Magit version 3.2.1 (v3.2.1-57-gee55595ca+1).
#+BEGIN_QUOTE
Copyright (C) 2015-2021 Jonas Bernoulli
@@ -3508,6 +3508,10 @@ which all the other references are compared.
This command lists branches and tags in a dedicated buffer. Each
reference is being compared with a branch read from the user.
+- Key: y r, magit-refs-set-show-commit-count
+
+ This command change for which refs the commit count is shown.
+
- User Option: magit-refs-show-commit-count
Whether to show commit counts in Magit-Refs mode buffers.
diff --git a/Documentation/magit.texi b/Documentation/magit.texi
index caf202e..94900aa 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 (v3.2.1-43-g534ef5a64+1)
+@subtitle for version 3.2.1 (v3.2.1-57-gee55595ca+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 (v3.2.1-43-g534ef5a64+1).
+This manual is for Magit version 3.2.1 (v3.2.1-57-gee55595ca+1).
@quotation
Copyright (C) 2015-2021 Jonas Bernoulli
@@ -4743,6 +4743,12 @@ is detached.
This command lists branches and tags in a dedicated buffer. Each
reference is being compared with a branch read from the user.
+@kindex y r
+@cindex magit-refs-set-show-commit-count
+@item @kbd{y r}
@tie{}@tie{}@tie{}@tie{}(@code{magit-refs-set-show-commit-count})
+
+This command change for which refs the commit count is shown.
+
@end table
@defopt magit-refs-show-commit-count
diff --git a/lisp/magit-refs.el b/lisp/magit-refs.el
index e49c1f9..e21bb1e 100644
--- a/lisp/magit-refs.el
+++ b/lisp/magit-refs.el
@@ -341,7 +341,9 @@ Type \\[magit-reset] to reset `HEAD' to the commit at point.
["Actions"
("y" "Show refs, comparing them with HEAD" magit-show-refs-head)
("c" "Show refs, comparing them with current branch"
magit-show-refs-current)
- ("o" "Show refs, comparing them with other branch" magit-show-refs-other)]
+ ("o" "Show refs, comparing them with other branch" magit-show-refs-other)
+ ("r" "Show refs, changing commit count display"
+magit-refs-set-show-commit-count)]
(interactive (list (or (derived-mode-p 'magit-refs-mode)
current-prefix-arg)))
(if transient
[nongnu] elpa/git-commit 9cde2b1 1/3: magit-dispatch: Add comments for seemingly unbound keys
branch: elpa/git-commit
commit 9cde2b1c65e687e02bbf822cf8b71b71a68f82d9
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-dispatch: Add comments for seemingly unbound keys
---
lisp/magit.el | 18 ++
1 file changed, 18 insertions(+)
diff --git a/lisp/magit.el b/lisp/magit.el
index 65294a8..ab869dd 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -296,7 +296,10 @@ Also see info node `(magit)Commands for Buffers Visiting
Files'."
"Invoke a Magit command from a list of available commands."
:info-manual "(magit)Top"
["Transient and dwim commands"
+ ;; → bound in magit-mode-map or magit-section-mode-map
+ ;; ↓ bound below
[("A" "Apply" magit-cherry-pick)
+;; a ↓
("b" "Branch" magit-branch)
("B" "Bisect" magit-bisect)
("c" "Commit" magit-commit)
@@ -307,6 +310,8 @@ Also see info node `(magit)Commands for Buffers Visiting
Files'."
("E" "Ediff" magit-ediff)
("f" "Fetch" magit-fetch)
("F" "Pull" magit-pull)
+;; g ↓
+;; G→ magit-refresh-all
("h" "Help" magit-help)
("H" "Section info" magit-describe-section :if-derived magit-mode)]
[("i" "Ignore" magit-gitignore)
@@ -314,20 +319,33 @@ Also see info node `(magit)Commands for Buffers Visiting
Files'."
("j" "Jump to section"magit-status-jump :if-mode magit-status-mode)
("j" "Display status" magit-status-quick :if-not-mode magit-status-mode)
("J" "Display buffer" magit-display-repository-buffer)
+;; k ↓
+;; K→ magit-file-untrack
("l" "Log"magit-log)
("L" "Log (change)" magit-log-refresh)
("m" "Merge" magit-merge)
("M" "Remote" magit-remote)
+;; n→ magit-section-forward
+;; N reserved → forge-dispatch
("o" "Submodule" magit-submodule)
("O" "Subtree"magit-subtree)
+;; p→ magit-section-backward
("P" "Push" magit-push)
+;; q→ magit-mode-bury-buffer
("Q" "Command"magit-git-command)]
[("r" "Rebase" magit-rebase)
+;; R→ magit-file-rename
+;; s ↓
+;; S ↓
("t" "Tag"magit-tag)
("T" "Note" magit-notes)
+;; u ↓
+;; U ↓
+;; v ↓
("V" "Revert" magit-revert)
("w" "Apply patches" magit-am)
("W" "Format patches" magit-patch)
+;; x→ magit-reset-quickly
("X" "Reset" magit-reset)
("y" "Show Refs" magit-show-refs)
("Y" "Cherries" magit-cherry)
[nongnu] elpa/git-commit updated (d173de7 -> 2fe42f6)
elpasync pushed a change to branch elpa/git-commit. from d173de7 magit-version: Make more flexible for when no *.el exists new 9cde2b1 magit-dispatch: Add comments for seemingly unbound keys new ee55595 magit-refs-show-commit-count: Fix doc-string new 2fe42f6 magit-show-refs: Add magit-refs-set-show-commit-count Summary of changes: Documentation/magit.org | 8 ++-- Documentation/magit.texi | 10 -- lisp/magit-refs.el | 6 -- lisp/magit.el| 18 ++ 4 files changed, 36 insertions(+), 6 deletions(-)
[nongnu] elpa/with-editor eabf9c9: manual: Cleanup local variables
branch: elpa/with-editor commit eabf9c9bd2477e98251b84ed22c6b4d8d43603e6 Author: Jonas Bernoulli Commit: Jonas Bernoulli manual: Cleanup local variables --- with-editor.org | 4 1 file changed, 4 deletions(-) diff --git a/with-editor.org b/with-editor.org index e7b9a13..f68fded 100644 --- a/with-editor.org +++ b/with-editor.org @@ -326,10 +326,6 @@ General Public License for more details. # LocalWords: Magit Emacs emacsclient FreeBSD macOS texinfo # LocalWords: async eval hg init performant rebase startup -# Local Variables: -# eval: (require 'ox-texinfo+ nil t) -# End: - # IMPORTANT: Also update ORG_ARGS and ORG_EVAL in the Makefile. # Local Variables: # eval: (require 'magit-utils nil t)
[elpa] externals/ada-mode 497573e: * ada-mode.texi (Project files): Add fragment to URL for wisi link
branch: externals/ada-mode
commit 497573ebdba5ee4fbcac9978929c07f5273b9f8a
Author: Stephen Leake
Commit: Stephen Leake
* ada-mode.texi (Project files): Add fragment to URL for wisi link
---
ada-mode.texi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ada-mode.texi b/ada-mode.texi
index f012407..050c5b8 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -1440,7 +1440,7 @@ wisi project files; @ref{Project files, Project files,
Project files, wisi}.
@c We can't use @ref, because that doesn't let us specify a relative
@c directory for the html file (it drops the directory part of
@c the info file name!). This path works for the ELPA website.
-@url{../wisi/wisi.html, wisi project files}.
+@url{../wisi/wisi.html#Project-files, wisi project files}.
@end ifhtml
A wisi project file specifies what directories hold sources for your
[elpa] externals/ada-mode df6efc2 1/3: First attempt to make doc cross reference work on ELPA website
branch: externals/ada-mode commit df6efc230967d474166b4ceb8fe6ef9b5817f8a2 Author: Stephen Leake Commit: Stephen Leake First attempt to make doc cross reference work on ELPA website * ada-build.el (ada-build-require-project-file): Fix typo in doc string. * ada-mode.info: Delete; now built by the elpa server. * ada-mode.texi (Project files): Fix wisi cross reference. For html, make it work on the ELPA website. (Project file overview): Fix wisi cross reference. --- ada-build.el |6 +- ada-mode.info | 2665 - ada-mode.texi |6 +- 3 files changed, 7 insertions(+), 2670 deletions(-) diff --git a/ada-build.el b/ada-build.el index 7d12dbf..7706896 100644 --- a/ada-build.el +++ b/ada-build.el @@ -1,7 +1,7 @@ ;; ada-build.el --- Extensions to ada-mode for compiling and running -*- lexical-binding:t -*- ;; Ada projects without 'make' or similar tool ;; -;; Copyright (C) 1994, 1995, 1997 - 2017, 2019 Free Software Foundation, Inc. +;; Copyright (C) 1994, 1995, 1997 - 2017, 2019, 2021 Free Software Foundation, Inc. ;; ;; Author: Stephen Leake ;; Maintainer: Stephen Leake @@ -232,9 +232,9 @@ main. search-prompt - Search for a project file in the current directory with the same name as the main file. If not found, -prompt for a project file; thow error if user aborts +prompt for a project file; throw an error if user aborts. -prompt - Prompt for a project file; thow error if user aborts. +prompt - Prompt for a project file; throw an error if user aborts. error - Throw an error (no prompt, no default project). diff --git a/ada-mode.info b/ada-mode.info deleted file mode 100644 index e179e9f..000 --- a/ada-mode.info +++ /dev/null @@ -1,2665 +0,0 @@ -This is ada-mode.info, produced by makeinfo version 6.7 from -ada-mode.texi. - -Copyright (C) 1999 - 2021 Free Software Foundation, Inc. - - Permission is granted to copy, distribute and/or modify this - document under the terms of the GNU Free Documentation License, - Version 1.3 or any later version published by the Free Software - Foundation; with no Invariant Sections, with the Front-Cover texts - being "A GNU Manual", and with the Back-Cover Texts as in (a) - below. A copy of the license is included in the section entitled - "GNU Free Documentation License". - - (a) The FSF's Back-Cover Text is: "You have the freedom to copy and - modify this GNU manual. Buying copies from the FSF supports it in - developing GNU and promoting software freedom." -INFO-DIR-SECTION Emacs -START-INFO-DIR-ENTRY -* Ada mode: (ada-mode). Emacs mode for editing and navigating Ada code. -END-INFO-DIR-ENTRY - - -File: ada-mode.info, Node: Top, Next: Overview, Prev: (dir), Up: (dir) - -Top -*** - -Ada Mode Version 7.1.5 - -* Menu: - -* Overview:: -* Installation::Installing Ada mode on your system -* Customization:: Setting up Ada mode to your taste -* Compiling Executing:: Working with your application within Emacs -* Project files:: Describing the organization of your project -* Moving Through Ada Code:: Moving easily through Ada sources -* Identifier completion:: Finishing words automatically -* Indentation:: Indenting your code automatically as you type -* Statement skeletons:: Some code is written for you -* Aligning code:: Making it pretty -* Automatic casing::Adjusting the case of words automatically -* Comment Handling::Reformatting comments easily -* Key summary:: -* Developer overview:: -* GNU Free Documentation License:: - - -- The Detailed Node Listing -- - -Overview - -* Why not LSP?:: - -Installation - -* Ada executables:: -* Known versions:: - -Ada executables - -* Building GNATCOLL:: -* Building the executables:: - -Customizing Ada mode - -* Slow response:: -* Non-standard file names:: -* Other compiler:: -* Other cross-reference:: -* Other customization:: - -Compiling Executing - -* Compile commands:: -* Compiling Examples:: -* Compiler errors:: - -Compiling Examples - -* No project files::Just menus -* Set compiler options::A basic Ada mode project file -* Set source search path:: Source in multiple directories -* Use wisi project file:: -* Use multiple GNAT project files:: -* Use a Makefile:: - -Project files - -* Project file overview:: -* Project file variables:: - -Developer overview - -* Directory structure:: -* ELPA:: -* Savannah:: - - - -File: ada-mode.info, Node: Overview, Next: Installation, Prev: Top, Up: Top - -1 Overview -** - -The Emacs mode for programming in Ada helps the user in reading existing -code and facilitates developing new code. - - Cross-reference information output by the compiler is used to provide -powerful code navigation (jump to definition, find all uses, etc). - - When you open a file with a file e
[elpa] branch scratch/publish-docs created (now e0dc20b)
stephen_leake pushed a change to branch scratch/publish-docs. at e0dc20b Add links to html :doc files in each package's ELPA web page This branch includes the following new commits: new e0dc20b Add links to html :doc files in each package's ELPA web page
[elpa] scratch/publish-docs e0dc20b: Add links to html :doc files in each package's ELPA web page
branch: scratch/publish-docs
commit e0dc20bc46389bd5b6da739782b5191e5fade8f1
Author: Stephen Leake
Commit: Stephen Leake
Add links to html :doc files in each package's ELPA web page
* elpa-admin.el (elpaa--doc-subdirectory): New.
(elpaa-read-config): Add elpaa--doc-subdirectory.
(elpaa--make-one-tarball-1): Pass destdir (the archive directory) to
elpaa--build-Info for saving html files.
(elpaa--string-width): Use "magick convert" instead of legacy "convert".
(elpaa--html-make-pkg): Add links to html :doc files.
(elpaa--build-Info): Add tarball-dir arg for saving html files.
(elpaa--build-Info-1): Add html-dir arg for saving html files. Build html
files from texinfo; add FIXME for org source.
---
elpa-admin.el | 65 ---
1 file changed, 58 insertions(+), 7 deletions(-)
diff --git a/elpa-admin.el b/elpa-admin.el
index ac72f2f..5ec9a7d 100644
--- a/elpa-admin.el
+++ b/elpa-admin.el
@@ -67,6 +67,12 @@ This is recommended when building packages from untrusted
sources,
but this requires Bubblewrap (https://github.com/containers/bubblewrap)
to be installed and has only been tested on some Debian systems.")
+(defvar elpaa--doc-subdirectory "doc/"
+ "If non-nil, build html docs as well as info docs, and save the
+html docs in this dir, for the ELPA website. Directory is
+relative to the tarball directory. Can be set in elpa-config via
+'doc-dir.")
+
(defvar elpaa--debug nil)
(unless (fboundp 'ignore-error)
@@ -101,6 +107,7 @@ to be installed and has only been tested on some Debian
systems.")
('email-reply-to elpaa--email-reply-to)
('sandboxelpaa--sandbox)
('sandbox-extra-ro-dirs elpaa--sandbox-extra-ro-dirs)
+ ('doc-dir elpa--doc-subdirectory)
('debug elpaa--debug))
val
@@ -567,7 +574,7 @@ Return non-nil if a new tarball was created."
;; Run `make' before building the Info file, so that the `make' rule
;; can be used to build the Info/Texinfo file.
(elpaa--make pkg-spec dir)
- (elpaa--build-Info pkg-spec dir)
+ (elpaa--build-Info pkg-spec dir destdir)
(elpaa--write-pkg-file dir pkgname metadata)
;; FIXME: Allow renaming files or selecting a subset of the files!
(cl-assert (not (string-match "[][*\\|?]" pkgname)))
@@ -691,7 +698,7 @@ Return non-nil if a new tarball was created."
"Determine string width in pixels of STR."
(with-temp-buffer
(elpaa--call (current-buffer)
- "convert" "-debug" "annotate" "xc:" "-font" "DejaVu-Sans"
+ "magick" "convert" "-debug" "annotate" "xc:" "-font"
"DejaVu-Sans"
"-pointsize" "110" "-annotate" "0" str "null:")
(goto-char (point-min))
(if (re-search-forward "Metrics:.*?width: \\([0-9]+\\)")
@@ -1318,6 +1325,21 @@ return section under HEADER in package's main file."
(write-region rm nil (concat name "-readme.txt"))
(insert "Full description\n" (elpaa--html-quote rm)
"\n\n")))
+
+ (let ((docfiles (elpaa--spec-get pkg-spec :doc))
+ (html-dir (concat elpaa--doc-subdirectory name "/"))) ;; relative
to tarball directory
+ (when (file-readable-p html-dir) ;; html doc files were built
+ (insert "Documentation\n")
+ (dolist (f (if (listp docfiles) docfiles (list docfiles)))
+ (let ((html-file
+ (concat html-dir
+ (file-name-sans-extension f)
+ ".html")))
+ (insert ""
(file-name-sans-extension f) "\n")
+ ;; FIXME: get link text from info direntry?
+ ))
+ (insert "\n")))
+
;; (message "latest=%S; files=%S" latest files)
(unless (< (length files) (if (zerop (length latest)) 1 2))
(insert (format "Old versions\n"))
@@ -1783,16 +1805,29 @@ More at " (elpaa--default-url pkgname))
;;; Build Info files from Texinfo
-(defun elpaa--build-Info (pkg-spec dir)
- (let ((docfile (elpaa--spec-get pkg-spec :doc)))
+(defun elpaa--build-Info (pkg-spec dir tarball-dir)
+ "Build info files for docs specified in :doc field of PKG-SPEC.
+If `elpa--doc-subdirectory' is non-nil, also build html files.
+DIR is the package directory."
+ (let ((docfile (elpaa--spec-get pkg-spec :doc))
+ (html-dir
+(when elpaa--doc-subdirectory
+ (elpaa--dirname (car pkg-spec) (expand-file-name
elpaa--doc-subdirectory tarball-dir)
+(when (not (file-readable-p html-dir))
+ (make-directory html-dir t))
(dolist (f (if (listp docfile) docfile (list docfile)))
- (elpaa--build-Info-1 f dir
+ (elpaa--build-Info-1 f dir html-dir
-(defun elpaa--build-Info-1 (docfile dir)
+(defun elpaa--build-Info-1 (docfile dir html-dir)
+ "Build an info file from DOCFILE (a texinfo source fil
[elpa] externals/ada-mode 8c3e366 2/3: * ada-mode.texi: Really add @ifhtml
branch: externals/ada-mode
commit 8c3e3660676165d7f59c3a4282da09268f1b5ff9
Author: Stephen Leake
Commit: Stephen Leake
* ada-mode.texi: Really add @ifhtml
---
ada-mode.texi | 4
1 file changed, 4 insertions(+)
diff --git a/ada-mode.texi b/ada-mode.texi
index f46bef1..784a5b7 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -1435,6 +1435,10 @@ references are accessed via @kbd{C-c `}.
Ada mode uses wisi project files;
@ifinfo
@ref{Project files, Project files, Project files, wisi}.
+@end ifinfo
+@ifhtml
+@ref{Project files, Project files, Project files, doc/wisi/wisi}.
+@end ifhtml
A wisi project file specifies what directories hold sources for your
project, and allows you to customize the compilation commands and
[elpa] externals/ada-mode updated (1c52507 -> f1b619f)
stephen_leake pushed a change to branch externals/ada-mode. from 1c52507 Release ada-mode 7.1.8; packaging fix new df6efc2 First attempt to make doc cross reference work on ELPA website new 8c3e366 * ada-mode.texi: Really add @ifhtml new f1b619f * ada-mode.texi (Project files): Use @url for ELPA website link Summary of changes: ada-build.el |6 +- ada-mode.info | 2665 - ada-mode.texi | 13 +- 3 files changed, 14 insertions(+), 2670 deletions(-) delete mode 100644 ada-mode.info
[elpa] externals/ada-mode f1b619f 3/3: * ada-mode.texi (Project files): Use @url for ELPA website link
branch: externals/ada-mode
commit f1b619f37ad21c9d64822b92bae03cc03a9ba3f1
Author: Stephen Leake
Commit: Stephen Leake
* ada-mode.texi (Project files): Use @url for ELPA website link
---
ada-mode.texi | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ada-mode.texi b/ada-mode.texi
index 784a5b7..f012407 100644
--- a/ada-mode.texi
+++ b/ada-mode.texi
@@ -1432,12 +1432,15 @@ references are accessed via @kbd{C-c `}.
@node Project files, Moving Through Ada Code, Compiling Executing, Top
@chapter Project files
-Ada mode uses wisi project files;
+Ada mode uses
@ifinfo
-@ref{Project files, Project files, Project files, wisi}.
+wisi project files; @ref{Project files, Project files, Project files, wisi}.
@end ifinfo
@ifhtml
-@ref{Project files, Project files, Project files, doc/wisi/wisi}.
+@c We can't use @ref, because that doesn't let us specify a relative
+@c directory for the html file (it drops the directory part of
+@c the info file name!). This path works for the ELPA website.
+@url{../wisi/wisi.html, wisi project files}.
@end ifhtml
A wisi project file specifies what directories hold sources for your
[nongnu] elpa/arduino-mode 06df09e 1/2: Delete dir-locals
branch: elpa/arduino-mode commit 06df09e79c3e6bd68fa73415a87b9f1c37c0b519 Author: stardiviner Commit: stardiviner Delete dir-locals --- .dir-locals.el | 1 - 1 file changed, 1 deletion(-) diff --git a/.dir-locals.el b/.dir-locals.el deleted file mode 100644 index 692c5be..000 --- a/.dir-locals.el +++ /dev/null @@ -1 +0,0 @@ -((nil . ((flycheck-mode . t
[nongnu] elpa/arduino-mode 6d2d112 2/2: Fix warnings when flycheck is unavailable and some minor code
branch: elpa/arduino-mode
commit 6d2d1122924370ffa17ce337e3b02ecab79d861b
Author: Stefan Monnier
Commit: stardiviner
Fix warnings when flycheck is unavailable and some minor code
Make it work under Emacs ELPA.
---
.gitignore | 2 +
arduino-mode.el | 127 +---
ede-arduino.el | 99
flycheck-arduino.el | 7 ++-
ob-arduino.el | 19
5 files changed, 127 insertions(+), 127 deletions(-)
diff --git a/.gitignore b/.gitignore
index 9b4291b..d7747cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
# Compiled
*.elc
+/arduino-mode-autoloads.el
+/arduino-mode-pkg.el
# Packaging
.cask
diff --git a/arduino-mode.el b/arduino-mode.el
index 9de266b..a24ec4c 100644
--- a/arduino-mode.el
+++ b/arduino-mode.el
@@ -1,4 +1,4 @@
-;;; arduino-mode.el --- Major mode for editing Arduino code
+;;; arduino-mode.el --- Major mode for editing Arduino code -*-
lexical-binding: t; -*-
;; Copyright (C) 2008 Christopher Grim
;; Authors: Christopher Grim
@@ -45,7 +45,7 @@
;; fall back on c-mode
(c-add-language 'arduino-mode 'c-mode))
-(require 'flycheck-arduino)
+;; (require 'flycheck-arduino)
(defgroup arduino-mode nil
"Customize arduino-mode."
@@ -178,11 +178,12 @@ Value is a symbol. The possible values are the symbols
in the
("while" "while" c-electric-continued-statement 0)))
(defvar arduino-mode-map
- (let ((map (c-make-inherited-keymap)))
-(define-key map (kbd "C-c C-c") 'arduino-upload)
-(define-key map (kbd "C-c C-v") 'arduino-verify)
-(define-key map (kbd "C-c C-m") 'arduino-serial-monitor)
-(define-key map (kbd "C-c C-x") 'arduino-open-with-arduino)
+ (let ((map (make-sparse-keymap)))
+(set-keymap-parent map c-mode-base-map)
+(define-key map (kbd "C-c C-c") #'arduino-upload)
+(define-key map (kbd "C-c C-v") #'arduino-verify)
+(define-key map (kbd "C-c C-m") #'arduino-serial-monitor)
+(define-key map (kbd "C-c C-x") #'arduino-open-with-arduino)
map)
"Keymap used in arduino-mode buffers.")
@@ -209,22 +210,22 @@ Value is a symbol. The possible values are the symbols
in the
(interactive)
(setq arduino-upload-process-buf (buffer-name))
(let* ((proc-name "arduino-upload")
- (proc-buffer "*arduino-upload*")
- (proc (make-process
-:command (list arduino-executable "--upload"
(buffer-file-name))
-:name proc-name
-:buffer proc-buffer
-:sentinel (lambda (proc event)
-(if (string= event "finished\n")
-(progn
- (with-current-buffer
arduino-upload-process-buf
-(setq mode-line-process nil))
- (message "Arduino upload succeed."))
- (with-current-buffer arduino-upload-process-buf
-(display-buffer "*arduino-upload*")))
-(setq-local mode-line-process nil)
-(with-current-buffer arduino-upload-process-buf
- (when spinner-current (spinner-stop)))
+ (proc-buffer "*arduino-upload*"))
+(make-process
+ :command (list arduino-executable "--upload" (buffer-file-name))
+ :name proc-name
+ :buffer proc-buffer
+ :sentinel (lambda (_proc event)
+ (if (string= event "finished\n")
+ (progn
+ (with-current-buffer arduino-upload-process-buf
+ (setq mode-line-process nil))
+ (message "Arduino upload succeed."))
+ (with-current-buffer arduino-upload-process-buf
+ (display-buffer "*arduino-upload*")))
+ (setq-local mode-line-process nil)
+ (with-current-buffer arduino-upload-process-buf
+ (when spinner-current (spinner-stop)
(spinner-start arduino-spinner-type)
(setq mode-line-process proc-name)))
@@ -235,21 +236,23 @@ Value is a symbol. The possible values are the symbols
in the
(interactive)
(setq arduino-verify-process-buf (buffer-name))
(let* ((proc-name "arduino-verify")
- (proc-buffer "*arduino-verify*")
- (proc (make-process
-:command (list arduino-executable "--verify"
(buffer-file-name))
-:name proc-name
-:buffer proc-buffer
-:sentinel (lambda (proc event)
-(if (string= event "finished\n")
-(progn
- (with-current-buffer
arduino-verify-process-buf
-(setq mode-line-process nil))
- (message "Arduino verify build succeed."))
-
[nongnu] elpa/arduino-mode updated (d7c8781 -> 6d2d112)
elpasync pushed a change to branch elpa/arduino-mode. from d7c8781 Mention ob-arduino.el usage in README new 06df09e Delete dir-locals new 6d2d112 Fix warnings when flycheck is unavailable and some minor code Summary of changes: .dir-locals.el | 1 - .gitignore | 2 + arduino-mode.el | 127 +--- ede-arduino.el | 99 flycheck-arduino.el | 7 ++- ob-arduino.el | 19 6 files changed, 127 insertions(+), 128 deletions(-) delete mode 100644 .dir-locals.el
[elpa] externals/engrave-faces updated (7a807b7 -> 6b50761)
elpasync pushed a change to branch externals/engrave-faces. from 7a807b7 html: don't generate spans with style="" new 6b8261d Improve autoload statements new 6b50761 Reduce the public API of engrave-faces Summary of changes: engrave-faces-ansi.el | 52 +++--- engrave-faces-html.el | 34 + engrave-faces-latex.el | 4 +++- engrave-faces.el | 17 - 4 files changed, 57 insertions(+), 50 deletions(-)
[elpa] externals/engrave-faces 6b50761 2/2: Reduce the public API of engrave-faces
branch: externals/engrave-faces commit 6b507611ee861e6f09259fd28ced3647d09853c6 Author: TEC Commit: TEC Reduce the public API of engrave-faces Private (--) symbols have not been used as much as they should have. --- engrave-faces-ansi.el | 49 ++--- engrave-faces-html.el | 30 +++--- engrave-faces.el | 16 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/engrave-faces-ansi.el b/engrave-faces-ansi.el index dc0cdda..e2a9372 100644 --- a/engrave-faces-ansi.el +++ b/engrave-faces-ansi.el @@ -42,25 +42,25 @@ Possible values are: (when (eq t (plist-get attrs :underline)) "\uE000[4m") (when (and engrave-faces-ansi-use-face-colours (plist-get attrs :foreground)) - (engrave-faces-ansi-color-to-ansi + (engrave-faces-ansi--color-to-ansi (plist-get attrs :foreground))) (when (and engrave-faces-ansi-use-face-colours (plist-get attrs :background)) - (engrave-faces-ansi-color-to-ansi + (engrave-faces-ansi--color-to-ansi (plist-get attrs :background) t ; Color conversion -(defun engrave-faces-ansi-color-to-ansi (color &optional background) +(defun engrave-faces-ansi--color-to-ansi (color &optional background) (if (eq color 'unspecified) nil (apply (pcase engrave-faces-ansi-color-mode ((or '3-bit '8-color) #'engrave-faces-ansi-color-3bit-code) ((or '4-bit '16-color) #'engrave-faces-ansi-color-4bit-code) - ((or '8-bit '256-color) #'engrave-faces-ansi-color-8bit-code) + ((or '8-bit '256-color) #'engrave-faces-ansi--color-8bit-code) ((or '24-bit '16m-color) #'engrave-faces-ansi-color-24bit-code)) (append (mapcar (lambda (c) (/ c 257)) (color-values color)) (list background) -(defun engrave-faces-ansi-color-dist-squared (reference rgb) +(defun engrave-faces-ansi--color-dist-squared (reference rgb) "Squared l2 distance between a REFERENCE and RBG values, each a list of 3 values (r g b)." (+ (* (nth 0 reference) (nth 0 rgb)) @@ -71,7 +71,7 @@ Possible values are: ;; 4-bit / 16-color -(defvar engrave-faces-ansi-256-to-16-map +(defvar engrave-faces-ansi--256-to-16-map '(0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 0 4 4 4 12 12 2 6 4 4 12 12 2 2 6 4 12 12 2 2 2 6 12 12 10 10 10 10 14 12 10 10 @@ -93,7 +93,7 @@ Possible values are: "Convert the (R G B) colour code to a correspanding 4bit ansi escape sequence." (format "\uE000[%sm" (pcase (nth (engrave-faces-ansi-color-rbg-to-256 r g b) - engrave-faces-ansi-256-to-16-map) + engrave-faces-ansi--256-to-16-map) ((and (pred (> 8)) n) (+ 30 (if background 10 0) n)) (n (+ 82 (if background 10 0) n) @@ -105,43 +105,43 @@ Possible values are: Brighter colours are induced via the addition of a bold code." (format "\uE000[%sm" (pcase (nth (engrave-faces-ansi-color-rbg-to-256 r g b) - engrave-faces-ansi-256-to-16-map) + engrave-faces-ansi--256-to-16-map) ((and (pred (> 8)) n) (+ 30 (if background 10 0) n)) (n (format "1;%d" (+ 22 (if background 10 0) n)) ;; 8-bit / 256-color -(defvar engrave-faces-ansi-color-6cube-values '(0 95 135 175 215 255)) -(defun engrave-faces-ansi-color-to-6cube (value) +(defvar engrave-faces-ansi--color-6cube-values '(0 95 135 175 215 255)) +(defun engrave-faces-ansi--color-to-6cube (value) "Map VALUE to the associated 6x6 colour cube value." (pcase value ((pred (> 48)) 0) ((pred (> 114)) 1) (_ (/ (- value 35) 40 -(defun engrave-faces-ansi-color-8bit-code (r g b &optional background) +(defun engrave-faces-ansi--color-8bit-code (r g b &optional background) "Convert the (R G B) colour code to a correspanding 8bit ansi escape sequence." (format (if background "\uE000[48;5;%dm" "\uE000[38;5;%dm") (engrave-faces-ansi-color-rbg-to-256 r g b))) (defun engrave-faces-ansi-color-rbg-to-256 (r g b) "Convert the (R G B) colour code to the nearest 256-colour." - (let ((6cube-r (engrave-faces-ansi-color-to-6cube r)) -(6cube-g (engrave-faces-ansi-color-to-6cube g)) -(6cube-b (engrave-faces-ansi-color-to-6cube b))) -(let ((nearest-r (nth 6cube-r engrave-faces-ansi-color-6cube-values)) - (nearest-g (nth 6cube-g engrave-faces-ansi-color-6cube-values)) - (nearest-b (nth 6cube-b engrave-faces-ansi-color-6cube-values))) + (let ((6cube-r (engrave-faces-ansi--color-to-6cube r)) +(6cube-g (engrave-faces-ansi--color-to-6cube g)) +(6cube-b (engrave-faces-ansi--color-to-6cube b))) +(let ((nearest-r (nth 6cube-r engrave-faces-ansi--color-6cube-values)) + (nearest-g (nth 6cube-g engrave-faces-ansi--color-6cube
[elpa] externals/shell-command+ 1554f6f: Add rgrep to shell-command+-substitute-alist
branch: externals/shell-command+
commit 1554f6f573ee77a0834f747e8178bf2f59ef2a9f
Author: Philip Kaludercic
Commit: Philip Kaludercic
Add rgrep to shell-command+-substitute-alist
---
shell-command+.el | 1 +
1 file changed, 1 insertion(+)
diff --git a/shell-command+.el b/shell-command+.el
index d46918e..918414f 100644
--- a/shell-command+.el
+++ b/shell-command+.el
@@ -125,6 +125,7 @@ handlers if the symbol (eg. `man') is contained in the
list."
("fgrep" . shell-command+-cmd-grep)
("agrep" . shell-command+-cmd-grep)
("egrep" . shell-command+-cmd-grep)
+ ("rgrep" . shell-command+-cmd-grep)
("find" . shell-command+-cmd-find)
("locate" . shell-command+-cmd-locate)
("man" . shell-command+-cmd-man)
[elpa] externals/engrave-faces 6b8261d 1/2: Improve autoload statements
branch: externals/engrave-faces
commit 6b8261d9d4d276299c266941dacf64c1eccbe601
Author: TEC
Commit: TEC
Improve autoload statements
Having ;;;###autoload above the macro call caused the whole macro
expansion to be inlined! That's not very nice. There may be a better
solution long-term, but for now just crafting targeted autoload
statements is an improvement.
---
engrave-faces-ansi.el | 3 ++-
engrave-faces-html.el | 4 +++-
engrave-faces-latex.el | 4 +++-
engrave-faces.el | 1 -
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/engrave-faces-ansi.el b/engrave-faces-ansi.el
index cdbc265..dc0cdda 100644
--- a/engrave-faces-ansi.el
+++ b/engrave-faces-ansi.el
@@ -169,7 +169,8 @@ are collateral damage from \"[0m\"."
(declare-function ansi-color-apply-on-region "ansi-color"
(begin end &optional preserve-sequences))
-;;;###autoload
+;;;###autoload (autoload #'engrave-faces-ansi-buffer "engrave-faces-ansi" nil
t)
+;;;###autoload (autoload #'engrave-faces-ansi-file "engrave-faces-ansi" nil t)
(engrave-faces-define-backend "ansi" ".txt" #'engrave-faces-ansi-face-apply nil
(lambda () (ansi-color-apply-on-region
(point-min) (point-max) t)))
(add-hook 'engrave-faces-ansi-after-hook #'engrave-faces-unescape-escape)
diff --git a/engrave-faces-html.el b/engrave-faces-html.el
index 8b4d0da..fef93e5 100644
--- a/engrave-faces-html.el
+++ b/engrave-faces-html.el
@@ -153,7 +153,9 @@ See `engrave-faces-preset-styles' and
`engrave-faces-html-output-style'."
"))
-;;;###autoload
+;;;###autoload (autoload #'engrave-faces-html-buffer "engrave-faces-html" nil
t)
+;;;###autoload (autoload #'engrave-faces-html-buffer-standalone
"engrave-faces-html" nil t)
+;;;###autoload (autoload #'engrave-faces-html-file "engrave-faces-html" nil t)
(engrave-faces-define-backend "html" ".html" #'engrave-faces-html-face-mapper
#'engrave-faces-html-make-standalone #'html-mode)
(provide 'engrave-faces-html)
diff --git a/engrave-faces-latex.el b/engrave-faces-latex.el
index 3998571..1ca4f25 100644
--- a/engrave-faces-latex.el
+++ b/engrave-faces-latex.el
@@ -112,7 +112,9 @@ See `engrave-faces-preset-styles' and
`engrave-faces-latex-output-style'."
(insert "\\end{Verbatim}
\\end{document}"))
-;;;###autoload
+;;;###autoload (autoload #'engrave-faces-latex-buffer "engrave-faces-latex"
nil t)
+;;;###autoload (autoload #'engrave-faces-latex-buffer-standalone
"engrave-faces-latex" nil t)
+;;;###autoload (autoload #'engrave-faces-latex-file "engrave-faces-latex" nil
t)
(engrave-faces-define-backend "latex" ".tex" #'engrave-faces-latex-face-mapper
#'engrave-faces-latex-make-standalone #'latex-mode)
(add-hook 'engrave-faces-latex-after-hook
#'engrave-faces-latex-post-processing)
diff --git a/engrave-faces.el b/engrave-faces.el
index 4052ca3..70a339f 100644
--- a/engrave-faces.el
+++ b/engrave-faces.el
@@ -62,7 +62,6 @@ buffer. You may use them to modify the outlook of the final
output."
:group 'engrave-faces
:type 'hook)
-;;;###autoload
(defvar engrave-faces--backends nil)
;;;###autoload
[elpa] externals/engrave-faces 7a807b7: html: don't generate spans with style=""
branch: externals/engrave-faces
commit 7a807b7c57eafe3e1d50f4fa1eada1f4bbc27811
Author: TEC
Commit: TEC
html: don't generate spans with style=""
---
engrave-faces-html.el | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/engrave-faces-html.el b/engrave-faces-html.el
index cdeca29..8b4d0da 100644
--- a/engrave-faces-html.el
+++ b/engrave-faces-html.el
@@ -85,9 +85,11 @@ See `engrave-faces-preset-styles' and
`engrave-faces-html-output-style'."
('black 950)))
(defun engrave-faces-html-face-apply (faces content)
- (let ((attrs (engrave-faces-merge-attributes faces)))
-(concat ""
-content "")))
+ (let* ((attrs (engrave-faces-merge-attributes faces))
+ (style (engrave-faces-html-gen-style-css attrs " ")))
+(if (string= style "")
+content
+ (concat "" content ""
(defun engrave-faces-html-protect-string (str)
(replace-regexp-in-string
[elpa] externals/setup updated (4ed266f -> 1fba467)
elpasync pushed a change to branch externals/setup. from 4ed266f Fix quoting bug in :file-match new cce248a Replace HEAD with NAME in documentation new 1fba467 Evaluate path one in :load-from Summary of changes: setup.el | 17 + 1 file changed, 9 insertions(+), 8 deletions(-)
[elpa] externals/setup cce248a 1/2: Replace HEAD with NAME in documentation
branch: externals/setup commit cce248adcbb61b0f41b86396fa7bf6518ad4e708 Author: Philip Kaludercic Commit: Philip Kaludercic Replace HEAD with NAME in documentation --- setup.el | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.el b/setup.el index 3e91a51..b2ac450 100644 --- a/setup.el +++ b/setup.el @@ -376,7 +376,7 @@ If HOOK is a list, apply BODY to all elements of HOOK." (package-refresh-contents)) (package-install ',package))) :documentation "Install PACKAGE if it hasn't been installed yet. -This macro can be used as HEAD, and it will replace itself with +This macro can be used as NAME, and it will replace itself with the first PACKAGE." :repeatable t :shorthand #'cadr) @@ -386,7 +386,7 @@ the first PACKAGE." `(unless (require ',feature nil t) ,(setup-quit))) :documentation "Try to require FEATURE, or stop evaluating body. -This macro can be used as HEAD, and it will replace itself with +This macro can be used as NAME, and it will replace itself with the first FEATURE." :repeatable t :shorthand #'cadr) @@ -555,7 +555,7 @@ See `advice-add' for more details." `(unless (package-installed-p ',package) ,(setup-quit))) :documentation "If package is not installed, stop evaluating the body. -This macro can be used as HEAD, and it will replace itself with +This macro can be used as NAME, and it will replace itself with the first PACKAGE." :repeatable t :shorthand #'cadr) @@ -565,7 +565,7 @@ the first PACKAGE." `(unless (featurep ',feature) ,(setup-quit))) :documentation "If FEATURE is not available, stop evaluating the body. -This macro can be used as HEAD, and it will replace itself with +This macro can be used as NAME, and it will replace itself with the first PACKAGE." :repeatable t :shorthand #'cadr) @@ -590,7 +590,7 @@ the first PACKAGE." (add-to-list 'load-path (expand-file-name ,path)) ,(setup-quit))) :documentation "Add PATH to load path. -This macro can be used as HEAD, and it will replace itself with +This macro can be used as NAME, and it will replace itself with the nondirectory part of PATH. If PATH does not exist, abort the evaluation." :shorthand (lambda (args) (intern
[elpa] externals/setup 1fba467 2/2: Evaluate path one in :load-from
branch: externals/setup commit 1fba4674ac496a6e2fc2cf5f7936c2240320450d Author: Philip Kaludercic Commit: Philip Kaludercic Evaluate path one in :load-from --- setup.el | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.el b/setup.el index b2ac450..51aecf6 100644 --- a/setup.el +++ b/setup.el @@ -586,9 +586,10 @@ the first PACKAGE." (setup-define :load-from (lambda (path) -`(if (file-exists-p ,path) - (add-to-list 'load-path (expand-file-name ,path)) - ,(setup-quit))) +`(let ((path* (expand-file-name ,path))) + (if (file-exists-p path*) + (add-to-list 'load-path path*) + ,(setup-quit :documentation "Add PATH to load path. This macro can be used as NAME, and it will replace itself with the nondirectory part of PATH.
