[elpa] externals/marginalia c7fc1c3: Update custom annotator section (Fix #104)
branch: externals/marginalia commit c7fc1c36a839401298f65adfea718982489bba97 Author: Daniel Mendler Commit: Daniel Mendler Update custom annotator section (Fix #104) Thanks, @hmelman! --- README.org | 80 -- 1 file changed, 46 insertions(+), 34 deletions(-) diff --git a/README.org b/README.org index 86e74a7..94d3979 100644 --- a/README.org +++ b/README.org @@ -57,39 +57,46 @@ commands. * Adding custom annotators or classifiers -Minibuffer completion commands can specify the type of the candidates which are -being completed, called the *completion category*. For example the =M-x= command -(=execute-extended-command=) specifies the category =command=. However many -commands do not specify a completion category, this includes many of the Emacs -built-in completion commands. - -In order to repair existing commands, Marginalia provides heuristic classifiers, -which try to determine the completion category based on the prompt string or -based on other properties of the completion candidates. You can for example -define that commands with a prompt containing "face", have the associated =face= -completion category. +Commands that support minibuffer completion use a completion table of all the +available candidates. Candidates are associated with a *category* such as =command=, +=file=, =face=, or =variable= depending on what the candidates are. Based on the +category of the candidates, Marginalia selects an *annotator* to generate +annotations for display for each candidate. + +Unfortunately, not all commands (including Emacs' builtin ones) specify the +category of their candidates. To compensate for this shortcoming, Marginalia +hooks into the emacs completion framework and runs the *classifiers* listed in the +variable =marginalia-classifiers=, which use the command's prompt or other +properties of the candidates to specify the completion category. + +For example, the =marginalia-classify-by-prompt= classifier checks the minibuffer +prompt against regexps listed in the =marginalia-prompt-categories= alist to +determine a category. The following is already included but would be a way to +assign the category =face= to all candidates from commands with prompts that +include the word "face". #+begin_src emacs-lisp - (add-to-list 'marginalia-prompt-categories '("face" . face)) + (add-to-list 'marginalia-prompt-categories '("\\" . face)) #+end_src -Another useful classifier uses the =marginalia-command-categories= variable, -which allows do define the completion category per command name. This is -particularily useful if for example the prompt classifier yields a false -positive. The list of all available classifiers is specified by the variable -=marginalia-classifiers=. The completion categories are also important for -[[https://github.com/oantolin/embark][Embark]], which associates its minibuffer actions depending on the completion -commands. +The =marginalia-classify-by-command-name= classifier uses the alist +=marginalia-command-categories= to specify the completion category based on the +command name. This is particularily useful if the prompt classifier yields a +false positive. + +Completion categories are also important for [[https://github.com/oantolin/embark][Embark]], which associates actions +based on the completion category and benefits from Marginalia's classifiers. -Marginalia uses the annotators depending on the completion category of the -current command as registered in =marginalia-annotator-registry=. It is possible -to specify multiple annotators per completion category (for example with more or -less information). You can cycle between the different annotators by invoking -the =marginalia-cycle= command during the current completion. +Once the category of the candidates is known, Marginalia looks in the +=marginalia-annotator-registry= to find the associated annotator to use. An +annotator is a function that takes a completion candidate string as an argument +and returns an annotation string to be displayed after the candidate in the +minibuffer. More than one annotator can be assigned to each each category, +displaying more, less or different information. Use the =marginalia-cycle= command +to cycle between the annotations of different annotators defined for the current +category. -An annotation function is a function that takes a completion candidate string as -argument and returns the annotation string. For example a basic face annotator -can be written as follows: +Here's an example of a basic face annotator: #+begin_src emacs-lisp (defun my-face-annotator (cand) @@ -98,19 +105,24 @@ can be written as follows: (propertize "The quick brown fox jumps over the lazy dog" 'face sym #+end_src -There are a few helper functions available internally which can be used to write -the annotation functions more conveniently, in particular =marginalia--fields=. -After de
[elpa] externals/consult 48474f1: Remove unnecessary calls to buffer-live-p
branch: externals/consult commit 48474f1e69755e514ffd6def20147bce28f71f9f Author: Daniel Mendler Commit: Daniel Mendler Remove unnecessary calls to buffer-live-p --- consult-register.el | 2 +- consult.el | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/consult-register.el b/consult-register.el index 0269882..089fb6d 100644 --- a/consult-register.el +++ b/consult-register.el @@ -97,7 +97,7 @@ This function can be used as `register-preview-function'." (propertize (abbreviate-file-name (cadr val)) 'face 'consult-file) (caddr val))) ;; Display full line of buffer -((and (markerp val) (buffer-live-p (marker-buffer val))) +((and (markerp val) (marker-buffer val)) (with-current-buffer (marker-buffer val) (save-restriction (save-excursion diff --git a/consult.el b/consult.el index e5d3edc..3b0e980 100644 --- a/consult.el +++ b/consult.el @@ -1102,7 +1102,7 @@ See `isearch-open-necessary-overlays' and `isearch-open-overlay-temporary'." (defun consult--jump-nomark (pos) "Go to POS and recenter." (cond - ((and (markerp pos) (not (buffer-live-p (marker-buffer pos + ((and (markerp pos) (not (marker-buffer pos))) ;; Only print a message, no error in order to not mess ;; with the minibuffer update hook. (message "Buffer is dead")) @@ -1147,7 +1147,7 @@ FACE is the cursor face." (cond (restore (let ((saved-buffer (marker-buffer saved-pos))) - (if (not (buffer-live-p saved-buffer)) + (if (not saved-buffer) (message "Buffer is dead") (set-buffer saved-buffer) (narrow-to-region saved-min saved-max)
[elpa] externals/ivy 1c6b3da 1/2: Add arrow prefix + full line candidate format
branch: externals/ivy commit 1c6b3da377a840e898b14020133f59fca9ceea1c Author: Basil L. Contovounesios Commit: Basil L. Contovounesios Add arrow prefix + full line candidate format * ivy.el (ivy-format-function-arrow-line): New candidate formatting function. (ivy-format-functions-alist): List it as one of the options. (ivy-format-function-default, ivy-format-function-arrow) (ivy-format-function-line): Extend docstrings. Closes #2921. --- ivy.el | 31 ++- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/ivy.el b/ivy.el index 33cf95d..dcf58da 100644 --- a/ivy.el +++ b/ivy.el @@ -1706,6 +1706,8 @@ This string is inserted into the minibuffer." (const :tag "Default" ivy-format-function-default) (const :tag "Arrow prefix" ivy-format-function-arrow) (const :tag "Full line" ivy-format-function-line) + (const :tag "Arrow prefix + full line" + ivy-format-function-arrow-line) (function :tag "Custom function" (defun ivy-sort-file-function-default (x y) @@ -3967,7 +3969,8 @@ and SEPARATOR is used to join them." separator))) (defun ivy-format-function-default (cands) - "Transform CANDS into a string for minibuffer." + "Transform CANDS into a multiline string for the minibuffer. +Add the face `ivy-current-match' to the selected candidate." (ivy--format-function-generic (lambda (str) (ivy--add-face str 'ivy-current-match)) @@ -3976,7 +3979,9 @@ and SEPARATOR is used to join them." "\n")) (defun ivy-format-function-arrow (cands) - "Transform CANDS into a string for minibuffer." + "Transform CANDS into a multiline string for the minibuffer. +Like `ivy-format-function-default', but also prefix the selected +candidate with an arrow \">\"." (ivy--format-function-generic (lambda (str) (concat "> " (ivy--add-face str 'ivy-current-match))) @@ -3986,9 +3991,13 @@ and SEPARATOR is used to join them." "\n")) (defun ivy-format-function-line (cands) - "Transform CANDS into a string for minibuffer. -Note that since Emacs 27, `ivy-current-match' needs to have :extend t attribute. -It has it by default, but the current theme also needs to set it." + "Transform CANDS into a multiline string for the minibuffer. +Like `ivy-format-function-default', but extend highlighting of +the selected candidate to the window edge. + +Note that since Emacs 27, `ivy-current-match' needs to have a +non-nil :extend attribute. This is the case by default, but it +also needs to be preserved by the current theme." (ivy--format-function-generic (lambda (str) (ivy--add-face (concat str "\n") 'ivy-current-match)) @@ -3997,6 +4006,18 @@ It has it by default, but the current theme also needs to set it." cands "")) +(defun ivy-format-function-arrow-line (cands) + "Transform CANDS into a multiline string for the minibuffer. +This combines the \">\" prefix of `ivy-format-function-arrow' +with the extended highlighting of `ivy-format-function-line'." + (ivy--format-function-generic + (lambda (str) + (concat "> " (ivy--add-face (concat str "\n") 'ivy-current-match))) + (lambda (str) + (concat " " str "\n")) + cands + "")) + (defun ivy--highlight-ignore-order (str) "Highlight STR, using the ignore-order method." (when (consp ivy--old-re)
[elpa] externals/ivy af57505 2/2: Merge branch 'master' into externals/ivy
branch: externals/ivy commit af57505f51521f6dd764999b8a80f086bc12fd21 Merge: a79ab91 1c6b3da Author: Basil L. Contovounesios Commit: Basil L. Contovounesios Merge branch 'master' into externals/ivy --- ivy.el | 31 ++- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/ivy.el b/ivy.el index 33cf95d..dcf58da 100644 --- a/ivy.el +++ b/ivy.el @@ -1706,6 +1706,8 @@ This string is inserted into the minibuffer." (const :tag "Default" ivy-format-function-default) (const :tag "Arrow prefix" ivy-format-function-arrow) (const :tag "Full line" ivy-format-function-line) + (const :tag "Arrow prefix + full line" + ivy-format-function-arrow-line) (function :tag "Custom function" (defun ivy-sort-file-function-default (x y) @@ -3967,7 +3969,8 @@ and SEPARATOR is used to join them." separator))) (defun ivy-format-function-default (cands) - "Transform CANDS into a string for minibuffer." + "Transform CANDS into a multiline string for the minibuffer. +Add the face `ivy-current-match' to the selected candidate." (ivy--format-function-generic (lambda (str) (ivy--add-face str 'ivy-current-match)) @@ -3976,7 +3979,9 @@ and SEPARATOR is used to join them." "\n")) (defun ivy-format-function-arrow (cands) - "Transform CANDS into a string for minibuffer." + "Transform CANDS into a multiline string for the minibuffer. +Like `ivy-format-function-default', but also prefix the selected +candidate with an arrow \">\"." (ivy--format-function-generic (lambda (str) (concat "> " (ivy--add-face str 'ivy-current-match))) @@ -3986,9 +3991,13 @@ and SEPARATOR is used to join them." "\n")) (defun ivy-format-function-line (cands) - "Transform CANDS into a string for minibuffer. -Note that since Emacs 27, `ivy-current-match' needs to have :extend t attribute. -It has it by default, but the current theme also needs to set it." + "Transform CANDS into a multiline string for the minibuffer. +Like `ivy-format-function-default', but extend highlighting of +the selected candidate to the window edge. + +Note that since Emacs 27, `ivy-current-match' needs to have a +non-nil :extend attribute. This is the case by default, but it +also needs to be preserved by the current theme." (ivy--format-function-generic (lambda (str) (ivy--add-face (concat str "\n") 'ivy-current-match)) @@ -3997,6 +4006,18 @@ It has it by default, but the current theme also needs to set it." cands "")) +(defun ivy-format-function-arrow-line (cands) + "Transform CANDS into a multiline string for the minibuffer. +This combines the \">\" prefix of `ivy-format-function-arrow' +with the extended highlighting of `ivy-format-function-line'." + (ivy--format-function-generic + (lambda (str) + (concat "> " (ivy--add-face (concat str "\n") 'ivy-current-match))) + (lambda (str) + (concat " " str "\n")) + cands + "")) + (defun ivy--highlight-ignore-order (str) "Highlight STR, using the ignore-order method." (when (consp ivy--old-re)
[elpa] externals/org updated (5f46dbc -> 59cb39f)
elpasync pushed a change to branch externals/org. from 5f46dbc etc/ORG-NEWS: Add "Version 9.6 (not yet released)" new e1c49af org-src.el: Fix special editing of LaTeX fragments new 59cb39f Merge branch 'bugfix' Summary of changes: lisp/org-macs.el | 9 ++--- lisp/org-src.el | 18 ++ 2 files changed, 20 insertions(+), 7 deletions(-)
[elpa] externals-release/org e1c49af: org-src.el: Fix special editing of LaTeX fragments
branch: externals-release/org commit e1c49af76de6c612cd7a0b75b576629b8af0de37 Author: Sébastien Miquel Commit: Bastien org-src.el: Fix special editing of LaTeX fragments * lisp/org-macs.el (org-do-remove-indentation): Add optional argument to skip the first line. * lisp/org-src.el (org-src--coordinates): Fix coordinates for inline LaTeX fragments. (org-src--contents-for-write-back): Do not indent first line for LaTeX fragments. (org-src--edit-element): Compute block-indentation according to parent for LaTeX fragments. Skip first line when removing common indentation for LaTeX fragments. --- lisp/org-macs.el | 9 ++--- lisp/org-src.el | 18 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index a8fb79e..0779c3a 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -326,17 +326,19 @@ it for output." ;;; Indentation -(defun org-do-remove-indentation (&optional n) +(defun org-do-remove-indentation (&optional n skip-fl) "Remove the maximum common indentation from the buffer. When optional argument N is a positive integer, remove exactly -that much characters from indentation, if possible. Return nil -if it fails." +that much characters from indentation, if possible. When +optional argument SKIP-FL is non-nil, skip the first +line. Return nil if it fails." (catch :exit (goto-char (point-min)) ;; Find maximum common indentation, if not specified. (let ((n (or n (let ((min-ind (point-max))) (save-excursion + (when skip-fl (forward-line)) (while (re-search-forward "^[ \t]*\\S-" nil t) (let ((ind (current-indentation))) (if (zerop ind) (throw :exit nil) @@ -344,6 +346,7 @@ if it fails." min-ind (if (zerop n) (throw :exit nil) ;; Remove exactly N indentation, but give up if not possible. +(when skip-fl (forward-line)) (while (not (eobp)) (let ((ind (progn (skip-chars-forward " \t") (current-column (cond ((eolp) (delete-region (line-beginning-position) (point))) diff --git a/lisp/org-src.el b/lisp/org-src.el index 91a3d41..0e16e23 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -327,7 +327,8 @@ a cons cell (LINE . COLUMN) or symbol `end'. See also (if (>= pos end) 'end (org-with-wide-buffer (goto-char (max beg pos)) - (cons (count-lines beg (line-beginning-position)) + (cons (count-lines (save-excursion (goto-char beg) (line-beginning-position)) +(line-beginning-position)) ;; Column is relative to the end of line to avoid problems of ;; comma escaping or colons appended in front of the line. (- (point) (min end (line-end-position))) @@ -445,6 +446,7 @@ Assume point is in the corresponding edit buffer." org-src--content-indentation 0 (use-tabs? (and (> org-src--tab-width 0) t)) +(preserve-fl (eq org-src--source-type 'latex-fragment)) (source-tab-width org-src--tab-width) (contents (org-with-wide-buffer (let ((eol (line-end-position))) @@ -466,7 +468,8 @@ Assume point is in the corresponding edit buffer." ;; Add INDENTATION-OFFSET to every line in buffer, ;; unless indentation is meant to be preserved. (when (> indentation-offset 0) - (while (not (eobp)) + (when preserve-fl (forward-line)) +(while (not (eobp)) (skip-chars-forward " \t") (when (or (not (eolp)) ; not a blank line (and (eq (point) (marker-position marker)) ; current line @@ -518,7 +521,13 @@ Leave point in edit buffer." (source-tab-width (if indent-tabs-mode tab-width 0)) (type (org-element-type datum)) (block-ind (org-with-point-at (org-element-property :begin datum) - (current-indentation))) + (cond + ((save-excursion (skip-chars-backward " \t") (bolp)) + (current-indentation)) + ((org-element-property :parent datum) +(org--get-expected-indentation + (org-element-property :parent datum) nil)) + (t (current-indentation) (content-ind org-edit-src-content-indentation) (blank-line (save-excursion (beginning-of-line) (looking-at-p "^[[:space:]]*$"))) @@ -548,7 +557,8 @@ Leave point in edit buffer." (insert contents) (remove-text-properties (point-min) (point-max) '(display nil invisible nil intangible nil)) - (unless preserve-ind (org-do-remove-
[elpa] externals/org 59cb39f: Merge branch 'bugfix'
branch: externals/org commit 59cb39f53dfe4f7b7f11ccfc920c5d3c3b8bf7a0 Merge: 5f46dbc e1c49af Author: Bastien Commit: Bastien Merge branch 'bugfix' --- lisp/org-macs.el | 9 ++--- lisp/org-src.el | 18 ++ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lisp/org-macs.el b/lisp/org-macs.el index a8fb79e..0779c3a 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -326,17 +326,19 @@ it for output." ;;; Indentation -(defun org-do-remove-indentation (&optional n) +(defun org-do-remove-indentation (&optional n skip-fl) "Remove the maximum common indentation from the buffer. When optional argument N is a positive integer, remove exactly -that much characters from indentation, if possible. Return nil -if it fails." +that much characters from indentation, if possible. When +optional argument SKIP-FL is non-nil, skip the first +line. Return nil if it fails." (catch :exit (goto-char (point-min)) ;; Find maximum common indentation, if not specified. (let ((n (or n (let ((min-ind (point-max))) (save-excursion + (when skip-fl (forward-line)) (while (re-search-forward "^[ \t]*\\S-" nil t) (let ((ind (current-indentation))) (if (zerop ind) (throw :exit nil) @@ -344,6 +346,7 @@ if it fails." min-ind (if (zerop n) (throw :exit nil) ;; Remove exactly N indentation, but give up if not possible. +(when skip-fl (forward-line)) (while (not (eobp)) (let ((ind (progn (skip-chars-forward " \t") (current-column (cond ((eolp) (delete-region (line-beginning-position) (point))) diff --git a/lisp/org-src.el b/lisp/org-src.el index 91a3d41..0e16e23 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -327,7 +327,8 @@ a cons cell (LINE . COLUMN) or symbol `end'. See also (if (>= pos end) 'end (org-with-wide-buffer (goto-char (max beg pos)) - (cons (count-lines beg (line-beginning-position)) + (cons (count-lines (save-excursion (goto-char beg) (line-beginning-position)) +(line-beginning-position)) ;; Column is relative to the end of line to avoid problems of ;; comma escaping or colons appended in front of the line. (- (point) (min end (line-end-position))) @@ -445,6 +446,7 @@ Assume point is in the corresponding edit buffer." org-src--content-indentation 0 (use-tabs? (and (> org-src--tab-width 0) t)) +(preserve-fl (eq org-src--source-type 'latex-fragment)) (source-tab-width org-src--tab-width) (contents (org-with-wide-buffer (let ((eol (line-end-position))) @@ -466,7 +468,8 @@ Assume point is in the corresponding edit buffer." ;; Add INDENTATION-OFFSET to every line in buffer, ;; unless indentation is meant to be preserved. (when (> indentation-offset 0) - (while (not (eobp)) + (when preserve-fl (forward-line)) +(while (not (eobp)) (skip-chars-forward " \t") (when (or (not (eolp)) ; not a blank line (and (eq (point) (marker-position marker)) ; current line @@ -518,7 +521,13 @@ Leave point in edit buffer." (source-tab-width (if indent-tabs-mode tab-width 0)) (type (org-element-type datum)) (block-ind (org-with-point-at (org-element-property :begin datum) - (current-indentation))) + (cond + ((save-excursion (skip-chars-backward " \t") (bolp)) + (current-indentation)) + ((org-element-property :parent datum) +(org--get-expected-indentation + (org-element-property :parent datum) nil)) + (t (current-indentation) (content-ind org-edit-src-content-indentation) (blank-line (save-excursion (beginning-of-line) (looking-at-p "^[[:space:]]*$"))) @@ -548,7 +557,8 @@ Leave point in edit buffer." (insert contents) (remove-text-properties (point-min) (point-max) '(display nil invisible nil intangible nil)) - (unless preserve-ind (org-do-remove-indentation)) + (let ((lf (eq type 'latex-fragment))) + (unless preserve-ind (org-do-remove-indentation (and lf block-ind) lf))) (set-buffer-modified-p nil) (setq buffer-file-name nil) ;; Initialize buffer.
[elpa] externals/vertico 9e764a1: README: org 9.5 uses crm for org-set-tags-command
branch: externals/vertico commit 9e764a142fafef8d8e265f5542794c0912ca452e Author: Daniel Mendler Commit: Daniel Mendler README: org 9.5 uses crm for org-set-tags-command --- README.org | 22 -- 1 file changed, 22 deletions(-) diff --git a/README.org b/README.org index 3615a48..9297975 100644 --- a/README.org +++ b/README.org @@ -318,28 +318,6 @@ completion UI. Some of these assumptions may not hold in Vertico and as such require minor workarounds. -** ~org-set-tags-command~ - - ~org-set-tags-command~ implements a completion table which relies on the ~basic~ - completion style and TAB completion. This table does not work well with - Vertico and Icomplete. The issue can be mitigated by deactivating most of the - Vertico UI and relying purely on TAB completion. The UI is still enhanced by - Vertico, since Vertico shows the available tags. - - #+begin_src emacs-lisp - (defun disable-selection () - (when (eq minibuffer-completion-table #'org-tags-completion-function) - (setq-local vertico-map minibuffer-local-completion-map - completion-cycle-threshold nil - completion-styles '(basic - (advice-add #'vertico--setup :before #'disable-selection) - #+end_src - - *Update:* ~org-set-tags-command~ is changed to use ~completing-read-multiple~ in - the current Org development version (9.5) as has been [[https://lists.gnu.org/archive/html/emacs-orgmode/2020-07/msg00222.html][proposed before]]. This - fix improves the compatibility with many completion UIs, including Vertico. - See the recent [[https://lists.gnu.org/archive/html/emacs-orgmode/2021-07/msg00287.html][mailing list discussion]]. - ** ~org-refile~ ~org-refile~ uses ~org-olpath-completing-read~ to complete the outline path
[elpa] externals/javaimp 766cc2e: Don't save excursion or restriction in parse entry points
branch: externals/javaimp commit 766cc2e30096bf9b1d423a2266a1a26fc2e2b098 Author: Filipp Gunbin Commit: Filipp Gunbin Don't save excursion or restriction in parse entry points --- javaimp-parse.el | 85 ++-- javaimp-tests.el | 14 +- javaimp.el | 39 ++ 3 files changed, 68 insertions(+), 70 deletions(-) diff --git a/javaimp-parse.el b/javaimp-parse.el index e00fedb..91002a0 100644 --- a/javaimp-parse.el +++ b/javaimp-parse.el @@ -367,12 +367,9 @@ then goes all the way up. Examines and sets property buffer which are after `javaimp--parse-dirty-pos', if it is non-nil. Resets this variable after parsing is done." (when javaimp--parse-dirty-pos -(when (eq javaimp--parse-dirty-pos 'init) - ;; TODO better way to do this - (setq javaimp--parse-dirty-pos (point-min)) - (setq syntax-ppss-table javaimp-syntax-table) - (add-hook 'after-change-functions #'javaimp--parse-update-dirty-pos)) -;; FIXME this inhibits costly cc-mode hooks on prop updates +(javaimp--parse-ensure-buffer-setup) +;; cc-mode sets some costly modification hooks, we can inhibit +;; them because we update only our private props here (let ((inhibit-modification-hooks t)) (remove-text-properties javaimp--parse-dirty-pos (point-max) '(javaimp-parse-scope nil)) @@ -387,6 +384,13 @@ non-nil. Resets this variable after parsing is done." (javaimp--parse-scopes nil) (setq javaimp--parse-dirty-pos nil +(defun javaimp--parse-ensure-buffer-setup () + ;; FIXME This may be done in major/minor mode setup + (when (eq javaimp--parse-dirty-pos 'init) +(setq javaimp--parse-dirty-pos (point-min)) +(setq syntax-ppss-table javaimp-syntax-table) +(add-hook 'after-change-functions #'javaimp--parse-update-dirty-pos))) + (defun javaimp--parse-class-abstract-methods () (goto-char (point-max)) (let (res) @@ -435,57 +439,46 @@ non-nil. Resets this variable after parsing is done." (setq javaimp--parse-dirty-pos beg))) -;; Functions intended to be called from other parts of javaimp. +;; Functions intended to be called from other parts of javaimp. They +;; do not preserve excursion / restriction - it's the caller's +;; responsibility. (defun javaimp--parse-get-package () "Return the package declared in the current file." - (save-excursion -(save-restriction - (widen) - (javaimp--parse-all-scopes) - (goto-char (point-max)) - (when (javaimp--parse-rsb-keyword - "^[ \t]*package[ \t]+\\([^ \t;\n]+\\)[ \t]*;" nil t 1) -(match-string 1) + (javaimp--parse-all-scopes) + (goto-char (point-max)) + (when (javaimp--parse-rsb-keyword + "^[ \t]*package[ \t]+\\([^ \t;\n]+\\)[ \t]*;" nil t 1) +(match-string 1))) (defun javaimp--parse-get-all-scopes (&optional pred parent-pred) "Return all scopes in the current buffer, optionally filtering them with PRED, and their parents with PARENT-PRED. Neither of them should move point." - (save-excursion -(save-restriction - (widen) - (javaimp--parse-all-scopes) - (let ((pos (point-max)) -scope res) -(while (setq pos (previous-single-property-change pos 'javaimp-parse-scope)) - (setq scope (get-text-property pos 'javaimp-parse-scope)) - (when (and scope - (or (null pred) - (funcall pred scope))) -(setq scope (javaimp--copy-scope scope)) -(when parent-pred - (javaimp--filter-scope-parents scope parent-pred)) -(push scope res))) -res + (javaimp--parse-all-scopes) + (let ((pos (point-max)) +scope res) +(while (setq pos (previous-single-property-change pos 'javaimp-parse-scope)) + (setq scope (get-text-property pos 'javaimp-parse-scope)) + (when (and scope + (or (null pred) + (funcall pred scope))) +(setq scope (javaimp--copy-scope scope)) +(when parent-pred + (javaimp--filter-scope-parents scope parent-pred)) +(push scope res))) +res)) (defun javaimp--parse-get-class-abstract-methods () - (save-excursion -(save-restriction - (widen) - (javaimp--parse-all-scopes) - (javaimp--parse-class-abstract-methods + (javaimp--parse-all-scopes) + (javaimp--parse-class-abstract-methods)) (defun javaimp--parse-get-interface-abstract-methods () - (save-excursion -(save-restriction - (widen) - (let ((interfaces - (javaimp--parse-get-all-scopes - (lambda (scope) -(javaimp-test-scope-type scope - '(interface) javaimp--classlike-scope-types) -(seq-mapcat #'javaimp--parse-interface-abstract-methods -interfaces) + (let ((interfaces (javaimp--parse-get-all-s
[nongnu] elpa/projectile updated (ca89722 -> d8ef47c)
elpasync pushed a change to branch elpa/projectile. from ca89722 [Fix #1710] Improve the documentation of text search commands new 81be63e [Fix #1709] Fix `projectile-project-buffer-p` contain current buffer (#1713) new 12d53c4 [Fix #1712] Make it possible to hide Projectile's menu new d8ef47c Fix the last changelog entry Summary of changes: CHANGELOG.md| 1 + projectile.el | 25 + test/projectile-test.el | 11 +++ 3 files changed, 29 insertions(+), 8 deletions(-)
[nongnu] elpa/projectile 81be63e 1/3: [Fix #1709] Fix `projectile-project-buffer-p` contain current buffer (#1713)
branch: elpa/projectile commit 81be63e5bc6ae6b2a1c4adc7b9f213a38a5b52b2 Author: Kijima Daigo Commit: GitHub [Fix #1709] Fix `projectile-project-buffer-p` contain current buffer (#1713) If `projectile-project-buffer-p` is executed in a non-current project, `default-directory` return current directory. Since `projectile-project-buffers` contains current buffer, kill current buffer. --- projectile.el | 17 ++--- test/projectile-test.el | 11 +++ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/projectile.el b/projectile.el index 3534b84..577c192 100644 --- a/projectile.el +++ b/projectile.el @@ -1547,13 +1547,16 @@ If PROJECT is not specified the command acts on the current project." (defun projectile-project-buffer-p (buffer project-root) "Check if BUFFER is under PROJECT-ROOT." (with-current-buffer buffer -(and (not (string-prefix-p " " (buffer-name buffer))) - (not (projectile-ignored-buffer-p buffer)) - default-directory - (string-equal (file-remote-p default-directory) - (file-remote-p project-root)) - (not (string-match-p "^http\\(s\\)?://" default-directory)) - (string-prefix-p project-root (file-truename default-directory) (eq system-type 'windows-nt) +(let ((directory (if buffer-file-name + (file-name-directory buffer-file-name) + default-directory))) + (and (not (string-prefix-p " " (buffer-name buffer))) + (not (projectile-ignored-buffer-p buffer)) + directory + (string-equal (file-remote-p directory) + (file-remote-p project-root)) + (not (string-match-p "^http\\(s\\)?://" directory)) + (string-prefix-p project-root (file-truename directory) (eq system-type 'windows-nt)) (defun projectile-ignored-buffer-p (buffer) "Check if BUFFER should be ignored. diff --git a/test/projectile-test.el b/test/projectile-test.el index 3d37dd6..2624af2 100644 --- a/test/projectile-test.el +++ b/test/projectile-test.el @@ -1687,6 +1687,17 @@ projectile-process-current-project-buffers-current to have similar behaviour" (projectile-process-current-project-buffers-current (lambda () (push (current-buffer) list-b))) (expect list-a :to-equal list-b)) +(describe "projectile-project-buffers" + (it "return project buffers" + (projectile-test-with-sandbox + (projectile-test-with-files +("project1/" + "project1/.projectile" + "project1/foo") +(cd "project1") +(with-current-buffer (find-file-noselect "foo" t)) +(expect (length (projectile-project-buffers)) :to-equal 1) + (describe "projectile--impl-name-for-test-name" :var ((mock-projectile-project-types '((foo test-suffix "Test")
[nongnu] elpa/projectile d8ef47c 3/3: Fix the last changelog entry
branch: elpa/projectile commit d8ef47c0bb4bd27975972fb2bfa686350ff6 Author: Bozhidar Batsov Commit: Bozhidar Batsov Fix the last changelog entry --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c3bd43d..ade384e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ ### New features * [#1699](https://github.com/bbatsov/projectile/pull/1699): `projectile-ripgrep` now supports [`rg.el`](https://github.com/dajva/rg.el). -* [#1710](https://github.com/bbatsov/projectile/issues/1710): Make it possible to hide Projectile's menu. See `projectile-show-menu`. +* [#1712](https://github.com/bbatsov/projectile/issues/1712): Make it possible to hide Projectile's menu. See `projectile-show-menu`. ### Bugs fixed
[nongnu] elpa/projectile 12d53c4 2/3: [Fix #1712] Make it possible to hide Projectile's menu
branch: elpa/projectile commit 12d53c47bfa88a8eff60b2d049cc220721ac84f1 Author: Bozhidar Batsov Commit: Bozhidar Batsov [Fix #1712] Make it possible to hide Projectile's menu --- CHANGELOG.md | 1 + projectile.el | 8 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0149390..c3bd43d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### New features * [#1699](https://github.com/bbatsov/projectile/pull/1699): `projectile-ripgrep` now supports [`rg.el`](https://github.com/dajva/rg.el). +* [#1710](https://github.com/bbatsov/projectile/issues/1710): Make it possible to hide Projectile's menu. See `projectile-show-menu`. ### Bugs fixed diff --git a/projectile.el b/projectile.el index 577c192..8dcf72c 100644 --- a/projectile.el +++ b/projectile.el @@ -5347,6 +5347,12 @@ thing shown in the mode line otherwise." :type 'string :package-version '(projectile . "0.12.0")) +(defcustom projectile-show-menu t + "Controls whether to display Projectile's menu." + :group 'projectile + :type 'boolean + :package-version '(projectile . "2.6.0")) + (defvar-local projectile--mode-line projectile-mode-line-prefix) (defun projectile-default-mode-line () @@ -5442,7 +5448,7 @@ thing shown in the mode line otherwise." (define-key map projectile-keymap-prefix 'projectile-command-map)) (easy-menu-define projectile-mode-menu map "Menu for Projectile" - '("Projectile" + '("Projectile" :visible projectile-show-menu ["Find file" projectile-find-file] ["Find file in known projects" projectile-find-file-in-known-projects] ["Find test file" projectile-find-test-file]
[elpa] externals/crdt 3bd1a57: Squashed commit of the following:
branch: externals/crdt commit 3bd1a57999576249d726afa5f2cae1891535747c Author: Qiantan Hong Commit: Qiantan Hong Squashed commit of the following: commit 52506c637a9f28f80fb4332dda79535a825701c5 Author: Qiantan Hong Date: Thu Sep 30 10:01:16 2021 -0700 bump version commit 43bbb18bae4e17e202b210754f3b0691498ef690 Author: Qiantan Hong Date: Tue Sep 28 00:02:12 2021 -0700 fix a bug when synchronizing mark commit 4b86674f99675ba9ea75f0674ee15690276bb698 Author: Qiantan Hong Date: Sat Sep 25 11:48:43 2021 -0700 more sensible version message commit 270a4099bba87036da8ebe6d400baa101e9224a2 Author: Qiantan Hong Date: Fri Sep 24 23:17:15 2021 -0700 return -> cl-return commit 709059ff5e0846f2c8f44b479e6083c6d0128dc8 Author: Qiantan Hong Date: Fri Sep 24 22:54:09 2021 -0700 fix disconnect warn condition commit 102498e84f928ec9041682d832f6b42091417a98 Author: Qiantan Hong Date: Fri Sep 24 22:51:48 2021 -0700 remove tramp for now, keep it simple commit 94b0c488b5c56c6544d722e1dec49737cd9f01df Author: Qiantan Hong Date: Fri Sep 24 21:07:13 2021 -0700 bump version number commit fae016ba25b9118eed12183a4e705a2b938b9e5a Author: Qiantan Hong Date: Fri Sep 24 21:06:19 2021 -0700 Preliminary url support commit 38fdfc55575f906fcf1f0a8eb9180bce2cd79d17 Author: Qiantan Hong Date: Fri Sep 24 20:18:57 2021 -0700 semver, and various fixes commit 97427622b1c351aaac02c03fba7330dce294fd4c Author: Qiantan Hong Date: Fri Sep 24 16:29:12 2021 -0700 fix bug in crdt--stop-session interactive spec commit d46be72920ffe9c33ac941e4023fadaa4c399b75 Author: Qiantan Hong Date: Fri Sep 24 16:26:44 2021 -0700 remove base64 mangling and fix a stupid bug IDK why base64 was there. stupid bug: typo overlay-mode should be overlay-move commit 1347c678c3a05ce649a659d9237ffe5c05819583 Author: Qiantan Hong Date: Fri Sep 24 15:19:50 2021 -0700 Use some warning instead of message commit 5d90bf0ce2c74a6a548465d275df70b409258a46 Author: Qiantan Hong Date: Fri Sep 24 12:33:42 2021 -0700 generate uninteresting process buffers instead --- crdt.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crdt.el b/crdt.el index eb13295..858d718 100644 --- a/crdt.el +++ b/crdt.el @@ -6,7 +6,7 @@ ;; Maintainer: Qiantan Hong ;; URL: https://code.librehq.com/qhong/crdt.el ;; Keywords: collaboration crdt -;; Version: 0.2.5 +;; Version: 0.2.6 ;; This file is part of GNU Emacs. @@ -35,7 +35,7 @@ (require 'url) (require 'color) -(defconst crdt-version "0.2.5") +(defconst crdt-version "0.2.6") (defconst crdt-protocol-version "0.2.5") (defun crdt-version () @@ -1471,7 +1471,7 @@ CRDT--PROCESS should be bound to The network process for the client connection." (crdt--format-message `(cursor ,crdt--buffer-network-name ,site-id ,point ,(crdt--get-id point) - ,mark ,(crdt--get-id mark))) + ,mark ,(when mark (crdt--get-id mark crdt--pseudo-cursor-table) (process-send-string crdt--process (crdt--format-message (crdt--local-cursor nil)))
[elpa] externals-release/org updated (e1c49af -> a3b6728)
elpasync pushed a change to branch externals-release/org. from e1c49af org-src.el: Fix special editing of LaTeX fragments new 85e5540 lisp/ox-koma-letter.el: Use lexical-binding new a3b6728 lisp/ob-julia.el: Use lexical-binding Summary of changes: lisp/ob-julia.el | 32 +++- lisp/ox-koma-letter.el | 6 +++--- 2 files changed, 14 insertions(+), 24 deletions(-)
[elpa] externals-release/org 85e5540 1/2: lisp/ox-koma-letter.el: Use lexical-binding
branch: externals-release/org commit 85e5540eb5e9bf7337e43981c9848bbbf58be8dd Author: Bastien Commit: Bastien lisp/ox-koma-letter.el: Use lexical-binding * lisp/ox-koma-letter.el (org-koma-letter-export-block) (org-koma-letter-export-snippet): Silence the compiler. Use lexical-binding. --- lisp/ox-koma-letter.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el index 3bd2f68..70e996a 100644 --- a/lisp/ox-koma-letter.el +++ b/lisp/ox-koma-letter.el @@ -1,4 +1,4 @@ -;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine +;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine -*- lexical-binding: t; -*- ;; Copyright (C) 2007-2021 Free Software Foundation, Inc. @@ -618,7 +618,7 @@ such as the one tagged with PS." Export Block -(defun org-koma-letter-export-block (export-block contents info) +(defun org-koma-letter-export-block (export-block _contents _info) "Transcode an EXPORT-BLOCK element into KOMA Scrlttr2 code. CONTENTS is nil. INFO is a plist used as a communication channel." @@ -628,7 +628,7 @@ channel." Export Snippet -(defun org-koma-letter-export-snippet (export-snippet contents info) +(defun org-koma-letter-export-snippet (export-snippet _contents _info) "Transcode an EXPORT-SNIPPET object into KOMA Scrlttr2 code. CONTENTS is nil. INFO is a plist used as a communication channel."
[elpa] externals-release/org a3b6728 2/2: lisp/ob-julia.el: Use lexical-binding
branch: externals-release/org commit a3b6728f9afda35756fc490867176c4c48c36934 Author: Bastien Commit: Bastien lisp/ob-julia.el: Use lexical-binding * lisp/ob-julia.el: Use lexical-binding. (ess-eval-visibly-p): Declare as dynamically scoped. (org-babel-execute:julia, org-babel-julia-assign-elisp) (org-babel-julia-evaluate, org-babel-julia-evaluate-session): Remove unused references to `colnames-p' and `rownames-p'. Thanks to Pedro Bruel for reviewing this patch. --- lisp/ob-julia.el | 32 +++- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index 2f051a5..ad90f06 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -1,4 +1,4 @@ -;;; ob-julia.el --- org-babel functions for julia code evaluation +;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison @@ -59,6 +59,7 @@ (defvar ess-current-process-name) ; dynamically scoped (defvar ess-local-process-name) ; dynamically scoped +(defvar ess-eval-visibly-p) ; dynamically scoped (defun org-babel-edit-prep:julia (info) (let ((session (cdr (assq :session (nth 2 info) (when (and session @@ -89,17 +90,13 @@ This function is called by `org-babel-execute-src-block'." (graphics-file (and (member "graphics" (assq :result-params params)) (org-babel-graphical-output-file params))) (colnames-p (unless graphics-file (cdr (assq :colnames params - (rownames-p (unless graphics-file (cdr (assq :rownames params (full-body (org-babel-expand-body:julia body params graphics-file)) (result (org-babel-julia-evaluate session full-body result-type result-params (or (equal "yes" colnames-p) (org-babel-pick-name - (cdr (assq :colname-names params)) colnames-p)) -(or (equal "yes" rownames-p) -(org-babel-pick-name - (cdr (assq :rowname-names params)) rownames-p) + (cdr (assq :colname-names params)) colnames-p) (if graphics-file nil result (defun org-babel-normalize-newline (result) @@ -133,11 +130,7 @@ This function is called by `org-babel-execute-src-block'." "Return list of julia statements assigning the block's variables." (let ((vars (org-babel--get-vars params))) (mapcar - (lambda (pair) - (org-babel-julia-assign-elisp - (car pair) (cdr pair) - (equal "yes" (cdr (assq :colnames params))) - (equal "yes" (cdr (assq :rownames params) + (lambda (pair) (org-babel-julia-assign-elisp (car pair) (cdr pair))) (mapcar (lambda (i) (cons (car (nth i vars)) @@ -153,7 +146,7 @@ This function is called by `org-babel-execute-src-block'." (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") (format "%S" s))) -(defun org-babel-julia-assign-elisp (name value colnames-p rownames-p) +(defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) (let* ((lengths (mapcar 'length (cl-remove-if-not 'sequencep value))) @@ -161,10 +154,7 @@ This function is called by `org-babel-execute-src-block'." (min (if lengths (apply 'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). (unless (listp (car value)) (setq value (list value))) -(let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field))) - (header (if (or (eq (nth 1 value) 'hline) colnames-p) - "TRUE" "FALSE")) - (row-names (if rownames-p "1" "NULL"))) +(let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field (if (= max min) (format "%s = begin using CSV @@ -251,16 +241,16 @@ end" end") (defun org-babel-julia-evaluate -(session body result-type result-params column-names-p row-names-p) +(session body result-type result-params column-names-p) "Evaluate julia code in BODY." (if session (org-babel-julia-evaluate-session - session body result-type result-params column-names-p row-names-p) + session body result-type result-params column-names-p) (org-babel-julia-evaluate-external-process - body result-type result-params column-names-p row-names-p))) + body result-type result-params column-names-p))) (defun org-babel-julia-evaluate-external-process -(body result-type result-params column-names-p row-names-p) +(body result-type result-params column-names-p) "Evaluate BODY in external julia process. If RESULT-TYPE equals 'output then return standard output as a string. If R
[elpa] externals/org updated (59cb39f -> 2cdd930)
elpasync pushed a change to branch externals/org. from 59cb39f Merge branch 'bugfix' new 85e5540 lisp/ox-koma-letter.el: Use lexical-binding new a3b6728 lisp/ob-julia.el: Use lexical-binding new 2cdd930 Merge branch 'bugfix' Summary of changes: lisp/ob-julia.el | 32 +++- lisp/ox-koma-letter.el | 6 +++--- 2 files changed, 14 insertions(+), 24 deletions(-)
[elpa] externals/org 2cdd930: Merge branch 'bugfix'
branch: externals/org commit 2cdd930a7b383fefff981ef0096d0d82024ca39c Merge: 59cb39f a3b6728 Author: Bastien Commit: Bastien Merge branch 'bugfix' --- lisp/ob-julia.el | 32 +++- lisp/ox-koma-letter.el | 6 +++--- 2 files changed, 14 insertions(+), 24 deletions(-) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index 2f051a5..ad90f06 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -1,4 +1,4 @@ -;;; ob-julia.el --- org-babel functions for julia code evaluation +;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison @@ -59,6 +59,7 @@ (defvar ess-current-process-name) ; dynamically scoped (defvar ess-local-process-name) ; dynamically scoped +(defvar ess-eval-visibly-p) ; dynamically scoped (defun org-babel-edit-prep:julia (info) (let ((session (cdr (assq :session (nth 2 info) (when (and session @@ -89,17 +90,13 @@ This function is called by `org-babel-execute-src-block'." (graphics-file (and (member "graphics" (assq :result-params params)) (org-babel-graphical-output-file params))) (colnames-p (unless graphics-file (cdr (assq :colnames params - (rownames-p (unless graphics-file (cdr (assq :rownames params (full-body (org-babel-expand-body:julia body params graphics-file)) (result (org-babel-julia-evaluate session full-body result-type result-params (or (equal "yes" colnames-p) (org-babel-pick-name - (cdr (assq :colname-names params)) colnames-p)) -(or (equal "yes" rownames-p) -(org-babel-pick-name - (cdr (assq :rowname-names params)) rownames-p) + (cdr (assq :colname-names params)) colnames-p) (if graphics-file nil result (defun org-babel-normalize-newline (result) @@ -133,11 +130,7 @@ This function is called by `org-babel-execute-src-block'." "Return list of julia statements assigning the block's variables." (let ((vars (org-babel--get-vars params))) (mapcar - (lambda (pair) - (org-babel-julia-assign-elisp - (car pair) (cdr pair) - (equal "yes" (cdr (assq :colnames params))) - (equal "yes" (cdr (assq :rownames params) + (lambda (pair) (org-babel-julia-assign-elisp (car pair) (cdr pair))) (mapcar (lambda (i) (cons (car (nth i vars)) @@ -153,7 +146,7 @@ This function is called by `org-babel-execute-src-block'." (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") (format "%S" s))) -(defun org-babel-julia-assign-elisp (name value colnames-p rownames-p) +(defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) (let* ((lengths (mapcar 'length (cl-remove-if-not 'sequencep value))) @@ -161,10 +154,7 @@ This function is called by `org-babel-execute-src-block'." (min (if lengths (apply 'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). (unless (listp (car value)) (setq value (list value))) -(let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field))) - (header (if (or (eq (nth 1 value) 'hline) colnames-p) - "TRUE" "FALSE")) - (row-names (if rownames-p "1" "NULL"))) +(let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field (if (= max min) (format "%s = begin using CSV @@ -251,16 +241,16 @@ end" end") (defun org-babel-julia-evaluate -(session body result-type result-params column-names-p row-names-p) +(session body result-type result-params column-names-p) "Evaluate julia code in BODY." (if session (org-babel-julia-evaluate-session - session body result-type result-params column-names-p row-names-p) + session body result-type result-params column-names-p) (org-babel-julia-evaluate-external-process - body result-type result-params column-names-p row-names-p))) + body result-type result-params column-names-p))) (defun org-babel-julia-evaluate-external-process -(body result-type result-params column-names-p row-names-p) +(body result-type result-params column-names-p) "Evaluate BODY in external julia process. If RESULT-TYPE equals 'output then return standard output as a string. If RESULT-TYPE equals 'value then return the value of the @@ -284,7 +274,7 @@ last statement in BODY, as elisp." (output (org-babel-eval org-babel-julia-command body (defun org-babel-julia-evaluate-session -(session body result-type result-params column-names-p row-names-p) +(session body resul
[nongnu] elpa/projectile updated (d8ef47c -> 7f64570)
elpasync pushed a change to branch elpa/projectile. from d8ef47c Fix the last changelog entry new 4ff6472 [Fix #1447] Restructure the menu new 318f22b Mention projectile-ripgrep in the menu new 7f64570 Improve the menu structure Summary of changes: CHANGELOG.md | 4 +++ projectile.el | 105 +++--- 2 files changed, 60 insertions(+), 49 deletions(-)
[nongnu] elpa/projectile 4ff6472 1/3: [Fix #1447] Restructure the menu
branch: elpa/projectile commit 4ff6472884101f3622034fe748f2ceae8a2b3de9 Author: Bozhidar Batsov Commit: Bozhidar Batsov [Fix #1447] Restructure the menu --- CHANGELOG.md | 4 +++ projectile.el | 98 ++- 2 files changed, 54 insertions(+), 48 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ade384e..f61579d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ * [#1514](https://github.com/bbatsov/projectile/issues/1514): Fix `projectile-ag` global ignores not in effect. +### Changes + +* [#1447](https://github.com/bbatsov/projectile/issues/1447): Restructure the menu. + ## 2.5.0 (2021-08-10) ### New features diff --git a/projectile.el b/projectile.el index 8dcf72c..832c776 100644 --- a/projectile.el +++ b/projectile.el @@ -5449,54 +5449,56 @@ thing shown in the mode line otherwise." (easy-menu-define projectile-mode-menu map "Menu for Projectile" '("Projectile" :visible projectile-show-menu -["Find file" projectile-find-file] -["Find file in known projects" projectile-find-file-in-known-projects] -["Find test file" projectile-find-test-file] -["Find directory" projectile-find-dir] -["Find file in directory" projectile-find-file-in-directory] -["Find other file" projectile-find-other-file] -["Switch to buffer" projectile-switch-to-buffer] -["Jump between implementation file and test file" projectile-toggle-between-implementation-and-test] -["Kill project buffers" projectile-kill-buffers] -["Save project buffers" projectile-save-project-buffers] -["Recent files" projectile-recentf] -["Previous buffer" projectile-previous-project-buffer] -["Next buffer" projectile-next-project-buffer] -"--" -["Toggle project wide read-only" projectile-toggle-project-read-only] -["Edit .dir-locals.el" projectile-edit-dir-locals] -"--" -["Switch to project" projectile-switch-project] -["Switch to open project" projectile-switch-open-project] -["Discover projects in directory" projectile-discover-projects-in-directory] -["Clear known projects" projectile-clear-known-projects] -["Reset known projects" projectile-reset-known-projects] -["Browse dirty projects" projectile-browse-dirty-projects] -["Open project in dired" projectile-dired] -"--" -["Search in project (grep)" projectile-grep] -["Search in project (ag)" projectile-ag] -["Replace in project" projectile-replace] -["Multi-occur in project" projectile-multi-occur] -"--" -["Run GDB" projectile-run-gdb] -"--" -["Run shell" projectile-run-shell] -["Run eshell" projectile-run-eshell] -["Run ielm" projectile-run-ielm] -["Run term" projectile-run-term] -"--" -["Cache current file" projectile-cache-current-file] -["Invalidate cache" projectile-invalidate-cache] -["Regenerate [e|g]tags" projectile-regenerate-tags] -"--" -["Configure project" projectile-configure-project] -["Compile project" projectile-compile-project] -["Test project" projectile-test-project] -["Install project" projectile-install-project] -["Package project" projectile-package-project] -["Run project" projectile-run-project] -["Repeat last external command" projectile-repeat-last-command] +("Find..." + ["Find file" projectile-find-file] + ["Find file in known projects" projectile-find-file-in-known-projects] + ["Find test file" projectile-find-test-file] + ["Find directory" projectile-find-dir] + ["Find file in directory" projectile-find-file-in-directory] + ["Find other file" projectile-find-other-file] + ["Jump between implementation file and test file" projectile-toggle-between-implementation-and-test]) +("Buffers" + ["Switch to buffer" projectile-switch-to-buffer] + ["Kill project buffers" projectile-kill-buffers] + ["Save project buffers" projectile-save-project-buffers] + ["Recent files" projectile-recentf] + ["Previous buffer" projectile-previous-project-buffer] + ["Next buffer" projectile-next-project-buffer]) +("Projects" + ["Switch to project" projectile-switch-project] + ["Switch to open project" projectile-switch-open-project] + ["Discover projects in directory" projectile-discover-projects-in-directory] + ["Clear known projects" projectile-clear-known-projects] + ["Reset known projects" projectile-reset-known-projects] + ["Browse dirty projects" projectile-browse-dirty-projects] + ["Open project in dired" projectile-dired] + "--" + ["Toggle project wide read-only" projectile-toggle-project-read-only] +
[nongnu] elpa/projectile 318f22b 2/3: Mention projectile-ripgrep in the menu
branch: elpa/projectile commit 318f22b1965d3a4dbdce79661eabc561592c9e58 Author: Bozhidar Batsov Commit: Bozhidar Batsov Mention projectile-ripgrep in the menu --- projectile.el | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/projectile.el b/projectile.el index 832c776..a28dff4 100644 --- a/projectile.el +++ b/projectile.el @@ -5480,8 +5480,9 @@ thing shown in the mode line otherwise." ["Invalidate cache" projectile-invalidate-cache] ["Regenerate [e|g]tags" projectile-regenerate-tags]) ("Search" - ["Search in project (grep)" projectile-grep] - ["Search in project (ag)" projectile-ag] + ["Search with grep" projectile-grep] + ["Search with ag" projectile-ag] + ["Search with ripgrep" projectile-ripgrep] ["Replace in project" projectile-replace] ["Multi-occur in project" projectile-multi-occur]) ("Run..."
[nongnu] elpa/projectile 7f64570 3/3: Improve the menu structure
branch: elpa/projectile commit 7f64570d3e6829d767d340c8584f3e4f3472ee81 Author: Bozhidar Batsov Commit: Bozhidar Batsov Improve the menu structure --- projectile.el | 22 +- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/projectile.el b/projectile.el index a28dff4..fadb243 100644 --- a/projectile.el +++ b/projectile.el @@ -5467,18 +5467,22 @@ thing shown in the mode line otherwise." ("Projects" ["Switch to project" projectile-switch-project] ["Switch to open project" projectile-switch-open-project] + "--" ["Discover projects in directory" projectile-discover-projects-in-directory] ["Clear known projects" projectile-clear-known-projects] ["Reset known projects" projectile-reset-known-projects] - ["Browse dirty projects" projectile-browse-dirty-projects] + "--" ["Open project in dired" projectile-dired] "--" - ["Toggle project wide read-only" projectile-toggle-project-read-only] - ["Edit .dir-locals.el" projectile-edit-dir-locals] + ["Browse dirty projects" projectile-browse-dirty-projects] "--" ["Cache current file" projectile-cache-current-file] ["Invalidate cache" projectile-invalidate-cache] - ["Regenerate [e|g]tags" projectile-regenerate-tags]) + ["Regenerate [e|g]tags" projectile-regenerate-tags] + "--" + ["Toggle project wide read-only" projectile-toggle-project-read-only] + ["Edit .dir-locals.el" projectile-edit-dir-locals] + ["Project info" projectile-project-info]) ("Search" ["Search with grep" projectile-grep] ["Search with ag" projectile-ag] @@ -5486,12 +5490,12 @@ thing shown in the mode line otherwise." ["Replace in project" projectile-replace] ["Multi-occur in project" projectile-multi-occur]) ("Run..." - ["Run GDB" projectile-run-gdb] - "--" ["Run shell" projectile-run-shell] ["Run eshell" projectile-run-eshell] ["Run ielm" projectile-run-ielm] - ["Run term" projectile-run-term]) + ["Run term" projectile-run-term] + "--" + ["Run GDB" projectile-run-gdb]) ("Build" ["Configure project" projectile-configure-project] ["Compile project" projectile-compile-project] @@ -5499,9 +5503,9 @@ thing shown in the mode line otherwise." ["Install project" projectile-install-project] ["Package project" projectile-package-project] ["Run project" projectile-run-project] - ["Repeat last external command" projectile-repeat-last-command]) + "--" + ["Repeat last build command" projectile-repeat-last-command]) "--" -["Project info" projectile-project-info] ["About" projectile-version])) map) "Keymap for Projectile mode.")
[elpa] externals/setup 2d3b4f2 3/8: Generalize macro processing into setup-modifier-list
branch: externals/setup commit 2d3b4f2e1d9150d6bd90efe113126d7d8baaa24b Author: Philip Kaludercic Commit: Philip Kaludercic Generalize macro processing into setup-modifier-list --- setup.el | 56 1 file changed, 44 insertions(+), 12 deletions(-) diff --git a/setup.el b/setup.el index 8ea32a7..1c9c511 100644 --- a/setup.el +++ b/setup.el @@ -81,8 +81,6 @@ (require 'elisp-mode) -(defvar setup--need-quit) ;see `setup-quit' - (defvar setup-opts `((quit . ,(make-symbol "setup-quit"))) "Alist defining the context for local macros. Context-modifying macros (`:with-feature', `:with-mode', ...) @@ -90,11 +88,43 @@ prepend the new context to this variable using `let', before calling `setup-expand'. Within the macro definitions `setup-get' is used to retrieve the current context.") +(defvar setup-attributes '(error-demotion) + "A list symbols to be used by `setup-modifier-list'.") + +(defun setup-wrap-to-catch-quits (body _name) + "Wrap BODY in a catch block if necessary." + (if (memq 'need-quit setup-attributes) + `(catch ',(setup-get 'quit) ,@(macroexp-unprogn body)) +body)) + +(defun setup-wrap-to-demote-errors (body _name) + "Wrap BODY in a `with-demoted-errors' block." + (if (memq 'error-demotion setup-attributes) + `(with-demoted-errors ,(format "Error in setup form on line %d: %%S" + (line-number-at-pos)) + ,body) +body)) + +(defvar setup-modifier-list + '(setup-expand-local-macros +setup-wrap-to-catch-quits +setup-wrap-to-demote-errors) + "List of wrapper functions to be called after macro expansion.") + (defvar setup-macros nil "Local macro definitions to be bound in `setup' bodies. Do not modify this variable by hand. Instead use `setup-define.'") +(defun setup-expand-local-macros (body name) + "Expand macros in BODY given by `setup-macros'. +NAME is a symbol or string designating the default feature." + (macroexpand-all + (if (assq :with-feature setup-macros) + `(:with-feature ,name ,@body) +(macroexp-progn body)) + (append setup-macros macroexpand-all-environment))) + ;;;###autoload (defun setup-make-docstring () "Return a docstring for `setup'." @@ -129,15 +159,10 @@ NAME may also be a macro, if it can provide a symbol." (push name body) (let ((shorthand (get (car name) 'setup-shorthand))) (setq name (and shorthand (funcall shorthand name) - (let* ((setup--need-quit nil) - (res (macroexpand-all - (if (assq :with-feature setup-macros) - `(:with-feature ,name ,@body) - (macroexp-progn body)) - (append setup-macros macroexpand-all-environment -(if setup--need-quit -`(catch ',(setup-get 'quit) ,@(macroexp-unprogn res)) - res))) + (let ((setup-attributes setup-attributes)) +(dolist (mod-fn setup-modifier-list) + (setq body (funcall mod-fn body name))) +body)) ;;;###autoload (put 'setup 'function-documentation '(setup-make-docstring)) @@ -249,7 +274,7 @@ settings." (defun setup-quit (&optional return) "Generate code to quit evaluation. If RETURN is given, throw that value." - (setq setup--need-quit t) + (push 'need-quit setup-attributes) `(throw ',(setup-get 'quit) ,return)) (defun setup-ensure-kbd (sexp) @@ -611,6 +636,13 @@ yourself." :debug '(setup) :after-loaded t) +(setup-define :without-error-demotion +(lambda () + (setq setup-attributes (delq 'error-demotion setup-attributes)) + nil) + :documentation "Prevent the setup body from demoting errors. +See `setup-wrap-to-demote-errors'.") + (provide 'setup) ;;; setup.el ends here
[elpa] externals/setup 9433a3a 5/8: Allow :when-loaded to handle multiple expressions
branch: externals/setup commit 9433a3a00f6d36975478d41365ec9428ed176737 Author: Philip Kaludercic Commit: Philip Kaludercic Allow :when-loaded to handle multiple expressions --- setup.el | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/setup.el b/setup.el index 8338770..e3cb36c 100644 --- a/setup.el +++ b/setup.el @@ -585,13 +585,16 @@ If PATH does not exist, abort the evaluation." :debug '(form) :repeatable t) -(setup-define :when-loaded #'identity +(setup-define :when-loaded +(lambda (&rest body) + (macroexp-progn body)) :documentation "Evaluate BODY after the current feature has been loaded. Avoid using this macro whenever possible, and instead choose a more specialized alternative or write one yourself." :debug '(setup) - :after-loaded t) + :after-loaded t + :indent 0) (setup-define :without-error-demotion (lambda ()
[elpa] externals/setup 1b8b968 1/8: Remove lexical-binding check
branch: externals/setup commit 1b8b9684f9c2b4a708fdc5a93f098d6a498e1081 Author: Philip Kaludercic Commit: Philip Kaludercic Remove lexical-binding check Since the lexical code is all executed "in" setup.el, it is not required for the file that is currently being evaluated. --- setup.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.el b/setup.el index bbea313..370eb81 100644 --- a/setup.el +++ b/setup.el @@ -125,8 +125,6 @@ will otherwise just be evaluated as is. NAME may also be a macro, if it can provide a symbol." (declare (debug (&rest &or [symbolp sexp] form)) (indent defun)) - (unless lexical-binding -(error "The `setup' macro requires lexical binding")) (when (consp name) (push name body) (let ((shorthand (get (car name) 'setup-shorthand)))
[elpa] externals/setup 9591ff2 6/8: Consistently use "local macro" instead of "keyword"
branch: externals/setup commit 9591ff29f520e0d7cace516b2458eee9f1d52b13 Author: Philip Kaludercic Commit: Philip Kaludercic Consistently use "local macro" instead of "keyword" --- setup.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.el b/setup.el index e3cb36c..f26ebb7 100644 --- a/setup.el +++ b/setup.el @@ -212,7 +212,7 @@ If not given, it is assumed nothing is evaluated." #'setup-xref-def-function) -;;; Common utility functions for keywords +;;; Common utility functions for local macros (defun setup-get (opt) "Retrieve the context-sensitive value for OPT. @@ -281,7 +281,7 @@ and VAL into one s-expression." ((error "Invalid option %S" name -;;; Definitions of `setup' keywords +;;; Default local macros definitions (setup-define :with-feature (lambda (features &rest body)
[elpa] externals/setup 7107c78 4/8: Remove examples from package commentary section
branch: externals/setup commit 7107c785b5ee8c9c82927afaea0c6aa67ad07ab5 Author: Philip Kaludercic Commit: Philip Kaludercic Remove examples from package commentary section --- setup.el | 55 ++- 1 file changed, 6 insertions(+), 49 deletions(-) diff --git a/setup.el b/setup.el index 1c9c511..8338770 100644 --- a/setup.el +++ b/setup.el @@ -25,56 +25,13 @@ ;;; Commentary: ;; The `setup` macro simplifies repetitive configuration patterns, by -;; providing context-sensitive local macros in `setup` bodies. These +;; providing context-sensitive local macros in `setup' bodies. These ;; macros can be mixed with regular elisp code without any issues, -;; allowing for flexible and terse configurations. -;; -;; For example, these macros: - -;;(setup shell -;; (let ((key (kbd "C-c s"))) -;;(:global key shell) -;;(:bind key bury-buffer))) -;; -;;(setup dired -;; (:also-load dired-x) -;; (:option (prepend dired-guess-shell-alist-user) '("" "xdg-open") -;; dired-dwim-target t) -;; (unless global-auto-revert-mode -;;(:hook auto-revert-mode))) -;; -;;(setup (:package company) -;; (:bind "M-TAB" company-complete) -;; (:hook-into prog-mode conf-mode)) - - -;; expanded to the to the functional equivalent of - -;;(let ((key "C-c s")) -;; (global-set-key (kbd key) #'shell) -;; (with-eval-after-load 'shell -;;(define-key shell-mode-map (kbd key) #'bury-buffer))) - -;;(with-eval-after-load 'dired -;; (require 'dired-x)) -;;(customize-set-variable 'dired-guess-shell-alist-user -;;(cons '("" "xdg-open") -;; dired-guess-shell-alist-user)) -;;(customize-set-variable 'dired-dwim-target t) -;;(unless global-auto-revert-mode -;; (add-hook 'dired-mode-hook #'auto-revert-mode)) -;; -;;(unless (package-install-p 'company) -;; (package-install 'company)) -;;(with-eval-after-load 'company -;; (define-key company-mode-map (kbd "M-TAB") #'company-complete)) -;;(add-hook 'prog-mode-hook #'company-mode) -;;(add-hook 'conf-mode-hook #'company-mode) - -;; Additional "keywords" can be defined using `setup-define'. All -;; known keywords are documented in the docstring for `setup'. - -;; More information can be found on Emacs Wiki: +;; allowing for flexible and terse configurations. The list of local +;; macros can be extended by the user via `setup-define'. A list of +;; currently known local macros are documented in the docstring for `setup'. + +;; Examples and extended documentation can be found on Emacs wiki: ;; https://www.emacswiki.org/emacs/SetupEl ;;; Code:
[elpa] externals/setup 261ed62 8/8: Remove :without-error-demotion
branch: externals/setup commit 261ed6264fae01c7fe6a2d72a1906541fd96e301 Author: Philip Kaludercic Commit: Philip Kaludercic Remove :without-error-demotion --- setup.el | 7 --- 1 file changed, 7 deletions(-) diff --git a/setup.el b/setup.el index 63c2327..1321125 100644 --- a/setup.el +++ b/setup.el @@ -606,13 +606,6 @@ yourself." :after-loaded t :indent 0) -(setup-define :without-error-demotion -(lambda () - (setq setup-attributes (delq 'error-demotion setup-attributes)) - nil) - :documentation "Prevent the setup body from demoting errors. -See `setup-wrap-to-demote-errors'.") - (provide 'setup) ;;; setup.el ends here
[elpa] externals/setup d96fb5f 2/8: Indent the first two forms of setup-define
branch: externals/setup commit d96fb5f72717ff680369ce1a5b2167bde945293a Author: Philip Kaludercic Commit: Philip Kaludercic Indent the first two forms of setup-define --- setup.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.el b/setup.el index 370eb81..8ea32a7 100644 --- a/setup.el +++ b/setup.el @@ -171,7 +171,7 @@ returns a symbol to replace NAME. :debug SPEC A edebug specification, see Info node `(elisp) Specification List'. If not given, it is assumed nothing is evaluated." - (declare (indent 1)) + (declare (indent 2)) ;; NB.: NAME is not required to by a keyword, even though all macros ;; specified on the next page use keywords. The rationale for ;; this is currently that there is no clean way to "locally"
[elpa] externals/setup updated (2e1f7c3 -> 261ed62)
elpasync pushed a change to branch externals/setup. from 2e1f7c3 Bump version tag new 1b8b968 Remove lexical-binding check new d96fb5f Indent the first two forms of setup-define new 2d3b4f2 Generalize macro processing into setup-modifier-list new 7107c78 Remove examples from package commentary section new 9433a3a Allow :when-loaded to handle multiple expressions new 9591ff2 Consistently use "local macro" instead of "keyword" new f578ff7 Document if a macro uses deferred evaluation new 261ed62 Remove :without-error-demotion Summary of changes: setup.el | 133 ++- 1 file changed, 63 insertions(+), 70 deletions(-)
[elpa] externals/setup f578ff7 7/8: Document if a macro uses deferred evaluation
branch: externals/setup commit f578ff7a2f0ee1d3fd5f13be0ee849f7b1c4c673 Author: Philip Kaludercic Commit: Philip Kaludercic Document if a macro uses deferred evaluation --- setup.el | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/setup.el b/setup.el index f26ebb7..63c2327 100644 --- a/setup.el +++ b/setup.el @@ -90,7 +90,13 @@ NAME is a symbol or string designating the default feature." "\n\n") (if (null setup-macros) (insert "No local macros are defined.") - (insert "Within BODY, `setup' provides these local macros:") + (insert "Within BODY, `setup' is able to expand context-sensitive local macros. " + "Some of these may be evaluated after the respective current feature " + "has been loaded, by wrapping the expression in a `with-eval-after-load' block. " + "In the following list this is indicated by a \"*\". " + "Otherwise a \"-\" is used for all macros that expand to code " + "that is immediately evaluated.") + (fill-paragraph) (dolist (sym (sort (mapcar #'car setup-macros) #'string-lessp)) (newline 2) (let ((sig (mapcar @@ -99,7 +105,10 @@ NAME is a symbol or string designating the default feature." arg (intern (upcase (symbol-name arg) (get sym 'setup-signature - (insert (format " - %s\n\n" (cons sym sig)) + (insert (format " %c %s\n\n" + (if (get sym 'setup-delayed-eval) + ?* ?-) + (cons sym sig)) (or (get sym 'setup-documentation) "No documentation.") (buffer-string))) @@ -169,6 +178,7 @@ If not given, it is assumed nothing is evaluated." (if (plist-get opts :repeatable) '(...) (put name 'setup-shorthand (plist-get opts :shorthand)) (put name 'setup-definition-file (or load-file-name buffer-file-name)) + (put name 'setup-delayed-eval (plist-get opts :after-loaded)) (put name 'lisp-indent-function (plist-get opts :indent)) ;; define macro for `macroexpand-all' (setf (alist-get name setup-macros) ;New in Emacs-25.
[elpa] externals/javaimp 7fc2b51: More simplifications
branch: externals/javaimp commit 7fc2b51924ef0a4c16f38674f7428637050bf85f Author: Filipp Gunbin Commit: Filipp Gunbin More simplifications --- javaimp-parse.el | 18 ++-- javaimp-tests.el | 308 +++ javaimp-util.el | 26 - javaimp.el | 46 +++-- 4 files changed, 174 insertions(+), 224 deletions(-) diff --git a/javaimp-parse.el b/javaimp-parse.el index 91002a0..a9cef3b 100644 --- a/javaimp-parse.el +++ b/javaimp-parse.el @@ -275,11 +275,10 @@ the position of opening brace.") (1+ (point)) (when search-bound (let ((throws-args - (let ((pos (javaimp--parse-decl-suffix - "\\_" brace-pos search-bound))) - (when pos - (or (javaimp--parse-arglist pos brace-pos t) - t) + (when-let ((pos (javaimp--parse-decl-suffix +"\\_" brace-pos search-bound))) + (or (javaimp--parse-arglist pos brace-pos t) + t (when (and (not (eq throws-args t)) (progn (javaimp--parse-skip-back-until) @@ -306,11 +305,10 @@ the position of opening brace.") :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)) + (let ((args (javaimp--parse-arglist + (car arglist-region) + (cdr arglist-region + (concat name "(" (mapconcat #'car args ",") ")"))) :start (point) :open-brace brace-pos) diff --git a/javaimp-tests.el b/javaimp-tests.el index d102527..1b50257 100644 --- a/javaimp-tests.el +++ b/javaimp-tests.el @@ -66,106 +66,102 @@ Exception4>") ;; `javaimp--parse-scope-hook'. (ert-deftest javaimp-test--parse-scope-class () - (let ((javaimp--parse-scope-hook #'javaimp--parse-scope-class)) -(javaimp-test--check-single-scope - '("class Foo {" - class "Foo") - '("class Foo extends Bar {" - class "Foo") - '("class Foo implements Bar {" - class "Foo") - '("class Foo implements Bar, Baz {" - class "Foo") - '("public class Foo extends Bar implements Baz1 , Baz2 {" - class "Foo") - `(,(subst-char-in-string - ? ?\n - "public class Foo extends Bar implements Baz1 , Baz2 {") - class "Foo") - '("class Foo extends FooSuper \ + (javaimp-test--single-parser #'javaimp--parse-scope-class +'("class Foo {" + class "Foo") +'("class Foo extends Bar {" + class "Foo") +'("class Foo implements Bar {" + class "Foo") +'("class Foo implements Bar, Baz {" + class "Foo") +'("public class Foo extends Bar implements Baz1 , Baz2 {" + class "Foo") +`(,(subst-char-in-string +? ?\n +"public class Foo extends Bar implements Baz1 , Baz2 {") + class "Foo") +'("class Foo extends FooSuper \ implements Interface1, Interface2 {" - class "Foo") - '("class Foo {" - class "Foo") - '("class Foo> {" - class "Foo") - '("class Foo> \ + class "Foo") +'("class Foo {" + class "Foo") +'("class Foo> {" + class "Foo") +'("class Foo> \ extends Bar> {" - class "Foo") - '("interface Foo {" - interface "Foo") - '("private enum Foo {" - enum "Foo") - ))) + class "Foo") +'("interface Foo {" + interface "Foo") +'("private enum Foo {" + enum "Foo") +)) (ert-deftest javaimp-test--parse-scope-anonymous-class () - (let ((javaimp--parse-scope-hook #'javaimp--parse-scope-anonymous-class)) -(javaimp-test--check-single-scope - '(" = new Object < Class1 , Class2 > ( 1 + 1 , baz ) {" - anonymous-class "Object") - `(,(subst-char-in-string - ? ?\n - " = new Object < Class1 , Class2 > ( 1 + 1 , baz ) {") - anonymous-class "Object") - '(" = (obj.getField()).new Object(1, baz) {" - anonymous-class "Object") - '(" = obj.new Object<>(1, baz) {" - anonymous-class "Object") - ))) + (javaimp-test--single-parser #'javaimp--parse-scope-anonymous-class +'(" = new Object < Class1 , Class2 > ( 1 + 1 , baz ) {" + anonymous-class "Object") +`(,(subst-char-in-string +? ?\n +" = new Object < Class1 , Class2 > ( 1 + 1 , baz ) {") + anonymous-class "Object") +'(" = (obj.getField()).new Object(1, baz) {" + anonymous-class "Object") +'(" = obj.new Object<>(1,
[elpa] externals/setup 9f21c4a: Reindent everything
branch: externals/setup commit 9f21c4ae158bfb07a3913f5010d3977083d466dd Author: Philip Kaludercic Commit: Philip Kaludercic Reindent everything --- setup.el | 303 --- 1 file changed, 152 insertions(+), 151 deletions(-) diff --git a/setup.el b/setup.el index 1321125..7731daf 100644 --- a/setup.el +++ b/setup.el @@ -77,10 +77,10 @@ Do not modify this variable by hand. Instead use "Expand macros in BODY given by `setup-macros'. NAME is a symbol or string designating the default feature." (macroexpand-all - (if (assq :with-feature setup-macros) - `(:with-feature ,name ,@body) -(macroexp-progn body)) - (append setup-macros macroexpand-all-environment))) + (if (assq :with-feature setup-macros) + `(:with-feature ,name ,@body) + (macroexp-progn body)) + (append setup-macros macroexpand-all-environment))) ;;;###autoload (defun setup-make-docstring () @@ -268,48 +268,48 @@ and VAL into one s-expression." (cond ((symbolp name) (funcall wrap-fn name val)) ((eq (car-safe name) 'append) (funcall wrap-fn - (cadr name) - (let ((sym (gensym))) -`(let ((,sym ,val) - (list ,(funcall old-val-fn (cadr name - (if (member ,sym list) - list - (append list (list ,sym))) + (cadr name) + (let ((sym (gensym))) +`(let ((,sym ,val) + (list ,(funcall old-val-fn (cadr name + (if (member ,sym list) + list + (append list (list ,sym))) ((eq (car-safe name) 'prepend) (funcall wrap-fn - (cadr name) - (let ((sym (gensym))) -`(let ((,sym ,val) - (list ,(funcall old-val-fn (cadr name - (if (member ,sym list) - list - (cons ,sym list)) + (cadr name) + (let ((sym (gensym))) +`(let ((,sym ,val) + (list ,(funcall old-val-fn (cadr name + (if (member ,sym list) + list + (cons ,sym list)) ((eq (car-safe name) 'remove) (funcall wrap-fn - (cadr name) - `(remove ,val ,(funcall old-val-fn name + (cadr name) + `(remove ,val ,(funcall old-val-fn name ((error "Invalid option %S" name ;;; Default local macros definitions (setup-define :with-feature - (lambda (features &rest body) -(let (bodies) - (dolist (feature (if (listp features) features (list features))) -(push (if feature - (let* ((mode (if (string-match-p "-mode\\'" (symbol-name feature)) - feature - (intern (format "%s-mode" feature - (setup-opts `((feature . ,feature) - (mode . ,mode) - (hook . ,(intern (format "%s-hook" mode))) - (map . ,(intern (format "%s-map" mode))) - ,@setup-opts))) -(setup-expand body)) -body) - bodies)) - (macroexp-progn (if features (nreverse bodies) body +(lambda (features &rest body) + (let (bodies) +(dolist (feature (if (listp features) features (list features))) + (push (if feature +(let* ((mode (if (string-match-p "-mode\\'" (symbol-name feature)) + feature + (intern (format "%s-mode" feature + (setup-opts `((feature . ,feature) + (mode . ,mode) + (hook . ,(intern (format "%s-hook" mode))) + (map . ,(intern (format "%s-map" mode))) + ,@setup-opts))) + (setup-expand body)) + body) +bodies)) +(macroexp-progn (if features (nreverse bodies) body :documentation "Change the FEATURE that BODY is configuring. This macro also declares a current mode by appending \"-mode\" to FEATURE, unless it already ends with \"-mode\". @@ -318,53 +318,53 @@ If FEATURE is a list, apply BODY to all elements of FEATURE." :indent 1) (setup-define :with-mode - (lambda (modes &rest body) -(let (bodies) - (dolist (mode (if (listp modes) modes (list modes))) -(push (let ((setup-opts `((mode . ,mode) - (hook . ,(intern (format "%s-hook" mode))) -
[elpa] externals/company ba6ad7e 3/7: Add make help target
branch: externals/company commit ba6ad7e6713b5a054fe8bba04645a854b823c8b4 Author: YE Commit: YE Add make help target --- Makefile | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0549228..7dce400 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,11 @@ -EMACS=emacs +EMACS = emacs +ALL_TARGETS = help package clean test test-gui test-batch compile compile-warn -.PHONY: package clean test test-gui test-batch compile compile-warn +.PHONY: ${ALL_TARGETS} + +help: + @echo Targets: + @for t in ${ALL_TARGETS}; do echo "- "$$t; done package: *.el @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \
[elpa] externals/company 3c5ac38 1/7: Fix Phony targets
branch: externals/company commit 3c5ac38493aea2cca044755819cd0b4319456007 Author: YE Commit: YE Fix Phony targets --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cd3e1d6..59ed74a 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ EMACS=emacs -.PHONY: ert test test-batch +.PHONY: package elpa clean test test-gui test-batch compile compile-warn package: *.el @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \
[elpa] externals/company updated (5c84da8 -> f079bca)
elpasync pushed a change to branch externals/company. from 5c84da8 Fix another test new 3c5ac38 Fix Phony targets new 25f2fe8 Remove outdated target elpa new ba6ad7e Add make help target new 7c25307 Fix Darwin compatibility of 'make package' new 02f0145 Update 'make clean' recipe new b67a8b1 Update manual packaging new f079bca Merge pull request #1230 from yugaego/makefile Summary of changes: Makefile | 33 ++--- 1 file changed, 18 insertions(+), 15 deletions(-)
[elpa] externals/company b67a8b1 6/7: Update manual packaging
branch: externals/company commit b67a8b1d4c56bcdc32ac3633bd7d0188413da48a Author: YE Commit: YE Update manual packaging --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fe75bce..99b3646 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,9 @@ help: @for t in ${ALL_TARGETS}; do echo "- "$$t; done package: *.el - @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \ - tar ${TAR_OPTIONS} company-$$ver.tar.bz2 $$(find . -name \*.el) + @VERSION=$$(awk '/Version:/{print $$3;exit}' company.el); \ + FILES=$$(find . \! -name .\* -a \( -maxdepth 1 -name \*.el -o -name icons \) ); \ + tar ${TAR_OPTIONS} company-$$VERSION.tar.bz2 $$FILES clean: @rm -rf company-*.tar.bz2 *.elc test/*.elc
[elpa] externals/company 25f2fe8 2/7: Remove outdated target elpa
branch: externals/company commit 25f2fe8db7a56a4a887ae5f8637734af7ba9141c Author: YE Commit: YE Remove outdated target elpa --- Makefile | 14 ++ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 59ed74a..0549228 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,13 @@ EMACS=emacs -.PHONY: package elpa clean test test-gui test-batch compile compile-warn +.PHONY: package clean test test-gui test-batch compile compile-warn package: *.el @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \ tar cjvf company-$$ver.tar.bz2 --mode 644 $$(find . -name \*.el) -elpa: *.el - @version=`grep -o "Version: .*" company.el | cut -c 10-`; \ - dir=company-$$version; \ - mkdir -p "$$dir"; \ - cp $$(find . -name \*.el) company-$$version; \ - echo "(define-package \"company\" \"$$version\" \ - \"Modular in-buffer completion framework\")" \ - > "$$dir"/company-pkg.el; \ - tar cvf company-$$version.tar --mode 644 "$$dir" - clean: - @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el test/*.elc + @rm -rf company-*/ company-*.tar.bz2 *.elc ert.el test/*.elc test: ${EMACS} -Q -nw -L . -l test/all.el \
[elpa] externals/company 02f0145 5/7: Update 'make clean' recipe
branch: externals/company commit 02f01458f1b56d058c4deff2d83d791c4e8db515 Author: YE Commit: YE Update 'make clean' recipe --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d3b5855..fe75bce 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ package: *.el tar ${TAR_OPTIONS} company-$$ver.tar.bz2 $$(find . -name \*.el) clean: - @rm -rf company-*/ company-*.tar.bz2 *.elc ert.el test/*.elc + @rm -rf company-*.tar.bz2 *.elc test/*.elc test: ${EMACS} -Q -nw -L . -l test/all.el \
[elpa] externals/company 7c25307 4/7: Fix Darwin compatibility of 'make package'
branch: externals/company commit 7c253070417dd1cf011339c6b64597486bb054c8 Author: YE Commit: YE Fix Darwin compatibility of 'make package' --- Makefile | 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7dce400..d3b5855 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,13 @@ EMACS = emacs + ALL_TARGETS = help package clean test test-gui test-batch compile compile-warn +TAR_OPTIONS = cjvf +ifneq ($(shell uname -s), Darwin) + TAR_OPTIONS += --mode 644 +endif + + .PHONY: ${ALL_TARGETS} help: @@ -9,7 +16,7 @@ help: package: *.el @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \ - tar cjvf company-$$ver.tar.bz2 --mode 644 $$(find . -name \*.el) + tar ${TAR_OPTIONS} company-$$ver.tar.bz2 $$(find . -name \*.el) clean: @rm -rf company-*/ company-*.tar.bz2 *.elc ert.el test/*.elc
[elpa] externals/company f079bca 7/7: Merge pull request #1230 from yugaego/makefile
branch: externals/company commit f079bca855eb83a59acf97fb428acf8a0e7ff55b Merge: 5c84da8 b67a8b1 Author: Dmitry Gutov Commit: GitHub Merge pull request #1230 from yugaego/makefile Makefile updates and fixes --- Makefile | 33 ++--- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index cd3e1d6..99b3646 100644 --- a/Makefile +++ b/Makefile @@ -1,23 +1,26 @@ -EMACS=emacs +EMACS = emacs -.PHONY: ert test test-batch +ALL_TARGETS = help package clean test test-gui test-batch compile compile-warn + +TAR_OPTIONS = cjvf +ifneq ($(shell uname -s), Darwin) + TAR_OPTIONS += --mode 644 +endif + + +.PHONY: ${ALL_TARGETS} + +help: + @echo Targets: + @for t in ${ALL_TARGETS}; do echo "- "$$t; done package: *.el - @ver=`grep -o "Version: .*" company.el | cut -c 10-`; \ - tar cjvf company-$$ver.tar.bz2 --mode 644 $$(find . -name \*.el) - -elpa: *.el - @version=`grep -o "Version: .*" company.el | cut -c 10-`; \ - dir=company-$$version; \ - mkdir -p "$$dir"; \ - cp $$(find . -name \*.el) company-$$version; \ - echo "(define-package \"company\" \"$$version\" \ - \"Modular in-buffer completion framework\")" \ - > "$$dir"/company-pkg.el; \ - tar cvf company-$$version.tar --mode 644 "$$dir" + @VERSION=$$(awk '/Version:/{print $$3;exit}' company.el); \ + FILES=$$(find . \! -name .\* -a \( -maxdepth 1 -name \*.el -o -name icons \) ); \ + tar ${TAR_OPTIONS} company-$$VERSION.tar.bz2 $$FILES clean: - @rm -rf company-*/ company-*.tar company-*.tar.bz2 *.elc ert.el test/*.elc + @rm -rf company-*.tar.bz2 *.elc test/*.elc test: ${EMACS} -Q -nw -L . -l test/all.el \
[elpa] externals/setup 1728c11: Improve documentation of setup-attributes and related functionality
branch: externals/setup commit 1728c117185319db6ca8e80fdbb89b2074d5efd1 Author: Philip Kaludercic Commit: Philip Kaludercic Improve documentation of setup-attributes and related functionality --- setup.el | 26 +- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/setup.el b/setup.el index 7731daf..24fb643 100644 --- a/setup.el +++ b/setup.el @@ -45,28 +45,36 @@ prepend the new context to this variable using `let', before calling `setup-expand'. Within the macro definitions `setup-get' is used to retrieve the current context.") -(defvar setup-attributes '(error-demotion) - "A list symbols to be used by `setup-modifier-list'.") +(defvar setup-attributes '() + "A list symbols used to store a state during macro processing. +The list is populated during macro expansion, and may modify the +behaviour of the functions in `setup-modifier-list'..") (defun setup-wrap-to-catch-quits (body _name) - "Wrap BODY in a catch block if necessary." + "Wrap BODY in a catch block if necessary. +The body is wrapped in a `catch' block if `setup-attributes' +contains the symbol `need-quit'." (if (memq 'need-quit setup-attributes) `(catch ',(setup-get 'quit) ,@(macroexp-unprogn body)) body)) (defun setup-wrap-to-demote-errors (body _name) - "Wrap BODY in a `with-demoted-errors' block." - (if (memq 'error-demotion setup-attributes) - `(with-demoted-errors ,(format "Error in setup form on line %d: %%S" + "Wrap BODY in a `with-demoted-errors' block. +This behaviour is prevented, if `setup-attributes' contains the +symbol `without-error-demotion'." + (if (memq 'without-error-demotion setup-attributes) + body +`(with-demoted-errors ,(format "Error in setup form on line %d: %%S" (line-number-at-pos)) - ,body) -body)) + ,body))) (defvar setup-modifier-list '(setup-expand-local-macros setup-wrap-to-catch-quits setup-wrap-to-demote-errors) - "List of wrapper functions to be called after macro expansion.") + "List of wrapper functions to be called after macro expansion. +Each function is invoked by passing the current body and the name +of the default feature, returning the modified body.") (defvar setup-macros nil "Local macro definitions to be bound in `setup' bodies.
[elpa] externals-release/org updated (a3b6728 -> f5b2972)
elpasync pushed a change to branch externals-release/org. from a3b6728 lisp/ob-julia.el: Use lexical-binding new efa498b lisp/ob-julia.el: Backport modifications from Emacs b5e3cc3 new f5b2972 lisp/ox-koma-letter.el: Backport Emacs commit a5b761ec Summary of changes: lisp/ob-julia.el | 43 --- lisp/ox-koma-letter.el | 26 +- 2 files changed, 21 insertions(+), 48 deletions(-)
[elpa] externals-release/org efa498b 1/2: lisp/ob-julia.el: Backport modifications from Emacs b5e3cc3
branch: externals-release/org commit efa498b679653eb68f3a32e18020541ad4d17b04 Author: Bastien Commit: Bastien lisp/ob-julia.el: Backport modifications from Emacs b5e3cc3 * (org-babel-julia-initiate-session): Use `bound-and-true-p`. --- lisp/ob-julia.el | 43 --- 1 file changed, 20 insertions(+), 23 deletions(-) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index ad90f06..b44db4c 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -44,7 +44,7 @@ (raw org html latex code pp wrap) (replace silent append prepend) (output value graphics - "julia-specific header arguments.") + "Julia-specific header arguments.") (add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl")) @@ -58,8 +58,8 @@ :type 'string) (defvar ess-current-process-name) ; dynamically scoped -(defvar ess-local-process-name) ; dynamically scoped -(defvar ess-eval-visibly-p) ; dynamically scoped +(defvar ess-local-process-name) ; dynamically scoped +(defvar ess-eval-visibly-p) ; dynamically scoped (defun org-babel-edit-prep:julia (info) (let ((session (cdr (assq :session (nth 2 info) (when (and session @@ -69,7 +69,7 @@ (defun org-babel-expand-body:julia (body params &optional _graphics-file) "Expand BODY according to PARAMS, return the expanded body." - (mapconcat 'identity + (mapconcat #'identity (append (when (cdr (assq :prologue params)) (list (cdr (assq :prologue params @@ -143,15 +143,15 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-julia-quote-csv-field (s) "Quote field S for export to julia." (if (stringp s) - (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") + (concat "\"" (mapconcat #'identity (split-string s "\"") "\"\"") "\"") (format "%S" s))) (defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) - (let* ((lengths (mapcar 'length (cl-remove-if-not 'sequencep value))) - (max (if lengths (apply 'max lengths) 0)) - (min (if lengths (apply 'min lengths) 0))) + (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value))) + (max (if lengths (apply #'max lengths) 0)) + (min (if lengths (apply #'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). (unless (listp (car value)) (setq value (list value))) (let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field @@ -173,11 +173,15 @@ end" (unless (string= session "none") (let ((session (or session "*Julia*")) (ess-ask-for-ess-directory - (and (boundp 'ess-ask-for-ess-directory) - ess-ask-for-ess-directory - (not (cdr (assq :dir params)) + (and (bound-and-true-p ess-ask-for-ess-directory) +(not (cdr (assq :dir params)) (if (org-babel-comint-buffer-livep session) session + ;; FIXME: Depending on `display-buffer-alist', (julia) may end up +;; popping up a new frame which `save-window-excursion' won't be able +;; to "undo", so we really should call a kind of +;; `julia-no-select' instead so we don't need to undo any +;; window-changes afterwards. (save-window-excursion (when (get-buffer session) ;; Session buffer exists, but with dead process @@ -191,14 +195,6 @@ end" (buffer-name (current-buffer)) -; (defun org-babel-julia-associate-session (session) -; "Associate julia code buffer with a julia session. -; Make SESSION be the inferior ESS process associated with the -; current code buffer." -; (setq ess-local-process-name -; (process-name (get-buffer-process session))) -; (ess-make-buffer-current)) - (defun org-babel-julia-graphical-output-file (params) "Name of file to which julia should send graphical output." (and (member "graphics" (cdr (assq :result-params params))) @@ -304,7 +300,7 @@ last statement in BODY, as elisp." column-names-p))) (output (mapconcat - 'org-babel-chomp + #'org-babel-chomp (butlast (delq nil (mapcar @@ -317,13 +313,14 @@ last statement in BODY, as elisp." (substring line (match-end 1)) line)) (org-babel-comint-with-output (session org-babel-julia-eoe-output) -(insert (mapconcat 'org-babel-chomp +
[elpa] externals/org updated (2cdd930 -> 6c8f8f6)
elpasync pushed a change to branch externals/org. from 2cdd930 Merge branch 'bugfix' new efa498b lisp/ob-julia.el: Backport modifications from Emacs b5e3cc3 new f5b2972 lisp/ox-koma-letter.el: Backport Emacs commit a5b761ec new 6c8f8f6 Merge branch 'bugfix' Summary of changes: lisp/ob-julia.el | 43 --- lisp/ox-koma-letter.el | 26 +- 2 files changed, 21 insertions(+), 48 deletions(-)
[elpa] externals-release/org f5b2972 2/2: lisp/ox-koma-letter.el: Backport Emacs commit a5b761ec
branch: externals-release/org commit f5b297292e20e31a4fbdecbdb834a7a9d0c5e249 Author: Bastien Commit: Bastien lisp/ox-koma-letter.el: Backport Emacs commit a5b761ec * lisp/org/ox-koma-letter.el: Remove redundant `:group` args. --- lisp/ox-koma-letter.el | 26 +- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el index 70e996a..87ed9ed 100644 --- a/lisp/ox-koma-letter.el +++ b/lisp/ox-koma-letter.el @@ -184,7 +184,6 @@ (defcustom org-koma-letter-class-option-file "NF" "Letter Class Option File. This option can also be set with the LCO keyword." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-author 'user-full-name @@ -196,7 +195,6 @@ Alternatively a string, nil or a function may be given. Functions must return a string. This option can also be set with the AUTHOR keyword." - :group 'org-export-koma-letter :type '(radio (function-item user-full-name) (string) (function) @@ -210,7 +208,6 @@ returns `user-mail-address'. Alternatively a string, nil or a function may be given. Functions must return a string. This option can also be set with the EMAIL keyword." - :group 'org-export-koma-letter :type '(radio (function-item org-koma-letter-email) (string) (function) @@ -220,33 +217,28 @@ This option can also be set with the EMAIL keyword." "Sender's address, as a string. This option can also be set with one or more FROM_ADDRESS keywords." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-phone-number "" "Sender's phone number, as a string. This option can also be set with the PHONE_NUMBER keyword." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-url "" "Sender's URL, e. g., the URL of her homepage. This option can also be set with the URL keyword." - :group 'org-export-koma-letter :type 'string :safe #'stringp) (defcustom org-koma-letter-from-logo "" "Commands for inserting the sender's logo, e. g., \\includegraphics{logo}. This option can also be set with the FROM_LOGO keyword." - :group 'org-export-koma-letter :type 'string :safe #'stringp) (defcustom org-koma-letter-place "" "Place from which the letter is sent, as a string. This option can also be set with the PLACE keyword." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-location "" @@ -264,7 +256,6 @@ special heading. The location field is typically printed right of the address field (See Figure 4.9. in the English manual of 2015-10-03)." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-opening "" @@ -278,7 +269,6 @@ when: (3) the letter contains a headline without a special tag (e.g. \"to\" or \"ps\"); then the opening will be implicitly set as the untagged headline title." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-closing "" @@ -292,7 +282,6 @@ when: tag \"closing\"; then the opening will be set as the title of the closing special heading title." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-signature "" @@ -308,14 +297,12 @@ then the signature will be set as the content of the closing special heading. Note if the content is empty the signature will not be set." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-prefer-special-headings nil "Non-nil means prefer headlines over keywords for TO and FROM. This option can also be set with the OPTIONS keyword, e.g.: \"special-headings:t\"." - :group 'org-export-koma-letter :type 'boolean) (defcustom org-koma-letter-subject-format t @@ -353,14 +340,12 @@ This option can also be set with the OPTIONS keyword, e.g.: (const :tag "Subject right-justified" right) (const :tag "Add title or description to subject" underlined) (const :tag "Set subject underlined" titled) - (const :tag "Do not add title or description to subject" untitled))) - :group 'org-export-koma-letter) + (const :tag "Do not add title or description to subject" untitled (defcustom org-koma-letter-use-backaddress nil "Non-nil prints return address in line above to address. This option can also be set with the OPTIONS keyword, e.g.: \"backaddress:t\"." - :group 'org-export-koma-letter :type 'boolean) (defcustom org-koma-letter-use-foldmarks t @@ -393,7 +378,6 @@ following ones: This option can also be set with the OPTIONS keyword, e.g.: \"foldmarks:(b l m t)\"." - :group 'org-export-koma-letter :type '(choice (const :tag "Activate default folding marks" t) (const :tag "Deactivate folding marks" nil) @@ -418,14 +402,12 @@ This option can also be set with the OPTIONS keyword, e.g.: "Non-nil prints sender's phone number.
[elpa] externals/org 6c8f8f6: Merge branch 'bugfix'
branch: externals/org commit 6c8f8f6225332ff601a01df90978df47663767c4 Merge: 2cdd930 f5b2972 Author: Bastien Commit: Bastien Merge branch 'bugfix' --- lisp/ob-julia.el | 43 --- lisp/ox-koma-letter.el | 26 +- 2 files changed, 21 insertions(+), 48 deletions(-) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index ad90f06..b44db4c 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -44,7 +44,7 @@ (raw org html latex code pp wrap) (replace silent append prepend) (output value graphics - "julia-specific header arguments.") + "Julia-specific header arguments.") (add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl")) @@ -58,8 +58,8 @@ :type 'string) (defvar ess-current-process-name) ; dynamically scoped -(defvar ess-local-process-name) ; dynamically scoped -(defvar ess-eval-visibly-p) ; dynamically scoped +(defvar ess-local-process-name) ; dynamically scoped +(defvar ess-eval-visibly-p) ; dynamically scoped (defun org-babel-edit-prep:julia (info) (let ((session (cdr (assq :session (nth 2 info) (when (and session @@ -69,7 +69,7 @@ (defun org-babel-expand-body:julia (body params &optional _graphics-file) "Expand BODY according to PARAMS, return the expanded body." - (mapconcat 'identity + (mapconcat #'identity (append (when (cdr (assq :prologue params)) (list (cdr (assq :prologue params @@ -143,15 +143,15 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-julia-quote-csv-field (s) "Quote field S for export to julia." (if (stringp s) - (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") + (concat "\"" (mapconcat #'identity (split-string s "\"") "\"\"") "\"") (format "%S" s))) (defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) - (let* ((lengths (mapcar 'length (cl-remove-if-not 'sequencep value))) - (max (if lengths (apply 'max lengths) 0)) - (min (if lengths (apply 'min lengths) 0))) + (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value))) + (max (if lengths (apply #'max lengths) 0)) + (min (if lengths (apply #'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). (unless (listp (car value)) (setq value (list value))) (let ((file (orgtbl-to-csv value '(:fmt org-babel-julia-quote-csv-field @@ -173,11 +173,15 @@ end" (unless (string= session "none") (let ((session (or session "*Julia*")) (ess-ask-for-ess-directory - (and (boundp 'ess-ask-for-ess-directory) - ess-ask-for-ess-directory - (not (cdr (assq :dir params)) + (and (bound-and-true-p ess-ask-for-ess-directory) +(not (cdr (assq :dir params)) (if (org-babel-comint-buffer-livep session) session + ;; FIXME: Depending on `display-buffer-alist', (julia) may end up +;; popping up a new frame which `save-window-excursion' won't be able +;; to "undo", so we really should call a kind of +;; `julia-no-select' instead so we don't need to undo any +;; window-changes afterwards. (save-window-excursion (when (get-buffer session) ;; Session buffer exists, but with dead process @@ -191,14 +195,6 @@ end" (buffer-name (current-buffer)) -; (defun org-babel-julia-associate-session (session) -; "Associate julia code buffer with a julia session. -; Make SESSION be the inferior ESS process associated with the -; current code buffer." -; (setq ess-local-process-name -; (process-name (get-buffer-process session))) -; (ess-make-buffer-current)) - (defun org-babel-julia-graphical-output-file (params) "Name of file to which julia should send graphical output." (and (member "graphics" (cdr (assq :result-params params))) @@ -304,7 +300,7 @@ last statement in BODY, as elisp." column-names-p))) (output (mapconcat - 'org-babel-chomp + #'org-babel-chomp (butlast (delq nil (mapcar @@ -317,13 +313,14 @@ last statement in BODY, as elisp." (substring line (match-end 1)) line)) (org-babel-comint-with-output (session org-babel-julia-eoe-output) -(insert (mapconcat 'org-babel-chomp +(insert (mapconcat #'
[elpa] externals/setup ad8bb2e: Bump version to 1.1.0
branch: externals/setup commit ad8bb2e0bbc3a2b9ff6e8b40a65e46dea5c0264a Author: Philip Kaludercic Commit: Philip Kaludercic Bump version to 1.1.0 --- setup.el | 14 +- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/setup.el b/setup.el index 24fb643..8bc7ece 100644 --- a/setup.el +++ b/setup.el @@ -4,7 +4,7 @@ ;; Author: Philip Kaludercic ;; Maintainer: Philip Kaludercic -;; Version: 1.0.1 +;; Version: 1.1.0 ;; Package-Requires: ((emacs "26.1")) ;; Keywords: lisp, local ;; URL: https://git.sr.ht/~pkal/setup @@ -34,6 +34,18 @@ ;; Examples and extended documentation can be found on Emacs wiki: ;; https://www.emacswiki.org/emacs/SetupEl +;;; News + + Version 1.1.0: +;; +;; - Fix quoting error in :file-match definition +;; - Remove unnecessary check for lexical binding +;; - Change `setup-define' indentation +;; - Handle multiple expressions in :when-loaded +;; - Improvements to setup docstring +;; - Wrap `setup' forms with `with-demoted-errors' +;; - Allow `setup' to be extended using `setup-modifier-list' + ;;; Code: (require 'elisp-mode)
[elpa] externals/sketch-mode updated (1ac6863 -> 1fef6b7)
elpasync pushed a change to branch externals/sketch-mode. from 1ac6863 Update README with info about quick insert image new 5142af1 Move coordiantes echo to mode line new 1fef6b7 Fix quick image overlay: add require sgml-mode Summary of changes: sketch-mode.el | 41 +++-- 1 file changed, 23 insertions(+), 18 deletions(-)
[elpa] externals/sketch-mode 1fef6b7 2/2: Fix quick image overlay: add require sgml-mode
branch: externals/sketch-mode commit 1fef6b71fc4909d82da50c12fe4b7df8015a5e5c Author: Daniel Nicolai Commit: Daniel Nicolai Fix quick image overlay: add require sgml-mode --- sketch-mode.el | 1 + 1 file changed, 1 insertion(+) diff --git a/sketch-mode.el b/sketch-mode.el index 578ed1c..b4feef5 100644 --- a/sketch-mode.el +++ b/sketch-mode.el @@ -76,6 +76,7 @@ (require 'svg) (require 'transient) (require 'cl-lib) +(require 'sgml-mode) (defgroup sketch nil "Configure default sketch (object) properties."
[elpa] externals/sketch-mode 5142af1 1/2: Move coordiantes echo to mode line
branch: externals/sketch-mode commit 5142af11ba527c69197e7d48a62770a752b036c8 Author: Daniel Nicolai Commit: Daniel Nicolai Move coordiantes echo to mode line --- sketch-mode.el | 40 ++-- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/sketch-mode.el b/sketch-mode.el index f89cc00..578ed1c 100644 --- a/sketch-mode.el +++ b/sketch-mode.el @@ -254,6 +254,7 @@ VEC should be a cons or a list containing only number elements." (defvar-local sketch-root nil) (defvar-local sketch-layers-list nil) (defvar-local show-layers nil) +(defvar-local sketch-cursor-position nil) (defun sketch--create-canvas (width height &optional grid-parameter) "Create canvas of size WIDTH x HEIGHT for drawing svg. @@ -288,9 +289,10 @@ Optionally set a custom GRID-PARAMETER (default is value of (pointer arrow help-echo (lambda (_ _ pos) (let ((message-log-max nil) (coords (cdr (mouse-pixel-position - (print (format "(%s, %s)" - (- (car coords) sketch-im-x-offset) - (+ (cdr coords) sketch-im-y-offset) + (setq sketch-cursor-position (format "(%s, %s)" + (- (car coords) sketch-im-x-offset) + (+ (cdr coords) sketch-im-y-offset + (force-mode-line-update)) (prin1-to-string sketch-root ;; FIXME: `defvar' can't be meaningfully inside a function like that. @@ -314,6 +316,7 @@ values" (let ((width (if arg (car sketch-default-image-size) (read-number "Enter width: ") )) (height (if arg 600 (read-number "Enter height: " (switch-to-buffer (get-buffer-create "*sketch*")) +(add-to-list 'mode-line-format '(:eval sketch-cursor-position) t) (setq grid-param (if arg 25 (read-number "Enter grid parameter (enter 0 for no grid): "))) (sketch--create-canvas width height grid-param)) (setq call-buffer call-buffer) @@ -677,18 +680,18 @@ else return nil" 'transform (sketch-format-transfrom-value transform - ;; (mapcar (lambda (node) - ;; (pcase (dom-tag node) - ;; ('line (sketch-translate-node-coords node dx 'x1 'x2) - ;;(sketch-translate-node-coords node dy 'y1 'y2)) - ;; ('rect (sketch-translate-node-coords node dx 'x) - ;;(sketch-translate-node-coords node dy 'y)) - ;; ((or 'circle 'ellipse) - ;; (sketch-translate-node-coords node dx 'cx) - ;; (sketch-translate-node-coords node dy 'cy)) - ;; ('text (sketch-translate-node-coords node dx 'x) - ;;(sketch-translate-node-coords node dy 'y - ;; (cddr (nth active-layer sketch-layers-list +;; (mapcar (lambda (node) +;; (pcase (dom-tag node) +;; ('line (sketch-translate-node-coords node dx 'x1 'x2) +;;(sketch-translate-node-coords node dy 'y1 'y2)) +;; ('rect (sketch-translate-node-coords node dx 'x) +;;(sketch-translate-node-coords node dy 'y)) +;; ((or 'circle 'ellipse) +;; (sketch-translate-node-coords node dx 'cx) +;; (sketch-translate-node-coords node dy 'cy)) +;; ('text (sketch-translate-node-coords node dx 'x) +;;(sketch-translate-node-coords node dy 'y +;; (cddr (nth active-layer sketch-layers-list ;; (let ((node (car (dom-by-id svg-sketch label ;; (pcase (car node) ;; ('g (setf (alist-get 'transform (cadr node)) @@ -735,9 +738,10 @@ else return nil" (pointer arrow help-echo (lambda (_ _ pos) (let ((message-log-max nil) (coords (mouse-pixel-position))) - (print (format "(%s, %s)" - (- (cadr coords) pos) - (cddr coords)
[nongnu] elpa/slime 65dce67 1/3: slime-repl.el: stop lisp-mode-map overriding keybindings.
branch: elpa/slime commit 65dce67134e22d844d81bbe78e2ad404f6c3e0a5 Author: Stas Boukarev Commit: Stas Boukarev slime-repl.el: stop lisp-mode-map overriding keybindings. Copy it, otherwise inferior-lisp-mode loaded later overrides C-c C-d bindings (in a weird way, as both bindings just stop working). --- contrib/slime-repl.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/slime-repl.el b/contrib/slime-repl.el index 5db5eb6..461efe1 100644 --- a/contrib/slime-repl.el +++ b/contrib/slime-repl.el @@ -425,7 +425,7 @@ joined together.")) (defvar slime-repl-mode-map (let ((map (make-sparse-keymap))) -(set-keymap-parent map lisp-mode-map) +(set-keymap-parent map (copy-keymap lisp-mode-map)) map)) (slime-define-keys slime-prefix-map
[nongnu] elpa/slime updated (8aa055b -> 514c26f)
elpasync pushed a change to branch elpa/slime. from 8aa055b Add keyword-args to macro "define-minor-mode" to eliminate deprecation new 65dce67 slime-repl.el: stop lisp-mode-map overriding keybindings. new 43d62a3 slime-sbcl-exts: indentation for :generator in define-vop. new 514c26f swank-sbcl-exts: Restore compute-enriched-decoded-arglist for inst. Summary of changes: contrib/slime-repl.el| 2 +- contrib/slime-sbcl-exts.el | 13 + contrib/swank-sbcl-exts.lisp | 22 ++ 3 files changed, 24 insertions(+), 13 deletions(-)
[nongnu] elpa/slime 43d62a3 2/3: slime-sbcl-exts: indentation for :generator in define-vop.
branch: elpa/slime commit 43d62a36ecd2b2ed1349388a9abdacca9b100c05 Author: Stas Boukarev Commit: Stas Boukarev slime-sbcl-exts: indentation for :generator in define-vop. --- contrib/slime-sbcl-exts.el | 13 + 1 file changed, 13 insertions(+) diff --git a/contrib/slime-sbcl-exts.el b/contrib/slime-sbcl-exts.el index ab1c524..4cf7926 100644 --- a/contrib/slime-sbcl-exts.el +++ b/contrib/slime-sbcl-exts.el @@ -31,4 +31,17 @@ symbol at point, or if QUERY is non-nil." (browse-url (format "http://bugs.launchpad.net/sbcl/+bug/%s"; (substring bug 1 +(defun slime-indent-define-vop (path state indent-point sexp-column normal-indent) + (if (save-excursion + (backward-sexp) + (ignore-errors (down-list)) + (looking-at ":generator")) + '4 + (lisp-indent-259 '((&whole 4 &rest 4) + &body) + path state indent-point sexp-column normal-indent))) + +(put 'define-vop 'common-lisp-indent-function + 'slime-indent-define-vop) + (provide 'slime-sbcl-exts)
[nongnu] elpa/slime 514c26f 3/3: swank-sbcl-exts: Restore compute-enriched-decoded-arglist for inst.
branch: elpa/slime commit 514c26f10041532594d3ed9ba3b5d95f76bb85a9 Author: Stas Boukarev Commit: Stas Boukarev swank-sbcl-exts: Restore compute-enriched-decoded-arglist for inst. --- contrib/swank-sbcl-exts.lisp | 22 ++ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/contrib/swank-sbcl-exts.lisp b/contrib/swank-sbcl-exts.lisp index 6cbe09d..dad8330 100644 --- a/contrib/swank-sbcl-exts.lisp +++ b/contrib/swank-sbcl-exts.lisp @@ -24,7 +24,7 @@ ;; The arglist of INST is (instruction ...INSTR-ARGLIST...). (push 'sb-assem::instruction (arglist.required-args decoded-arglist)) (values decoded-arglist - (list instr-name) + (list (string-downcase instr-name)) t (if (null argument-forms) (call-next-method) @@ -35,20 +35,18 @@ (arglist-dummy (string-upcase (arglist-dummy.string-representation instruction))) (symbol - (string-downcase instruction + (string-upcase instruction (instr-fn - #+#.(swank/backend:with-symbol 'op-encoder-name 'sb-assem) - (or (sb-assem::op-encoder-name instr-name) - (sb-assem::op-encoder-name (string-upcase instr-name))) - #+#.(swank/backend:with-symbol 'inst-emitter-symbol 'sb-assem) - (sb-assem::inst-emitter-symbol instr-name) #+(and - (not #.(swank/backend:with-symbol 'inst-emitter-symbol 'sb-assem)) - #.(swank/backend:with-symbol '*assem-instructions* 'sb-assem)) - (gethash instr-name sb-assem:*assem-instructions*))) + #.(swank/backend:with-symbol '*inst-encoder* 'sb-assem) + #.(swank/backend:with-symbol '*backend-instruction-set-package* 'sb-assem)) + (or (gethash (find-symbol instr-name sb-assem::*backend-instruction-set-package*) +sb-assem::*inst-encoder*) + (find-symbol (format nil "M:~A" instr-name) + sb-assem::*backend-instruction-set-package* (cond ((functionp instr-fn) (with-available-arglist (arglist) (arglist instr-fn) - (decode-instruction-arglist instr-name arglist))) + (decode-instruction-arglist instr-name (cdr arglist ((fboundp instr-fn) (with-available-arglist (arglist) (arglist instr-fn) ;; SB-ASSEM:INST invokes a symbolic INSTR-FN with @@ -57,7 +55,7 @@ (if (or (get instr-fn :macro) (macro-function instr-fn)) arglist - (cddr arglist) + (cdr arglist) (t (call-next-method
[nongnu] elpa/slime b6d5b82: slime-sbcl-exts: adjust indentation of :generator in define-vop.
branch: elpa/slime commit b6d5b82a8d1665f905bf7b5b590c9926438049ff Author: Stas Boukarev Commit: Stas Boukarev slime-sbcl-exts: adjust indentation of :generator in define-vop. Take sexp-column into account. --- contrib/slime-sbcl-exts.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/slime-sbcl-exts.el b/contrib/slime-sbcl-exts.el index 4cf7926..ae9edf5 100644 --- a/contrib/slime-sbcl-exts.el +++ b/contrib/slime-sbcl-exts.el @@ -36,7 +36,7 @@ symbol at point, or if QUERY is non-nil." (backward-sexp) (ignore-errors (down-list)) (looking-at ":generator")) - '4 + (+ sexp-column 2) (lisp-indent-259 '((&whole 4 &rest 4) &body) path state indent-point sexp-column normal-indent)))
[elpa] externals/crdt 2eddf96 2/2: Update README.org, move NAT advice to the end.
branch: externals/crdt commit 2eddf967731d6a3fd4c9db62b93c29081e984400 Author: Qiantan Hong Commit: Qiantan Hong Update README.org, move NAT advice to the end. --- README.org | 86 +++--- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/README.org b/README.org index 0576dad..639e4a8 100644 --- a/README.org +++ b/README.org @@ -40,49 +40,6 @@ optional password and your display name (default to your current =(user-full-nam ** Join a session =M-x crdt-connect=, then enter address, port, and your display name. - -** What if we don't have a public IP? - -There're various workaround. - -- You can use [[https://gitlab.com/gjedeer/tuntox][tuntox]] to proxy your connection over the [[https://tox.chat][Tox]] protocol. - =crdt.el= has experimental built-in integration for =tuntox=. - To enable it, you need to install =tuntox=, - set up the custom variable =crdt-tuntox-executable= accordingly (the path to your =tuntox= binary), - and set the custom variable =crdt-use-tuntox=. - Setting it to =t= make =crdt.el= always create =tuntox= proxy for new server sessions, - and setting it to ='confirm= make =crdt.el= ask you every time when creating new sessions. - After starting a session with =tuntox= proxy, - you can =M-x crdt-copy-url= to copy a URL recognizable by =M-x crdt-connect= and share it to your friends. - Be aware that according to my experience, =tuntox= takes significant time to establish a connection (sometimes up to half a minute), - however it gets much faster after the connection is established. - -- You can use Teredo to get a public routable IPv6 address. - One free software implementation is Miredo. Get it from your - favorite package manager or from [[https://www.remlab.net/miredo/][their website]]. - A typical usage is (run as root) - #+BEGIN_SRC -# /usr/local/sbin/miredo -# ifconfig teredo - #+END_SRC - The =ifconfig= command should print the information of your IPv6 address. - Now your traffic go through IPv6, and once you start a =crdt.el= session, - your friends should be able to join using the IPv6 address. - For more information, see the user guide on the Miredo website. - -- You can use SSH port forwarding if you have a VPS with public IP. - Example usage: - #+BEGIN_SRC -$ ssh -R EXAMPLE.COM:6530:127.0.0.1:6530 EXAMPLE.COM - #+END_SRC - This make your =crdt.el= session on local port =6530= accessible from - =EXAMPLE.COM:6530=. - - Note that you need to set the following =/etc/ssh/sshd_config= option on - your VPS - #+BEGIN_SRC -GatewayPorts yes - #+END_SRC ** List active users @@ -132,3 +89,46 @@ Just go ahead and share you comint REPL buffer! Tested: ~shell~ and ~cmuscheme~. By default, when sharing a comint buffer, ~crdt.el~ temporarily reset input history (as in =M-n= =M-p=) so others don't spy into your =.bash_history= and alike. You can customize this behavior using variable =crdt-comint-share-input-history=. + +** What if we don't have a public IP? + +There're various workaround. + +- You can use [[https://gitlab.com/gjedeer/tuntox][tuntox]] to proxy your connection over the [[https://tox.chat][Tox]] protocol. + =crdt.el= has experimental built-in integration for =tuntox=. + To enable it, you need to install =tuntox=, + set up the custom variable =crdt-tuntox-executable= accordingly (the path to your =tuntox= binary), + and set the custom variable =crdt-use-tuntox=. + Setting it to =t= make =crdt.el= always create =tuntox= proxy for new server sessions, + and setting it to ='confirm= make =crdt.el= ask you every time when creating new sessions. + After starting a session with =tuntox= proxy, + you can =M-x crdt-copy-url= to copy a URL recognizable by =M-x crdt-connect= and share it to your friends. + Be aware that according to my experience, =tuntox= takes significant time to establish a connection (sometimes up to half a minute), + however it gets much faster after the connection is established. + +- You can use Teredo to get a public routable IPv6 address. + One free software implementation is Miredo. Get it from your + favorite package manager or from [[https://www.remlab.net/miredo/][their website]]. + A typical usage is (run as root) + #+BEGIN_SRC +# /usr/local/sbin/miredo +# ifconfig teredo + #+END_SRC + The =ifconfig= command should print the information of your IPv6 address. + Now your traffic go through IPv6, and once you start a =crdt.el= session, + your friends should be able to join using the IPv6 address. + For more information, see the user guide on the Miredo website. + +- You can use SSH port forwarding if you have a VPS with public IP. + Example usage: + #+BEGIN_SRC +$ ssh -R EXAMPLE.COM:6530:127.0.0.1:6530 EXAMPLE.COM + #+END_SRC + This make your =crdt.el= session on local port =6530= accessible from + =EXAMPLE.COM:6530=. + + Note that you need to set the following =/etc/ssh/sshd_config= option on
[elpa] externals/crdt updated (3bd1a57 -> 2eddf96)
elpasync pushed a change to branch externals/crdt. from 3bd1a57 Squashed commit of the following: new 2f1ebd7 Update README.org, ask ppl to use same version. new 2eddf96 Update README.org, move NAT advice to the end. Summary of changes: README.org | 93 +- 1 file changed, 50 insertions(+), 43 deletions(-)
[elpa] externals-release/org 15b09c1 1/6: Backport commit a5b761ec3 from Emacs
branch: externals-release/org commit 15b09c16802446fd1771ead0a1162cabe7147681 Author: Stefan Monnier Commit: Kyle Meyer Backport commit a5b761ec3 from Emacs * lisp/org/ox-koma-letter.el: Use lexical-binding a5b761ec334cded8252e81c3887142a46752ec6a Stefan Monnier Thu Sep 30 09:58:04 2021 -0400 [ km: This was independently applied covered on the bugfix branch with the combination of 85e5540eb and f5b297292, but I'm applying it here too for bookkeeping/traceability purposes. ] --- lisp/ox-koma-letter.el | 28 ++-- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/lisp/ox-koma-letter.el b/lisp/ox-koma-letter.el index 3bd2f68..96704db 100644 --- a/lisp/ox-koma-letter.el +++ b/lisp/ox-koma-letter.el @@ -1,4 +1,4 @@ -;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine +;;; ox-koma-letter.el --- KOMA Scrlttr2 Back-End for Org Export Engine -*- lexical-binding: t; -*- ;; Copyright (C) 2007-2021 Free Software Foundation, Inc. @@ -184,7 +184,6 @@ (defcustom org-koma-letter-class-option-file "NF" "Letter Class Option File. This option can also be set with the LCO keyword." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-author 'user-full-name @@ -196,7 +195,6 @@ Alternatively a string, nil or a function may be given. Functions must return a string. This option can also be set with the AUTHOR keyword." - :group 'org-export-koma-letter :type '(radio (function-item user-full-name) (string) (function) @@ -210,7 +208,6 @@ returns `user-mail-address'. Alternatively a string, nil or a function may be given. Functions must return a string. This option can also be set with the EMAIL keyword." - :group 'org-export-koma-letter :type '(radio (function-item org-koma-letter-email) (string) (function) @@ -220,33 +217,28 @@ This option can also be set with the EMAIL keyword." "Sender's address, as a string. This option can also be set with one or more FROM_ADDRESS keywords." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-phone-number "" "Sender's phone number, as a string. This option can also be set with the PHONE_NUMBER keyword." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-url "" "Sender's URL, e. g., the URL of her homepage. This option can also be set with the URL keyword." - :group 'org-export-koma-letter :type 'string :safe #'stringp) (defcustom org-koma-letter-from-logo "" "Commands for inserting the sender's logo, e. g., \\includegraphics{logo}. This option can also be set with the FROM_LOGO keyword." - :group 'org-export-koma-letter :type 'string :safe #'stringp) (defcustom org-koma-letter-place "" "Place from which the letter is sent, as a string. This option can also be set with the PLACE keyword." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-location "" @@ -264,7 +256,6 @@ special heading. The location field is typically printed right of the address field (See Figure 4.9. in the English manual of 2015-10-03)." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-opening "" @@ -278,7 +269,6 @@ when: (3) the letter contains a headline without a special tag (e.g. \"to\" or \"ps\"); then the opening will be implicitly set as the untagged headline title." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-closing "" @@ -292,7 +282,6 @@ when: tag \"closing\"; then the opening will be set as the title of the closing special heading title." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-signature "" @@ -308,14 +297,12 @@ then the signature will be set as the content of the closing special heading. Note if the content is empty the signature will not be set." - :group 'org-export-koma-letter :type 'string) (defcustom org-koma-letter-prefer-special-headings nil "Non-nil means prefer headlines over keywords for TO and FROM. This option can also be set with the OPTIONS keyword, e.g.: \"special-headings:t\"." - :group 'org-export-koma-letter :type 'boolean) (defcustom org-koma-letter-subject-format t @@ -353,14 +340,12 @@ This option can also be set with the OPTIONS keyword, e.g.: (const :tag "Subject right-justified" right) (const :tag "Add title or description to subject" underlined) (const :tag "Set subject underlined" titled) - (const :tag "Do not add title or description to subject" untitled))) - :group 'org-export-koma-letter) + (const :tag "Do not add title or description to subject" untitled (defcustom org-koma-letter-use-backaddress nil "Non-nil prints return address in line above to address. This option can also be set with the OPTIONS keyword,
[elpa] externals-release/org 7325cf1 2/6: Backport commit b5e3cc3bc from Emacs
branch: externals-release/org commit 7325cf186a5b482db57ef7845c7ad0d4a5462333 Author: Stefan Monnier Commit: Kyle Meyer Backport commit b5e3cc3bc from Emacs * lisp/ob-julia.el: Use lexical-binding. (ess-eval-visibly-p): Declare. (org-babel-julia-assign-elisp): Remove unused vars `header` and `row-names` and corespondingly remove now unused args `colnames-p` and `rownames-p`. (org-babel-variable-assignments:julia): Adjust call to `org-babel-julia-assign-elisp` accordingly. (org-babel-julia-initiate-session): Use `bound-and-true-p`. (org-babel-julia-evaluate-external-process) (org-babel-julia-evaluate-session, org-babel-julia-evaluate): Remove unused arg `row-names-p`. (org-babel-execute:julia): Adjust call to `org-babel-julia-evaluate` accordingly. * lisp/org/ob-julia.el: Use lexical-binding b5e3cc3bc597d56dfe09ee500717344649ea0354 Stefan Monnier Thu Sep 30 10:02:29 2021 -0400 [ km: This was independently applied covered on the bugfix branch with the combination of a3b6728f9 and efa498b67. I'm applying it here too for bookkeeping/traceability purposes, and to bring in one missing piece (see merge). ] --- lisp/ob-julia.el | 67 1 file changed, 38 insertions(+), 29 deletions(-) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index 2f051a5..5ff6a7c 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -1,4 +1,4 @@ -;;; ob-julia.el --- org-babel functions for julia code evaluation +;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison @@ -44,7 +44,7 @@ (raw org html latex code pp wrap) (replace silent append prepend) (output value graphics - "julia-specific header arguments.") + "Julia-specific header arguments.") (add-to-list 'org-babel-tangle-lang-exts '("julia" . "jl")) @@ -58,7 +58,8 @@ :type 'string) (defvar ess-current-process-name) ; dynamically scoped -(defvar ess-local-process-name) ; dynamically scoped +(defvar ess-local-process-name) ; dynamically scoped +(defvar ess-eval-visibly-p) ; dynamically scoped (defun org-babel-edit-prep:julia (info) (let ((session (cdr (assq :session (nth 2 info) (when (and session @@ -68,7 +69,7 @@ (defun org-babel-expand-body:julia (body params &optional _graphics-file) "Expand BODY according to PARAMS, return the expanded body." - (mapconcat 'identity + (mapconcat #'identity (append (when (cdr (assq :prologue params)) (list (cdr (assq :prologue params @@ -89,7 +90,7 @@ This function is called by `org-babel-execute-src-block'." (graphics-file (and (member "graphics" (assq :result-params params)) (org-babel-graphical-output-file params))) (colnames-p (unless graphics-file (cdr (assq :colnames params - (rownames-p (unless graphics-file (cdr (assq :rownames params + ;; (rownames-p (unless graphics-file (cdr (assq :rownames params (full-body (org-babel-expand-body:julia body params graphics-file)) (result (org-babel-julia-evaluate @@ -97,9 +98,10 @@ This function is called by `org-babel-execute-src-block'." (or (equal "yes" colnames-p) (org-babel-pick-name (cdr (assq :colname-names params)) colnames-p)) -(or (equal "yes" rownames-p) -(org-babel-pick-name - (cdr (assq :rowname-names params)) rownames-p) +;; (or (equal "yes" rownames-p) +;; (org-babel-pick-name +;; (cdr (assq :rowname-names params)) rownames-p)) +))) (if graphics-file nil result (defun org-babel-normalize-newline (result) @@ -136,8 +138,9 @@ This function is called by `org-babel-execute-src-block'." (lambda (pair) (org-babel-julia-assign-elisp (car pair) (cdr pair) - (equal "yes" (cdr (assq :colnames params))) - (equal "yes" (cdr (assq :rownames params) + ;; (equal "yes" (cdr (assq :colnames params))) + ;; (equal "yes" (cdr (assq :rownames params))) + )) (mapcar (lambda (i) (cons (car (nth i vars)) @@ -150,21 +153,22 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-julia-quote-csv-field (s) "Quote field S for export to julia." (if (stringp s) - (concat "\"" (mapconcat 'identity (split-string s "\"") "\"\"") "\"") + (concat "\"" (mapconcat #'identity (split-string s "\"") "\"\"") "\"") (format "%S" s))) -(defun org-babel-julia-assign-elisp (name value colnames-p rownames-p) +(defun or
[elpa] externals-release/org c763b9a 3/6: Backport commit 58102466e from Emacs
branch: externals-release/org commit c763b9ae61d46a8395a578cfc2246b9985ab5424 Author: Mattias Engdegård Commit: Kyle Meyer Backport commit 58102466e from Emacs * lisp/org-element.el (org-element-headline-parser): Pretty sure this one should be `skip-chars-backward`, not `skip-syntax-backward`, since \t isn't a valid syntax code. org-element: use correct function 58102466e32d4dd9c7d816cdc3f4595a2145f332 Mattias Engdegård Thu Sep 30 17:16:25 2021 +0200 --- lisp/org-element.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index 1c971b2..ed684df 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -1024,7 +1024,7 @@ Assume point is at beginning of the headline." (title-start (prog1 (point) (unless (or todo priority commentedp) ;; Headline like "* :tag:" -(skip-syntax-backward " \t" +(skip-chars-backward " \t" (tags (when (re-search-forward "[ \t]+\\(:[[:alnum:]_@#%:]+:\\)[ \t]*$" (line-end-position)
[elpa] externals-release/org 1c1614e 5/6: Merge branch 'km/from-emacs-28' into bugfix
branch: externals-release/org commit 1c1614e9b7a0785d455ca03692b389a554c9d18e Merge: f5b2972 7de3d3c Author: Kyle Meyer Commit: Kyle Meyer Merge branch 'km/from-emacs-28' into bugfix --- lisp/ob-java.el| 44 +++- lisp/ob-julia.el | 4 ++-- lisp/org-element.el| 4 ++-- lisp/ox-koma-letter.el | 2 +- lisp/ox-org.el | 2 +- 5 files changed, 29 insertions(+), 27 deletions(-) diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 60ef33b..dd35387 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -96,27 +96,29 @@ like javac -verbose." (group (1+ (in alnum ?_))) ; capture the class name (0+ space) ?{) "Regexp for the class declaration.") -(defconst org-babel-java--main-re (rx line-start (0+ space) "public" - (1+ space) "static" - (1+ space) "void" - (1+ space) "main" - (0+ space) ?\( - (0+ space) "String" - (0+ space) (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--main-re + (rx line-start (0+ space) "public" + (1+ space) "static" + (1+ space) "void" + (1+ space) "main" + (0+ space) ?\( + (0+ space) "String" + (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for the main method declaration.") -(defconst org-babel-java--any-method-re (rx line-start - (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility - (opt (seq "static" (1+ space))) ; binding - (1+ (in alnum ?_ ?\[ ?\])) ; return type -(1+ space) (1+ (in alnum ?_)) ; method name - (0+ space) ?\( - (0+ space) (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--any-method-re + (rx line-start + (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility + (opt (seq "static" (1+ space))); binding + (1+ (in alnum ?_ ?\[ ?\])) ; return type + (1+ space) (1+ (in alnum ?_)) ; method name + (0+ space) ?\( + (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for any method.") (defconst org-babel-java--result-wrapper "\npublic static String __toString(Object val) { if (val instanceof String) { @@ -192,7 +194,7 @@ replaced in this string.") ;; the dir to write the source file (packagedir (if (and (not run-from-temp) packagename) (file-name-as-directory - (concat basedir (replace-regexp-in-string "\\\." "/" packagename))) + (concat basedir (replace-regexp-in-string "\\." "/" packagename))) basedir)) ;; the filename of the source file (src-file (concat packagedir classname ".java")) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index b44db4c..2e70ed3 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -1,4 +1,4 @@ -;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- +;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison @@ -149,7 +149,7 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) - (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value))) + (let* ((lengths (mapcar #'length (cl-remove-if-not #'sequencep value))) (max (if lengths (apply #'max lengths) 0)) (min (if lengths (apply #'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). diff --git a/lisp/org-element.el b/lisp/org-element.el index 1c971b2..f8334cc 10
[elpa] externals/crdt 2f1ebd7 1/2: Update README.org, ask ppl to use same version.
branch: externals/crdt commit 2f1ebd733cf1f759d345abb36da4aa1de1638044 Author: Qiantan Hong Commit: Qiantan Hong Update README.org, ask ppl to use same version. --- README.org | 7 +++ 1 file changed, 7 insertions(+) diff --git a/README.org b/README.org index 0a3d681..0576dad 100644 --- a/README.org +++ b/README.org @@ -16,6 +16,13 @@ Highlights: ~crdt.el~ is now on GNU ELPA! Just =M-x package-install crdt=. +*Caution!!!* Please make sure that you and your peers are on the same ~crdt.el~ version! +It turns out to be one of the most common causes of ~crdt.el~ not working. +Because currently the network protocol is not stablized, behavior when using mismatched versions is unexpectable. +- Strictly speaking, it should works when =crdt-protocol-version= are defined and the same on all peers. + But why not save some hassle and keep everyone on the latest version. +- To upgrade, just =M-x package-reinstall crdt=, then preferably restart Emacs. + ** Start a shared session A shared session is a place that can contains multiple buffers (or files),
[elpa] externals-release/org 8bc222b 6/6: org-src: Silence byte-compiler under 'make single'
branch: externals-release/org commit 8bc222bce6f8daa9758e27e04f6c5027a949843b Author: Kyle Meyer Commit: Kyle Meyer org-src: Silence byte-compiler under 'make single' This warning shows up when compiling in the Emacs repo, too. --- lisp/org-src.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-src.el b/lisp/org-src.el index 0e16e23..8d02cf4 100644 --- a/lisp/org-src.el +++ b/lisp/org-src.el @@ -38,6 +38,7 @@ (require 'org-keys) (declare-function org-mode "org" ()) +(declare-function org--get-expected-indentation "org" (element contentsp)) (declare-function org-element-at-point "org-element" ()) (declare-function org-element-class "org-element" (datum &optional parent)) (declare-function org-element-context "org-element" (&optional element))
[elpa] externals-release/org updated (f5b2972 -> 8bc222b)
elpasync pushed a change to branch externals-release/org. from f5b2972 lisp/ox-koma-letter.el: Backport Emacs commit a5b761ec new 15b09c1 Backport commit a5b761ec3 from Emacs new 7325cf1 Backport commit b5e3cc3bc from Emacs new c763b9a Backport commit 58102466e from Emacs new 7de3d3c Backport commit 2075411ed from Emacs new 1c1614e Merge branch 'km/from-emacs-28' into bugfix new 8bc222b org-src: Silence byte-compiler under 'make single' Summary of changes: lisp/ob-java.el| 44 +++- lisp/ob-julia.el | 4 ++-- lisp/org-element.el| 4 ++-- lisp/org-src.el| 1 + lisp/ox-koma-letter.el | 2 +- lisp/ox-org.el | 2 +- 6 files changed, 30 insertions(+), 27 deletions(-)
[elpa] externals-release/org 7de3d3c 4/6: Backport commit 2075411ed from Emacs
branch: externals-release/org commit 7de3d3cb3274f29e53bdeb9e6d0b2640614cf79a Author: Mattias Engdegård Commit: Kyle Meyer Backport commit 2075411ed from Emacs * lisp/org-element.el (org-element-citation-key-re): * lisp/ox-org.el (org-org-identity): Remove repeated chars in alternatives. * lisp/ob-java.el (org-babel-execute:java): Remove superfluous backslash. * lisp/ob-java.el (org-babel-java--main-re) (org-babel-java--any-method-re): Remove (0+ space) expressions subsumed by adjacent expressions. Fix regexp snags in org 2075411edbad954c0fdf2aa141757d834a6708b7 Mattias Engdegård Thu Sep 30 17:16:41 2021 +0200 --- lisp/ob-java.el | 44 +++- lisp/org-element.el | 2 +- lisp/ox-org.el | 2 +- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 60ef33b..dd35387 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -96,27 +96,29 @@ like javac -verbose." (group (1+ (in alnum ?_))) ; capture the class name (0+ space) ?{) "Regexp for the class declaration.") -(defconst org-babel-java--main-re (rx line-start (0+ space) "public" - (1+ space) "static" - (1+ space) "void" - (1+ space) "main" - (0+ space) ?\( - (0+ space) "String" - (0+ space) (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--main-re + (rx line-start (0+ space) "public" + (1+ space) "static" + (1+ space) "void" + (1+ space) "main" + (0+ space) ?\( + (0+ space) "String" + (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for the main method declaration.") -(defconst org-babel-java--any-method-re (rx line-start - (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility - (opt (seq "static" (1+ space))) ; binding - (1+ (in alnum ?_ ?\[ ?\])) ; return type -(1+ space) (1+ (in alnum ?_)) ; method name - (0+ space) ?\( - (0+ space) (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--any-method-re + (rx line-start + (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility + (opt (seq "static" (1+ space))); binding + (1+ (in alnum ?_ ?\[ ?\])) ; return type + (1+ space) (1+ (in alnum ?_)) ; method name + (0+ space) ?\( + (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for any method.") (defconst org-babel-java--result-wrapper "\npublic static String __toString(Object val) { if (val instanceof String) { @@ -192,7 +194,7 @@ replaced in this string.") ;; the dir to write the source file (packagedir (if (and (not run-from-temp) packagename) (file-name-as-directory - (concat basedir (replace-regexp-in-string "\\\." "/" packagename))) + (concat basedir (replace-regexp-in-string "\\." "/" packagename))) basedir)) ;; the filename of the source file (src-file (concat packagedir classname ".java")) diff --git a/lisp/org-element.el b/lisp/org-element.el index ed684df..f8334cc 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -118,7 +118,7 @@ ;; to current setup. (defconst org-element-citation-key-re - (rx "@" (group (one-or-more (any word "-.:?!`'/*@+|(){}<>&_^$#%&~" + (rx "@" (group (one-or-more (any word "-.:?!`'/*@+|(){}<>&_^$#%~" "Regexp matching a citation key. Key is located in match group 1.") diff --git a/lisp/ox-org.el b/lisp/ox-org.el index 11d9c09..fcf8768 100644 --- a/lisp/ox-org.el +++ b/lisp/ox-org.el @@ -141,7 +141,7 @@ CONTENTS and INFO are ignored." CONTENTS is its contents, as a string or nil. INFO is ignored." (let ((case-fold-search t))
[elpa] externals/org updated (6c8f8f6 -> d97223b)
elpasync pushed a change to branch externals/org. from 6c8f8f6 Merge branch 'bugfix' new 15b09c1 Backport commit a5b761ec3 from Emacs new 7325cf1 Backport commit b5e3cc3bc from Emacs new c763b9a Backport commit 58102466e from Emacs new 7de3d3c Backport commit 2075411ed from Emacs new 1c1614e Merge branch 'km/from-emacs-28' into bugfix new 8bc222b org-src: Silence byte-compiler under 'make single' new d97223b Merge branch 'bugfix' Summary of changes: lisp/ob-java.el| 44 +++- lisp/ob-julia.el | 4 ++-- lisp/org-element.el| 4 ++-- lisp/org-src.el| 1 + lisp/ox-koma-letter.el | 2 +- lisp/ox-org.el | 2 +- 6 files changed, 30 insertions(+), 27 deletions(-)
[elpa] externals/org d97223b: Merge branch 'bugfix'
branch: externals/org commit d97223b24403bea65637714d12171a681b44cbad Merge: 6c8f8f6 8bc222b Author: Kyle Meyer Commit: Kyle Meyer Merge branch 'bugfix' --- lisp/ob-java.el| 44 +++- lisp/ob-julia.el | 4 ++-- lisp/org-element.el| 4 ++-- lisp/org-src.el| 1 + lisp/ox-koma-letter.el | 2 +- lisp/ox-org.el | 2 +- 6 files changed, 30 insertions(+), 27 deletions(-) diff --git a/lisp/ob-java.el b/lisp/ob-java.el index 60ef33b..dd35387 100644 --- a/lisp/ob-java.el +++ b/lisp/ob-java.el @@ -96,27 +96,29 @@ like javac -verbose." (group (1+ (in alnum ?_))) ; capture the class name (0+ space) ?{) "Regexp for the class declaration.") -(defconst org-babel-java--main-re (rx line-start (0+ space) "public" - (1+ space) "static" - (1+ space) "void" - (1+ space) "main" - (0+ space) ?\( - (0+ space) "String" - (0+ space) (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--main-re + (rx line-start (0+ space) "public" + (1+ space) "static" + (1+ space) "void" + (1+ space) "main" + (0+ space) ?\( + (0+ space) "String" + (1+ (in alnum ?_ ?\[ ?\] space)) ; "[] args" or "args[]" + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for the main method declaration.") -(defconst org-babel-java--any-method-re (rx line-start - (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility - (opt (seq "static" (1+ space))) ; binding - (1+ (in alnum ?_ ?\[ ?\])) ; return type -(1+ space) (1+ (in alnum ?_)) ; method name - (0+ space) ?\( - (0+ space) (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params - (0+ space) ?\) - (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) - ?{) +(defconst org-babel-java--any-method-re + (rx line-start + (0+ space) (opt (seq (1+ alnum) (1+ space))) ; visibility + (opt (seq "static" (1+ space))); binding + (1+ (in alnum ?_ ?\[ ?\])) ; return type + (1+ space) (1+ (in alnum ?_)) ; method name + (0+ space) ?\( + (0+ (in alnum ?_ ?\[ ?\] ?, space)) ; params + ?\) + (0+ space) (opt "throws" (1+ (in alnum ?_ ?, ?. space))) + ?{) "Regexp for any method.") (defconst org-babel-java--result-wrapper "\npublic static String __toString(Object val) { if (val instanceof String) { @@ -192,7 +194,7 @@ replaced in this string.") ;; the dir to write the source file (packagedir (if (and (not run-from-temp) packagename) (file-name-as-directory - (concat basedir (replace-regexp-in-string "\\\." "/" packagename))) + (concat basedir (replace-regexp-in-string "\\." "/" packagename))) basedir)) ;; the filename of the source file (src-file (concat packagedir classname ".java")) diff --git a/lisp/ob-julia.el b/lisp/ob-julia.el index b44db4c..2e70ed3 100644 --- a/lisp/ob-julia.el +++ b/lisp/ob-julia.el @@ -1,4 +1,4 @@ -;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- +;;; ob-julia.el --- org-babel functions for julia code evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2013-2021 Free Software Foundation, Inc. ;; Authors: G. Jay Kerns, based on ob-R.el by Eric Schulte and Dan Davison @@ -149,7 +149,7 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-julia-assign-elisp (name value) "Construct julia code assigning the elisp VALUE to a variable named NAME." (if (listp value) - (let* ((lengths (mapcar #'length (cl-remove-if-not 'sequencep value))) + (let* ((lengths (mapcar #'length (cl-remove-if-not #'sequencep value))) (max (if lengths (apply #'max lengths) 0)) (min (if lengths (apply #'min lengths) 0))) ;; Ensure VALUE has an orgtbl structure (depth of at least 2). diff --git a/lisp/org-element.el b/lisp/org-element.el index 1c971b2..f8334cc 1
[elpa] externals-release/org d19660b: ob-gnuplot: Honour :missing argument
branch: externals-release/org commit d19660b05b0bda66e8ae5ec64e25a3e06c77eafa Author: Ihor Radchenko Commit: Ihor Radchenko ob-gnuplot: Honour :missing argument * lisp/ob-gnuplot.el (org-babel-gnuplot-table-to-data): Force applying `org-babel-gnuplot-quote-tsv-field' to empty table cells when converting org tables to gnuplot input. By default, `orgtbl-to-generic' ignores :fmt for empty table cells. We need to set :raw to non-nil AND :backend to non-nil to force custom formatting of empty table cells. Fixes https://orgmode.org/list/20210617211347.59e4d...@happy.intern.roklein.de --- lisp/ob-gnuplot.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index 3c84e4d..8c4a595 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -290,7 +290,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE." (orgtbl-to-generic table (org-combine-plists - '(:sep "\t" :fmt org-babel-gnuplot-quote-tsv-field) + '(:sep "\t" :fmt org-babel-gnuplot-quote-tsv-field :raw t :backend ascii) params) data-file)
[elpa] externals/org ddee7b6: ob-gnuplot: Honour :missing argument
branch: externals/org commit ddee7b617cf118750108b4912e61f60185506483 Author: Ihor Radchenko Commit: Ihor Radchenko ob-gnuplot: Honour :missing argument * lisp/ob-gnuplot.el (org-babel-gnuplot-table-to-data): Force applying `org-babel-gnuplot-quote-tsv-field' to empty table cells when converting org tables to gnuplot input. By default, `orgtbl-to-generic' ignores :fmt for empty table cells. We need to set :raw to non-nil AND :backend to non-nil to force custom formatting of empty table cells. Fixes https://orgmode.org/list/20210617211347.59e4d...@happy.intern.roklein.de --- lisp/ob-gnuplot.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-gnuplot.el b/lisp/ob-gnuplot.el index 3c84e4d..8c4a595 100644 --- a/lisp/ob-gnuplot.el +++ b/lisp/ob-gnuplot.el @@ -290,7 +290,7 @@ Pass PARAMS through to `orgtbl-to-generic' when exporting TABLE." (orgtbl-to-generic table (org-combine-plists - '(:sep "\t" :fmt org-babel-gnuplot-quote-tsv-field) + '(:sep "\t" :fmt org-babel-gnuplot-quote-tsv-field :raw t :backend ascii) params) data-file)
[elpa] externals/svg-lib da9f6e9: Added install instructions (ELPA)
branch: externals/svg-lib commit da9f6e9d473b41c99626bec33c0744aa380db7f5 Author: Nicolas P. Rougier Commit: Nicolas P. Rougier Added install instructions (ELPA) --- README.org | 6 ++ 1 file changed, 6 insertions(+) diff --git a/README.org b/README.org index 40deeb5..1ff0eb0 100644 --- a/README.org +++ b/README.org @@ -6,6 +6,12 @@ namely tags, progress bars, progress pies and icons. Each object is guaranteed to fit nicely in a text buffer ensuring width is an integer multiple of charater width. +*** Installation + +#+begin_src elisp +M-x package-install RET svg-lib RET +#+end_src + *** Usage example [[file:screenshot.png]]
[elpa] externals/debbugs 59e6b04: emacs-28 is now the release branch
branch: externals/debbugs commit 59e6b0463caf18f54db33281f9ac5d8039790d23 Author: Lars Ingebrigtsen Commit: Lars Ingebrigtsen emacs-28 is now the release branch * debbugs-gnu.el (debbugs-gnu-branch-directory): Bump version. --- debbugs-gnu.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debbugs-gnu.el b/debbugs-gnu.el index 3bd95a8..770a832 100644 --- a/debbugs-gnu.el +++ b/debbugs-gnu.el @@ -2468,10 +2468,10 @@ or bug ranges, with default to `debbugs-gnu-default-bug-number-list'." :type 'directory :version "25.2") -(defcustom debbugs-gnu-branch-directory "~/src/emacs/emacs-27/" +(defcustom debbugs-gnu-branch-directory "~/src/emacs/emacs-28/" "The directory where the previous source tree lives." :type 'directory - :version "28.1") + :version "29.1") (defvar debbugs-gnu-current-directory nil "The current source tree directory.")