[elpa] externals/consult d4e71c7: Command splitting bug (Fix #420)
branch: externals/consult commit d4e71c7cd2900bfdac76443435457d187c52d082 Author: Daniel Mendler Commit: Daniel Mendler Command splitting bug (Fix #420) --- consult.el | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/consult.el b/consult.el index cba01ae..670e8a0 100644 --- a/consult.el +++ b/consult.el @@ -4178,7 +4178,7 @@ INITIAL is inital input." (pcase-let* ((cmd (split-string-and-unquote consult-grep-args)) (type (consult--grep-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg type))) + (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg type (when re (list :command (append cmd @@ -4214,7 +4214,7 @@ Otherwise the `default-directory' is searched." (defun consult--git-grep-builder (input) "Build command line given CONFIG and INPUT." (pcase-let* ((`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended))) + (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg 'extended (when re (list :command (append (split-string-and-unquote consult-git-grep-args) @@ -4244,7 +4244,7 @@ See `consult-grep' for more details." (pcase-let* ((cmd (split-string-and-unquote consult-ripgrep-args)) (type (consult--ripgrep-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg type))) + (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg type (when re (list :command (append cmd @@ -4301,7 +4301,7 @@ INITIAL is inital input." (pcase-let* ((cmd (split-string-and-unquote consult-find-args)) (type (consult--find-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg type))) + (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg type (when re (list :command (append cmd @@ -4333,7 +4333,7 @@ See `consult-grep' for more details regarding the asynchronous search." (defun consult--locate-builder (input) "Build command line given INPUT." (pcase-let* ((`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (funcall consult--regexp-compiler arg 'basic))) + (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg 'basic (when re (list :command (append (split-string-and-unquote consult-locate-args) @@ -4355,10 +4355,10 @@ See `consult-grep' for more details regarding the asynchronous search." (defun consult--man-builder (input) "Build command line given CONFIG and INPUT." (pcase-let ((`(,arg . ,opts) (consult--command-split input))) -(unless (string-blank-p arg) - (list :command (append (split-string-and-unquote consult-man-args) - (list arg) opts) -:highlight (cdr (consult--default-regexp-compiler input 'basic)) +(and arg (not (string-blank-p arg)) + (list :command (append (split-string-and-unquote consult-man-args) +(list arg) opts) + :highlight (cdr (consult--default-regexp-compiler input 'basic)) (defun consult--man-format (lines) "Format man candidates from LINES."
[elpa] externals/consult a07ca38: Simpler fix for #420
branch: externals/consult commit a07ca383318cdce6935a370f1d17687ba9f225c3 Author: Daniel Mendler Commit: Daniel Mendler Simpler fix for #420 --- consult.el | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/consult.el b/consult.el index 670e8a0..755ac74 100644 --- a/consult.el +++ b/consult.el @@ -537,9 +537,8 @@ ARGS is a list of commands or sources followed by the list of keyword-value pair (let ((opts (when (string-match " +--\\( +\\|\\'\\)" str) (prog1 (substring str (match-end 0)) (setq str (substring str 0 (match-beginning 0))) - (unless (string-blank-p str) -;; split-string-and-unquote fails if the quotes are invalid. Ignore it. -(cons str (and opts (ignore-errors (split-string-and-unquote opts + ;; split-string-and-unquote fails if the quotes are invalid. Ignore it. + (cons str (and opts (ignore-errors (split-string-and-unquote opts))) (defun consult--highlight-regexps (regexps str) "Highlight REGEXPS in STR. @@ -4178,7 +4177,7 @@ INITIAL is inital input." (pcase-let* ((cmd (split-string-and-unquote consult-grep-args)) (type (consult--grep-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg type + (`(,re . ,hl) (funcall consult--regexp-compiler arg type))) (when re (list :command (append cmd @@ -4214,7 +4213,7 @@ Otherwise the `default-directory' is searched." (defun consult--git-grep-builder (input) "Build command line given CONFIG and INPUT." (pcase-let* ((`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg 'extended + (`(,re . ,hl) (funcall consult--regexp-compiler arg 'extended))) (when re (list :command (append (split-string-and-unquote consult-git-grep-args) @@ -4244,7 +4243,7 @@ See `consult-grep' for more details." (pcase-let* ((cmd (split-string-and-unquote consult-ripgrep-args)) (type (consult--ripgrep-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg type + (`(,re . ,hl) (funcall consult--regexp-compiler arg type))) (when re (list :command (append cmd @@ -4301,7 +4300,7 @@ INITIAL is inital input." (pcase-let* ((cmd (split-string-and-unquote consult-find-args)) (type (consult--find-regexp-type (car cmd))) (`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg type + (`(,re . ,hl) (funcall consult--regexp-compiler arg type))) (when re (list :command (append cmd @@ -4333,7 +4332,7 @@ See `consult-grep' for more details regarding the asynchronous search." (defun consult--locate-builder (input) "Build command line given INPUT." (pcase-let* ((`(,arg . ,opts) (consult--command-split input)) - (`(,re . ,hl) (and arg (funcall consult--regexp-compiler arg 'basic + (`(,re . ,hl) (funcall consult--regexp-compiler arg 'basic))) (when re (list :command (append (split-string-and-unquote consult-locate-args) @@ -4355,10 +4354,10 @@ See `consult-grep' for more details regarding the asynchronous search." (defun consult--man-builder (input) "Build command line given CONFIG and INPUT." (pcase-let ((`(,arg . ,opts) (consult--command-split input))) -(and arg (not (string-blank-p arg)) - (list :command (append (split-string-and-unquote consult-man-args) -(list arg) opts) - :highlight (cdr (consult--default-regexp-compiler input 'basic)) +(unless (string-blank-p arg) + (list :command (append (split-string-and-unquote consult-man-args) + (list arg) opts) +:highlight (cdr (consult--default-regexp-compiler input 'basic)) (defun consult--man-format (lines) "Format man candidates from LINES."
[elpa] externals/crdt c8cb0e4: Squashed commit of the following:
branch: externals/crdt commit c8cb0e4994b1732cde172da4af0acd6a994b1a0b Author: Qiantan Hong Commit: Qiantan Hong Squashed commit of the following: commit 10962c78ac217ba1ea6b6e333db16c63713c25ca Author: Qiantan Hong Date: Sun Sep 12 07:29:04 2021 -0700 add comint-send-eof commit df9cbdf34e1477f679188999734caabf257634a5 Merge: 46b015f af43adb Author: Qiantan Hong Date: Sun Sep 12 07:28:28 2021 -0700 Merge branch 'development' into fix commit af43adb8e0cc8e072ae540a3ca5adabd3f733dbd Author: Qiantan Hong Date: Sat Sep 11 02:09:30 2021 -0700 reorder sections commit 77be6cded0e2d24fc9c132032ae3bf7ae8ed2cf9 Author: Qiantan Hong Date: Sat Sep 11 00:32:26 2021 -0700 bump version number --- HACKING.org | 14 +++ crdt.el | 278 ++-- 2 files changed, 153 insertions(+), 139 deletions(-) diff --git a/HACKING.org b/HACKING.org index 57fde18..9bcd78a 100644 --- a/HACKING.org +++ b/HACKING.org @@ -282,6 +282,20 @@ We then just need to design a thin protocol that communicate between local Emacs Since this protocol communicate only locally, the latency should be negligible, therefore we use a blocking reader/writer lock based synchronization scheme. +** Lock: modes of operations + +It turns out that I vastly over-estimated the extensibility of /The Other Editors/. +For example, lots of them (including M$ vScoDe and cult 666) doesn't seem to have anything like =pre-command-hook=, +making it impossible to implement a usual bidirectional locking mechanism +(because we can't tell those editors to acquire lock from Emacs before running commands that potentially modify the buffer). + +Currently I implemneted a hack that by default let /The Other Editors/ hold the lock, but upon receiving +an =acquire= from Emacs, let /The Other Editors/ dead loops to hopefully halt command execution until Emacs gives back the lock. +Emacs thus must give back lock as soon as possible to un-hang /The Other Editors/. + +Q: What if Emacs GCs? +/Q got thrown out of the window./ + ** Bridge protocol - Reader/writer lock diff --git a/crdt.el b/crdt.el index fd7f336..0e15150 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.1 +;; Version: 0.2.2 ;; This file is part of GNU Emacs. @@ -2157,33 +2157,6 @@ Join with DISPLAY-NAME." (advice-add 'delete-overlay :around #'crdt--delete-overlay-advice) (advice-add 'overlay-put :around #'crdt--overlay-put-advice) -;;; Org integration - -(define-minor-mode crdt-org-sync-overlay-mode - "Minor mode to synchronize hidden `org-mode' subtrees." - :lighter " Sync Org Overlay" - (if crdt-org-sync-overlay-mode - (progn -(save-excursion - (save-restriction -(widen) -;; heuristic to remove existing org overlays -(cl-loop for ov in (overlays-in (point-min) (point-max)) - do (when (memq (overlay-get ov 'invisible) - '(outline org-hide-block)) - (delete-overlay ov) -(crdt--enable-overlay-species 'org)) -(crdt--disable-overlay-species 'org))) - -(defun crdt--org-overlay-advice (orig-fun &rest args) - (if crdt-org-sync-overlay-mode - (let ((crdt--track-overlay-species 'org)) -(apply orig-fun args)) -(apply orig-fun args))) - -(cl-loop for command in '(org-cycle org-shifttab) - do (advice-add command :around #'crdt--org-overlay-advice)) - ;;; Auxillary autoload (defun crdt-register-autoload (mode feature) @@ -2489,117 +2462,6 @@ The result DIFF can be used in (CRDT--NAPPLY-DIFF OLD DIFF) to reproduce NEW." (dolist (entry variable-entries) (crdt-unregister-variable (car entry -;;; Built-in package integrations - -;; xscheme -(defvar crdt-xscheme-command-entries - '((xscheme-send-region (region)) -(xscheme-send-definition (point)) -(xscheme-send-previous-expression (point)) -(xscheme-send-next-expression (point)) -(xscheme-send-current-line (point)) -(xscheme-send-buffer) -(xscheme-send-char) -(xscheme-delete-output) -(xscheme-send-breakpoint-interrupt) -(xscheme-send-proceed) -(xscheme-send-control-g-interrupt) -(xscheme-send-control-u-interrupt) -(xscheme-send-control-x-interrupt) -(scheme-debugger-self-insert (last-command-event - -(crdt-register-remote-commands crdt-xscheme-command-entries) -;; xscheme doesn't use standard DEFINE-*-MODE facility -;; and doesn't call after-change-major-mode-hook. -;; Therefore we have to hack. -(advice-add 'scheme-interaction-mode-initialize :after 'crdt--after-change-major-mode) -(advice-add 'scheme-debugger-mode-initialize :after -(lambda () ;; ha - (let ((major-m
[elpa] externals/hyperbole updated (a2e7eb1 -> 9113e1b)
elpasync pushed a change to branch externals/hyperbole. from a2e7eb1 Hyperbole install from source tests (#114) new b7b7793 kexport:html - Allow only Koutline buffers and files new 2349505 Add Rolo key tests (#115) new b5ecd11 Remove native compiler warnings (#113) new 493c5bb Merge branch 'master' of hyperbole new 90f003c Use browse-url--browser-defcustom-type for customization (#117) new 9113e1b Merge branch 'master' of hyperbole Summary of changes: ChangeLog| 19 +++ hsettings.el | 3 +- hui-select.el| 140 +-- hui-window.el| 1 + kotl/kexport.el | 20 +--- test/hyrolo-tests.el | 112 - 6 files changed, 215 insertions(+), 80 deletions(-)
[elpa] externals/hyperbole 90f003c 5/6: Use browse-url--browser-defcustom-type for customization (#117)
branch: externals/hyperbole commit 90f003c9ab062c8b7cd3b55822e58cecb491716f Author: Mats Lidell Commit: GitHub Use browse-url--browser-defcustom-type for customization (#117) --- ChangeLog| 5 + hsettings.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0405b76..d907890 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-09-11 Mats Lidell + +* hsettings.el (hyperbole-web-search-browser-function): Use +browse-url--browser-defcustom-type for customization. + 2021-09-05 Mats Lidell * test/hyrolo-tests.el (hyrolo-demo-show-overview) diff --git a/hsettings.el b/hsettings.el index 9c60de5..94d6f46 100644 --- a/hsettings.el +++ b/hsettings.el @@ -25,6 +25,7 @@ (require 'hversion) (require 'hvar) +(require 'browse-url) ;;; ;;; Public declarations @@ -218,7 +219,7 @@ Hyperbole, and then restart Emacs." (defcustom hyperbole-web-search-browser-function browse-url-browser-function "*Function of one url argument called by any Hyperbole Find/Web search." - :type 'boolean + :type browse-url--browser-defcustom-type :group 'hyperbole-commands) (defcustom hyperbole-web-search-alist
[elpa] externals/hyperbole 9113e1b 6/6: Merge branch 'master' of hyperbole
branch: externals/hyperbole commit 9113e1bae663ec157c9f12a497b5b7bd91be324b Merge: 493c5bb 90f003c Author: Bob Weiner Commit: Bob Weiner Merge branch 'master' of hyperbole --- ChangeLog| 5 + hsettings.el | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e5ec21e..9285081 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2021-09-11 Mats Lidell + +* hsettings.el (hyperbole-web-search-browser-function): Use +browse-url--browser-defcustom-type for customization. + 2021-09-05 Bob Weiner * kotl/kexport.el (kexport:html): Fix export-from parameter checks to diff --git a/hsettings.el b/hsettings.el index 9c60de5..94d6f46 100644 --- a/hsettings.el +++ b/hsettings.el @@ -25,6 +25,7 @@ (require 'hversion) (require 'hvar) +(require 'browse-url) ;;; ;;; Public declarations @@ -218,7 +219,7 @@ Hyperbole, and then restart Emacs." (defcustom hyperbole-web-search-browser-function browse-url-browser-function "*Function of one url argument called by any Hyperbole Find/Web search." - :type 'boolean + :type browse-url--browser-defcustom-type :group 'hyperbole-commands) (defcustom hyperbole-web-search-alist
[elpa] externals/hyperbole 493c5bb 4/6: Merge branch 'master' of hyperbole
branch: externals/hyperbole
commit 493c5bb877535637a34e08330c9b8a0cbf746138
Merge: b7b7793 b5ecd11
Author: Bob Weiner
Commit: Bob Weiner
Merge branch 'master' of hyperbole
---
ChangeLog| 8 +++
hui-select.el| 140 +--
hui-window.el| 1 +
test/hyrolo-tests.el | 112 -
4 files changed, 189 insertions(+), 72 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7f7ff8d..e5ec21e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,14 @@
allow only Koutline buffers and files. Stop centering title since
often places it too far right.
+2021-09-05 Mats Lidell
+
+* test/hyrolo-tests.el (hyrolo-demo-show-overview)
+(hyrolo-demo-move-to-beginning-and-end-of-file)
+(hyrolo-demo-move-between-entries-on-same-level)
+(hyrolo-demo-no-following-same-level-heading): Add tests for rolo keys.
+(hyrolo-demo-toggle-visibility): Update to test key 's'.
+
2021-08-19 Mats Lidell
* test/hbut-tests.el (hbut-tests:should-match-tmp-folder): Add check for
diff --git a/hui-select.el b/hui-select.el
index a565293..8bee86c 100644
--- a/hui-select.el
+++ b/hui-select.el
@@ -203,6 +203,76 @@
(defvar hui-select-prior-buffer nil)
;;;
+;;; Private variables
+;;;
+
+(defconst hui-select-syntax-table (make-syntax-table
emacs-lisp-mode-syntax-table)
+ "Syntax table to use when selecting delimited things.")
+;; Make braces be thing delimiters, not punctuation.
+(modify-syntax-entry ?\{ "\(\}" hui-select-syntax-table)
+(modify-syntax-entry ?\} "\)\{" hui-select-syntax-table)
+
+(defvar hui-select-bigger-alist
+ '((char nil)
+(whitespace hui-select-whitespace)
+(word hui-select-word)
+(symbol hui-select-symbol)
+(punctuation nil)
+(string hui-select-string)
+(text nil)
+(comment hui-select-comment)
+(markup-pair nil)
+(preprocessor-def nil)
+(sexp hui-select-sexp)
+(sexp-start nil)
+(sexp-end nil)
+(sexp-up hui-select-sexp-up)
+(line hui-select-line)
+(sentence hui-select-sentence)
+(brace-def-or-declaration hui-select-brace-def-or-declaration)
+(indent-def hui-select-indent-def)
+(paragraph hui-select-paragraph)
+(page hui-select-page)
+(buffer hui-select-buffer)
+)
+ "Unordered list of ( ) pairs.
+Used to go from one thing to a bigger thing. See `hui-select-bigger-thing'.
+Nil value for means that region type is skipped
+over when trying to grow the region and is only used when a selection is made
+with point on a character that triggers that type of selection.")
+
+(defvar hui-select-prior-buffer nil)
+(defvar hui-select-prior-point nil)
+
+(defvar hui-select-previous 'char
+ "Most recent type of selection. Must be set by all hui-select functions.")
+
+(defvar hui-select-region (cons nil nil)
+ "Cons cell that contains a region ( . ).
+The function `hui-select-set-region' updates and returns it.")
+
+(defvar hui-select-old-region (cons nil nil)
+ "Cons cell that contains a region ( . ).")
+
+(defcustom hui-select-syntax-alist
+ '((?w . hui-select-word)
+(?_ . hui-select-symbol)
+(?\" . hui-select-string)
+(?\( . hui-select-sexp-start)
+(?\$ . hui-select-sexp-start)
+(?\' . hui-select-sexp-start)
+(?\) . hui-select-sexp-end)
+(? . hui-select-whitespace)
+(?\< . hui-select-comment)
+(?\. . hui-select-punctuation))
+ "*Unordered list of pairs of the form ( ) used by the
function `hui-select-syntactical-region'.
+Each takes a single position argument and returns a
+region (start . end) defining the boundaries of the thing at that position."
+ :type '(repeat (cons (character :tag "Syntax-Char") function))
+ :group 'hyperbole-commands)
+
+
+;;;
;;; Public functions
;;;
@@ -1346,76 +1416,6 @@ list, hui-select-markup-modes."
(setq hui-select-previous 'buffer)
(hui-select-set-region (point-min) (point-max)))
-;;;
-;;; Private variables
-;;;
-
-(defconst hui-select-syntax-table (make-syntax-table
emacs-lisp-mode-syntax-table)
- "Syntax table to use when selecting delimited things.")
-;; Make braces be thing delimiters, not punctuation.
-(modify-syntax-entry ?\{ "\(\}" hui-select-syntax-table)
-(modify-syntax-entry ?\} "\)\{" hui-select-syntax-table)
-
-(defvar hui-select-bigger-alist
- '((char nil)
-(whitespace hui-select-whitespace)
-(word hui-select-word)
-(symbol hui-select-symbol)
-(punctuation nil)
-(string hui-select-string)
-(text nil)
-(comment hui-select-comment)
-(mar
[elpa] externals/hyperbole 2349505 1/6: Add Rolo key tests (#115)
branch: externals/hyperbole commit 2349505d4967294c921dc32f5c83fac40e1c5e64 Author: Mats Lidell Commit: GitHub Add Rolo key tests (#115) --- ChangeLog| 8 test/hyrolo-tests.el | 112 ++- 2 files changed, 118 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e5ba5..0405b76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2021-09-05 Mats Lidell + +* test/hyrolo-tests.el (hyrolo-demo-show-overview) +(hyrolo-demo-move-to-beginning-and-end-of-file) +(hyrolo-demo-move-between-entries-on-same-level) +(hyrolo-demo-no-following-same-level-heading): Add tests for rolo keys. +(hyrolo-demo-toggle-visibility): Update to test key 's'. + 2021-08-19 Mats Lidell * test/hbut-tests.el (hbut-tests:should-match-tmp-folder): Add check for diff --git a/test/hyrolo-tests.el b/test/hyrolo-tests.el index 68ce444..35d3181 100644 --- a/test/hyrolo-tests.el +++ b/test/hyrolo-tests.el @@ -64,14 +64,122 @@ (should (looking-at "Work")) (should (hact 'kbd-key "h")) -(hy-test-helpers:consume-input-events) (end-of-line) (should (get-char-property (point) 'invisible)) (should (hact 'kbd-key "a")) -(hy-test-helpers:consume-input-events) +(should-not (get-char-property (point) 'invisible)) + +(should (hact 'kbd-key "h")) +(end-of-line) +(should (get-char-property (point) 'invisible)) + +(should (hact 'kbd-key "s")) (should-not (get-char-property (point) 'invisible))) (hyrolo-demo-quit))) +(ert-deftest hyrolo-demo-show-overview () + "Keys o shall show overview." + (skip-unless (not noninteractive)) + (unwind-protect + (progn +(load "../hyrolo-demo") +(should (hact 'kbd-key "C-x 4r work RET TAB")) +(hy-test-helpers:consume-input-events) +(should (string= (buffer-name) "*Hyperbole Rolo*")) +(should (looking-at "Work")) + +(should (hact 'kbd-key "o")) +(hy-test-helpers:consume-input-events) +(end-of-line) +(should-not (get-char-property (point) 'invisible)) + +;; Check second line is an outline +(should (hact 'kbd-key "n")) +(end-of-line) +(should (get-char-property (point) 'invisible)) + +;; Check third line is an outline +(should (hact 'kbd-key "n")) +(end-of-line) +(should (get-char-property (point) 'invisible)) + +;; Check fourth line is end of buffer +(should (hact 'kbd-key "n")) +(should (equal (point) (point-max +(hyrolo-demo-quit))) + +(ert-deftest hyrolo-demo-move-to-beginning-and-end-of-file () + "Keys '<', '.' and '>', ',' shall move to beginning and end of file respectively." + (skip-unless (not noninteractive)) + (unwind-protect + (progn +(load "../hyrolo-demo") +(should (hact 'kbd-key "C-x 4r work RET TAB")) +(hy-test-helpers:consume-input-events) +(should (string= (buffer-name) "*Hyperbole Rolo*")) +(should (looking-at "Work")) + +(should (hact 'kbd-key ">")) +(should (equal (point) (point-max))) + +(should (hact 'kbd-key "<")) +(should (equal (point) (point-min))) + +(should (hact 'kbd-key ",")) +(should (equal (point) (point-max))) + +(should (hact 'kbd-key ".")) +(should (equal (point) (point-min +(hyrolo-demo-quit))) + +(ert-deftest hyrolo-demo-move-between-entries-on-same-level () + "Keys '<', '.' and '>', ',' shall move to beginning and end of file respectively." + (skip-unless (not noninteractive)) + (unwind-protect + (progn +(load "../hyrolo-demo") +(should (hact 'kbd-key "C-x 4r com RET TAB")) +(hy-test-helpers:consume-input-events) +(should (string= (buffer-name) "*Hyperbole Rolo*")) +(should (hact 'kbd-key "<")) +(should (equal (point) (point-min))) + +(should (hact 'kbd-key "n")) +(should (looking-at "\\*\\*\\s-+Strong")) + +(should (hact 'kbd-key "f")) +(should (looking-at "\\*\\*\\s-+Hansen")) + +(should (hact 'kbd-key "b")) +(should (looking-at "\\*\\*\\s-+Strong"))) +(hyrolo-demo-quit))) + +(ert-deftest hyrolo-demo-no-following-same-level-heading () + "Error when trying to move to non existing next level heading." + (skip-unless (not noninteractive)) + (unwind-protect + (progn +(load "../hyrolo-demo") +(should (hact 'kbd-key "C-x 4r com RET TAB")) +(hy-test-helpers:consume-input-events) +(should (string= (buffer-name) "*Hyperbole Rolo*")) +(should (hact 'kbd-key "<")) +(should (equal (point) (point-min))) + +(should (hact 'kbd-key "n")) +(should (looking-at "\\*\\*\\s-+Strong")) + +(should (hact 'kbd-key "n")) +(should (looking-at "\\*\\*\\*\\s-+Smith")) + +(condition-case er
[elpa] externals/hyperbole b5ecd11 2/6: Remove native compiler warnings (#113)
branch: externals/hyperbole
commit b5ecd1113dcadcf71e214ef770ec9e50d51017f5
Author: Mats Lidell
Commit: GitHub
Remove native compiler warnings (#113)
---
hui-select.el | 140 +-
hui-window.el | 1 +
2 files changed, 71 insertions(+), 70 deletions(-)
diff --git a/hui-select.el b/hui-select.el
index a565293..8bee86c 100644
--- a/hui-select.el
+++ b/hui-select.el
@@ -203,6 +203,76 @@
(defvar hui-select-prior-buffer nil)
;;;
+;;; Private variables
+;;;
+
+(defconst hui-select-syntax-table (make-syntax-table
emacs-lisp-mode-syntax-table)
+ "Syntax table to use when selecting delimited things.")
+;; Make braces be thing delimiters, not punctuation.
+(modify-syntax-entry ?\{ "\(\}" hui-select-syntax-table)
+(modify-syntax-entry ?\} "\)\{" hui-select-syntax-table)
+
+(defvar hui-select-bigger-alist
+ '((char nil)
+(whitespace hui-select-whitespace)
+(word hui-select-word)
+(symbol hui-select-symbol)
+(punctuation nil)
+(string hui-select-string)
+(text nil)
+(comment hui-select-comment)
+(markup-pair nil)
+(preprocessor-def nil)
+(sexp hui-select-sexp)
+(sexp-start nil)
+(sexp-end nil)
+(sexp-up hui-select-sexp-up)
+(line hui-select-line)
+(sentence hui-select-sentence)
+(brace-def-or-declaration hui-select-brace-def-or-declaration)
+(indent-def hui-select-indent-def)
+(paragraph hui-select-paragraph)
+(page hui-select-page)
+(buffer hui-select-buffer)
+)
+ "Unordered list of ( ) pairs.
+Used to go from one thing to a bigger thing. See `hui-select-bigger-thing'.
+Nil value for means that region type is skipped
+over when trying to grow the region and is only used when a selection is made
+with point on a character that triggers that type of selection.")
+
+(defvar hui-select-prior-buffer nil)
+(defvar hui-select-prior-point nil)
+
+(defvar hui-select-previous 'char
+ "Most recent type of selection. Must be set by all hui-select functions.")
+
+(defvar hui-select-region (cons nil nil)
+ "Cons cell that contains a region ( . ).
+The function `hui-select-set-region' updates and returns it.")
+
+(defvar hui-select-old-region (cons nil nil)
+ "Cons cell that contains a region ( . ).")
+
+(defcustom hui-select-syntax-alist
+ '((?w . hui-select-word)
+(?_ . hui-select-symbol)
+(?\" . hui-select-string)
+(?\( . hui-select-sexp-start)
+(?\$ . hui-select-sexp-start)
+(?\' . hui-select-sexp-start)
+(?\) . hui-select-sexp-end)
+(? . hui-select-whitespace)
+(?\< . hui-select-comment)
+(?\. . hui-select-punctuation))
+ "*Unordered list of pairs of the form ( ) used by the
function `hui-select-syntactical-region'.
+Each takes a single position argument and returns a
+region (start . end) defining the boundaries of the thing at that position."
+ :type '(repeat (cons (character :tag "Syntax-Char") function))
+ :group 'hyperbole-commands)
+
+
+;;;
;;; Public functions
;;;
@@ -1346,76 +1416,6 @@ list, hui-select-markup-modes."
(setq hui-select-previous 'buffer)
(hui-select-set-region (point-min) (point-max)))
-;;;
-;;; Private variables
-;;;
-
-(defconst hui-select-syntax-table (make-syntax-table
emacs-lisp-mode-syntax-table)
- "Syntax table to use when selecting delimited things.")
-;; Make braces be thing delimiters, not punctuation.
-(modify-syntax-entry ?\{ "\(\}" hui-select-syntax-table)
-(modify-syntax-entry ?\} "\)\{" hui-select-syntax-table)
-
-(defvar hui-select-bigger-alist
- '((char nil)
-(whitespace hui-select-whitespace)
-(word hui-select-word)
-(symbol hui-select-symbol)
-(punctuation nil)
-(string hui-select-string)
-(text nil)
-(comment hui-select-comment)
-(markup-pair nil)
-(preprocessor-def nil)
-(sexp hui-select-sexp)
-(sexp-start nil)
-(sexp-end nil)
-(sexp-up hui-select-sexp-up)
-(line hui-select-line)
-(sentence hui-select-sentence)
-(brace-def-or-declaration hui-select-brace-def-or-declaration)
-(indent-def hui-select-indent-def)
-(paragraph hui-select-paragraph)
-(page hui-select-page)
-(buffer hui-select-buffer)
-)
- "Unordered list of ( ) pairs.
-Used to go from one thing to a bigger thing. See `hui-select-bigger-thing'.
-Nil value for means that region type is skipped
-over when trying to grow the region and is only used when a selection is made
-with point on a character that triggers that type of selection.")
-
-(defvar hui-select-prior-buffer nil)
-(defvar hui-selec
[elpa] externals/hyperbole b7b7793 3/6: kexport:html - Allow only Koutline buffers and files
branch: externals/hyperbole commit b7b779338a1c89375c279d6ad2cd34a1383b306a Author: Bob Weiner Commit: Bob Weiner kexport:html - Allow only Koutline buffers and files Also stop centering HTML title since often ends up to far to the right. --- ChangeLog | 6 ++ kotl/kexport.el | 20 +--- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 03e5ba5..7f7ff8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-09-05 Bob Weiner + +* kotl/kexport.el (kexport:html): Fix export-from parameter checks to +allow only Koutline buffers and files. Stop centering title since +often places it too far right. + 2021-08-19 Mats Lidell * test/hbut-tests.el (hbut-tests:should-match-tmp-folder): Add check for diff --git a/kotl/kexport.el b/kotl/kexport.el index 34be7cc..c8cbd1d 100644 --- a/kotl/kexport.el +++ b/kotl/kexport.el @@ -225,14 +225,20 @@ hard newlines are not used. Also converts Urls and Klinks into Html hyperlinks. STILL TODO: Make delimited pathnames into file links (but not if within klinks). Copy attributes stored in cell 0 and attributes from each cell." - (interactive "fKoutline buffer/file to export: \nFHTML buffer/file to save to: \nP") + (interactive (list (read-file-name + "Koutline buffer/file to export: " nil buffer-file-name t) +(read-file-name "HTML buffer/file to save to: ") +current-prefix-arg)) (let* ((export-buf-name - (cond ((or (bufferp export-from) -(get-buffer export-from)) -(buffer-name (get-buffer export-from))) - ((get-file-buffer export-from) + (cond ((get-file-buffer export-from) (buffer-name (get-file-buffer export-from))) - ((stringp export-from) + ((and (or (bufferp export-from) + (get-buffer export-from)) + (kotl-mode:is-p)) +(buffer-name (get-buffer export-from))) + ((and (stringp export-from) + (string-match "\\.kotl$" export-from) + (file-readable-p export-from)) (buffer-name (find-file-noselect export-from))) (t (error "(kexport:html): `%s' is an invalid `export-from' argument" export-from @@ -291,7 +297,7 @@ STILL TODO: ;; HTML (princ "\n\n") (princ (format "\n\n" kexport:html-body-attributes)) - (princ (format "%s\n\n" title)) + (princ (format "%s\n\n" title)) (let* ((separator (hypb:replace-match-string ">" (hypb:replace-match-string
[elpa] externals-release/org 4be129f: doc/Makefile: Clean up *.info files too
branch: externals-release/org commit 4be129f543b0dc0352338040c66f9a3c940a1390 Author: Bastien Commit: Bastien doc/Makefile: Clean up *.info files too Continue 9802877fb by cleaning up *.info files and removing duplicate *.html pattern. --- doc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index fcde02d..f6da9a1 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -54,9 +54,9 @@ install: org orgguide $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide.info clean: - $(RM) org orgguide *.pdf *.html *_letter.tex org-version.inc \ - org-version.tex *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys \ - *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps + $(RM) *.pdf *.html *.info *_letter.tex org-version.inc org-version.tex \ + *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs *.toc \ + *.tp *.tps *.vr *.vrs *.log *.ps cleanall: clean $(RMR) guide manual
[elpa] externals/org 72af213: Merge branch 'maint'
branch: externals/org commit 72af213be844b478892562b5bcc8d7bc2b80c961 Merge: d70f280 4be129f Author: Bastien Commit: Bastien Merge branch 'maint' --- doc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index d934258..b0255a8 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -54,9 +54,9 @@ install: org orgguide $(INSTALL_INFO) --infodir=$(DESTDIR)$(infodir) orgguide.info clean: - $(RM) org orgguide *.pdf *.html *_letter.tex org-version.inc \ - org-version.tex *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys \ - *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs *.log *.html *.ps + $(RM) *.pdf *.html *.info *_letter.tex org-version.inc org-version.tex \ + *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.pg *.pgs *.toc \ + *.tp *.tps *.vr *.vrs *.log *.ps cleanall: clean $(RM) org.texi orgguide.texi $(RMR) guide manual
[elpa] externals/org updated (d70f280 -> 72af213)
elpasync pushed a change to branch externals/org. from d70f280 org-macs: Allow for nil ffap-url-regexp new 4be129f doc/Makefile: Clean up *.info files too new 72af213 Merge branch 'maint' Summary of changes: doc/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[nongnu] elpa/proof-general 75062f6 2/6: test: Add dist-tests target & Refactor .github/workflows/test.yml
branch: elpa/proof-general commit 75062f60d410b924f4019b27d758cdb4cfdddc50 Author: Erik Martin-Dorel Commit: Erik Martin-Dorel test: Add dist-tests target & Refactor .github/workflows/test.yml --- .github/workflows/test.yml | 2 +- Makefile | 11 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9874fa4..3979ba2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -123,7 +123,7 @@ jobs: endGroup startGroup Run tests sudo chown -R coq:coq ./ci -./ci/test.sh +make tests endGroup # - run: echo "::remove-matcher owner=ert-problem-matcher::" diff --git a/Makefile b/Makefile index 668241b..986aed6 100644 --- a/Makefile +++ b/Makefile @@ -121,12 +121,21 @@ check: $(EL) @echo "" ## -## tests : run regression tests +## tests : run a selection of regression tests ## +.PHONY: tests tests: ci/test.sh ## +## dist-tests : run all regression tests +## +.PHONY: dist-tests +dist-tests: + +$(MAKE) -C ci/simple-tests all + +$(MAKE) -C ci/compile-tests test + +## ## Make an individual .elc. Building separately means we need to be ## careful to add proper requires in source files and prevent ## evaluating/optimising top-level forms too early. Using a separate
[nongnu] elpa/proof-general updated (32b15ff -> eb97857)
elpasync pushed a change to branch elpa/proof-general. from 32b15ff Adding the CI for indentation. new d2d1a73 Minor tweaks encountered while trying to run the CI tests new 75062f6 test: Add dist-tests target & Refactor .github/workflows/test.yml new 5519af7 test: Add check-doc-magic target & Restrict its git-diff test to doc new ad36557 test: Extend dist-tests target after merging #591 new ce0f2f3 fix(dist-tests): `make dist-tests` also runs `make tests check-doc-magic` new eb97857 Merge pull request #593 from ProofGeneral/stefan Summary of changes: .github/workflows/test.yml | 4 ++-- .gitignore | 1 + Makefile | 32 +++- ci/coq-tests.el| 2 +- 4 files changed, 31 insertions(+), 8 deletions(-)
[nongnu] elpa/proof-general d2d1a73 1/6: Minor tweaks encountered while trying to run the CI tests
branch: elpa/proof-general commit d2d1a73f2b93937a5f0abd6d93aa810d1f72b419 Author: Stefan Monnier Commit: Erik Martin-Dorel Minor tweaks encountered while trying to run the CI tests * ci/coq-tests.el (070_coq-test-regression-wholefile-no-proof): Clarify the intention of the test. * Makefile (check): Fix comment. (tests): New target. * .gitignore: Add `ci/.lia.cache`, apparently generated by ci/test.sh --- .gitignore | 1 + Makefile| 14 +- ci/coq-tests.el | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2039757..0af17ea 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ChangeLog proof-general-autoloads.el *.elc *~ +/ci/.lia.cache diff --git a/Makefile b/Makefile index 265aad6..668241b 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ ## make scripts - edit paths to bash/perl/PGHOME in scripts ## make install - install into system directories ## make clean - return to clean source +## make tests - run the suite of regression tests ## ## Edit the EMACS setting below or call with an explicit one, like this: ## @@ -103,14 +104,12 @@ compile: $(EL) @echo "" ## -## compile : byte compile all lisp files -## -## Compiling can show up errors in the code, but be wary of fixing obsoletion -## or argument call warnings unless they're valid for all supported Emacsen. +## check : make sure compilation doesn't emit warnings ## ## The check target aborts compilation on any byte-compiler warning. -## Compile with this target once before commiting your changes to +## Compile with this target once before commiting your changes to ## the repository. +## FIXME: Compilation currently emits many warnings :-( ## check: $(EL) @echo "" @@ -121,6 +120,11 @@ check: $(EL) @echo " Finished." @echo "" +## +## tests : run regression tests +## +tests: + ci/test.sh ## ## Make an individual .elc. Building separately means we need to be diff --git a/ci/coq-tests.el b/ci/coq-tests.el index ff762d9..fb5635f 100644 --- a/ci/coq-tests.el +++ b/ci/coq-tests.el @@ -274,7 +274,7 @@ For example, COMMENT could be (*test-definition*)" (proof-shell-wait) (goto-char (point-min)) (insert "(*.*)") - (should (equal (proof-queue-or-locked-end) 1) + (should (equal (proof-queue-or-locked-end) (point-min)) (ert-deftest 080_coq-test-regression-show-proof-stepwise() "Regression test for the \"Show Proof\" option"
[nongnu] elpa/proof-general eb97857 6/6: Merge pull request #593 from ProofGeneral/stefan
branch: elpa/proof-general commit eb978573c372913a7465817ce00a9fdf2871648f Merge: 32b15ff ce0f2f3 Author: Erik Martin-Dorel Commit: GitHub Merge pull request #593 from ProofGeneral/stefan Minor tweaks encountered while trying to run the CI tests --- .github/workflows/test.yml | 4 ++-- .gitignore | 1 + Makefile | 32 +++- ci/coq-tests.el| 2 +- 4 files changed, 31 insertions(+), 8 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9874fa4..826ed74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,7 +73,7 @@ jobs: - run: emacs --version - run: make -C doc magic -- run: git diff --exit-code +- run: git diff --exit-code -- doc test: runs-on: ubuntu-latest @@ -123,7 +123,7 @@ jobs: endGroup startGroup Run tests sudo chown -R coq:coq ./ci -./ci/test.sh +make tests endGroup # - run: echo "::remove-matcher owner=ert-problem-matcher::" diff --git a/.gitignore b/.gitignore index 2039757..0af17ea 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ ChangeLog proof-general-autoloads.el *.elc *~ +/ci/.lia.cache diff --git a/Makefile b/Makefile index 265aad6..4db14a0 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,7 @@ ## make scripts - edit paths to bash/perl/PGHOME in scripts ## make install - install into system directories ## make clean - return to clean source +## make tests - run the suite of regression tests ## ## Edit the EMACS setting below or call with an explicit one, like this: ## @@ -103,14 +104,12 @@ compile: $(EL) @echo "" ## -## compile : byte compile all lisp files -## -## Compiling can show up errors in the code, but be wary of fixing obsoletion -## or argument call warnings unless they're valid for all supported Emacsen. +## check : make sure compilation doesn't emit warnings ## ## The check target aborts compilation on any byte-compiler warning. -## Compile with this target once before commiting your changes to +## Compile with this target once before commiting your changes to ## the repository. +## FIXME: Compilation currently emits many warnings :-( ## check: $(EL) @echo "" @@ -121,6 +120,29 @@ check: $(EL) @echo " Finished." @echo "" +## +## tests : run a selection of regression tests +## +.PHONY: tests +tests: + ci/test.sh + +## +## dist-tests : run all regression tests +## +.PHONY: dist-tests +dist-tests: tests check-doc-magic + +$(MAKE) -C ci/simple-tests all + +$(MAKE) -C ci/compile-tests test + +$(MAKE) -C ci/test-indent + +## +## check-doc-magic : check *.texi are up-to-date w.r.t. docstrings +## +.PHONY: check-doc-magic +check-doc-magic: + +$(MAKE) -C doc magic + git diff --exit-code -- doc ## ## Make an individual .elc. Building separately means we need to be diff --git a/ci/coq-tests.el b/ci/coq-tests.el index ff762d9..fb5635f 100644 --- a/ci/coq-tests.el +++ b/ci/coq-tests.el @@ -274,7 +274,7 @@ For example, COMMENT could be (*test-definition*)" (proof-shell-wait) (goto-char (point-min)) (insert "(*.*)") - (should (equal (proof-queue-or-locked-end) 1) + (should (equal (proof-queue-or-locked-end) (point-min)) (ert-deftest 080_coq-test-regression-show-proof-stepwise() "Regression test for the \"Show Proof\" option"
[nongnu] elpa/proof-general 5519af7 3/6: test: Add check-doc-magic target & Restrict its git-diff test to doc
branch: elpa/proof-general commit 5519af7af84a79242ea54268ec339991df41a825 Author: Erik Martin-Dorel Commit: Erik Martin-Dorel test: Add check-doc-magic target & Restrict its git-diff test to doc --- .github/workflows/test.yml | 2 +- Makefile | 10 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3979ba2..826ed74 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -73,7 +73,7 @@ jobs: - run: emacs --version - run: make -C doc magic -- run: git diff --exit-code +- run: git diff --exit-code -- doc test: runs-on: ubuntu-latest diff --git a/Makefile b/Makefile index 986aed6..1c0a8ff 100644 --- a/Makefile +++ b/Makefile @@ -130,12 +130,20 @@ tests: ## ## dist-tests : run all regression tests ## -.PHONY: dist-tests +.PHONY: dist-tests check-doc-magic dist-tests: +$(MAKE) -C ci/simple-tests all +$(MAKE) -C ci/compile-tests test ## +## check-doc-magic : check *.texi are up-to-date w.r.t. docstrings +## +.PHONY: check-doc-magic +check-doc-magic: + +$(MAKE) -C doc magic + git diff --exit-code -- doc + +## ## Make an individual .elc. Building separately means we need to be ## careful to add proper requires in source files and prevent ## evaluating/optimising top-level forms too early. Using a separate
[nongnu] elpa/proof-general ce0f2f3 5/6: fix(dist-tests): `make dist-tests` also runs `make tests check-doc-magic`
branch: elpa/proof-general commit ce0f2f3041098e4a59ec37d5eb6bbe790ee6a751 Author: Erik Martin-Dorel Commit: Erik Martin-Dorel fix(dist-tests): `make dist-tests` also runs `make tests check-doc-magic` --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 891d2a6..4db14a0 100644 --- a/Makefile +++ b/Makefile @@ -130,8 +130,8 @@ tests: ## ## dist-tests : run all regression tests ## -.PHONY: dist-tests check-doc-magic -dist-tests: +.PHONY: dist-tests +dist-tests: tests check-doc-magic +$(MAKE) -C ci/simple-tests all +$(MAKE) -C ci/compile-tests test +$(MAKE) -C ci/test-indent
[nongnu] elpa/proof-general ad36557 4/6: test: Extend dist-tests target after merging #591
branch: elpa/proof-general commit ad3655744050f4ac0d16435ebac7133f8b5f9a58 Author: Erik Martin-Dorel Commit: Erik Martin-Dorel test: Extend dist-tests target after merging #591 * href: https://github.com/ProofGeneral/PG/pull/593#issuecomment-915560731 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 1c0a8ff..891d2a6 100644 --- a/Makefile +++ b/Makefile @@ -134,6 +134,7 @@ tests: dist-tests: +$(MAKE) -C ci/simple-tests all +$(MAKE) -C ci/compile-tests test + +$(MAKE) -C ci/test-indent ## ## check-doc-magic : check *.texi are up-to-date w.r.t. docstrings
[elpa] externals/setup 8acf431: Delete setup--quit-sym
branch: externals/setup commit 8acf43122c32648a5c17a5df3e9b0da0829e11a5 Author: Philip Kaludercic Commit: Philip Kaludercic Delete setup--quit-sym --- setup.el | 7 ++- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/setup.el b/setup.el index 51aecf6..71503e1 100644 --- a/setup.el +++ b/setup.el @@ -83,12 +83,9 @@ (require 'elisp-mode) -(defconst setup--quit-sym (gensym) - "Symbol thrown on an early exit.") - (defvar setup--need-quit) ;see `setup-quit' -(defvar setup-opts `((quit . ,setup--quit-sym)) +(defvar setup-opts `((quit . ,(make-symbol "setup-quit"))) "Alist defining context-specific options. Values are extracted using `setup-get'.") @@ -140,7 +137,7 @@ NAME may also be a macro, if it can provide a symbol." (macroexp-progn body)) (append setup-macros macroexpand-all-environment (if setup--need-quit -`(catch ',setup--quit-sym ,@(macroexp-unprogn res)) +`(catch ',(setup-get 'quit) ,@(macroexp-unprogn res)) res))) ;;;###autoload
[elpa] externals/shelisp 16c2e95: Added support for zsh and fish shells along side bash
branch: externals/shelisp
commit 16c2e954f53b9fbf7c839e57b36234aade0222aa
Author: Michael R. Mauger
Commit: Michael R. Mauger
Added support for zsh and fish shells along side bash
---
shelisp.el | 51 ++-
1 file changed, 42 insertions(+), 9 deletions(-)
diff --git a/shelisp.el b/shelisp.el
index d470e5c..fc5d4d2 100644
--- a/shelisp.el
+++ b/shelisp.el
@@ -1,6 +1,6 @@
;;; shelisp.el --- execute elisp in shell -*- lexical-binding: t; -*-
-;; Copyright (C) 2018-2019 Free Software Foundation, Inc.
+;; Copyright (C) 2018-2021 Free Software Foundation, Inc.
;; Author: Michael R. Mauger
;; Version: 0.9.1
@@ -110,6 +110,39 @@ while in a shell mode buffer."
(defvar shelisp-debug nil
"When non-nil, display messages showing the elisp expression.")
+(defvar shelisp-shell 'bash
+ "Identifies the shell scripting environment in use.")
+
+(defvar shelisp--wrapper-commands
+ '((bash
+ "unset -f shelisp_%1$s"
+ "function shelisp_%1$s { printf '\\e_#EMACS# %2$s \\a' \"$@\" ; }"
+ "alias %1$s=shelisp_%1$s")
+(zsh
+ "unfunction shelisp_%1$s >/dev/null 2>&1"
+ "function shelisp_%1$s { printf '\\e_#EMACS# %2$s \\a' \"$@\" ; }"
+ "alias %1$s=shelisp_%1$s")
+(fish
+ "function %1$s"
+ "printf '\\e_#EMACS# %2$s \\a' $argv"
+ "end"))
+
+ "Alist of shell commands necessary to make ShElisp work.
+
+The key of the alist is either an atom that identifies the type
+of shell (See `shelisp-shell' for defining the type of shell).
+
+The value is a series of strings which will be sent to the shell.
+Each string will be separated by the `shelisp--wrapper-separator'
+string. The assempled string is used as a specification for the
+`format' function. The first format parameter (\"%1$s\") is the
+command to be defined with \"%1$s\" set to the command; the
+second parameter (\"%2$s\") is the elisp expression to be
+executed when the command is used.")
+
+(defvar shelisp--wrapper-separator " ; "
+ "String to separate commands sent to the shell.")
+
(defun shelisp--file-name (file)
"Apply remote host in `default-directory' to FILE."
(if (and (file-name-absolute-p file)
@@ -196,7 +229,8 @@ expression and cannot be used elsewhere.")
(defun shelisp-add-commands ()
"Add Emacs Lisp to shell aliases (assumes GNU bash syntax)."
- (when (and shelisp-mode shelisp-commands)
+ (when (and shelisp-mode shelisp-commands
+ (assoc shelisp-shell shelisp--wrapper-commands))
(let ((proc (get-buffer-process (current-buffer
(dolist (c shelisp-commands)
(let ((cmd (car c))
@@ -205,13 +239,12 @@ expression and cannot be used elsewhere.")
proc
(apply #'format
(mapconcat #'identity
- '("unset -f shelisp_%s"
- "function shelisp_%s { printf '\\e_#EMACS# %s
\\a' \"$@\"; }"
- "alias %s=shelisp_%s" "")
- " ; ")
-(list cmd cmd
- (replace-regexp-in-string "\"" "\"" expr)
- cmd cmd)
+ (append (cdr (assoc shelisp-shell
+ shelisp--wrapper-commands))
+ '(""))
+ shelisp--wrapper-separator)
+ (list cmd
+ (replace-regexp-in-string "\"" "\"" expr))
(process-send-string proc "\n"
(provide 'shelisp)
[elpa] externals/org updated (72af213 -> a246a13)
elpasync pushed a change to branch externals/org. from 72af213 Merge branch 'maint' new 9961abf Backport commit fc4b956c7 from Emacs new d2deb18 Backport commit ff4de1bd8 from Emacs new a246a13 Merge branch 'km/from-emacs-master' Summary of changes: lisp/ob-sql.el | 4 ++-- lisp/org-compat.el | 6 +++--- lisp/org-list.el | 2 +- lisp/org.el| 14 +++--- 4 files changed, 13 insertions(+), 13 deletions(-)
[elpa] externals/org 9961abf 1/3: Backport commit fc4b956c7 from Emacs
branch: externals/org commit 9961abf75aecf52a2e2992480e058a956a06c0d4 Author: Stefan Kangas Commit: Kyle Meyer Backport commit fc4b956c7 from Emacs ; Fix symbol quoting typos fc4b956c7cb2fba8ed2a18865a7686c6cfa5d030 Stefan Kangas Sun Sep 12 18:36:49 2021 +0200 --- lisp/ob-sql.el | 4 ++-- lisp/org-compat.el | 6 +++--- lisp/org-list.el | 2 +- lisp/org.el| 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index 68d5ddd..7c7be60 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -189,8 +189,8 @@ Otherwise, use Emacs' standard conversion function." "Return database connection parameter NAME. Given a parameter NAME, if :dbconnection is defined in PARAMS then look for the parameter into the corresponding connection -defined in `sql-connection-alist`, otherwise look into PARAMS. -Look `sql-connection-alist` (part of SQL mode) for how to define +defined in `sql-connection-alist', otherwise look into PARAMS. +See `sql-connection-alist' (part of SQL mode) for how to define database connections." (if (assq :dbconnection params) (let* ((dbconnection (cdr (assq :dbconnection params))) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 383febc..7fd8776 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -179,9 +179,9 @@ This is a floating point number if the size is too large for an integer." Case is significant." (string< s1 s2))) -;; The time- functions below translate nil to `current-time` and -;; accept an integer as of Emacs 25. `decode-time` and -;; `format-time-string` accept nil on Emacs 24 but don't accept an +;; The time- functions below translate nil to `current-time' and +;; accept an integer as of Emacs 25. `decode-time' and +;; `format-time-string' accept nil on Emacs 24 but don't accept an ;; integer until Emacs 25. (if (< emacs-major-version 25) (let ((convert diff --git a/lisp/org-list.el b/lisp/org-list.el index f97164e..b26e47a 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -3355,7 +3355,7 @@ Valid parameters are: (when (and backend (symbolp backend) (not (org-export-get-backend backend))) (user-error "Unknown :backend value")) (unless backend (require 'ox-org)) -;; When`:raw' property has a non-nil value, turn all objects back +;; When `:raw' property has a non-nil value, turn all objects back ;; into Org syntax. (when (and backend (plist-get params :raw)) (org-element-map data org-element-all-objects diff --git a/lisp/org.el b/lisp/org.el index f560c65..dc56948 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19654,7 +19654,7 @@ When BLOCK-REGEXP is non-nil, use this regexp to find blocks." ;; Org still relies on `comment-dwim', but cannot trust ;; `comment-only-p'. So, `comment-region-function' and ;; `uncomment-region-function' both point -;; to`org-comment-or-uncomment-region'. Eventually, +;; to `org-comment-or-uncomment-region'. Eventually, ;; `org-insert-comment' takes care of insertion of comments at the ;; beginning of line.
[elpa] externals/org d2deb18 2/3: Backport commit ff4de1bd8 from Emacs
branch: externals/org commit d2deb188a656ad114cfdb223b60c4150f0141386 Author: Eli Zaretskii Commit: Kyle Meyer Backport commit ff4de1bd8 from Emacs * lisp/org.el: * lisp/org-list.el (org-list-to-generic): * lisp/org-compat.el: In comments, quote 'like this'. Fix quoting style in Lisp comments ff4de1bd88b8be4a7071884910ff601eb10fbad5 Eli Zaretskii Sun Sep 12 19:51:06 2021 +0300 --- lisp/org-compat.el | 6 +++--- lisp/org-list.el | 2 +- lisp/org.el| 14 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 7fd8776..b19dc01 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -179,9 +179,9 @@ This is a floating point number if the size is too large for an integer." Case is significant." (string< s1 s2))) -;; The time- functions below translate nil to `current-time' and -;; accept an integer as of Emacs 25. `decode-time' and -;; `format-time-string' accept nil on Emacs 24 but don't accept an +;; The time- functions below translate nil to 'current-time' and +;; accept an integer as of Emacs 25. 'decode-time' and +;; 'format-time-string' accept nil on Emacs 24 but don't accept an ;; integer until Emacs 25. (if (< emacs-major-version 25) (let ((convert diff --git a/lisp/org-list.el b/lisp/org-list.el index b26e47a..ddb47dd 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -3355,7 +3355,7 @@ Valid parameters are: (when (and backend (symbolp backend) (not (org-export-get-backend backend))) (user-error "Unknown :backend value")) (unless backend (require 'ox-org)) -;; When `:raw' property has a non-nil value, turn all objects back +;; When ':raw' property has a non-nil value, turn all objects back ;; into Org syntax. (when (and backend (plist-get params :raw)) (org-element-map data org-element-all-objects diff --git a/lisp/org.el b/lisp/org.el index dc56948..d03676e 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19651,15 +19651,15 @@ When BLOCK-REGEXP is non-nil, use this regexp to find blocks." ;; example-block) don't accept comments. Usual Emacs comment commands ;; cannot cope with those requirements. Therefore, Org replaces them. -;; Org still relies on `comment-dwim', but cannot trust -;; `comment-only-p'. So, `comment-region-function' and -;; `uncomment-region-function' both point -;; to `org-comment-or-uncomment-region'. Eventually, -;; `org-insert-comment' takes care of insertion of comments at the +;; Org still relies on 'comment-dwim', but cannot trust +;; 'comment-only-p'. So, 'comment-region-function' and +;; 'uncomment-region-function' both point +;; to 'org-comment-or-uncomment-region'. Eventually, +;; 'org-insert-comment' takes care of insertion of comments at the ;; beginning of line. -;; `org-setup-comments-handling' install comments related variables -;; during `org-mode' initialization. +;; 'org-setup-comments-handling' install comments related variables +;; during 'org-mode' initialization. (defun org-setup-comments-handling () (interactive)
[elpa] externals/org a246a13 3/3: Merge branch 'km/from-emacs-master'
branch: externals/org commit a246a131873e566afe243ab98b59a806b31019b8 Merge: 72af213 d2deb18 Author: Kyle Meyer Commit: Kyle Meyer Merge branch 'km/from-emacs-master' --- lisp/ob-sql.el | 4 ++-- lisp/org-compat.el | 6 +++--- lisp/org-list.el | 2 +- lisp/org.el| 14 +++--- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lisp/ob-sql.el b/lisp/ob-sql.el index 6eae5bb..ee19946 100644 --- a/lisp/ob-sql.el +++ b/lisp/ob-sql.el @@ -208,8 +208,8 @@ Otherwise, use Emacs' standard conversion function." "Return database connection parameter NAME. Given a parameter NAME, if :dbconnection is defined in PARAMS then look for the parameter into the corresponding connection -defined in `sql-connection-alist`, otherwise look into PARAMS. -Look `sql-connection-alist` (part of SQL mode) for how to define +defined in `sql-connection-alist', otherwise look into PARAMS. +See `sql-connection-alist' (part of SQL mode) for how to define database connections." (if (assq :dbconnection params) (let* ((dbconnection (cdr (assq :dbconnection params))) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 68834fb..4ee847b 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -215,9 +215,9 @@ This is a floating point number if the size is too large for an integer." Case is significant." (string< s1 s2))) -;; The time- functions below translate nil to `current-time' and -;; accept an integer as of Emacs 25. `decode-time' and -;; `format-time-string' accept nil on Emacs 24 but don't accept an +;; The time- functions below translate nil to 'current-time' and +;; accept an integer as of Emacs 25. 'decode-time' and +;; 'format-time-string' accept nil on Emacs 24 but don't accept an ;; integer until Emacs 25. (if (< emacs-major-version 25) (let ((convert diff --git a/lisp/org-list.el b/lisp/org-list.el index d2ce129..2bd9dc4 100644 --- a/lisp/org-list.el +++ b/lisp/org-list.el @@ -3348,7 +3348,7 @@ Valid parameters are: (when (and backend (symbolp backend) (not (org-export-get-backend backend))) (user-error "Unknown :backend value")) (unless backend (require 'ox-org)) -;; When`:raw' property has a non-nil value, turn all objects back +;; When ':raw' property has a non-nil value, turn all objects back ;; into Org syntax. (when (and backend (plist-get params :raw)) (org-element-map data org-element-all-objects diff --git a/lisp/org.el b/lisp/org.el index ce68f46..d6d9c4f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -19840,15 +19840,15 @@ When BLOCK-REGEXP is non-nil, use this regexp to find blocks." ;; example-block) don't accept comments. Usual Emacs comment commands ;; cannot cope with those requirements. Therefore, Org replaces them. -;; Org still relies on `comment-dwim', but cannot trust -;; `comment-only-p'. So, `comment-region-function' and -;; `uncomment-region-function' both point -;; to`org-comment-or-uncomment-region'. Eventually, -;; `org-insert-comment' takes care of insertion of comments at the +;; Org still relies on 'comment-dwim', but cannot trust +;; 'comment-only-p'. So, 'comment-region-function' and +;; 'uncomment-region-function' both point +;; to 'org-comment-or-uncomment-region'. Eventually, +;; 'org-insert-comment' takes care of insertion of comments at the ;; beginning of line. -;; `org-setup-comments-handling' install comments related variables -;; during `org-mode' initialization. +;; 'org-setup-comments-handling' install comments related variables +;; during 'org-mode' initialization. (defun org-setup-comments-handling () (interactive)
[nongnu] elpa/markdown-mode 3a29243 1/2: Update stable version link
branch: elpa/markdown-mode
commit 3a2924311d7cd5fa64126e1769d166282e35ad4f
Author: Shohei YOSHIDA
Commit: Shohei YOSHIDA
Update stable version link
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 342e1de..754f995 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ to load automatically by adding the following to your init
file:
(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
```
-[markdown-mode.el]:
https://jblevins.org/projects/markdown-mode/markdown-mode.el
+[markdown-mode.el]:
https://raw.githubusercontent.com/jrblevin/markdown-mode/v2.4/markdown-mode.el
**Development Version**
[nongnu] elpa/markdown-mode 862ae8a 2/2: Merge pull request #657 from jrblevin/fix-stable-version-link
branch: elpa/markdown-mode
commit 862ae8addd29bf6affca1a35fd0176cb0c1392da
Merge: 4810cac 3a29243
Author: Shohei YOSHIDA
Commit: GitHub
Merge pull request #657 from jrblevin/fix-stable-version-link
Update stable version link
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 342e1de..754f995 100644
--- a/README.md
+++ b/README.md
@@ -105,7 +105,7 @@ to load automatically by adding the following to your init
file:
(add-to-list 'auto-mode-alist '("README\\.md\\'" . gfm-mode))
```
-[markdown-mode.el]:
https://jblevins.org/projects/markdown-mode/markdown-mode.el
+[markdown-mode.el]:
https://raw.githubusercontent.com/jrblevin/markdown-mode/v2.4/markdown-mode.el
**Development Version**
