[nongnu] elpa/magit 895e4feced 13/17: magit-file-{rename, untrack, delete}: Autoload
branch: elpa/magit
commit 895e4feced0eea2875422db9bd4a3d417af78732
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-file-{rename,untrack,delete}: Autoload
---
lisp/magit-files.el | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 765979727c..f361254aeb 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -419,6 +419,7 @@ the same location in the respective file in the working
tree."
;;; File Commands
+;;;###autoload
(defun magit-file-rename (file newname)
"Rename or move FILE to NEWNAME.
NEWNAME may be a file or directory name. If FILE isn't tracked in
@@ -455,6 +456,7 @@ Git, fallback to using `rename-file'."
(vc-find-file-hook))
(magit-refresh))
+;;;###autoload
(defun magit-file-untrack (files &optional force)
"Untrack the selected FILES or one file read in the minibuffer.
@@ -469,6 +471,7 @@ staged as well as unstaged changes."
(magit-with-toplevel
(magit-run-git "rm" "--cached" (and force "--force") "--" files)))
+;;;###autoload
(defun magit-file-delete (files &optional force)
"Delete the selected FILES or one file read in the minibuffer.
[elpa] externals/denote-journal a824db10af 1/4: Use denote-open-link-function instead of hardcoding find-file-other-window
branch: externals/denote-journal commit a824db10af1ce0cc4e9903bfdd5f7ee9b27ef17f Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Use denote-open-link-function instead of hardcoding find-file-other-window --- denote-journal.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/denote-journal.el b/denote-journal.el index b7501c8c82..420b415aab 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -355,7 +355,7 @@ among them." (file (if (> (length files) 1) (completing-read "Select journal entry: " files nil t) (car files -(find-file-other-window file) +(funcall denote-open-link-function file) (user-error "No Denote journal entry for this date" (defun denote-journal-calendar-new-or-existing () @@ -369,7 +369,7 @@ among them." (progn (calendar-mark-visible-date calendar-date 'denote-journal-calendar) ;; Do not use the same `calendar' window... - (cl-letf (((symbol-function #'find-file) #'find-file-other-window)) + (cl-letf (((symbol-function #'find-file) denote-open-link-function)) (denote-journal-new-or-existing-entry internal))) (user-error "No Denote journal entry for this date"
[elpa] externals/denote-journal 2db19387a0 4/4: Clarify wording of denote-journal-title-format documentation
branch: externals/denote-journal commit 2db19387a0224dc671c0b63f6544622aeb335430 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Clarify wording of denote-journal-title-format documentation --- README.org| 45 + denote-journal.el | 2 +- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/README.org b/README.org index 1efcb9b6f6..73b18d95ac 100644 --- a/README.org +++ b/README.org @@ -286,31 +286,28 @@ the file-naming scheme for searching or filtering"). :END: #+vindex: denote-journal-title-format -New journal entries will use the current date as the title of the new +New journal entries will use the current date as the title of the entry. The exact format is controlled by the user option -~denote-journal-title-format~. Acceptable values for this user option -and their corresponding styles are: - -| Symbol | Style | -|-+---| -| day | Monday| -| day-date-month-year | Monday 19 September 2023 | -| day-date-month-year-24h | Monday 19 September 2023 20:49| -| day-date-month-year-12h | Monday 19 September 2023 08:49 PM | - -For example: - -#+begin_src emacs-lisp -(setq denote-journal-title-format 'day-date-month-year) -#+end_src - -If the value of this user option is ~nil~, then the command -~denote-journal-new-entry~ will prompt for a title. In terms of -workflow, using the current date as the title is better for -maintaining a daily journal. A prompt for an arbitrary title is more -suitable for those who like to keep a record of something like a -thought or event (though this can also be achieved with the regular -~denote~ command or a variant thereof like ~denote-subdirectory~). +~denote-journal-title-format~. The value it can take is either nil, a +custom string, or a symbol: + +- When ~denote-journal-title-format~ is set to a nil value, then new + journal entries always prompt for a title. Users will want this if + they prefer to journal using a given theme for the day rather than + the date itself (e.g. instead of "1st of April 2025" they may prefer + something like "Early Spring at the hut"). + +- When ~denote-journal-title-format~ is set to a symbol, it is one + among =day= (results in a title like =Tuesday=), =day-date-month-year= + (for a result like =Tuesday 1 April 2025=), =day-date-month-year-24h= + (for =Tuesday 1 April 2025 13:46=), or =day-date-month-year-12h= + (e.g. =Tuesday 1 April 2025 02:46 PM=). + +- When ~denote-journal-title-format~ is set to a string, it is used + literally except for any "format specifiers", as interpreted by the + function ~format-time-string~, which are replaced by their given + date component. For example, the ="Week %V on %A %e %B %Y at %H:%M"= + will yield a title like =Week 14 on 1 April 2025 at 13:48=. ** Create a journal entry using Org capture :PROPERTIES: diff --git a/denote-journal.el b/denote-journal.el index cdec87090d..5b68300e99 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -68,7 +68,7 @@ It is used by `denote-journal-new-entry' (or related)." "Date format to construct the title with `denote-journal-new-entry'. The value is either a symbol or an arbitrary string that is passed to `format-time-string' (consult its documentation for the -technicalities). +technicalities, such as how to include week numbers). Acceptable symbols and their corresponding styles are:
[elpa] externals/denote-journal updated (807e16e8e5 -> 2db19387a0)
elpasync pushed a change to branch externals/denote-journal. from 807e16e8e5 Update the denote-journal-calendar--file-to-date doc string new a824db10af Use denote-open-link-function instead of hardcoding find-file-other-window new 45f36f95d6 Define denote-journal-select-file-prompt to streamline file selection when >1 entries for a date new b4ba18a738 Make stylistic change in denote-journal-path-to-new-or-existing-entry new 2db19387a0 Clarify wording of denote-journal-title-format documentation Summary of changes: README.org| 45 + denote-journal.el | 34 +++--- 2 files changed, 40 insertions(+), 39 deletions(-)
[nongnu] elpa/magit 64e69ea809 11/17: magit--git-insert: Do not return empty string as error message
branch: elpa/magit
commit 64e69ea809042a1182c7a0b3e92c1f7c6b4f8b6b
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit--git-insert: Do not return empty string as error message
When RETURN-ERROR is `full' this function returns all stderr output.
If there was nothing on stderr, then it returned the empty string,
now it returns the exit code in that case too.
If a caller of `magit--git-wash' uses `wash-anyway' for KEEP-ERROR, it
likely does so because a non-zero exit code does not necessarily mean
that an error occurred. If `magit--git-insert' cannot find any error
string in such a case, that is because there wasn't actually an error,
and it must return the exit code. This does not affect the case when
there is an actual error because that would be accompanied by non-empty
stdout.
Callers can then still interpret the non-zero, non-string return value
as an error, but they don't have to. (magit--git-wash ... 'wash-anyway
...) does not and because it no longer ends up inserting the empty
string and some separator whitespace before the output from stdout,
stdout washing does no longer break.
The command `magit-diff-paths' uses `magit--git-wash' as described, and
it broke when support for `full' as a special RETURN-ERROR was added in
[1: 1f17e515cf]. (Like "diff", "git diff --no-index" exits with 1 if
there are differences.)
Fixes second coming of #5093.
1: 2024-11-15 1f17e515cfbef3acfd2bdf990cd206d6ae02010b
magit--git-{insert,wash}: Potentially use complete error text
---
lisp/magit-git.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/magit-git.el b/lisp/magit-git.el
index d432531d21..4c5ec28029 100644
--- a/lisp/magit-git.el
+++ b/lisp/magit-git.el
@@ -484,7 +484,8 @@ insert the run command and stderr into the process buffer."
(setq errmsg
(cond
((eq return-error 'full)
-(buffer-string))
+(let ((str (buffer-string)))
+ (and (not (equal str "")) str)))
((functionp magit-git-debug)
(funcall magit-git-debug (buffer-string)))
((magit--locate-error-message)
[nongnu] elpa/magit ce9f1a5427 07/17: magit-toggle-git-debug: Fix key binding in docstring
branch: elpa/magit commit ce9f1a5427c735bcfba144ef3bacd9aad2d72bce Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-toggle-git-debug: Fix key binding in docstring --- lisp/magit-git.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 4323993515..e6f57d83e7 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -235,7 +235,8 @@ Magit basically calls git for one of these two reasons: for side-effects or to do something with its standard output. When git is run for side-effects then its output, including error -messages, go into the process buffer which is shown when using ~$~. +messages, go into the process buffer which is shown when using \ +[magit-process-buffer]. When git's output is consumed in some way, then it would be too expensive to also insert it into this buffer, but with this command
[elpa] externals/denote-journal 3a6ce875c9 08/10: Add eval-when-compile for cl-lib because we use cl-letf
branch: externals/denote-journal commit 3a6ce875c9bdea6157efd345fffbd1726cc3357e Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Add eval-when-compile for cl-lib because we use cl-letf --- denote-journal.el | 1 + 1 file changed, 1 insertion(+) diff --git a/denote-journal.el b/denote-journal.el index 75e451502a..7fac071a4f 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -33,6 +33,7 @@ (require 'denote) (require 'calendar) +(eval-when-compile (require 'cl-lib)) (defgroup denote-journal nil "Convenience functions for daily journaling with Denote."
[nongnu] elpa/magit 65437016c2 06/17: magit-git-executable: Change name of output buffer
branch: elpa/magit commit 65437016c28bd2d27cb2302841bcc2fb4da1679c Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-git-executable: Change name of output buffer Naming it *magit-git-debug* because there is a variable by that name, which enables debugging that does *not* use this buffer. --- lisp/magit-git.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 2d47c91d95..4323993515 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -679,7 +679,7 @@ values of `magit-remote-git-executable' and `exec-path'.\n")) Also include information about `magit-remote-git-executable'. See info node `(magit)Debugging Tools' for more information." (interactive) - (with-current-buffer (get-buffer-create "*magit-git-debug*") + (with-current-buffer (get-buffer-create "*magit-git-executable*") (pop-to-buffer (current-buffer)) (erase-buffer) (insert (format "magit-remote-git-executable: %S\n"
[elpa] externals/denote-journal updated (d71692bd8c -> 807e16e8e5)
elpasync pushed a change to branch externals/denote-journal. from d71692bd8c CHECK CAREFULLY Make denote-journal-calendar--get-files limit results to date range new c6a76f22bf Change the denote-journal-calendar--get-files indentation of one expression new e76e04b73d Clarify the doc string of denote-journal-calendar-mark-dates new 36c4fd60ce Clarify doc string of denote-journal-calendar--date-to-time new 0d1a82a21a Change the name of a helper function and clarify its doc string new 71026c5aad Change the error message of denote-journal-calendar-new-or-existing new 8e32975a20 Make denote-journal-calendar-new-or-existing error more precise new 4c3f0d16ea Make the denote-journal-calendar-find-file error more precise new 3a6ce875c9 Add eval-when-compile for cl-lib because we use cl-letf new a68740cb83 Remove faulty extra argument from remove-hook in denote-journal-calendar-mode new 807e16e8e5 Update the denote-journal-calendar--file-to-date doc string Summary of changes: denote-journal.el | 47 --- 1 file changed, 24 insertions(+), 23 deletions(-)
[elpa] externals/denote-journal 4c3f0d16ea 07/10: Make the denote-journal-calendar-find-file error more precise
branch: externals/denote-journal commit 4c3f0d16ea640ec06a6078305f6ea49a8d7f48da Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Make the denote-journal-calendar-find-file error more precise --- denote-journal.el | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/denote-journal.el b/denote-journal.el index 330cf2ca8a..75e451502a 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -350,13 +350,13 @@ among them." (interactive nil calendar-mode) (unless (derived-mode-p 'calendar-mode) (user-error "Only use this command inside the `calendar'")) - (if-let* ((calendar-date (calendar-cursor-to-date)) -(files (denote-journal-calendar--date-to-identifier calendar-date)) -(file (if (> (length files) 1) - (completing-read "Select journal entry: " files nil t) -(car files - (find-file-other-window file) -(user-error "No Denote journal entry for this date"))) + (when-let* ((calendar-date (calendar-cursor-to-date))) +(if-let* ((files (denote-journal-calendar--date-to-identifier calendar-date)) + (file (if (> (length files) 1) +(completing-read "Select journal entry: " files nil t) + (car files +(find-file-other-window file) + (user-error "No Denote journal entry for this date" (defun denote-journal-calendar-new-or-existing () "Like `denote-journal-new-or-existing-entry' for the `calendar' date at point."
[elpa] externals/denote-journal 39728e976a 1/2: Avoid concating absolute path to denote-directory
branch: externals/denote-journal commit 39728e976a9d5b06c14431746649d290c1b9eac0 Author: Honza Pokorny Commit: Honza Pokorny Avoid concating absolute path to denote-directory --- denote-journal.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/denote-journal.el b/denote-journal.el index 5b68300e99..caa31e025a 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -213,7 +213,7 @@ Perform the operation relative to the variable `denote-journal-directory'." (relative-files (mapcar #'denote-get-file-name-relative-to-denote-directory files)) (file (if (> (length files) 1) (completing-read "Select journal entry: " (denote--completion-table 'file relative-files) nil t) - (car files + (car relative-files (concat denote-directory file))) ;;;###autoload
[nongnu] elpa/helm 9c390d36cb 2/4: Inherit from isearch in helm-selection for tty's (#2714)
branch: elpa/helm commit 9c390d36cb165a8eeb3eb521002b88d18c98999f Author: Thierry Volpiatto Commit: Thierry Volpiatto Inherit from isearch in helm-selection for tty's (#2714) --- helm-core.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm-core.el b/helm-core.el index ffeb61c1fc..aa81cb3d9d 100644 --- a/helm-core.el +++ b/helm-core.el @@ -1208,7 +1208,7 @@ then doesn't use `while-no-input', because `while-no-input' throws on (defface helm-selection `type tty pc)) ,@(and (>= emacs-major-version 27) '(:extend t)) - :inherit highlight) + :inherit isearch) (((background dark)) ,@(and (>= emacs-major-version 27) '(:extend t)) :background "ForestGreen"
[nongnu] elpa/helm 15494ab4e1 1/4: Allow passing a nil arg to helm-force-update
branch: elpa/helm commit 15494ab4e13bd16563b6078089670f75aa72c490 Author: Thierry Volpiatto Commit: Thierry Volpiatto Allow passing a nil arg to helm-force-update Ensure helm-select-action doesn't try to preselect. --- helm-core.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/helm-core.el b/helm-core.el index 2831e02408..ffeb61c1fc 100644 --- a/helm-core.el +++ b/helm-core.el @@ -5226,7 +5226,7 @@ Argument OVERLAY is a ref-cell." (error nil)) (helm-follow-execute-persistent-action-maybe))) -(cl-defun helm-force-update (&optional preselect (recenter t)) +(cl-defun helm-force-update (&optional (preselect nil spreselect) (recenter t)) "Force recalculation and update of candidates. Unlike `helm-update', this function re-evaluates `init' and @@ -5245,7 +5245,7 @@ passed as argument to `recenter'." (regexp-quote it (setq helm--force-updating-p t) (mapc 'helm-force-update--reinit helm-sources) - (helm-update (or preselect selection) source) + (helm-update (if spreselect preselect selection) source) (when (and (helm-window) recenter) (with-helm-window (recenter (and (numberp recenter) recenter))) @@ -5737,7 +5737,7 @@ If action buffer is selected, back to the Helm buffer." ;; was itself force updating, now do it explicitely ;; from here. (helm-set-pattern "" t) - (helm-force-update) + (helm-force-update nil) ;; Unhide minibuffer to make visible action prompt [1]. (with-selected-window (minibuffer-window) (remove-overlays) (setq cursor-type t))
[elpa] externals/denote-journal 0d1a82a21a 04/10: Change the name of a helper function and clarify its doc string
branch: externals/denote-journal commit 0d1a82a21ac98b28908813210af96542c9d536af Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Change the name of a helper function and clarify its doc string --- denote-journal.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/denote-journal.el b/denote-journal.el index e363edf92c..0265b9b84c 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -336,9 +336,9 @@ CALENDAR-DATE is a list of three numbers, in the form of (MONTH DAY YEAR)." (time (format-time-string "%T"))) (date-to-time (format "%s-%02d-%02d %s" year month day time -(defun denote-journal-calendar--date-at-point-to-identifier (calendar-date) +(defun denote-journal-calendar--date-to-identifier (calendar-date) "Return path to Denote journal entry corresponding to CALENDAR-DATE. -CALENDAR-DATE is commensurate with `calendar-cursor-to-date'." +CALENDAR-DATE is a list of three numbers, in the form of (MONTH DAY YEAR)." (when-let* ((date (denote-journal-calendar--date-to-time calendar-date))) (denote-journal--entry-today date))) @@ -351,7 +351,7 @@ among them." (unless (derived-mode-p 'calendar-mode) (user-error "Only use this command inside the `calendar'")) (if-let* ((calendar-date (calendar-cursor-to-date)) -(files (denote-journal-calendar--date-at-point-to-identifier calendar-date)) +(files (denote-journal-calendar--date-to-identifier calendar-date)) (file (if (> (length files) 1) (completing-read "Select journal entry: " files nil t) (car files
[elpa] externals/denote-journal 807e16e8e5 10/10: Update the denote-journal-calendar--file-to-date doc string
branch: externals/denote-journal commit 807e16e8e5cef14ad05fea8f3895b704037cc733 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Update the denote-journal-calendar--file-to-date doc string --- denote-journal.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/denote-journal.el b/denote-journal.el index dc3e0cd250..b7501c8c82 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -291,8 +291,7 @@ file's title. This has the same meaning as in `denote-link'." "Face to mark a Denote journal entry in the `calendar'.") (defun denote-journal-calendar--file-to-date (file) - "Convert FILE to date. -Return (MONTH DAY YEAR) or nil if not an Org time-string." + "Convert FILE to calendar date by interpreting its identifier." (when-let* ((identifier (denote-retrieve-filename-identifier file)) (date (denote--id-to-date identifier)) (numbers (mapcar #'string-to-number (split-string date "-"
[elpa] externals/denote-journal 36c4fd60ce 03/10: Clarify doc string of denote-journal-calendar--date-to-time
branch: externals/denote-journal commit 36c4fd60ce177cd31f0e983c5b2a3689352f22d7 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Clarify doc string of denote-journal-calendar--date-to-time --- denote-journal.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/denote-journal.el b/denote-journal.el index 21154d82cf..e363edf92c 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -331,7 +331,7 @@ Return (MONTH DAY YEAR) or nil if not an Org time-string." (defun denote-journal-calendar--date-to-time (calendar-date) "Return internal time of `calendar' CALENDAR-DATE. -CALENDAR-DATE is commensurate with `calendar-cursor-to-date'." +CALENDAR-DATE is a list of three numbers, in the form of (MONTH DAY YEAR)." (pcase-let ((`(,month ,day ,year) calendar-date) (time (format-time-string "%T"))) (date-to-time (format "%s-%02d-%02d %s" year month day time
[elpa] externals/denote-journal 71026c5aad 05/10: Change the error message of denote-journal-calendar-new-or-existing
branch: externals/denote-journal commit 71026c5aad295540045ce1e0b6c913bbeb01b438 Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Change the error message of denote-journal-calendar-new-or-existing --- denote-journal.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/denote-journal.el b/denote-journal.el index 0265b9b84c..c8db40be81 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -371,7 +371,7 @@ among them." ;; Do not use the same `calendar' window... (cl-letf (((symbol-function #'find-file) #'find-file-other-window)) (denote-journal-new-or-existing-entry internal))) -(user-error "No Denote journal entry for this calendar-date"))) +(user-error "No Denote journal entry for this date"))) (defvar denote-journal-calendar-mode-map (let ((map (make-sparse-keymap)))
[nongnu] elpa/magit 6aec967ee4 01/17: Move Ido kludges to a new package magit-ido
branch: elpa/magit commit 6aec967ee4af617ddae577153208bd8a8bb011f0 Author: Jonas Bernoulli Commit: Jonas Bernoulli Move Ido kludges to a new package magit-ido --- lisp/magit-base.el | 43 +-- lisp/magit-extras.el| 15 --- lisp/magit-submodule.el | 22 -- lisp/magit-subtree.el | 1 - 4 files changed, 17 insertions(+), 64 deletions(-) diff --git a/lisp/magit-base.el b/lisp/magit-base.el index b2b401f201..635b3f835a 100644 --- a/lisp/magit-base.el +++ b/lisp/magit-base.el @@ -69,21 +69,17 @@ (defcustom magit-completing-read-function #'magit-builtin-completing-read "Function to be called when requesting input from the user. -If you have enabled `ivy-mode' or `helm-mode', then you don't -have to customize this option; `magit-builtin-completing-read' -will work just fine. However, if you use Ido completion, then -you do have to use `magit-ido-completing-read', because Ido is -less well behaved than the former, more modern alternatives. - -If you would like to use Ivy or Helm completion with Magit but -not enable the respective modes globally, then customize this -option to use `ivy-completing-read' or -`helm--completing-read-default'. If you choose to use -`ivy-completing-read', note that the items may always be shown in -alphabetical order, depending on your version of Ivy." +The default, `magit-builtin-completing-read', support third-party +completion frameworks, including `vertico-mode', `ivy-mode' and +`helm-mode'. + +However, if you would like to use Ivy or Helm completion with Magit but +not enable the respective modes globally, then customize this option to +use `ivy-completing-read' or `helm--completing-read-default'. + +If you still use `ido-mode', you'll likely need the `magit-ido' package." :group 'magit-essentials :type `(radio (function-item ,#'magit-builtin-completing-read) -(function-item ,#'magit-ido-completing-read) (function-item ivy-completing-read) (function-item helm--completing-read-default) (function :tag "Other function"))) @@ -699,27 +695,6 @@ third-party completion frameworks." hist def inherit-input-method))) (if no-split input values))) -(defun magit-ido-completing-read -(prompt choices &optional predicate require-match initial-input hist def) - "Ido-based `completing-read' almost-replacement. - -Unfortunately `ido-completing-read' is not suitable as a -drop-in replacement for `completing-read', instead we use -`ido-completing-read+' from the third-party package by the -same name." - (if (and (require 'ido-completing-read+ nil t) - (fboundp 'ido-completing-read+)) - (ido-completing-read+ prompt choices predicate require-match -initial-input hist -(or def (and require-match (car choices -(display-warning 'magit "ido-completing-read+ is not installed - -To use Ido completion with Magit you need to install the -third-party `ido-completing-read+' packages. Falling -back to built-in `completing-read' for now." :error) -(magit-builtin-completing-read prompt choices predicate require-match - initial-input hist def))) - (defvar-keymap magit-minibuffer-local-ns-map :parent minibuffer-local-map "SPC" #'magit-whitespace-disallowed diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el index 5e399440fe..63264584dc 100644 --- a/lisp/magit-extras.el +++ b/lisp/magit-extras.el @@ -34,8 +34,6 @@ (declare-function vc-git-command "vc-git" (buffer okstatus file-or-list &rest flags)) -(defvar ido-exit) -(defvar ido-fallback) (defvar project-prefix-map) (defvar project-switch-commands) @@ -193,19 +191,6 @@ blame to center around the line point is on." ;;; Emacs Tools -;;;###autoload -(defun ido-enter-magit-status () - "Drop into `magit-status' from file switching. - -To make this command available use something like: - - (keymap-set ido-common-completion-map - \"C-x g\" \\='ido-enter-magit-status)" - (interactive) - (setq ido-exit 'fallback) - (setq ido-fallback #'magit-status) - (exit-minibuffer)) - ;;;###autoload (defun magit-project-status () "Run `magit-status' in the current project's root." diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el index a342e9ab76..18eb9dab7d 100644 --- a/lisp/magit-submodule.el +++ b/lisp/magit-submodule.el @@ -220,26 +220,20 @@ it is nil, then PATH also becomes the name." (interactive (magit-with-toplevel (let* ((url (magit-read-string-ns "Add submodule (remote url)")) -(path (let ((read-file-name-function - (if (or (eq read-file-name-function 'ido-read-file-name) - (advice-function-member-p - 'ido-read-file-name - read-file-name-funct
[nongnu] elpa/magit 88464b5363 09/17: magit-git-debug: Add docstring
branch: elpa/magit commit 88464b5363675d9fda27f4275d79fae96cbc6408 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-git-debug: Add docstring --- lisp/magit-git.el | 11 ++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index 865ddb1aff..41587bc73e 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -226,7 +226,16 @@ framework ultimately determines how the collection is displayed." ;;; Git -(defvar magit-git-debug nil) +(defvar magit-git-debug nil + "Whether and how to enable additional debugging of git errors. + +Use `magit-toggle-git-debug' (which see) to toggle the boolean value of +this variable. This can also manually be set to `include-success', in +which case successful git invocations are also logged. + +This can also be a function, which takes one argument, the error output +as a string. This is intended for internal use and is established using +let-bindings around critical code (i.e., in `magit--assert-usable-git').") (defun magit-toggle-git-debug () "Toggle whether additional git errors are reported.
[nongnu] elpa/magit 69cd033e82 08/17: magit-git-debug: Rename value all to include-success
branch: elpa/magit commit 69cd033e825bca10285fb12f6a19f8d558666071 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-git-debug: Rename value all to include-success "All" is misleading as this does not include each and every git invocation. There are low-level functions which by pass even this most extreme setting. --- lisp/magit-git.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index e6f57d83e7..865ddb1aff 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -467,7 +467,7 @@ insert the run command and stderr into the process buffer." (setq log (make-temp-file "magit-stderr")) (delete-file log) (setq exit (magit-process-git (list t log) args)) - (when (or (> exit 0) (eq magit-git-debug 'all)) + (when (or (> exit 0) (eq magit-git-debug 'include-success)) (when (file-exists-p log) (with-temp-buffer (insert-file-contents log)
[nongnu] elpa/magit 3dcff7ece5 14/17: magit-file-untrack: Move definition
branch: elpa/magit commit 3dcff7ece5f3e3fe9bb1fe59d54b9c12991234b9 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-file-untrack: Move definition Order definitions the same as these commands are ordered in the menu. --- lisp/magit-files.el | 30 +++--- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/lisp/magit-files.el b/lisp/magit-files.el index f361254aeb..2519d302df 100644 --- a/lisp/magit-files.el +++ b/lisp/magit-files.el @@ -419,6 +419,21 @@ the same location in the respective file in the working tree." ;;; File Commands +;;;###autoload +(defun magit-file-untrack (files &optional force) + "Untrack the selected FILES or one file read in the minibuffer. + +With a prefix argument FORCE do so even when the files have +staged as well as unstaged changes." + (interactive (list (or (if-let ((files (magit-region-values 'file t))) + (if (magit-file-tracked-p (car files)) + (magit-confirm-files 'untrack files "Untrack") + (user-error "Already untracked")) + (list (magit-read-tracked-file "Untrack file" + current-prefix-arg)) + (magit-with-toplevel +(magit-run-git "rm" "--cached" (and force "--force") "--" files))) + ;;;###autoload (defun magit-file-rename (file newname) "Rename or move FILE to NEWNAME. @@ -456,21 +471,6 @@ Git, fallback to using `rename-file'." (vc-find-file-hook)) (magit-refresh)) -;;;###autoload -(defun magit-file-untrack (files &optional force) - "Untrack the selected FILES or one file read in the minibuffer. - -With a prefix argument FORCE do so even when the files have -staged as well as unstaged changes." - (interactive (list (or (if-let ((files (magit-region-values 'file t))) - (if (magit-file-tracked-p (car files)) - (magit-confirm-files 'untrack files "Untrack") - (user-error "Already untracked")) - (list (magit-read-tracked-file "Untrack file" - current-prefix-arg)) - (magit-with-toplevel -(magit-run-git "rm" "--cached" (and force "--force") "--" files))) - ;;;###autoload (defun magit-file-delete (files &optional force) "Delete the selected FILES or one file read in the minibuffer.
[nongnu] elpa/magit 4fed8d67a5 12/17: magit-rebase-autosquash: With a prefix allow selecting beginning
branch: elpa/magit commit 4fed8d67a5a2edcf541aab6495542e23aff42f9b Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-rebase-autosquash: With a prefix allow selecting beginning --- docs/magit.org | 5 + lisp/magit-sequence.el | 33 ++--- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/docs/magit.org b/docs/magit.org index 19d86ad731..ea86633e87 100644 --- a/docs/magit.org +++ b/docs/magit.org @@ -6014,6 +6014,11 @@ is not enabled in the transient. This command combines squash and fixup commits with their intended targets. + By default only commits that are not reachable from the upstream + branch are potentially squashed into. If no upstream is configured + or with a prefix argument, the user is prompted for the first commit + to potentially squash into. + - Key: r m (magit-rebase-edit-commit) :: This command starts an interactive rebase sequence that lets the diff --git a/lisp/magit-sequence.el b/lisp/magit-sequence.el index 5cc119a110..87ab203e46 100644 --- a/lisp/magit-sequence.el +++ b/lisp/magit-sequence.el @@ -675,17 +675,13 @@ START has to be selected from a list of recent commits." (commit args message &optional editor delay-edit-confirm noassert confirm) (declare (indent 2)) (when commit -(if (eq commit :merge-base) -(setq commit - (and-let* ((upstream (magit-get-upstream-branch))) -(magit-git-string "merge-base" upstream "HEAD"))) - (unless (magit-rev-ancestor-p commit "HEAD") -(user-error "%s isn't an ancestor of HEAD" commit)) - (if (magit-commit-parents commit) - (when (or (not (eq this-command 'magit-rebase-interactive)) -magit-rebase-interactive-include-selected) -(setq commit (concat commit "^"))) -(setq args (cons "--root" args) +(unless (magit-rev-ancestor-p commit "HEAD") + (user-error "%s isn't an ancestor of HEAD" commit)) +(if (magit-commit-parents commit) +(when (or (not (eq this-command 'magit-rebase-interactive)) + magit-rebase-interactive-include-selected) + (setq commit (concat commit "^"))) + (setq args (cons "--root" args (when (and commit (not noassert)) (setq commit (magit-rebase-interactive-assert commit delay-edit-confirm @@ -761,10 +757,17 @@ START has to be selected from a list of recent commits." nil t)) ;;;###autoload -(defun magit-rebase-autosquash (args) - "Combine squash and fixup commits with their intended targets." - (interactive (list (magit-rebase-arguments))) - (magit-rebase-interactive-1 :merge-base +(defun magit-rebase-autosquash (select args) + "Combine squash and fixup commits with their intended targets. +By default only squash into commits that are not reachable from +the upstream branch. If no upstream is configured or with a prefix +argument, prompt for the first commit to potentially squash into." + (interactive (list current-prefix-arg + (magit-rebase-arguments))) + (magit-rebase-interactive-1 + (and-let* (((not select)) + (upstream (magit-get-upstream-branch))) +(magit-git-string "merge-base" upstream "HEAD")) (nconc (list "--autosquash" "--keep-empty") args) "Type %p on a commit to squash into it and then rebase as necessary," "true" nil t))
[nongnu] elpa/magit bf920b7ff7 16/17: magit-{stage, unstage}-buffer-file: Rename to magit-file-{stage, unstage}
branch: elpa/magit
commit bf920b7ff7101d2514232fb69d6a255a51661c1d
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-{stage,unstage}-buffer-file: Rename to magit-file-{stage,unstage}
For consistency with the other `magit-file-*' commands.
---
lisp/magit-apply.el | 4 ++--
lisp/magit-files.el | 15 +++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 3a3621dd7a..43986e5a98 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -397,7 +397,7 @@ ignored) files."
(list #'magit-stage
#'magit-stage-file
#'magit-stage-modified
-'magit-stage-buffer-file))
+'magit-file-stage))
(defun magit-run-post-stage-hook ()
(when (memq this-command magit-post-stage-hook-commands)
@@ -476,7 +476,7 @@ ignored) files."
(list #'magit-unstage
#'magit-unstage-file
#'magit-unstage-all
-'magit-unstage-buffer-file))
+'magit-file-unstage))
(defun magit-run-post-unstage-hook ()
(when (memq this-command magit-post-unstage-hook-commands)
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 506ee27e3c..30827a6547 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -300,8 +300,8 @@ to `magit-dispatch'."
:info-manual "(magit) Minor Mode for Buffers Visiting Files"
[:if magit-file-relative-name
["File actions"
-(" s" "Stage"magit-stage-buffer-file)
-(" u" "Unstage" magit-unstage-buffer-file)
+(" s" "Stage"magit-file-stage)
+(" u" "Unstage" magit-file-unstage)
(", x" "Untrack" magit-file-untrack)
(", r" "Rename" magit-file-rename)
(", k" "Delete" magit-file-delete)
@@ -420,7 +420,7 @@ the same location in the respective file in the working
tree."
;;; File Commands
;;;###autoload
-(defun magit-stage-buffer-file ()
+(defun magit-file-stage ()
"Stage all changes to the file being visited in the current buffer."
(interactive)
(unless buffer-file-name
@@ -433,7 +433,7 @@ the same location in the respective file in the working
tree."
(list (magit-file-relative-name)
;;;###autoload
-(defun magit-unstage-buffer-file ()
+(defun magit-file-unstage ()
"Unstage all changes to the file being visited in the current buffer."
(interactive)
(unless buffer-file-name
@@ -581,5 +581,12 @@ If DEFAULT is non-nil, use this as the default value
instead of
(concat "No file changed in " rev-or-range)))
;;; _
+
+(define-obsolete-function-alias 'magit-stage-buffer-file
+ 'magit-file-stage "Magit 4.3.2")
+
+(define-obsolete-function-alias 'magit-unstage-buffer-file
+ 'magit-file-unstage "Magit 4.3.2")
+
(provide 'magit-files)
;;; magit-files.el ends here
[nongnu] elpa/magit c7147bb800 04/17: magit-git-insert: Fix docstring typo
branch: elpa/magit commit c7147bb800a4083ba9644381203008f0510d499d Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-git-insert: Fix docstring typo --- lisp/magit-git.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index fb8e46477a..e676d011c3 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -453,7 +453,7 @@ a boolean, then raise an error." (defun magit-git-insert (&rest args) "Execute Git with ARGS, insert stdout at point and return exit code. -If `magit-git-debug' in non-nil and the exit code is non-zero, then +If `magit-git-debug' is non-nil and the exit code is non-zero, then insert the run command and stderr into the process buffer." (apply #'magit--git-insert nil args))
[nongnu] elpa/magit b3e4f956d4 1/4: Update changelog
branch: elpa/magit commit b3e4f956d40d9febc9fe442697876e8451f17956 Author: Jonas Bernoulli Commit: Jonas Bernoulli Update changelog --- CHANGELOG | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 1aadec7455..94deda2c8b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,9 +3,9 @@ - Removed legacy options ~magit-wip-*-mode-lighter~. 225ea6fd00 -- ~magit-log-current~ now falls back to displaying log for ~HEAD~ if no - branch is checked out, and the now redundant ~magit-log-head~ is no - longer displayed in the ~magit-log~ menu by default. c8b1e12bd5 +- ~magit-log-current~ now falls back to displaying the log for ~HEAD~ if + no branch is checked out, and the now redundant ~magit-log-head~ is + no longer displayed in the ~magit-log~ menu by default. c8b1e12bd5 - Renamed ~magit-merge-into~ to ~magit-merge-dissolve~ and changed the key binding in the ~magit-merge~ menu from ~i~ to ~d~. The descripton @@ -16,6 +16,9 @@ - Added new option ~magit-process-apply-ansi-colors~ (but discourage its use). #5348 +- Support for Ido has been moved out into a new package ~magit-ido~. + 6aec967ee4 + Bugfixes: - ~magit-after-save-refresh-buffers~ did not respect @@ -32,7 +35,9 @@ Bugfixes: - After applying a hunk, the buffer was refreshed twice. #5343 -Also contains code cleanups and other fixes. +- The diff shown by ~magit-diff-paths~ was not washed. #5093 + +Also contains more code and documentation cleanups and improvements. * v4.3.12025-03-02 @@ -43,7 +48,7 @@ Also contains code cleanups and other fixes. - Added new commands ~magit-previous-reference~ and ~magit-next-reference~, with entry point ~C-c C-r~. Enable ~repeat-mode~ to keep navigating with ~p~ and ~n~. #5310 - + Bugfixes: - ~magit-commit-revise~ failed if no arguments were used. #5306
[nongnu] elpa/magit 8edb640599 3/4: Regenerate manual
branch: elpa/magit
commit 8edb640599de64b96ebc46e1836f2f68c59a443d
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
Regenerate manual
---
docs/magit.texi | 5 +
1 file changed, 5 insertions(+)
diff --git a/docs/magit.texi b/docs/magit.texi
index eced27f465..14c6f21e92 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -7098,6 +7098,11 @@ This command starts an interactive rebase sequence.
This command combines squash and fixup commits with their intended
targets.
+By default only commits that are not reachable from the upstream
+branch are potentially squashed into. If no upstream is configured
+or with a prefix argument, the user is prompted for the first commit
+to potentially squash into.
+
@item @kbd{r m} (@code{magit-rebase-edit-commit})
@kindex r m
@findex magit-rebase-edit-commit
[nongnu] elpa/magit 2a789033ec 2/4: Bump dependencies
branch: elpa/magit commit 2a789033ecc3d865ab1a4732d4e483caa1d4626c Author: Jonas Bernoulli Commit: Jonas Bernoulli Bump dependencies --- lisp/magit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/magit.el b/lisp/magit.el index 504ec9a1e0..1adfc26e84 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -21,10 +21,10 @@ ;; Package-Requires: ( ;; (emacs "27.1") ;; (compat "30.0.2.0") -;; (llama "0.6.1") +;; (llama "0.6.2") ;; (magit-section "4.3.1") ;; (seq "2.24") -;; (transient "0.8.5") +;; (transient "0.8.7") ;; (with-editor "3.4.3")) ;; SPDX-License-Identifier: GPL-3.0-or-later
[nongnu] elpa/magit bf58615a03 4/4: Release version 4.3.2
branch: elpa/magit
commit bf58615a033b8c827bf630962531c67539789215
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
Release version 4.3.2
---
CHANGELOG | 2 +-
docs/magit-section.org | 4 ++--
docs/magit-section.texi | 4 ++--
docs/magit.org | 4 ++--
docs/magit.texi | 4 ++--
lisp/magit-section.el | 2 +-
lisp/magit.el | 4 ++--
7 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 94deda2c8b..0b8b5285d9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
# -*- mode: org -*-
-* v4.3.2UNRELEASED
+* v4.3.22025-04-01
- Removed legacy options ~magit-wip-*-mode-lighter~. 225ea6fd00
diff --git a/docs/magit-section.org b/docs/magit-section.org
index 85f5d6aeda..4bc7dea3f4 100644
--- a/docs/magit-section.org
+++ b/docs/magit-section.org
@@ -7,7 +7,7 @@
#+texinfo_dir_category: Emacs
#+texinfo_dir_title: Magit-Section: (magit-section).
#+texinfo_dir_desc: Use Magit sections in your own packages.
-#+subtitle: for version 4.3.1
+#+subtitle: for version 4.3.2
#+setupfile: .orgconfig
@@ -21,7 +21,7 @@ user options see [[info:magit#Sections]]. This manual
documents how you
can use sections in your own packages.
#+texinfo: @noindent
-This manual is for Magit-Section version 4.3.1.
+This manual is for Magit-Section version 4.3.2.
#+texinfo: @insertcopying
:END:
diff --git a/docs/magit-section.texi b/docs/magit-section.texi
index c5ba12398b..a922cacab1 100644
--- a/docs/magit-section.texi
+++ b/docs/magit-section.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit-Section Developer Manual
-@subtitle for version 4.3.1
+@subtitle for version 4.3.2
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -54,7 +54,7 @@ user options see @ref{Sections,,,magit,}. This manual
documents how you
can use sections in your own packages.
@noindent
-This manual is for Magit-Section version 4.3.1.
+This manual is for Magit-Section version 4.3.2.
@insertcopying
@end ifnottex
diff --git a/docs/magit.org b/docs/magit.org
index ea86633e87..db431592ac 100644
--- a/docs/magit.org
+++ b/docs/magit.org
@@ -7,7 +7,7 @@
#+texinfo_dir_category: Emacs
#+texinfo_dir_title: Magit: (magit).
#+texinfo_dir_desc: Using Git from Emacs with Magit.
-#+subtitle: for version 4.3.1
+#+subtitle: for version 4.3.2
#+setupfile: .orgconfig
@@ -24,7 +24,7 @@ directly from within Emacs. While many fine Git clients
exist, only
Magit and Git itself deserve to be called porcelains.
#+texinfo: @noindent
-This manual is for Magit version 4.3.1.
+This manual is for Magit version 4.3.2.
#+texinfo: @insertcopying
:END:
diff --git a/docs/magit.texi b/docs/magit.texi
index 14c6f21e92..e07e147787 100644
--- a/docs/magit.texi
+++ b/docs/magit.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Magit User Manual
-@subtitle for version 4.3.1
+@subtitle for version 4.3.2
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ directly from within Emacs. While many fine Git clients
exist, only
Magit and Git itself deserve to be called porcelains.
@noindent
-This manual is for Magit version 4.3.1.
+This manual is for Magit version 4.3.2.
@insertcopying
@end ifnottex
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index 065423bdd5..e94c98321e 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -8,7 +8,7 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: tools
-;; Package-Version: 4.3.1
+;; Package-Version: 4.3.2
;; Package-Requires: (
;; (emacs "27.1")
;; (compat "30.0.2.0")
diff --git a/lisp/magit.el b/lisp/magit.el
index 1adfc26e84..b240b9436a 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -17,12 +17,12 @@
;; Homepage: https://github.com/magit/magit
;; Keywords: git tools vc
-;; Package-Version: 4.3.1
+;; Package-Version: 4.3.2
;; Package-Requires: (
;; (emacs "27.1")
;; (compat "30.0.2.0")
;; (llama "0.6.2")
-;; (magit-section "4.3.1")
+;; (magit-section "4.3.2")
;; (seq "2.24")
;; (transient "0.8.7")
;; (with-editor "3.4.3"))
[elpa] externals/transient afc88b24e4 3/3: Release version 0.8.7
branch: externals/transient
commit afc88b24e4faa5c7e246303648e70b4507652f32
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
Release version 0.8.7
---
CHANGELOG | 2 +-
docs/transient.org | 4 ++--
docs/transient.texi | 4 ++--
lisp/transient.el | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9c7d648217..d0368d55a6 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,5 @@
# -*- mode: org -*-
-* v0.8.7UNRELEASED
+* v0.8.72025-04-01
- Added new hook ~transient-post-exit-hook~. 55050b60
diff --git a/docs/transient.org b/docs/transient.org
index a2690443b7..a53fae49f6 100644
--- a/docs/transient.org
+++ b/docs/transient.org
@@ -7,7 +7,7 @@
#+texinfo_dir_category: Emacs misc features
#+texinfo_dir_title: Transient: (transient).
#+texinfo_dir_desc: Transient Commands
-#+subtitle: for version 0.8.6
+#+subtitle: for version 0.8.7
#+setupfile: .orgconfig
@@ -20,7 +20,7 @@ resource to get over that hurdle is Psionic K's interactive
tutorial,
available at https://github.com/positron-solutions/transient-showcase.
#+texinfo: @noindent
-This manual is for Transient version 0.8.6.
+This manual is for Transient version 0.8.7.
#+texinfo: @insertcopying
:END:
diff --git a/docs/transient.texi b/docs/transient.texi
index 8ada4d1946..42f4c6766c 100644
--- a/docs/transient.texi
+++ b/docs/transient.texi
@@ -31,7 +31,7 @@ General Public License for more details.
@finalout
@titlepage
@title Transient User and Developer Manual
-@subtitle for version 0.8.6
+@subtitle for version 0.8.7
@author Jonas Bernoulli
@page
@vskip 0pt plus 1filll
@@ -53,7 +53,7 @@ resource to get over that hurdle is Psionic K's interactive
tutorial,
available at @uref{https://github.com/positron-solutions/transient-showcase}.
@noindent
-This manual is for Transient version 0.8.6.
+This manual is for Transient version 0.8.7.
@insertcopying
@end ifnottex
diff --git a/lisp/transient.el b/lisp/transient.el
index 9793cb405d..fec9c7349e 100644
--- a/lisp/transient.el
+++ b/lisp/transient.el
@@ -6,7 +6,7 @@
;; Homepage: https://github.com/magit/transient
;; Keywords: extensions
-;; Package-Version: 0.8.6
+;; Package-Version: 0.8.7
;; Package-Requires: ((emacs "26.1") (compat "30.0.2.0") (seq "2.24"))
;; SPDX-License-Identifier: GPL-3.0-or-later
@@ -34,7 +34,7 @@
;;; Code:
-(defconst transient-version "0.8.6")
+(defconst transient-version "0.8.7")
(require 'cl-lib)
(require 'compat)
[elpa] externals/transient 9606ef3bb2 1/3: Update changelog
branch: externals/transient commit 9606ef3bb27634b0958904d3a8b5a8e9631f2e2d Author: Jonas Bernoulli Commit: Jonas Bernoulli Update changelog --- CHANGELOG | 12 1 file changed, 12 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d5b821f8f4..9c7d648217 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,16 @@ # -*- mode: org -*- +* v0.8.7UNRELEASED + +- Added new hook ~transient-post-exit-hook~. 55050b60 + +- ~transient-insert-suffix~ and ~transient-append-suffix~ now signal + error if the specified location is invalid. #374 + +Bug fixes: + +- Autoloaded commands were loaded too late in ~transient-init-suffix~, + resulting in the suffix prototype object not being used. 00112c11 + * v0.8.62025-03-15 Bug fixes:
[elpa] externals/transient updated (00112c11e5 -> afc88b24e4)
tarsius pushed a change to branch externals/transient. from 00112c11e5 transient--init-suffix: Load autoloaded command earlier new 9606ef3bb2 Update changelog new bc8ff0c61e Bump compat dependency new afc88b24e4 Release version 0.8.7 Summary of changes: CHANGELOG | 12 docs/transient.org | 4 ++-- docs/transient.texi | 4 ++-- lisp/transient.el | 6 +++--- 4 files changed, 19 insertions(+), 7 deletions(-)
[elpa] externals/denote-journal a68740cb83 09/10: Remove faulty extra argument from remove-hook in denote-journal-calendar-mode
branch: externals/denote-journal commit a68740cb83b3ccc3fc4350560474a98c09443f2d Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Remove faulty extra argument from remove-hook in denote-journal-calendar-mode --- denote-journal.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/denote-journal.el b/denote-journal.el index 7fac071a4f..dc3e0cd250 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -390,7 +390,7 @@ Add the function `denote-journal-calendar-mode' to the (dolist (hook '(calendar-today-visible-hook calendar-today-invisible-hook)) (add-hook hook #'denote-journal-calendar-mark-dates nil :local)) (dolist (hook '(calendar-today-visible-hook calendar-today-invisible-hook)) - (remove-hook hook #'denote-journal-calendar-mark-dates nil :local + (remove-hook hook #'denote-journal-calendar-mark-dates :local (provide 'denote-journal) ;;; denote-journal.el ends here
[elpa] externals/auctex 08075445e2: Add support for the 'build' hook
branch: externals/auctex
commit 08075445e2fc1e94e5ebd7dcc4dd14c4ccab3add
Author: Arash Esbati
Commit: Arash Esbati
Add support for the 'build' hook
* font-latex.el (font-latex-built-in-keyword-classes): Don't
fontify the code argument of \AddToHook and \AddToHookNext.
* latex.el (TeX-read-hook): Support 'build' hook.
---
font-latex.el | 2 +-
latex.el | 16 +++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/font-latex.el b/font-latex.el
index 57149bdacb..4bea8d6596 100644
--- a/font-latex.el
+++ b/font-latex.el
@@ -354,7 +354,7 @@ variable `font-latex-fontify-sectioning'." ',num)
("addvspace" "{") ("vspace" "*{") ("hspace" "*{")
("addcontentsline" "{{{") ("addtocontents" "{{")
("labelformat" "{{") ("linespread" "{")
- ("AddToHook" "{[{") ("RemoveFromHook" "{[") ("AddToHookNext" "{{")
+ ("AddToHook" "{[") ("RemoveFromHook" "{[") ("AddToHookNext" "{")
("ProvidesClass" "{[") ("ProvidesPackage" "{[") ("ProvidesFile" "{[")
("NewMarkClass" "{")
("DeclareDocumentCommand" "|{\\{{")
diff --git a/latex.el b/latex.el
index 311c104369..e320719a6b 100644
--- a/latex.el
+++ b/latex.el
@@ -3686,7 +3686,9 @@ INHERIT-INPUT-METHOD are passed to
;; From ltpara-doc.pdf
"para"
;; From ltmarks-doc.pdf
- "insertmark")))
+ "insertmark"
+ ;; From ltoutput.dtx
+ "build")))
(place (lambda (&optional opt pr)
(completing-read
(TeX-argument-prompt opt pr "Where")
@@ -3842,6 +3844,18 @@ INHERIT-INPUT-METHOD are passed to
((string= hook "shipout")
(setq where (funcall place)))
+ ;; build//: is one of (page|column) and
+ ;; is one of (before|after|(reset)?)
+ ((string= hook "build")
+ (setq name (completing-read
+ (TeX-argument-prompt nil nil "Place")
+ '("page" "column")))
+ (setq where (if (string= name "page")
+ (completing-read
+(TeX-argument-prompt nil nil "Where")
+'("after" "before" "reset"))
+ (funcall place
+
;; Other hooks or user specific input, do nothing:
(t nil))
[nongnu] elpa/helm 91b9bb40f2: Try to find a suitable face for tty's (#2714)
branch: elpa/helm commit 91b9bb40f26bc1fc64e35751be90694d6cc73745 Author: Thierry Volpiatto Commit: Thierry Volpiatto Try to find a suitable face for tty's (#2714) --- helm-core.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/helm-core.el b/helm-core.el index 9eef9914c8..2831e02408 100644 --- a/helm-core.el +++ b/helm-core.el @@ -1208,8 +1208,7 @@ then doesn't use `while-no-input', because `while-no-input' throws on (defface helm-selection `type tty pc)) ,@(and (>= emacs-major-version 27) '(:extend t)) - :background "Brightred" - :distant-foreground "black") + :inherit highlight) (((background dark)) ,@(and (>= emacs-major-version 27) '(:extend t)) :background "ForestGreen"
[elpa] externals/minuet f98350cafd 3/5: doc: fix docstring.
branch: externals/minuet commit f98350cafd8163b832a2903590b206bbcc287b17 Author: Milan Glacier Commit: Milan Glacier doc: fix docstring. --- minuet.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/minuet.el b/minuet.el index 97066cfb08..0f8250fd27 100644 --- a/minuet.el +++ b/minuet.el @@ -173,14 +173,14 @@ enclosed in markers: - ``: Current cursor location - ``: Code context before the cursor " - "The default prefix style prompt for minuet completion.") + "The default prefix-first style prompt for minuet completion.") (defvar minuet-default-prompt (concat minuet-default-prompt-prefix-first " Note that the user's code will be prompted in reverse order: first the code after the cursor, then the code before the cursor. -") "The default prefix-first style prompt for minuet completion.") +") "The default prompt for minuet completion.") (defvar minuet-default-guidelines "Guidelines:
[elpa] externals/minuet 78175bf60b 4/5: feat!: change default openai_compatible service to openrouter.
branch: externals/minuet commit 78175bf60b4536ef1d64a0c7405fb575d4ef8f66 Author: Milan Glacier Commit: Milan Glacier feat!: change default openai_compatible service to openrouter. Also change the default model used by `openai_compatible` to `qwen2.5-32b-instruct`. --- README.md | 6 +++--- minuet.el | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3180051fe5..9eaa1b95cc 100644 --- a/README.md +++ b/README.md @@ -524,9 +524,9 @@ The following config is the default. ```lisp (defvar minuet-openai-compatible-options -`(:end-point "https://api.groq.com/openai/v1/chat/completions"; - :api-key "GROQ_API_KEY" - :model "llama-3.3-70b-versatile" +`(:end-point "https://openrouter.ai/api/v1/chat/completions"; + :api-key "OPENROUTER_API_KEY" + :model "qwen/qwen2.5-32b-instruct" :system (:template minuet-default-system-template :prompt minuet-default-prompt diff --git a/minuet.el b/minuet.el index 0f8250fd27..556302895b 100644 --- a/minuet.el +++ b/minuet.el @@ -302,9 +302,9 @@ fib(5)") "Config options for Minuet Codestral provider.") (defvar minuet-openai-compatible-options - `(:end-point "https://api.groq.com/openai/v1/chat/completions"; -:api-key "GROQ_API_KEY" -:model "llama-3.3-70b-versatile" + `(:end-point "https://openrouter.ai/api/v1/chat/completions"; +:api-key "OPENROUTER_API_KEY" +:model "qwen/qwen2.5-32b-instruct" :system (:template minuet-default-system-template :prompt minuet-default-prompt
[elpa] externals/minuet 64240457eb 1/5: feat!: Implement Prefix-First prompt structure for Gemini (#36)
branch: externals/minuet
commit 64240457eb4868af8ae614c304a5691f1f6fc43d
Author: milanglacier
Commit: GitHub
feat!: Implement Prefix-First prompt structure for Gemini (#36)
- Add a new "Prefix-First" prompt structure for chat LLMs.
- Modified the Gemini provider's default prompt strategy to use this new
structure.
- Other providers will continue to use their previous default prompt
configurations.
---
README.md | 15 +++
minuet.el | 35 +-
prompt.md | 86 ++-
3 files changed, 100 insertions(+), 36 deletions(-)
diff --git a/README.md b/README.md
index a69c966b95..3180051fe5 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@
- [Claude](#claude)
- [Codestral](#codestral)
- [Gemini](#gemini)
-- [Experimental Configuration](#experimental-configuration)
- [OpenAI-compatible](#openai-compatible)
- [OpenAI-FIM-Compatible](#openai-fim-compatible)
- [Troubleshooting](#troubleshooting)
@@ -476,12 +475,12 @@ The following config is the default.
:api-key "GEMINI_API_KEY"
:system
(:template minuet-default-system-template
- :prompt minuet-default-prompt
+ :prompt minuet-default-prompt-prefix-first
:guidelines minuet-default-guidelines
:n-completions-template minuet-default-n-completion-template)
- :fewshots minuet-default-fewshots
+ :fewshots minuet-default-fewshots-prefix-first
:chat-input
- (:template minuet-default-chat-input-template
+ (:template minuet-default-chat-input-template-prefix-first
:language-and-tab minuet--default-chat-input-language-and-tab-function
:context-before-cursor minuet--default-chat-input-before-cursor-function
:context-after-cursor minuet--default-chat-input-after-cursor-function)
@@ -512,14 +511,6 @@ settings following the example:
-### Experimental Configuration
-
-Gemini appears to perform better with an alternative input structure, unlike
-other chat-based LLMs. This observation is currently experimental and requires
-further validation. For details on the experimental prompt setup currently in
-use by the maintainer, please refer to the
-[prompt
documentation](./prompt.md#an-experimental-configuration-setup-for-gemini).
-
## OpenAI-compatible
Use any providers compatible with OpenAI's chat completion API.
diff --git a/minuet.el b/minuet.el
index 844e691f7f..97066cfb08 100644
--- a/minuet.el
+++ b/minuet.el
@@ -164,7 +164,7 @@ guarantee the exact number of completion items specified,
as this
parameter serves only as a prompt guideline. The default is `3`."
:type 'integer)
-(defvar minuet-default-prompt
+(defvar minuet-default-prompt-prefix-first
"You are the backend of an AI-powered code completion engine. Your task is to
provide code suggestions based on the user's input. The user's code will be
enclosed in markers:
@@ -172,11 +172,15 @@ enclosed in markers:
- ``: Code context after the cursor
- ``: Current cursor location
- ``: Code context before the cursor
+"
+ "The default prefix style prompt for minuet completion.")
+(defvar minuet-default-prompt
+ (concat minuet-default-prompt-prefix-first
+ "
Note that the user's code will be prompted in reverse order: first the code
after the cursor, then the code before the cursor.
-"
- "The default prompt for minuet completion.")
+") "The default prefix-first style prompt for minuet completion.")
(defvar minuet-default-guidelines
"Guidelines:
@@ -207,6 +211,14 @@ after the cursor, then the code before the cursor.
{{{:context-before-cursor}}}"
"The default template for minuet chat input.")
+(defvar minuet-default-chat-input-template-prefix-first
+ "{{{:language-and-tab}}}
+
+{{{:context-before-cursor}}}
+
+{{{:context-after-cursor}}}"
+ "The default prefix-first style template for minuet chat input.")
+
(defvar minuet-default-fewshots
`((:role "user"
:content "# language: python
@@ -234,6 +246,17 @@ def fibonacci(n):
")))
+(defvar minuet-default-fewshots-prefix-first
+ `((:role "user"
+ :content "# language: python
+
+def fibonacci(n):
+
+
+
+fib(5)")
+,(cadr minuet-default-fewshots)))
+
(defvar minuet-claude-options
`(:model "claude-3-5-haiku-20241022"
:max_tokens 512
@@ -311,12 +334,12 @@ def fibonacci(n):
:api-key "GEMINI_API_KEY"
:system
(:template minuet-default-system-template
- :prompt minuet-default-prompt
+ :prompt minuet-default-prompt-prefix-first
:guidelines minuet-default-guidelines
:n-completions-template minuet-default-n-completion-template)
-:fewshots minuet-default-fewshots
+:fewshots minuet-default-fewshots-prefix-first
:chat-input
-(:template minuet-default-chat-input-template
+(:template minuet-default-chat-input-template-prefix-first
:language-and-tab minuet--default-chat-input-language-and-tab-function
:context-be
[elpa] externals/minuet 87abb854c4 5/5: doc: change openai_compatibel LLM example to Qwen-2.5-Instruct.
branch: externals/minuet commit 87abb854c416bda14b2c0fdb697dea5f3f9395e4 Author: Milan Glacier Commit: Milan Glacier doc: change openai_compatibel LLM example to Qwen-2.5-Instruct. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9eaa1b95cc..85c9c6fe9c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ - [Installation](#installation) - [Quick Start: LLM Provider Examples](#quick-start-llm-provider-examples) - [Ollama Qwen-2.5-coder:3b](#ollama-qwen-25-coder3b) - - [OpenRouter Llama-3.3-70b-instruct](#openrouter-llama-33-70b-instruct) + - [OpenRouter Qwen2.5-32B-Instruct](#openrouter-qwen25-32b-instruct) - [Llama.cpp Qwen-2.5-coder:1.5b](#llamacpp-qwen-25-coder15b) - [API Keys](#api-keys) - [Selecting a Provider or Model](#selecting-a-provider-or-model) @@ -144,7 +144,7 @@ managers. -## OpenRouter Llama-3.3-70b-instruct +## OpenRouter Qwen2.5-32B-Instruct @@ -158,7 +158,7 @@ managers. (plist-put minuet-openai-compatible-options :end-point "https://openrouter.ai/api/v1/chat/completions";) (plist-put minuet-openai-compatible-options :api-key "OPENROUTER_API_KEY") -(plist-put minuet-openai-compatible-options :model "meta-llama/llama-3.3-70b-instruct") +(plist-put minuet-openai-compatible-options :model "qwen/qwen2.5-32b-instruct") ;; Prioritize throughput for faster completion
[nongnu] elpa/aidermacs 3a5199e42d: readme: add spacemacs example
branch: elpa/aidermacs commit 3a5199e42db4ab0fa137d74872208b624d8c8cd2 Author: Christian Stewart Commit: Matthew Zeng readme: add spacemacs example Signed-off-by: Christian Stewart --- README.md | 23 ++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7fe3799272..7b9ea85ceb 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,28 @@ Here's what the community is saying about Aidermacs: (aidermacs-use-architect-mode t) (aidermacs-default-model "sonnet")) ``` -3. Open a project and run `M-x aidermacs-transient-menu` or `C-c a` (where you bind it) + +### Spacemacs + +For **Spacemacs** users: + +1. Add `aidermacs` to your `dotspacemacs-additional-packages` list in your `.spacemacs` file: +```emacs-lisp +dotspacemacs-additional-packages '( + (aidermacs :variables + aidermacs-use-architect-mode t + aidermacs-default-model "sonnet") +) +``` + +2. Add the keybinding to your `dotspacemacs/user-config` function in `.spacemacs`: +```emacs-lisp +(defun dotspacemacs/user-config () + ;; Set leader key for Aidermacs + (spacemacs/set-leader-keys "aa" 'aidermacs-transient-menu) ; Example binding SPC a a +) +``` +3. Open a project and run `M-x aidermacs-transient-menu` or `SPC a a` (or your chosen binding). 4. Add files and start coding with AI! ## Usage
[nongnu] elpa/haskell-mode e9c3567393 5/5: Merge pull request #1876 from haskell/bytecomp-fixes
branch: elpa/haskell-mode commit e9c356739310332afe59b10ffa2e6c3e76f124e3 Merge: be2639592f 3112f5f4a5 Author: Steve Purcell Commit: GitHub Merge pull request #1876 from haskell/bytecomp-fixes Bytecomp fixes --- haskell-commands.el| 9 - haskell-customize.el | 2 +- haskell-indentation.el | 3 +-- haskell.el | 22 ++ w3m-haddock.el | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-) diff --git a/haskell-commands.el b/haskell-commands.el index c9ae488b4f..dd6fb99c22 100644 --- a/haskell-commands.el +++ b/haskell-commands.el @@ -710,9 +710,9 @@ function `xref-find-definitions' after new table was generated." (haskell-mode-message-line "Tags generated.")) (defun haskell-process-add-cabal-autogen () - "Add cabal's autogen dir to the GHCi search path. + "Add the cabal autogen dir to the GHCi search path. Add /dist/build/autogen/ to GHCi seatch path. -This allows modules such as 'Path_...', generated by cabal, to be +This allows modules such as \"Path_...\", generated by cabal, to be loaded by GHCi." (unless (eq 'cabal-repl (haskell-process-type)) (let* @@ -769,9 +769,8 @@ inferior GHCi process." (haskell-session-set-target session target) (when (not (string= old-target target)) (haskell-mode-toggle-interactive-prompt-state) -(unwind-protect -(when (y-or-n-p "Target changed, restart haskell process? ") - (haskell-process-start session))) +(when (y-or-n-p "Target changed, restart haskell process? ") + (haskell-process-start session)) (haskell-mode-toggle-interactive-prompt-state t) ;;;###autoload diff --git a/haskell-customize.el b/haskell-customize.el index dccddc7a6e..3ed41affe7 100644 --- a/haskell-customize.el +++ b/haskell-customize.el @@ -394,7 +394,7 @@ hindent, structured-haskell-mode, tool-de-jour, etc. You can set this per-project with a .dir-locals.el file" :group 'haskell - :type '(repeat 'string)) + :type '(repeat string)) (defcustom haskell-stylish-on-save nil "Whether to run stylish-haskell on the buffer before saving. diff --git a/haskell-indentation.el b/haskell-indentation.el index 4c2525121c..1576741b7e 100644 --- a/haskell-indentation.el +++ b/haskell-indentation.el @@ -1135,8 +1135,7 @@ layout starts." (haskell-indentation-add-indentation (+ left-indent haskell-indentation-starter-offset)) (throw 'parse-end nil)) -(setq phrase1 (cddr phrase))) - ((string= (cadr phrase) "in")) +(setq phrase1 (cddr phrase))) (defun haskell-indentation-add-indentation (indent) "" ; FIXME diff --git a/haskell.el b/haskell.el index eae8d2b9f8..33e7ac7b47 100644 --- a/haskell.el +++ b/haskell.el @@ -167,11 +167,10 @@ (interactive) (when (eq major-mode 'haskell-interactive-mode) (haskell-mode-toggle-interactive-prompt-state) -(unwind-protect -(when (and (boundp 'haskell-session) - haskell-session - (y-or-n-p "Kill the whole session? ")) - (haskell-session-kill t))) +(when (and (boundp 'haskell-session) + haskell-session + (y-or-n-p "Kill the whole session? ")) + (haskell-session-kill t)) (haskell-mode-toggle-interactive-prompt-state t))) (defun haskell-session-make (name) @@ -223,13 +222,12 @@ If `haskell-process-load-or-reload-prompt' is nil, accept `default'." (when (not (string= name "")) (let ((session (haskell-session-lookup name))) (haskell-mode-toggle-interactive-prompt-state) -(unwind-protect -(if session -(when -(y-or-n-p - (format "Session %s already exists. Use it?" name)) - session) - (haskell-session-make name))) +(if session +(when +(y-or-n-p + (format "Session %s already exists. Use it?" name)) + session) + (haskell-session-make name)) (haskell-mode-toggle-interactive-prompt-state t) ;;;###autoload diff --git a/w3m-haddock.el b/w3m-haddock.el index 0f6a9e1190..59b118bf96 100644 --- a/w3m-haddock.el +++ b/w3m-haddock.el @@ -54,7 +54,7 @@ You can rebind this if you're using hsenv by adding it to your " :group 'haskell - :type 'list) + :type '(list string)) (defvar w3m-haddock-entry-regex "^\\(\\(data\\|type\\) \\|[a-z].* :: \\)" "Regex to match entry headings.")
[nongnu] elpa/haskell-mode 3112f5f4a5 4/5: Remove no-op cond clause (bytecomp warning)
branch: elpa/haskell-mode commit 3112f5f4a5de9658b409e9994d0038962b01cb2b Author: Steve Purcell Commit: Steve Purcell Remove no-op cond clause (bytecomp warning) --- haskell-indentation.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/haskell-indentation.el b/haskell-indentation.el index 4c2525121c..1576741b7e 100644 --- a/haskell-indentation.el +++ b/haskell-indentation.el @@ -1135,8 +1135,7 @@ layout starts." (haskell-indentation-add-indentation (+ left-indent haskell-indentation-starter-offset)) (throw 'parse-end nil)) -(setq phrase1 (cddr phrase))) - ((string= (cadr phrase) "in")) +(setq phrase1 (cddr phrase))) (defun haskell-indentation-add-indentation (indent) "" ; FIXME
[nongnu] elpa/haskell-mode updated (be2639592f -> e9c3567393)
elpasync pushed a change to branch elpa/haskell-mode. from be2639592f Merge pull request #1873 from haskell/dependabot/github_actions/cachix/install-nix-action-31 new c9e76ddd22 Remove no-op unwind-protect forms (bytecomp warning) new 26b134a030 Fix quoting in docstring (bytecode warning) new e85acb09d2 Fix defcustom types (bytecomp warning) new 3112f5f4a5 Remove no-op cond clause (bytecomp warning) new e9c3567393 Merge pull request #1876 from haskell/bytecomp-fixes Summary of changes: haskell-commands.el| 9 - haskell-customize.el | 2 +- haskell-indentation.el | 3 +-- haskell.el | 22 ++ w3m-haddock.el | 2 +- 5 files changed, 17 insertions(+), 21 deletions(-)
[nongnu] elpa/haskell-mode 26b134a030 2/5: Fix quoting in docstring (bytecode warning)
branch: elpa/haskell-mode commit 26b134a0303b4ac4cf08f81c7c004a0f747e77a1 Author: Steve Purcell Commit: Steve Purcell Fix quoting in docstring (bytecode warning) See #1875 --- haskell-commands.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-commands.el b/haskell-commands.el index 992bb9c9e4..dd6fb99c22 100644 --- a/haskell-commands.el +++ b/haskell-commands.el @@ -710,9 +710,9 @@ function `xref-find-definitions' after new table was generated." (haskell-mode-message-line "Tags generated.")) (defun haskell-process-add-cabal-autogen () - "Add cabal's autogen dir to the GHCi search path. + "Add the cabal autogen dir to the GHCi search path. Add /dist/build/autogen/ to GHCi seatch path. -This allows modules such as 'Path_...', generated by cabal, to be +This allows modules such as \"Path_...\", generated by cabal, to be loaded by GHCi." (unless (eq 'cabal-repl (haskell-process-type)) (let*
[nongnu] elpa/logview 649d878f7e: Merge remote-tracking branch 'nongnu/scratch/logview'
branch: elpa/logview commit 649d878f7e2aad0f938b2cf0a870f1968b4d5e30 Merge: cd990bf637 1d1bcbcfd9 Author: Paul Pogonyshev Commit: Paul Pogonyshev Merge remote-tracking branch 'nongnu/scratch/logview' --- logview.el | 227 + 1 file changed, 106 insertions(+), 121 deletions(-) diff --git a/logview.el b/logview.el index e861c80547..f82557b085 100644 --- a/logview.el +++ b/logview.el @@ -264,7 +264,6 @@ aliases [optional] Submode can have any number of optional aliases, which work just as the name." - :group 'logview :type logview--additional-submodes-type :set #'logview--set-submode-affecting-variable :set-after '(logview-additional-timestamp-formats logview-additional-level-mappings)) @@ -318,7 +317,6 @@ map to the levels of the mode. This is the case with RFC 5424: Mapping can have any number of optional aliases, which work just as the name." - :group 'logview :type '(repeat (cons (string :tag "Name") (list :tag "Definition" (cons :tag "" (const :tag "Error levels:" error) (repeat string)) @@ -357,7 +355,6 @@ also specified. Timestamp format can have any number of optional aliases, which work just as the name." - :group 'logview :type '(repeat (cons (string :tag "Name") (list :tag "Definition" (set :inline t @@ -376,7 +373,6 @@ not even looked at. If several lines look like log entry starts, but still cannot be matched against known submodes, the rest is skipped, see variable `logview-max-promising-lines'. However, setting this to a ridiculously large number can still be slow." - :group 'logview :type 'integer) (defcustom logview-max-promising-lines 3 @@ -389,7 +385,6 @@ avoiding very long unsuccessful guessing times even when Setting this to zero makes the mode match against all `logview-guess-lines'." - :group 'logview :type 'integer) (defcustom logview-auto-revert-mode nil @@ -405,7 +400,6 @@ to it. To temporarily activate or deactivate Auto-Revert (Tail) mode in a Logview buffer type `[auto-revert-mode]' or `[auto-revert-tail-mode]'." - :group 'logview :type '(choice (const :tag "Off" nil) (const :tag "Auto-Revert mode" auto-revert-mode) (const :tag "Auto-Revert Tail mode" auto-revert-tail-mode))) @@ -417,7 +411,6 @@ to compare part of the file on disk with part of the buffer to make sure (even if not with 100% guarantee) that the buffer really represents beginning of its backing file. The command will refuse to complete operation unless this check succeeds." - :group 'logview :type 'integer) @@ -425,7 +418,6 @@ will refuse to complete operation unless this check succeeds." "Default target gap length for `[logview-next-timestamp-gap]' and similar commands. This must be a non-negative number of seconds. Can be changed temporarily for a single buffer with `[logview-change-target-gap-length]'." - :group 'logview :type 'number) (defcustom logview-copy-visible-text-only t @@ -434,7 +426,6 @@ Standard Emacs behavior is to copy even invisible text, but that typically doesn't make much sense with filtering. To temporarily change this on per-buffer basis type `[logview-toggle-copy-visible-text-only]'." - :group 'logview :type 'boolean) (defcustom logview-search-only-in-messages nil @@ -444,7 +435,6 @@ anywhere. However, it is sometimes useful to ignore other parts of log entries, e.g. timestamp when searching for numbers. To temporarily change this on per-buffer basis type `[logview-toggle-search-only-in-messages]'." - :group 'logview :type 'boolean) (defcustom logview-preview-filter-changes t @@ -453,19 +443,16 @@ This preview is activated whenever you change the filters in the buffer popped up by `[logview-edit-filters]' or `[logview-edit-thread-narrowing-filters]'. To temporarily change this on per-buffer basis type `[logview-toggle-filter-preview]'." - :group 'logview :type 'boolean) (defcustom logview-show-ellipses t "Whether to show ellipses to indicate hidden log entries. To temporarily change this on per-buffer basis type `[logview-toggle-show-ellipses]'." - :group 'logview :type 'boolean) (defcustom logview-highlighted-entry-part 'whole "Which parts of an entry get highlighted with `[logview-highlight-view-entries]'." - :group 'logview :type '(choice (const :tag "The whole entry" whole) (const :tag "Entry header (date, level, etc.)" header) (const :tag "Entry message"message)) @@ -475,7 +462,6 @@ To temporarily change this on per-buffer basis type `[logv (defcustom logview-pulse-entries '(section-movement navigation-view timestamp-gap) "When to bri
[nongnu] elpa/haskell-mode e85acb09d2 3/5: Fix defcustom types (bytecomp warning)
branch: elpa/haskell-mode commit e85acb09d29fece3ec335cc6d94bd50b8577dac6 Author: Steve Purcell Commit: Steve Purcell Fix defcustom types (bytecomp warning) --- haskell-customize.el | 2 +- w3m-haddock.el | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/haskell-customize.el b/haskell-customize.el index dccddc7a6e..3ed41affe7 100644 --- a/haskell-customize.el +++ b/haskell-customize.el @@ -394,7 +394,7 @@ hindent, structured-haskell-mode, tool-de-jour, etc. You can set this per-project with a .dir-locals.el file" :group 'haskell - :type '(repeat 'string)) + :type '(repeat string)) (defcustom haskell-stylish-on-save nil "Whether to run stylish-haskell on the buffer before saving. diff --git a/w3m-haddock.el b/w3m-haddock.el index 0f6a9e1190..59b118bf96 100644 --- a/w3m-haddock.el +++ b/w3m-haddock.el @@ -54,7 +54,7 @@ You can rebind this if you're using hsenv by adding it to your " :group 'haskell - :type 'list) + :type '(list string)) (defvar w3m-haddock-entry-regex "^\\(\\(data\\|type\\) \\|[a-z].* :: \\)" "Regex to match entry headings.")
[nongnu] elpa/orgit 01dd23aa31 1/2: Bump dependencies
branch: elpa/orgit commit 01dd23aa3158b189ca9d9219a864e37835973c26 Author: Jonas Bernoulli Commit: Jonas Bernoulli Bump dependencies --- orgit.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/orgit.el b/orgit.el index b2b8976752..62546bbce5 100644 --- a/orgit.el +++ b/orgit.el @@ -10,8 +10,8 @@ ;; Package-Requires: ( ;; (emacs "27.1") ;; (compat "30.0.2.0") -;; (magit "4.3.1") -;; (org "9.7.11")) +;; (magit "4.3.2") +;; (org "9.7.26")) ;; SPDX-License-Identifier: GPL-3.0-or-later
[nongnu] elpa/haskell-mode c9e76ddd22 1/5: Remove no-op unwind-protect forms (bytecomp warning)
branch: elpa/haskell-mode commit c9e76ddd22496009505b9b4190d01d67b16ccf72 Author: Steve Purcell Commit: Steve Purcell Remove no-op unwind-protect forms (bytecomp warning) --- haskell-commands.el | 5 ++--- haskell.el | 22 ++ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/haskell-commands.el b/haskell-commands.el index c9ae488b4f..992bb9c9e4 100644 --- a/haskell-commands.el +++ b/haskell-commands.el @@ -769,9 +769,8 @@ inferior GHCi process." (haskell-session-set-target session target) (when (not (string= old-target target)) (haskell-mode-toggle-interactive-prompt-state) -(unwind-protect -(when (y-or-n-p "Target changed, restart haskell process? ") - (haskell-process-start session))) +(when (y-or-n-p "Target changed, restart haskell process? ") + (haskell-process-start session)) (haskell-mode-toggle-interactive-prompt-state t) ;;;###autoload diff --git a/haskell.el b/haskell.el index eae8d2b9f8..33e7ac7b47 100644 --- a/haskell.el +++ b/haskell.el @@ -167,11 +167,10 @@ (interactive) (when (eq major-mode 'haskell-interactive-mode) (haskell-mode-toggle-interactive-prompt-state) -(unwind-protect -(when (and (boundp 'haskell-session) - haskell-session - (y-or-n-p "Kill the whole session? ")) - (haskell-session-kill t))) +(when (and (boundp 'haskell-session) + haskell-session + (y-or-n-p "Kill the whole session? ")) + (haskell-session-kill t)) (haskell-mode-toggle-interactive-prompt-state t))) (defun haskell-session-make (name) @@ -223,13 +222,12 @@ If `haskell-process-load-or-reload-prompt' is nil, accept `default'." (when (not (string= name "")) (let ((session (haskell-session-lookup name))) (haskell-mode-toggle-interactive-prompt-state) -(unwind-protect -(if session -(when -(y-or-n-p - (format "Session %s already exists. Use it?" name)) - session) - (haskell-session-make name))) +(if session +(when +(y-or-n-p + (format "Session %s already exists. Use it?" name)) + session) + (haskell-session-make name)) (haskell-mode-toggle-interactive-prompt-state t) ;;;###autoload
[nongnu] elpa/orgit efd98e5caa 2/2: Release version 2.0.2
branch: elpa/orgit commit efd98e5caaac1d08677dae95be40fab65dcda2c8 Author: Jonas Bernoulli Commit: Jonas Bernoulli Release version 2.0.2 --- orgit.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orgit.el b/orgit.el index 62546bbce5..222448ca31 100644 --- a/orgit.el +++ b/orgit.el @@ -6,7 +6,7 @@ ;; Homepage: https://github.com/magit/orgit ;; Keywords: hypermedia vc -;; Package-Version: 2.0.1 +;; Package-Version: 2.0.2 ;; Package-Requires: ( ;; (emacs "27.1") ;; (compat "30.0.2.0")
[elpa] main dce56ac4a5: elpa-packages (minuet): Add new package
branch: main
commit dce56ac4a57c0fdc4e14161946aa83f283459b5f
Author: Stefan Monnier
Commit: Stefan Monnier
elpa-packages (minuet): Add new package
---
elpa-packages | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/elpa-packages b/elpa-packages
index 4776b5e0fb..c5f29a567b 100644
--- a/elpa-packages
+++ b/elpa-packages
@@ -536,11 +536,10 @@
:ignored-files ("LICENSE.txt"))
(minibuffer-line :url nil)
(minimap :url nil)
- ;; FIXME: Waiting for copyright paperwork.
- ;; (minuet:url "https://github.com/milanglacier/minuet-ai.el";
- ;; :ignored-files ("LICENSE")
- ;; :readme "README.md"
- ;; :news "CHANGELOG.md")
+ (minuet :url "https://github.com/milanglacier/minuet-ai.el";
+ :ignored-files ("LICENSE")
+ :readme "README.md"
+ :news "CHANGELOG.md")
(mmm-mode :url "https://github.com/dgutov/mmm-mode";
:doc "mmm.texi")
(modus-themes :url "https://github.com/protesilaos/modus-themes";
[elpa] externals/org ada33a652e 1/2: Fix fontification of the last line in latex environments
branch: externals/org
commit ada33a652e739189934974b14d2b70914c0ffda2
Author: Ihor Radchenko
Commit: Ihor Radchenko
Fix fontification of the last line in latex environments
* lisp/org.el (org-latex-regexps): Include trailing whitespace and
newline after \end{...}. This way, latex fontification will include
the whole environment.
Reported-by: Rudolf Adamkovič
Link: https://orgmode.org/list/m2ldt0picx@adamkovic.org
---
lisp/org.el | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lisp/org.el b/lisp/org.el
index ec6aa75806..14df7ed66d 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -674,7 +674,7 @@ An entry can be toggled between COMMENT and normal with
LaTeX Environments and Fragments
(defconst org-latex-regexps
- '(("begin" "^[
\t]*\\(begin{\\([a-zA-Z0-9\\*]+\\)\\(?:.\\|\n\\)+?end{\\2}\\)" 1 t)
+ '(("begin" "^[
\t]*\\(begin{\\([a-zA-Z0-9\\*]+\\)\\(?:.\\|\n\\)+?end{\\2}[ \t]*\n?\\)"
1 t)
;; ("$" "\\([ \t(]\\|^\\)\\(\\(\\([$]\\)\\([^
\t\n,.$].*?\\(\n.*?\\)\\{0,5\\}[^ \t\n,.$]\\)\\4\\)\\)\\([ \t.,?;:'\")]\\|$\\)"
2 nil)
("$1" "\\([^$]\\|^\\)\\(\\$[^
\t\r\n,;.$]\\$\\)\\(\\s.\\|\\s-\\|\\s(\\|\\s)\\|\\s\"\\|'\\|$\\)" 2 nil)
("$" "\\([^$]\\|^\\)\\(\\(\\$\\([^
\t\n,;.$][^$\n\r]*?\\(\n[^$\n\r]*?\\)\\{0,2\\}[^
\t\n,.$]\\)\\$\\)\\)\\(\\s.\\|\\s-\\|\\s(\\|\\s)\\|\\s\"\\|'\\|$\\)" 2 nil)
[elpa] externals/transient bc8ff0c61e 2/3: Bump compat dependency
branch: externals/transient commit bc8ff0c61ea515ec4992fcd4edda37a3b676018a Author: Jonas Bernoulli Commit: Jonas Bernoulli Bump compat dependency --- lisp/transient.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/transient.el b/lisp/transient.el index 13c22598a9..9793cb405d 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -7,7 +7,7 @@ ;; Keywords: extensions ;; Package-Version: 0.8.6 -;; Package-Requires: ((emacs "26.1") (compat "30.0.0.0") (seq "2.24")) +;; Package-Requires: ((emacs "26.1") (compat "30.0.2.0") (seq "2.24")) ;; SPDX-License-Identifier: GPL-3.0-or-later
[elpa] externals/minuet updated (55f6527b2b -> 87abb854c4)
elpasync pushed a change to branch externals/minuet. from 55f6527b2b doc: update README. new 64240457eb feat!: Implement Prefix-First prompt structure for Gemini (#36) new bb1bff5934 chore: release v0.5.0 new f98350cafd doc: fix docstring. new 78175bf60b feat!: change default openai_compatible service to openrouter. new 87abb854c4 doc: change openai_compatibel LLM example to Qwen-2.5-Instruct. Summary of changes: CHANGELOG.md | 13 + README.md| 27 +++ minuet.el| 41 ++--- prompt.md| 86 +++- 4 files changed, 122 insertions(+), 45 deletions(-)
[elpa] externals/minuet bb1bff5934 2/5: chore: release v0.5.0
branch: externals/minuet commit bb1bff593496713ea7be99ea25060087905378dd Author: Milan Glacier Commit: Milan Glacier chore: release v0.5.0 --- CHANGELOG.md | 13 + 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index af64f6d422..16b1de7ce4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,16 @@ +# Version 0.5.0 (2025-03-28) + +## Breaking Changes + +- Modified the Gemini provider's default prompt strategy to use the new + **Prefix First** structure. +- Other providers will continue to use their previous default prompt + configurations. + +## Features + +- Add a new "Prefix-First" prompt structure for chat LLMs. + # Version 0.4.4 (2025-03-10) ## Features
[nongnu] elpa/cider de548e3084: Remove obsolete variables from before 1.0
branch: elpa/cider commit de548e3084f6f6b5802dd7f939fd9ddf36e62038 Author: Oleksandr Yakushev Commit: Bozhidar Batsov Remove obsolete variables from before 1.0 --- cider-client.el | 3 --- cider-debug.el | 4 cider-repl.el | 7 --- cider-stacktrace.el | 6 -- nrepl-client.el | 15 --- 5 files changed, 35 deletions(-) diff --git a/cider-client.el b/cider-client.el index 225a43dee0..29d3c67160 100644 --- a/cider-client.el +++ b/cider-client.el @@ -321,9 +321,6 @@ Here's an example for `pprint': :group 'cider :package-version '(cider . "0.21.0")) -(make-obsolete-variable 'cider-pprint-fn 'cider-print-fn "0.21") -(make-obsolete-variable 'cider-pprint-options 'cider-print-options "0.21") - (defcustom cider-print-quota (* 1024 1024) "A hard limit on the number of bytes to return from any printing operation. Set to nil for no limit." diff --git a/cider-debug.el b/cider-debug.el index d7427b57a3..ce24cb31b2 100644 --- a/cider-debug.el +++ b/cider-debug.el @@ -97,10 +97,6 @@ configure `cider-debug-prompt' instead." (const :tag "Both" both)) :package-version '(cider . "0.9.1")) -(make-obsolete 'cider-debug-print-length 'cider-debug-print-options "0.20") -(make-obsolete 'cider-debug-print-level 'cider-debug-print-options "0.20") -(make-obsolete-variable 'cider-debug-print-options 'cider-print-options "0.21") - ;;; Implementation (declare-function cider-browse-ns--combined-vars-with-meta "cider-browse-ns") diff --git a/cider-repl.el b/cider-repl.el index d37bb3382f..202845a379 100644 --- a/cider-repl.el +++ b/cider-repl.el @@ -95,8 +95,6 @@ focused. Otherwise the buffer is displayed and focused." "Controls whether the REPL buffer is displayed in the current window." :type 'boolean) -(make-obsolete-variable 'cider-repl-scroll-on-output 'scroll-conservatively "0.21") - (defcustom cider-repl-use-pretty-printing t "Control whether results in the REPL are pretty-printed or not. The REPL will use the printer specified in `cider-print-fn'. @@ -104,8 +102,6 @@ The `cider-toggle-pretty-printing' command can be used to interactively change the setting's value." :type 'boolean) -(make-obsolete-variable 'cider-repl-pretty-print-width 'cider-print-options "0.21") - (defcustom cider-repl-use-content-types nil "Control whether REPL results are presented using content-type information. The `cider-repl-toggle-content-types' command can be used to interactively @@ -149,9 +145,6 @@ you'd like to use the default Emacs behavior use `indent-for-tab-command'." :type 'symbol) -(make-obsolete-variable 'cider-repl-print-length 'cider-print-options "0.21") -(make-obsolete-variable 'cider-repl-print-level 'cider-print-options "0.21") - (defvar cider-repl-require-repl-utils-code '((clj . "(when-let [requires (resolve 'clojure.main/repl-requires)] (clojure.core/apply clojure.core/require @requires))") diff --git a/cider-stacktrace.el b/cider-stacktrace.el index 55636c8b3d..5686dc5e64 100644 --- a/cider-stacktrace.el +++ b/cider-stacktrace.el @@ -62,10 +62,6 @@ Pick nil if you prefer the same window as *cider-error*." :type 'boolean :package-version '(cider . "1.8.0")) -(make-obsolete 'cider-stacktrace-print-length 'cider-stacktrace-print-options "0.20") -(make-obsolete 'cider-stacktrace-print-level 'cider-stacktrace-print-options "0.20") -(make-obsolete-variable 'cider-stacktrace-print-options 'cider-print-options "0.21") - (defvar cider-stacktrace-detail-max 2 "The maximum detail level for causes.") @@ -76,8 +72,6 @@ Pick nil if you prefer the same window as *cider-error*." (defconst cider-error-buffer "*cider-error*") -(make-obsolete 'cider-visit-error-buffer 'cider-selector "0.18") - (defcustom cider-stacktrace-suppressed-errors '() "Errors that won't make the stacktrace buffer 'pop-over' your active window. The error types are represented as strings." diff --git a/nrepl-client.el b/nrepl-client.el index b438cfe37e..454fb2fe51 100644 --- a/nrepl-client.el +++ b/nrepl-client.el @@ -86,19 +86,6 @@ :prefix "nrepl-" :group 'applications) -;; (defcustom nrepl-buffer-name-separator " " -;; "Used in constructing the REPL buffer name. -;; The `nrepl-buffer-name-separator' separates cider-repl from the project name." -;; :type '(string) -;; :group 'nrepl) -(make-obsolete-variable 'nrepl-buffer-name-separator 'cider-session-name-template "0.18") - -;; (defcustom nrepl-buffer-name-show-port nil -;; "Show the connection port in the nrepl REPL buffer name, if set to t." -;; :type 'boolean -;; :group 'nrepl) -(make-obsolete-variable 'nrepl-buffer-name-show-port 'cider-session-name-template "0.18") - (defcustom nrepl-connected-hook nil "List of functions to call when connecting to the nREPL server." :type 'hook) @@ -1511,8 +1498,6 @@ The default buffer name is *nrepl-error*." (set-window-point win (point-max))) (setq buffer-read-only t))) -(make-obsolet
[nongnu] elpa/orgit updated (657f8cdd5d -> efd98e5caa)
elpasync pushed a change to branch elpa/orgit. from 657f8cdd5d Bump minimal Emacs new 01dd23aa31 Bump dependencies new efd98e5caa Release version 2.0.2 Summary of changes: orgit.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
[nongnu] elpa/aidermacs 38aa5bfa5c: readme: add back steps 4 and 5 to getting started
branch: elpa/aidermacs
commit 38aa5bfa5c5a4abb5bb9cd7f191d1ac3d915
Author: Christian Stewart
Commit: Matthew Zeng
readme: add back steps 4 and 5 to getting started
Signed-off-by: Christian Stewart
---
README.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 7b9ea85ceb..a088d2c1e1 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ Here's what the community is saying about Aidermacs:
- [Aider](https://aider.chat/docs/install.html)
- [Transient](https://github.com/magit/transient)
2. Download Aidermacs through [Melpa](https://melpa.org/#/aidermacs) or
[Non-GNU Elpa](https://elpa.nongnu.org/nongnu/aidermacs.html), or clone manually
-2. Modify this **sample config** and place it in your Emacs `init.el`:
+3. Modify this **sample config** and place it in your Emacs `init.el`:
```emacs-lisp
(use-package aidermacs
:bind (("C-c a" . aidermacs-transient-menu))
@@ -58,6 +58,8 @@ Here's what the community is saying about Aidermacs:
(aidermacs-use-architect-mode t)
(aidermacs-default-model "sonnet"))
```
+4. Open a project and run `M-x aidermacs-transient-menu` or `SPC a a` (or your
chosen binding).
+5. Add files and start coding with AI!
### Spacemacs
[elpa] externals/jinx 42e6d7f1f3: Offer lower-case words for saving in personal dictionary
branch: externals/jinx
commit 42e6d7f1f3b12dc95f203753926d252c98f8bbc8
Author: Daniel Mendler
Commit: Daniel Mendler
Offer lower-case words for saving in personal dictionary
---
jinx.el | 28
1 file changed, 16 insertions(+), 12 deletions(-)
diff --git a/jinx.el b/jinx.el
index 75b00bdd60..44403156ea 100644
--- a/jinx.el
+++ b/jinx.el
@@ -745,18 +745,22 @@ The word will be associated with GROUP and get a prefix
key."
(setq list (jinx--add-suggestion list ht w group)
(dolist (w (jinx--session-suggestions word))
(setq list (jinx--add-suggestion list ht w "Suggestions from session")))
-(cl-loop for (key . fun) in jinx--save-keys
- for actions = (funcall fun nil key word) do
- (when (and actions (not (consp (car actions
- (setq actions (list actions)))
- (cl-loop for (k w a) in actions do
- (push (propertize
- (concat (propertize (if (stringp k) k
(char-to-string k))
- 'face 'jinx-save
'rear-nonsticky t)
- w)
- 'jinx--group "Accept and save"
- 'jinx--suffix (format #(" [%s]" 0 5 (face
jinx-annotation)) a))
-list)))
+(cl-loop
+ for (key . fun) in jinx--save-keys
+ for actions = (funcall fun nil key word) do
+ (when (and actions (not (consp (car actions
+ (setq actions (list actions)))
+ (cl-loop
+ for (k w a) in actions
+ for k2 = (propertize (if (stringp k) k (char-to-string k))
+ 'face 'jinx-save 'rear-nonsticky t)
+ for a2 = (format #(" [%s]" 0 5 (face jinx-annotation)) a)
+ do (cl-loop
+ for w2 in (delete-consecutive-dups (list w (downcase w))) do
+ (push (propertize (concat k2 w2)
+'jinx--group "Accept and save"
+'jinx--suffix a2)
+list
(nreverse list)))
(defun jinx--correct-affixation (cands)
[elpa] externals/org ed64e94eaf 2/2: ol: Reuse existing overlay when previewing links
branch: externals/org commit ed64e94eaf7a1683a13fd39372a4d0a0672b611f Author: Karthik Chikmagalur Commit: Ihor Radchenko ol: Reuse existing overlay when previewing links * lisp/ol.el (org-link-preview-region): If a preview overlay exists on a link region when previewing that link, reuse it instead of placing a second one. Reported-by: stardiviner Link: https://orgmode.org/list/87ecygixi4@gmail.com --- lisp/ol.el | 16 +--- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lisp/ol.el b/lisp/ol.el index 9e46b43a5c..c08bfe67bf 100644 --- a/lisp/ol.el +++ b/lisp/ol.el @@ -2069,13 +2069,15 @@ buffer boundaries with possible narrowing." (not (org-element-contents-begin link))) (org-element-property :path link ;; Create an overlay to hold the preview - (let ((ov (make-overlay - (org-element-begin link) - (progn - (goto-char - (org-element-end link)) - (unless (eolp) (skip-chars-backward " \t")) - (point) + (let ((ov (or (cdr-safe (get-char-property-and-overlay + (org-element-begin link) 'org-image-overlay)) +(make-overlay + (org-element-begin link) + (progn + (goto-char + (org-element-end link)) + (unless (eolp) (skip-chars-backward " \t")) + (point)) (overlay-put ov 'modification-hooks (list 'org-link-preview--remove-overlay)) (push ov org-link-preview-overlays)
[elpa] externals/vertico e0bb699ebf: README: Use table
branch: externals/vertico commit e0bb699ebf9e41893dbd19e7d19381fa73c08bc1 Author: Daniel Mendler Commit: Daniel Mendler README: Use table --- README.org | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.org b/README.org index b5a651e7ca..4127b526f8 100644 --- a/README.org +++ b/README.org @@ -308,16 +308,16 @@ problem. (consult-grep buffer))) #+end_src -Temporary toggling between the different display modes is possible. The -following commands are bound by default in the =vertico-multiform-map=. You can of -course change these bindings if you like. - -- =M-B= -> ~vertico-multiform-buffer~ -- =M-F= -> ~vertico-multiform-flat~ -- =M-G= -> ~vertico-multiform-grid~ -- =M-R= -> ~vertico-multiform-reverse~ -- =M-U= -> ~vertico-multiform-unobtrusive~ -- =M-V= -> ~vertico-multiform-vertical~ +The different display modes can be toggled temporarily. The +=vertico-multiform-map= binds the following toggle commands to keys. Depending on +preference, these bindings can be changed in the =vertico-multiform-map=. + +| =M-B= | ~vertico-multiform-buffer~ | +| =M-F= | ~vertico-multiform-flat~| +| =M-G= | ~vertico-multiform-grid~| +| =M-R= | ~vertico-multiform-reverse~ | +| =M-U= | ~vertico-multiform-unobtrusive~ | +| =M-V= | ~vertico-multiform-vertical~| For special configuration you can use your own functions or even lambdas to configure the completion behavior per command or per completion category.
[elpa] externals/org updated (593785527b -> ed64e94eaf)
elpasync pushed a change to branch externals/org. from 593785527b oc-basic.el: New option org-cite-basic-complete-key-crm-separator new ada33a652e Fix fontification of the last line in latex environments new ed64e94eaf ol: Reuse existing overlay when previewing links Summary of changes: lisp/ol.el | 16 +--- lisp/org.el | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-)
[nongnu] elpa/emacsql updated (770120b674 -> 5470adaf5d)
elpasync pushed a change to branch elpa/emacsql. from 770120b674 Cosmetics new cd341658c2 emacsq.el: Provide feature at end of file new 5470adaf5d Release version 4.3.0 Summary of changes: emacsql.el | 8 1 file changed, 4 insertions(+), 4 deletions(-)
[nongnu] elpa/emacsql 5470adaf5d 2/2: Release version 4.3.0
branch: elpa/emacsql commit 5470adaf5dcabebc80c913ac831258fd47a87cbe Author: Jonas Bernoulli Commit: Jonas Bernoulli Release version 4.3.0 --- emacsql.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emacsql.el b/emacsql.el index 02f9d071bf..056de18b56 100644 --- a/emacsql.el +++ b/emacsql.el @@ -6,7 +6,7 @@ ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/emacsql -;; Package-Version: 4.2.0 +;; Package-Version: 4.3.0 ;; Package-Requires: ((emacs "26.1")) ;; SPDX-License-Identifier: Unlicense @@ -32,7 +32,7 @@ "The EmacSQL SQL database front-end." :group 'comm) -(defconst emacsql-version "4.2.0") +(defconst emacsql-version "4.3.0") (defvar emacsql-global-timeout 30 "Maximum number of seconds to wait before bailing out on a SQL command.
[elpa] externals/denote-journal af8c62fa92 2/2: Merge pull request #7 from honza/prompt-relative-files
branch: externals/denote-journal commit af8c62fa921719f9d01ed383080d0f6c85246679 Merge: 2db19387a0 39728e976a Author: Protesilaos Stavrou Commit: GitHub Merge pull request #7 from honza/prompt-relative-files Avoid concating absolute path to denote-directory --- denote-journal.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/denote-journal.el b/denote-journal.el index 5b68300e99..caa31e025a 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -213,7 +213,7 @@ Perform the operation relative to the variable `denote-journal-directory'." (relative-files (mapcar #'denote-get-file-name-relative-to-denote-directory files)) (file (if (> (length files) 1) (completing-read "Select journal entry: " (denote--completion-table 'file relative-files) nil t) - (car files + (car relative-files (concat denote-directory file))) ;;;###autoload
[nongnu] elpa/magit e4ea6f97be 03/17: readme: Add super badge
branch: elpa/magit commit e4ea6f97be8c58698183ba63b2364e7e8214717b Author: Jonas Bernoulli Commit: Jonas Bernoulli readme: Add super badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f988fa93a8..afd566910e 100644 --- a/README.md +++ b/README.md @@ -131,6 +131,7 @@ Thanks to all of you, may (the history of) the source be with you! [](https://melpa.org/#/magit) [](https://stable.melpa.org/#/magit) +[](https://repology.org/project/emacs%3Amagit/versions) [authors]: https://magit.vc/stats/magit/authors.html [jonas]: https://emacsair.me
[nongnu] elpa/emacsql cd341658c2 1/2: emacsq.el: Provide feature at end of file
branch: elpa/emacsql commit cd341658c2ff73a28fc528a47e8b94532347dde7 Author: Jonas Bernoulli Commit: Jonas Bernoulli emacsq.el: Provide feature at end of file --- emacsql.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emacsql.el b/emacsql.el index 47d58f310f..02f9d071bf 100644 --- a/emacsql.el +++ b/emacsql.el @@ -184,8 +184,6 @@ specific error conditions." (unless (eq (read) 'success) (emacsql-handle connection (read) (read -(provide 'emacsql) ; end of generic function declarations - ;;; Automatic connection cleanup (defun emacsql-register (connection) @@ -375,4 +373,6 @@ Once activated, vector contents no longer indent like lists." (advice-add 'calculate-lisp-indent :around #'emacsql--calculate-vector-indent)) +(provide 'emacsql) + ;;; emacsql.el ends here
[elpa] externals/minuet 79e2986d94 1/2: doc: update this package is on GNU ELPA.
branch: externals/minuet commit 79e2986d94831f4134f5a388db9751121dd714c6 Author: Milan Glacier Commit: Milan Glacier doc: update this package is on GNU ELPA. --- README.md | 20 +--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 85c9c6fe9c..8c1a464e9c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -- [Minuet](#minuet) +- [Minuet](#minuet)- [Minuet](#minuet) - [Features](#features) - [Requirements](#requirements) - [Installation](#installation) @@ -26,10 +26,19 @@ - [OpenAI-compatible](#openai-compatible) - [OpenAI-FIM-Compatible](#openai-fim-compatible) - [Troubleshooting](#troubleshooting) +- [Contributions](#contributions) - [Acknowledgement](#acknowledgement) # Minuet +[![GNU ELPA badge][elpa-badge]][elpa-link] +[![MELPA badge][melpa-badge]][melpa-link] + +[gnu-elpa-link]: https://elpa.gnu.org/packages/minuet.html +[gnu-elpa-link]: https://elpa.gnu.org/packages/minuet.svg +[melpa-link]: https://melpa.org/#/minuet +[melpa-badge]: https://melpa.org/packages/minuet-badge.svg + Minuet: Dance with LLM in Your Code 💃. `Minuet` brings the grace and harmony of a minuet to your coding process. Just @@ -64,8 +73,8 @@ as dancers move during a minuet. # Installation -`minuet` is available on MELPA and can be installed using your preferred package -managers. +`minuet` is available on ELPA and MELPA and can be installed using your +preferred package managers. ```elisp @@ -617,6 +626,11 @@ If your setup failed, there are two most likely reasons: To diagnose issues, examine the buffer content from `*minuet*`. +# Contributions + +As this package is part of GNU ELPA, significant contributions require a +copyright assignment to the Free Software Foundation (FSF). + # Acknowledgement - [continue.dev](https://www.continue.dev): not a emacs plugin, but I find a lot
[elpa] externals/denote-journal 4eaae6f059 3/3: Rewrite denote-journal--get-template
branch: externals/denote-journal commit 4eaae6f05999a84b7ce4f864881c0cbca7d9ad7a Author: Protesilaos Stavrou Commit: Protesilaos Stavrou Rewrite denote-journal--get-template --- denote-journal.el | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/denote-journal.el b/denote-journal.el index aa106f374a..0e1b61aa37 100644 --- a/denote-journal.el +++ b/denote-journal.el @@ -169,13 +169,12 @@ relevant. DATE has the same format as that returned by `current-time'." "Return template that has `journal' key in `denote-templates'. If no template with `journal' key exists but `denote-templates' is non-nil, prompt the user for a template among -`denote-templates'. Else return nil. - -Also see `denote-journal-new-entry'." - (if-let* ((template (alist-get 'journal denote-templates))) - template -(when denote-templates - (denote-template-prompt +`denote-templates'. Else return nil." + ;; FIXME 2025-04-02: Here we assume that `denote-templates' is an + ;; alist. Maybe we need to be more careful. + (when denote-templates +(or (alist-get 'journal denote-templates) +(denote-template-prompt ;;;###autoload (defun denote-journal-new-entry (&optional date)
[elpa] externals/minuet updated (87abb854c4 -> 70cc351d6b)
elpasync pushed a change to branch externals/minuet. from 87abb854c4 doc: change openai_compatibel LLM example to Qwen-2.5-Instruct. new 79e2986d94 doc: update this package is on GNU ELPA. new 70cc351d6b doc: fix ELPA badge link. Summary of changes: README.md | 18 -- 1 file changed, 16 insertions(+), 2 deletions(-)
[nongnu] elpa/markdown-mode 085fa615d0 15/33: Update wiki links test to check for markup-markup-face; organize wiki link tests to be with other wiki link tests
branch: elpa/markdown-mode
commit 085fa615d0ed93df6cde8fa9aeeb0fda9eb01db2
Author: Joe Reinhart
Commit: Joe Reinhart
Update wiki links test to check for markup-markup-face; organize wiki link
tests to be with other wiki link tests
---
tests/markdown-test.el | 210 +
1 file changed, 106 insertions(+), 104 deletions(-)
diff --git a/tests/markdown-test.el b/tests/markdown-test.el
index d5d032db34..b13eb87f6e 100644
--- a/tests/markdown-test.el
+++ b/tests/markdown-test.el
@@ -5761,6 +5761,112 @@ http://example.com \"title\" )
(call-interactively 'markdown-kill-thing-at-point)
(should (string-equal (current-kill 0) (cdr test)))
+(ert-deftest test-markdown/wiki-link-rules ()
+ "Test wiki link search rules and font lock for missing pages."
+ (let ((markdown-enable-wiki-links t)
+(markdown-wiki-link-fontify-missing t)
+(markdown-wiki-link-search-type '(project)))
+(progn
+ (find-file (expand-file-name "wiki/root" markdown-test-dir))
+ (unwind-protect
+ (progn
+(markdown-mode)
+(font-lock-ensure)
+;; search rules
+(should (string-match-p
+ "/sub/foo$"
+ (markdown-convert-wiki-link-to-filename "foo")))
+(should (string-equal
+ (markdown-convert-wiki-link-to-filename "doesnotexist")
+ "doesnotexist"))
+;; font lock
+(markdown-test-range-has-property 1 2 'face
'markdown-markup-face)
+(markdown-test-range-has-property 3 9 'face 'markdown-link-face)
+(markdown-test-range-has-property 10 11 'face
'markdown-markup-face)
+(markdown-test-range-has-property 16 31 'face
'markdown-missing-link-face)
+(markdown-test-range-has-property 38 40 'face 'markdown-link-face)
+(markdown-test-range-has-property 47 58 'face
'markdown-missing-link-face)
+(markdown-test-range-has-property 65 74 'face 'markdown-link-face))
+(kill-buffer)))
+(progn
+ (find-file (expand-file-name "wiki/sub/foo" markdown-test-dir))
+ (unwind-protect
+ (progn
+(markdown-mode)
+(font-lock-ensure)
+;; search rules
+(should (string-match-p
+ "/wiki/root$"
+ (markdown-convert-wiki-link-to-filename "root")))
+(should (string-equal
+ (markdown-convert-wiki-link-to-filename "doesnotexist")
+ "doesnotexist"))
+;; font lock
+(markdown-test-range-has-property 3 14 'face
'markdown-missing-link-face)
+(markdown-test-range-has-property 21 24 'face 'markdown-link-face))
+(kill-buffer)
+
+(ert-deftest test-markdown/wiki-link-keep-match-data ()
+ "Test that markdown-wiki-link-p keeps expected match data.
+Detail: https://github.com/jrblevin/markdown-mode/pull/590";
+ (let ((markdown-enable-wiki-links t)
+(markdown-link-space-sub-char " ")
+(markdown-wiki-link-search-type '(sub-directories)))
+(progn
+ (find-file (expand-file-name "wiki/pr590/Guide.md" markdown-test-dir))
+ (unwind-protect
+ (progn
+(markdown-mode)
+(re-search-forward "Zettel Markdown")
+(goto-char (match-beginning 0))
+(should (markdown-wiki-link-p)) ;; create match-data
+(should (string= (markdown-wiki-link-link) "Zettel Markdown")))
+(kill-buffer)
+
+(ert-deftest test-markdown/wiki-link-search-under-project ()
+ "Test that searching link under project root."
+ (let ((markdown-enable-wiki-links t)
+(markdown-link-space-sub-char " ")
+(markdown-wiki-link-search-type '(project))
+(expected (expand-file-name "wiki/pr590/Guide/Zettel Markdown/math.md"
+markdown-test-dir)))
+(progn
+ (find-file (expand-file-name "wiki/pr590/Guide/Plugin/Link.md"
markdown-test-dir))
+ (unwind-protect
+ (progn
+(markdown-mode)
+(re-search-forward "math")
+(goto-char (match-beginning 0))
+(markdown-wiki-link-p) ;; create match-data
+(let ((link (markdown-convert-wiki-link-to-filename
(markdown-wiki-link-link
+ (should (string= (expand-file-name link) expected
+(kill-buffer)
+
+(ert-deftest test-markdown/wiki-link-major-mode ()
+ "Test major-mode of linked page."
+ (let ((markdown-enable-wiki-links t)
+(auto-mode-alist (cons '("bar\\.md" . gfm-mode) auto-mode-alist)))
+(find-file (expand-file-name "wiki/root" markdown-test-dir))
+(unwind-protect
+(progn
+ (markdown-mode)
+ (search-forward "sub/bar.md")
+ (markdown-follow-wiki-link-at-point)
+ (should (eq major-mode 'gfm-mode)))
+ (kill-buffer
+
+(ert
[nongnu] elpa/markdown-mode 2120fc06d0 05/33: Removed unused bindings in markdown-eldoc-function
branch: elpa/markdown-mode commit 2120fc06d0a6e5e29a0344f8442340a75f262a3d Author: Joe Reinhart Commit: Joe Reinhart Removed unused bindings in markdown-eldoc-function --- markdown-mode.el | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 3c884e69f8..dab8d1bf2c 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -10071,9 +10071,7 @@ rows and columns and the column alignment." ((and (and markdown-enable-wiki-links (thing-at-point-looking-at markdown-regex-wiki-link)) (or markdown-hide-urls markdown-hide-markup)) -(let* ((imagep (string-equal (match-string 1) "!")) - (referencep (string-equal (match-string 5) "[")) - (part1 (match-string-no-properties 3)) +(let* ((part1 (match-string-no-properties 3)) (part2 (match-string-no-properties 5)) (link (if markdown-wiki-link-alias-first part2 part1)) (edit-keys (markdown--substitute-command-keys
[nongnu] elpa/markdown-mode f1447ef770 02/33: Proper faces are added to wiki links to allow for proper colorization
branch: elpa/markdown-mode commit f1447ef77005576ff1fd9521e9f4e86996c60fbe Author: Joe Reinhart Commit: Joe Reinhart Proper faces are added to wiki links to allow for proper colorization --- markdown-mode.el | 102 +++ 1 file changed, 65 insertions(+), 37 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 0ad9d24037..0598b0ecee 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -2292,7 +2292,7 @@ Depending on your font, some reasonable choices are: (markdown-match-inline-attributes . ((0 markdown-markup-properties prepend))) (markdown-match-leanpub-sections . ((0 markdown-markup-properties))) (markdown-fontify-blockquotes) -(markdown-match-wiki-link . ((0 'markdown-link-face prepend +(markdown-fontify-wiki-links)) "Syntax highlighting for Markdown files.") ;; Footnotes @@ -3381,8 +3381,8 @@ the buffer)." (defun markdown-match-yaml-metadata-key (last) (markdown-match-propertized-text 'markdown-metadata-key last)) -(defun markdown-match-wiki-link (last) - "Match wiki links from point to LAST." +(defun markdown-fontify-wiki-links (last) + "Add text properties to next wiki link from point to LAST." (when (and markdown-enable-wiki-links (not markdown-wiki-link-fontify-missing) (markdown-match-inline-generic markdown-regex-wiki-link last)) @@ -3395,9 +3395,9 @@ the buffer)." (markdown-code-block-at-pos begin)) (progn (goto-char (min (1+ begin) last)) (when (< (point) last) - (markdown-match-wiki-link last))) + (markdown-fontify-wiki-links last))) ;; Add text properties for hiding markup -(when markdown-hide-markup +(progn (if markdown-wiki-link-alias-first (progn (add-text-properties (match-beginning 3) (match-end 3) @@ -8456,20 +8456,22 @@ See `markdown-wiki-link-p' and `markdown-follow-wiki-link'." (markdown-follow-wiki-link (markdown-wiki-link-link) arg) (user-error "Point is not at a Wiki Link"))) -(defun markdown-highlight-wiki-link (from to face) - "Highlight the wiki link in the region between FROM and TO using FACE." - (put-text-property from to 'font-lock-face face)) - +;; TODO: Need to handle this function for a complete solution (defun markdown-unfontify-region-wiki-links (from to) "Remove wiki link faces from the region specified by FROM and TO." (interactive "*r") - (let ((modified (buffer-modified-p))) -(remove-text-properties from to '(font-lock-face markdown-link-face)) -(remove-text-properties from to '(font-lock-face markdown-missing-link-face)) -;; remove-text-properties marks the buffer modified in emacs 24.3, -;; undo that if it wasn't originally marked modified -(set-buffer-modified-p modified))) - + nil + ;; (let ((modified (buffer-modified-p))) + ;; ;; (remove-text-properties from to '(font-lock-face markdown-link-face)) + ;; ;; (remove-text-properties from to '(font-lock-face markdown-missing-link-face)) + ;; (remove-text-properties from to '(face markdown-link-face)) + ;; (remove-text-properties from to '(face markdown-missing-link-face)) + ;; ;; remove-text-properties marks the buffer modified in emacs 24.3, + ;; ;; undo that if it wasn't originally marked modified + ;; (set-buffer-modified-p modified)) + ) + +;; TODO: Need to handle this function for a complete solution (defun markdown-fontify-region-wiki-links (from to) "Search region given by FROM and TO for wiki links and fontify them. If a wiki link is found check to see if the backing file exists @@ -8478,16 +8480,39 @@ and highlight accordingly." (save-match-data (while (re-search-forward markdown-regex-wiki-link to t) (when (not (markdown-code-block-at-point-p)) -(let ((highlight-beginning (match-beginning 1)) - (highlight-end (match-end 1)) - (file-name - (markdown-convert-wiki-link-to-filename -(markdown-wiki-link-link - (if (condition-case nil (file-exists-p file-name) (error nil)) - (markdown-highlight-wiki-link - highlight-beginning highlight-end 'markdown-link-face) -(markdown-highlight-wiki-link - highlight-beginning highlight-end 'markdown-missing-link-face))) +(markdown-fontify-wiki-links to) + +;; (when markdown-hide-markup +;; (if markdown-wiki-link-alias-first +;; (progn +;; (add-text-properties (match-beginning 3) (match-end 3) +;; '(face markdown-link-face)) +;; (add-text-properties (match-beginning 5) (match-end 5) +;; '(invisible markdown-markup face markdown-url-face))) +;; (progn +;; (add-text-properties (match-beginning 3
[nongnu] elpa/markdown-mode 9d2850ed58 33/33: Merge pull request #861 from jayemar/jayemar/toggle-hiding-of-wiki-links
branch: elpa/markdown-mode
commit 9d2850ed58719778d3e76411242d112e54998fd3
Merge: d2d960bec1 f464a6fa68
Author: Shohei YOSHIDA
Commit: GitHub
Merge pull request #861 from jayemar/jayemar/toggle-hiding-of-wiki-links
Hide wiki markup as part of markdown-toggle-markup-hiding
---
CHANGES.md | 2 +
README.md | 42 +---
markdown-mode.el | 288 +
tests/markdown-test.el | 86 +++
tests/wiki-links.text | 2 +-
5 files changed, 264 insertions(+), 156 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index b4171603c5..38b24bfa5f 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,12 +11,14 @@
* Bug fixes:
- `markdown-export` should not output stderr content to output file
+- Hide wikilink markup as part of `markdown-toggle-markup-hiding`
[GH-847][]
* Improvements:
- Support drag and drop features on Windows and multiple files' drag and
drop
- Added cmark and cmark-gfm to the markdown command list.
- Disable `imenu-submenus-on-top` by default [GH-882][]
+ [gh-847]: https://github.com/jrblevin/markdown-mode/issues/847
[gh-882]: https://github.com/jrblevin/markdown-mode/issues/882
[gh-891]: https://github.com/jrblevin/markdown-mode/issues/891
diff --git a/README.md b/README.md
index 903a903d40..cfb62cf0fe 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ using `package.el`. First, configure `package.el` and the
MELPA Stable
repository by adding the following to your `.emacs`, `init.el`,
or equivalent startup file:
-```lisp
+```emacs-lisp
(require 'package)
(add-to-list 'package-archives
'("melpa-stable" . "https://stable.melpa.org/packages/";))
@@ -79,7 +79,7 @@ then you can automatically install and configure
`markdown-mode` by
adding a declaration such as this one to your init file (as an
example; adjust settings as desired):
-```lisp
+```emacs-lisp
(use-package markdown-mode
:ensure t
:mode ("README\\.md\\'" . gfm-mode)
@@ -99,7 +99,7 @@ save the file where Emacs can find it (i.e., a directory in
your
`load-path`). You can then configure `markdown-mode` and `gfm-mode`
to load automatically by adding the following to your init file:
-```lisp
+```emacs-lisp
(autoload 'markdown-mode "markdown-mode"
"Major mode for editing Markdown files" t)
(add-to-list 'auto-mode-alist
@@ -133,7 +133,7 @@ repository as above or install markdown-mode from
If you clone the repository directly, then make sure that Emacs can
find it by adding the following line to your startup file:
-```lisp
+```emacs-lisp
(add-to-list 'load-path "/path/to/markdown-mode/repository")
```
@@ -350,7 +350,7 @@ prefix. The most commonly used commands are described
below.
preview window to appear at the bottom or right, you can
customize `markdown-split-window-direction`.
- ```lisp
+ ```emacs-lisp
;; Set custom markdown preview function
(setq markdown-live-preview-window-function
#'my-markdown-preview-function)
@@ -952,18 +952,17 @@ customization screen.
[Marked 2]:
https://itunes.apple.com/us/app/marked-2/id890031187?mt=12&uo=4&at=11l5Vs&ct=mm
-## Extensions
-
+## Wiki Links Customization
Besides supporting the basic Markdown syntax, Markdown Mode also
includes syntax highlighting for `[[Wiki Links]]`. This can be
enabled by setting `markdown-enable-wiki-links` to a non-nil value.
-Wiki links may be followed by pressing C-c C-o when the point
-is at a wiki link. Use M-p and M-n to quickly jump to
the
-previous and next links (including links of other types).
+
Aliased or piped wiki links of the form `[[link text|PageName]]`
-are also supported. Since some wikis reverse these components, set
+are supported. Since some wikis reverse these components, set
`markdown-wiki-link-alias-first` to nil to treat them as
-`[[PageName|link text]]`. If `markdown-wiki-link-fontify-missing`
+`[[PageName|link text]]`.
+
+If `markdown-wiki-link-fontify-missing`
is also non-nil, Markdown Mode will highlight wiki links with
missing target file in a different color. By default, Markdown
Mode only searches for target files in the current directory.
@@ -974,18 +973,31 @@ This value type is a symbol list. Possible values are
- `parent-directories` : search in parent directories
- `project` : search under project root
-[SmartyPants][] support is possible by customizing `markdown-command`.
+## Extensions
+### SmartyPants
+
+[SmartyPants][] is a free tool for easily translating plain ASCII punctuation
+characters into "smart" typographic punctuation HTML entities. It can perform
+the following transformations:
+- straight quotes ( " and ' ) into “curly” quote HTML entities
+- backticks-style quotes (``like this'') into “curly” quote HTML entities
+- dashes (“--” and “---”) into en- and em-dash entities
+- three consecutive dots (“...”) into an ellipsis entity
+
+SmartyPants support is possible by customizi
[nongnu] elpa/markdown-mode 819ab2a212 18/33: Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links
branch: elpa/markdown-mode
commit 819ab2a212508062edfd57e0c2d5ab3ffe8feda6
Merge: 5bebb44f7f 7659bc470d
Author: Joe Reinhart
Commit: Joe Reinhart
Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links
---
CHANGES.md | 6 ++
README.md | 3 +++
markdown-mode.el | 14 +-
tests/markdown-test.el | 43 +++
4 files changed, 61 insertions(+), 5 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 55e63f647d..58748f5ace 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -14,6 +14,7 @@
- Trailing whitespace characters for line breaks are hidden when using
`markdown-hide-markup`
- `fill-paragraph` considers GFM alert syntax [GH-838][]
+- Add new flag `markdown-wiki-link-retain-case` [GH-839][]
* Bug fixes:
- Don't highlight superscript/subscript in math inline/block [GH-802][]
@@ -22,6 +23,7 @@
- Don't hide backslashes in code blocks when using `markdown-hide-markup`
and `markdown-fontify-code-blocks-natively` together [GH-766][]
- Fix `markdown-fontify-whole-heading-line` regression [GH-848][]
+- Fix using fundamental-mode issue when editting code block [GH-868][]
* Improvements:
- Apply url-unescape against URL in an inline link [GH-805][]
@@ -31,6 +33,7 @@
- Mark `markdown-css-paths` safe as file local variables [GH-834][]
- Resolve style sheets in `markdown-css-paths` relative to the Markdown
file
(if the path starts with `./` or `../`) [GH-855][] [GH-870][]
+- Don't insert list item in code block [GH-841][]
[gh-780]: https://github.com/jrblevin/markdown-mode/issues/780
[gh-802]: https://github.com/jrblevin/markdown-mode/issues/802
@@ -40,9 +43,12 @@
[gh-827]: https://github.com/jrblevin/markdown-mode/issues/827
[gh-834]: https://github.com/jrblevin/markdown-mode/issues/834
[gh-838]: https://github.com/jrblevin/markdown-mode/issues/838
+ [gh-839]: https://github.com/jrblevin/markdown-mode/issues/839
+ [gh-841]: https://github.com/jrblevin/markdown-mode/issues/841
[gh-845]: https://github.com/jrblevin/markdown-mode/issues/845
[gh-848]: https://github.com/jrblevin/markdown-mode/issues/848
[gh-855]: https://github.com/jrblevin/markdown-mode/issues/855
+ [gh-868]: https://github.com/jrblevin/markdown-mode/issues/868
[gh-870]: https://github.com/jrblevin/markdown-mode/issues/870
# Markdown Mode 2.6
diff --git a/README.md b/README.md
index b6bd29823a..62b5c3d306 100644
--- a/README.md
+++ b/README.md
@@ -772,6 +772,9 @@ provides an interface to all of the possible customizations:
(default: `t`). When set to nil, they will be treated as
`[[PageName|link text]]`.
+ * `markdown-wiki-link-retain-case nil` - set a non-nil value not to
+ change wiki link file name case
+
* `markdown-uri-types` - a list of protocol schemes (e.g., "http")
for URIs that `markdown-mode` should highlight.
diff --git a/markdown-mode.el b/markdown-mode.el
index a7c36b1276..e9dd0c43e6 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -287,6 +287,13 @@ cause lag when typing on slower machines."
:safe 'booleanp
:package-version '(markdown-mode . "2.2"))
+(defcustom markdown-wiki-link-retain-case nil
+ "When non-nil, wiki link file names do not have their case changed."
+ :group 'markdown
+ :type 'boolean
+ :safe 'booleanp
+ :package-version '(markdown-mode . "2.7"))
+
(defcustom markdown-uri-types
'("acap" "cid" "data" "dav" "fax" "file" "ftp"
"geo" "gopher" "http" "https" "imap" "ldap" "mailto"
@@ -5165,6 +5172,7 @@ list simply adds a blank line)."
(markdown-indent-on-enter
(let (bounds)
(if (and (memq markdown-indent-on-enter '(indent-and-new-item))
+ (not (markdown-code-block-at-point-p))
(setq bounds (markdown-cur-list-item-bounds)))
(let ((beg (cl-first bounds))
(end (cl-second bounds))
@@ -8425,7 +8433,7 @@ and [[test test]] both map to Test-test.ext."
;; This function must not overwrite match data(PR #590)
(let* ((basename (replace-regexp-in-string
"[[:space:]\n]" markdown-link-space-sub-char name))
- (basename (if (derived-mode-p 'gfm-mode)
+ (basename (if (and (derived-mode-p 'gfm-mode) (not
markdown-wiki-link-retain-case))
(concat (upcase (substring basename 0 1))
(downcase (substring basename 1 nil)))
basename))
@@ -9041,6 +9049,10 @@ LANG is a string, and the returned major mode is a
symbol."
(and mode
(fboundp mode)
(or
+(not (string-match-p "ts-mode\\'" (symbol-name mode)))
+;; Don't load tree-sitter mode if the mode is in neither
auto-mode-alist nor major-mode-remap-alist
+;; Because some ts-mode overwrites auto-mode-alist and it might break
user configurations
+
;; https://github.com/jrblevin/markdown-
[nongnu] elpa/markdown-mode 92830999de 10/33: Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links
branch: elpa/markdown-mode commit 92830999de663419970d2dee0b42d4fcc121cfd7 Merge: 847e7de1b1 b8637bae07 Author: Joe Reinhart Commit: Joe Reinhart Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links --- CHANGES.md | 10 ++ README.md | 5 ++--- markdown-mode.el | 37 ++--- tests/markdown-test.el | 44 +--- 4 files changed, 63 insertions(+), 33 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 411102ba5a..50709e47bd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -13,6 +13,7 @@ variable `markdown-special-ctrl-a/e`, like Org mode. - Trailing whitespace characters for line breaks are hidden when using `markdown-hide-markup` +- `fill-paragraph` considers GFM alert syntax [GH-838][] * Bug fixes: - Don't highlight superscript/subscript in math inline/block [GH-802][] @@ -20,11 +21,16 @@ - Fix the regexp in the download languages script [GH-827][] - Don't hide backslashes in code blocks when using `markdown-hide-markup` and `markdown-fontify-code-blocks-natively` together [GH-766][] +- Fix `markdown-fontify-whole-heading-line` regression [GH-848][] * Improvements: - Apply url-unescape against URL in an inline link [GH-805][] - Show mode toggle message only if it is called interactively - Copy `markdown-css-paths` in the output buffer [GH-834][] +- Change temporary buffer name according to the Emacs naming convention [GH-848][] +- Mark `markdown-css-paths` safe as file local variables [GH-834][] +- Resolve style sheets in `markdown-css-paths` relative to the Markdown file + [GH-855][] [gh-780]: https://github.com/jrblevin/markdown-mode/issues/780 [gh-802]: https://github.com/jrblevin/markdown-mode/issues/802 @@ -33,6 +39,10 @@ [gh-817]: https://github.com/jrblevin/markdown-mode/issues/817 [gh-827]: https://github.com/jrblevin/markdown-mode/issues/827 [gh-834]: https://github.com/jrblevin/markdown-mode/issues/834 + [gh-838]: https://github.com/jrblevin/markdown-mode/issues/838 + [gh-845]: https://github.com/jrblevin/markdown-mode/issues/845 + [gh-848]: https://github.com/jrblevin/markdown-mode/issues/848 + [gh-855]: https://github.com/jrblevin/markdown-mode/issues/855 # Markdown Mode 2.6 diff --git a/README.md b/README.md index 182141a0d3..f0b384243c 100644 --- a/README.md +++ b/README.md @@ -148,7 +148,7 @@ maintainer if not). * Ubuntu Linux: [elpa-markdown-mode][elpa-ubuntu] and [emacs-goodies-el][emacs-goodies-el-ubuntu] * RedHat and Fedora Linux: [emacs-goodies][] * NetBSD: [textproc/markdown-mode][] - * MacPorts: [markdown-mode.el][macports-package] ([pending][macports-ticket]) + * MacPorts: [markdown-mode.el][macports-package] * FreeBSD: [textproc/markdown-mode.el][freebsd-port] [elpa-markdown-mode]: https://packages.debian.org/sid/lisp/elpa-markdown-mode @@ -157,8 +157,7 @@ maintainer if not). [emacs-goodies-el-ubuntu]: http://packages.ubuntu.com/search?keywords=emacs-goodies-el [emacs-goodies]: https://apps.fedoraproject.org/packages/emacs-goodies [textproc/markdown-mode]: http://pkgsrc.se/textproc/markdown-mode - [macports-package]: https://trac.macports.org/browser/trunk/dports/editors/markdown-mode.el/Portfile - [macports-ticket]: http://trac.macports.org/ticket/35716 + [macports-package]: https://ports.macports.org/port/markdown-mode.el/ [freebsd-port]: http://svnweb.freebsd.org/ports/head/textproc/markdown-mode.el **Dependencies** diff --git a/markdown-mode.el b/markdown-mode.el index 71281607e8..149b07b13b 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -370,6 +370,7 @@ Math support can be enabled, disabled, or toggled later using (defcustom markdown-css-paths nil "List of URLs of CSS files to link to in the output XHTML." :group 'markdown + :safe (lambda (x) (and (listp x) (cl-every #'stringp x))) :type '(repeat (string :tag "CSS File Path"))) (defcustom markdown-content-type "text/html" @@ -3614,30 +3615,25 @@ SEQ may be an atom or a sequence." (add-text-properties (match-beginning 3) (match-end 3) rule-props))) ;; atx heading -(let ((header-end +(let ((fontified-start + (if (or markdown-hide-markup (not markdown-fontify-whole-heading-line)) + (match-beginning 5) + (match-beginning 0))) + (fontified-end (if markdown-fontify-whole-heading-line (min (point-max) (1+ (match-end 0))) - (match-end 0 + (match-end 5 (add-text-properties (match-beginning 4) (match-end 4) left-markup-props) ;; If closing tag is present (if (match-end 6) (progn -(if markdown-hide-markup -(progn - (add-t
[nongnu] elpa/markdown-mode f85b3be32a 22/33: Only set mouse-face when markdown-mouse-follow-link is t
branch: elpa/markdown-mode commit f85b3be32a215fa5885ac542ec2dd934dff8938e Author: Joe Reinhart Commit: Joe Reinhart Only set mouse-face when markdown-mouse-follow-link is t --- markdown-mode.el | 47 ++- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 2b229583ad..fdfaba1f3c 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -5705,23 +5705,32 @@ See also `markdown-mode-map'.") 'rear-nonsticky t 'font-lock-multiline t)) -(defconst markdown--url-props (list 'invisible 'markdown-markup -'keymap markdown-mode-mouse-map -'mouse-face 'markdown-highlight-face -'font-lock-multiline t)) - (defconst markdown--title-props (list 'invisible 'markdown-markup 'font-lock-multiline t)) +(defun markdown--url-props () + (if markdown-mouse-follow-link + (list 'invisible 'markdown-markup +'keymap markdown-mode-mouse-map +'mouse-face 'markdown-highlight-face +'font-lock-multiline t) +(list 'invisible 'markdown-markup + 'keymap markdown-mode-mouse-map + 'font-lock-multiline t))) + (defun markdown--link-props (url &optional title) "Return a property list for URL with optional TITLE." (let ((echo-text (if title (concat title "\n" url) url))) -(list 'keymap markdown-mode-mouse-map - 'mouse-face 'markdown-highlight-face - 'font-lock-multiline t - 'help-echo echo-text))) +(if markdown-mouse-follow-link +(list 'keymap markdown-mode-mouse-map + 'mouse-face 'markdown-highlight-face + 'font-lock-multiline t + 'help-echo echo-text) + (list 'keymap markdown-mode-mouse-map +'font-lock-multiline t +'help-echo echo-text + - ;;; Menu == (easy-menu-define markdown-mode-menu markdown-mode-map @@ -8199,19 +8208,7 @@ Translate filenames using `markdown-filename-translate-function'." (title-start (match-beginning 7)) (title-end (match-end 7)) (title (match-string-no-properties 7)) - ;; Link part (without face) - (lp (list 'keymap markdown-mode-mouse-map - 'font-lock-multiline t - 'help-echo (if title (concat title "\n" url) url))) - ;; URL part - (up (list 'keymap markdown-mode-mouse-map - 'invisible 'markdown-markup - 'font-lock-multiline t)) - ;; URL composition character (url-char (markdown--first-displayable markdown-url-compose-char))) - (when markdown-mouse-follow-link -(setq lp (append lp '(mouse-face 'markdown-highlight-face))) -(setq up (append up '(mouse-face 'markdown-highlight-face (dolist (g '(1 2 4 5 8)) (when (match-end g) (add-text-properties (match-beginning g) (match-end g) markdown--markup-props) @@ -8221,7 +8218,7 @@ Translate filenames using `markdown-filename-translate-function'." (add-text-properties link-start link-end (markdown--link-props url title)) (add-face-text-property link-start link-end 'markdown-link-face)) (when url-start -(add-text-properties url-start url-end markdown--url-props) +(add-text-properties url-start url-end (markdown--url-props)) (add-face-text-property url-start url-end 'markdown-url-face)) (when title-start (add-text-properties url-end title-end markdown--title-props) @@ -8313,14 +8310,14 @@ Translate filenames using `markdown-filename-translate-function'." ;; Properties alias portion of link (add-text-propertiesbeg3 end3 (markdown--link-props part2)) (add-face-text-property beg3 end3 'markdown-link-face) - (add-text-propertiesbeg5 end5 markdown--url-props) + (add-text-propertiesbeg5 end5 (markdown--url-props)) (add-text-propertiesbeg5 end5 '(invisible markdown-markup)) (add-face-text-property beg5 end5 'markdown-url-face) (when (and file-missing-p markdown-wiki-link-fontify-missing) (put-text-property beg3 end3 'face 'markdown-missing-link-face))) (progn ;; Properties URL portion of link -(add-text-propertiesbeg3 end3 markdown--url-props) +(add-text-propertiesbeg3 end3 (markdown--url-props)) (add-text-propertiesbeg3 end3 '(invisible markdown-markup)) (a
[nongnu] elpa/markdown-mode f285a34115 11/33: Fix wiki link font properties and remove unnecessary wiki link-related code
branch: elpa/markdown-mode commit f285a34115f1988df8af323e217c0571dd4c63b9 Author: Joe Reinhart Commit: Joe Reinhart Fix wiki link font properties and remove unnecessary wiki link-related code --- markdown-mode.el | 194 +++ 1 file changed, 38 insertions(+), 156 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 149b07b13b..a729aa99ce 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -1980,12 +1980,14 @@ inline code fragments and code blocks." (defface markdown-link-face '((t (:inherit link))) - "Face for links." + "Face for link text, ie the alias portion of a link. +If a wiki link does not have an alias portion, use this face +for the entire link." :group 'markdown-faces) (defface markdown-missing-link-face '((t (:inherit font-lock-warning-face))) - "Face for missing links." + "Face for the link text if the link points to a missing file." :group 'markdown-faces) (defface markdown-reference-face @@ -3413,45 +3415,42 @@ the buffer)." (markdown-fontify-wiki-links last))) ;; Add text properties for hiding markup (progn + ;; Propertize opening and closing brackets + (remove-text-properties begin end '(font-lock-face nil)) + (add-text-propertiesbeg2 end2 markup-props) + (add-face-text-property beg2 end2 'markdown-markup-face) + (add-text-propertiesbeg6 end6 markup-props) + (add-face-text-property beg6 end6 'markdown-markup-face) (if aliasp (progn ;; Propertize pipe separating URL from link text -(add-text-properties beg4 end4 markup-props) +(add-text-propertiesbeg4 end4 markup-props) (add-face-text-property beg4 end4 'markdown-markup-face) (if markdown-wiki-link-alias-first (progn - (if (and file-missing-p markdown-wiki-link-fontify-missing) - (progn -(add-text-properties beg3 end3 (missing-link-props part2)) -(put-text-property beg3 end3 'font-lock-face 'markdown-missing-link-face)) -(progn - (add-text-properties beg3 end3 (link-props part2)) - (put-text-property beg3 end3 'font-lock-face 'markdown-link-face))) - (progn -(add-text-properties beg5 end5 url-props) -(add-face-text-property beg5 end5 'markdown-url-face))) + ;; Properties alias portion of link + (add-text-propertiesbeg3 end3 (link-props part2)) + (add-face-text-property beg3 end3 'markdown-link-face) + (add-text-propertiesbeg5 end5 url-props) + (add-text-propertiesbeg5 end5 '(invisible markdown-markup)) + (add-face-text-property beg5 end5 'markdown-url-face) + (when (and file-missing-p markdown-wiki-link-fontify-missing) +(put-text-property beg3 end3 'font-lock-face 'markdown-missing-link-face))) (progn -(add-text-properties beg3 end3 url-props) +;; Properties URL portion of link +(add-text-propertiesbeg3 end3 url-props) +(add-text-propertiesbeg3 end3 '(invisible markdown-markup)) (add-face-text-property beg3 end3 'markdown-url-face) -(if (and file-missing-p markdown-wiki-link-fontify-missing) -(progn - (add-text-properties beg5 end5 (missing-link-props part1)) - (put-text-property beg5 end5 'font-lock-face 'markdown-missing-link-face)) - (progn -(add-text-properties beg5 end5 (link-props part1)) -(put-text-property beg5 end5 'font-lock-face 'markdown-link-face)) -(if (and file-missing-p markdown-wiki-link-fontify-missing) -(progn - (add-text-properties beg3 end3 (missing-link-props part1)) - (put-text-property beg3 end3 'font-lock-face 'markdown-missing-link-face)) - (progn -(add-text-properties beg3 end3 (link-props part1)) -(put-text-property beg3 end3 'font-lock-face 'markdown-link-face - ;; Propertize opening and closing brackets - (add-text-properties beg2 end2 markup-props) - (add-text-properties beg6 end6 markup-props) - (add-face-text-property beg2 end2 'markdown-markup-face) - (add-face-text-property beg6 end6 'markdown-markup-face)) +(add-text-propertiesbeg5 end5 (link-props part1)) +
[nongnu] elpa/markdown-mode 847e7de1b1 09/33: Code cleanup
branch: elpa/markdown-mode commit 847e7de1b143a1fce209ec5d7ad673e5170e9467 Author: Joe Reinhart Commit: Joe Reinhart Code cleanup --- markdown-mode.el | 89 ++-- 1 file changed, 22 insertions(+), 67 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index d773e0ed12..71281607e8 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -1878,7 +1878,6 @@ to first convert to HTML or PDF (e.g,. using Pandoc)." :package-version '(markdown-mode . "2.3")) (make-variable-buffer-local 'markdown-hide-markup) -;; TODO: nil does not work to disable hiding, only 0 or -1 (defun markdown-toggle-markup-hiding (&optional arg) "Toggle the display or hiding of markup. With a prefix argument ARG, enable markup hiding if ARG is positive, @@ -2293,9 +2292,7 @@ Depending on your font, some reasonable choices are: (markdown-fontify-sub-superscripts) (markdown-match-inline-attributes . ((0 markdown-markup-properties prepend))) (markdown-match-leanpub-sections . ((0 markdown-markup-properties))) -(markdown-fontify-blockquotes) -;; (markdown-fontify-wiki-links) -) +(markdown-fontify-blockquotes)) "Syntax highlighting for Markdown files.") ;; Footnotes @@ -3289,7 +3286,6 @@ processed elements." ;; If no closing parenthesis in range, update continuation point (setq cont-point (min end-of-block second-begin (cond - ;; TODO: Is this why I enter an infinite loop? ;; On failure, continue searching at cont-point ((and cont-point (< cont-point last)) (goto-char cont-point) @@ -3391,9 +3387,6 @@ the buffer)." (markdown-match-inline-generic markdown-regex-wiki-link last)) (let* ((begin (match-beginning 1)) (end (match-end 1)) - - ;; (beg1 (match-beginning 1)) - ;; (end1 (match-end 1)) (beg2 (match-beginning 2)) (end2 (match-end 2)) (beg3 (match-beginning 3)) @@ -3404,7 +3397,6 @@ the buffer)." (end5 (match-end 5)) (beg6 (match-beginning 6)) (end6 (match-end 6)) - (part1 (match-string-no-properties 3)) (part2 (match-string-no-properties 5)) (aliasp (string-equal (match-string-no-properties 4) "|")) @@ -3430,16 +3422,10 @@ the buffer)." (if (and file-missing-p markdown-wiki-link-fontify-missing) (progn (add-text-properties beg3 end3 (missing-link-props part2)) -;; (add-face-text-property beg3 end3 'markdown-missing-link-face) -(put-text-property beg3 end3 'font-lock-face 'markdown-missing-link-face) -;; (put-text-property beg3 end3 'face 'markdown-missing-link-face) -) +(put-text-property beg3 end3 'font-lock-face 'markdown-missing-link-face)) (progn (add-text-properties beg3 end3 (link-props part2)) - ;; (add-face-text-property beg3 end3 'markdown-link-face) - (put-text-property beg3 end3 'font-lock-face 'markdown-link-face) - ;; (put-text-property beg3 end3 'face 'markdown-link-face) - )) + (put-text-property beg3 end3 'font-lock-face 'markdown-link-face))) (progn (add-text-properties beg5 end5 url-props) (add-face-text-property beg5 end5 'markdown-url-face))) @@ -3449,29 +3435,17 @@ the buffer)." (if (and file-missing-p markdown-wiki-link-fontify-missing) (progn (add-text-properties beg5 end5 (missing-link-props part1)) - ;; (add-face-text-property beg5 end5 'markdown-missing-link-face) - (put-text-property beg5 end5 'font-lock-face 'markdown-missing-link-face) - ;; (put-text-property beg5 end5 'face 'markdown-missing-link-face) - ) + (put-text-property beg5 end5 'font-lock-face 'markdown-missing-link-face)) (progn (add-text-properties beg5 end5 (link-props part1)) -;; (add-face-text-property beg5 end5 'markdown-link-face) -(put-text-property beg5 end5 'font-lock-face 'markdown-link-face) -;; (put-text-property beg5 end5 'face 'markdown-link-face) -) +(put-text-property beg5 end5 'font-lock-face 'markdown-link-face)) (if (and file-missing-p markdown-wiki-link-fontify-missing) (progn (add-text-properties beg3 end
[nongnu] elpa/markdown-mode f579bcc561 26/33: Merge branch 'master' of github.com:jrblevin/markdown-mode into jayemar/toggle-hiding-of-wiki-links
branch: elpa/markdown-mode
commit f579bcc561b44aed0e1c564158fccc5eeaf73db2
Merge: 360abf5ff5 6fc5904257
Author: Joe Reinhart
Commit: Joe Reinhart
Merge branch 'master' of github.com:jrblevin/markdown-mode into
jayemar/toggle-hiding-of-wiki-links
---
CHANGES.md | 3 +++
README.md| 2 +-
markdown-mode.el | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 1a5c2326ad..d3f62d0890 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,7 @@
# Markdown Mode 2.8
+*Under development*
+
* **Breaking changes:**
- GNU Emacs 28.1 or later is required.
@@ -9,6 +11,7 @@
* Improvements:
- Support drag and drop features on Windows and multiple files' drag and
drop
+- Added cmark and cmark-gfm to the markdown command list.
# Markdown Mode 2.7
diff --git a/README.md b/README.md
index 66da025db7..cfb62cf0fe 100644
--- a/README.md
+++ b/README.md
@@ -48,7 +48,7 @@ a complete list of keybindings is available using C-h
m
_Note:_ To use all of the features of `markdown-mode`, you'll need
to install the Emacs package itself and also have a local Markdown
-processor installed (e.g., Markdown.pl, MultiMarkdown, or Pandoc).
+processor installed (e.g., Markdown.pl, MultiMarkdown, Pandoc, or CommonMark).
The external processor is not required for editing, but will be
used for rendering HTML for preview and export. After installing
the Emacs package, be sure to configure `markdown-command` to point
diff --git a/markdown-mode.el b/markdown-mode.el
index ba220d63a2..765ef7b499 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -108,7 +108,7 @@ Any changes to the output buffer made by this hook will be
saved.")
:group 'text
:link '(url-link "https://jblevins.org/projects/markdown-mode/";))
-(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown"
"pandoc" "markdown_py")
+(defcustom markdown-command (let ((command (cl-loop for cmd in '("markdown"
"pandoc" "markdown_py" "cmark" "cmark-gfm")
when (executable-find cmd)
return
(file-name-nondirectory it
(or command "markdown"))
[nongnu] elpa/markdown-mode e015d8542a 03/33: Propertize different sections of wiki links
branch: elpa/markdown-mode commit e015d8542a4f876a79a5164d05a3601d63cd4062 Author: Joe Reinhart Commit: Joe Reinhart Propertize different sections of wiki links --- markdown-mode.el | 137 +++ 1 file changed, 48 insertions(+), 89 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 0598b0ecee..b9edf44476 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -3387,7 +3387,9 @@ the buffer)." (not markdown-wiki-link-fontify-missing) (markdown-match-inline-generic markdown-regex-wiki-link last)) (let ((begin (match-beginning 1)) - (end (match-end 1))) + (end (match-end 1)) + (part1 (match-string-no-properties 3)) + (part2 (match-string-no-properties 5))) (if (or (markdown-in-comment-p begin) (markdown-in-comment-p end) (markdown-inline-code-at-pos-p begin) @@ -3400,21 +3402,14 @@ the buffer)." (progn (if markdown-wiki-link-alias-first (progn -(add-text-properties (match-beginning 3) (match-end 3) - '(face markdown-link-face)) -(add-text-properties (match-beginning 5) (match-end 5) - '(invisible markdown-markup face markdown-url-face))) +(add-text-properties (match-beginning 3) (match-end 3) (link-props part2)) +(add-text-properties (match-beginning 5) (match-end 5) url-props)) (progn - (add-text-properties (match-beginning 3) (match-end 3) - '(invisible markdown-markup face markdown-url-face)) - (add-text-properties (match-beginning 5) (match-end 5) - '(face markdown-link-face - (add-text-properties (match-beginning 2) (match-end 2) - '(invisible markdown-markup face markdown-markup-face)) - (add-text-properties (match-beginning 4) (match-end 4) - '(invisible markdown-markup face markdown-markup-face)) - (add-text-properties (match-beginning 6) (match-end 6) - '(invisible markdown-markup face markdown-markup-face))) + (add-text-properties (match-beginning 3) (match-end 3) url-props) + (add-text-properties (match-beginning 5) (match-end 5) (link-props part1 + (add-text-properties (match-beginning 2) (match-end 2) markup-props) + (add-text-properties (match-beginning 4) (match-end 4) markup-props) + (add-text-properties (match-beginning 6) (match-end 6) markup-props)) (set-match-data (list begin end)) t @@ -8193,6 +8188,31 @@ Translate filenames using `markdown-filename-translate-function'." (markdown--browse-url (markdown-link-url))) (user-error "Point is not at a Markdown link or URL"))) +(defconst markup-props (list 'face 'markdown-markup-face + 'invisible 'markdown-markup + 'rear-nonsticky t + 'font-lock-multiline t)) + +(defconst url-props (list 'face 'markdown-url-face + 'invisible 'markdown-markup + 'keymap 'markdown-mode-mouse-map + 'mouse-face 'markdown-highlight-face + 'font-lock-multiline t)) + +(defconst title-props (list 'face 'markdown-link-title-face +'invisible 'markdown-markup +'font-lock-multiline t)) + +(defun link-props (url &optional title) + "Return a property list for URL with optional TITLE." + (let ((echo-text (if title (concat title "\n" url) url))) +(list 'face 'markdown-link-face + 'keymap 'markdown-mode-mouse-map + ;; 'mouse-face markdown-highlight-face + 'mouse-face 'markdown-highlight-face + 'font-lock-multiline t + 'help-echo echo-text))) + (defun markdown-fontify-inline-links (last) "Add text properties to next inline link from point to LAST." (when (markdown-match-generic-links last nil) @@ -8204,39 +8224,17 @@ Translate filenames using `markdown-filename-translate-function'." (title-start (match-beginning 7)) (title-end (match-end 7)) (title (match-string-no-properties 7)) - ;; Markup part - (mp (list 'invisible 'markdown-markup - 'rear-nonsticky t - 'font-lock-multiline t)) - ;; Link part (without face) - (lp (list 'keymap markdown-mode-mouse-map - 'mouse-face 'markdown-highlight-face - 'font-lock-multiline t - 'help-echo (if title (concat title "\n" url) url))) - ;; URL part - (up (list 'keymap markdown-mode-mous
[nongnu] elpa/markdown-mode c9c9ec6bcd 23/33: Use markdown--markup-props instead of recreating as mp
branch: elpa/markdown-mode commit c9c9ec6bcdf0562af2c29dd4a063f25ba8eb20b6 Author: Joe Reinhart Commit: Joe Reinhart Use markdown--markup-props instead of recreating as mp --- markdown-mode.el | 9 ++--- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index fdfaba1f3c..c3aadff3b7 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -8340,19 +8340,14 @@ Translate filenames using `markdown-filename-translate-function'." (url-end (match-end 2))) (unless (or (markdown-in-inline-code-p url-start) (markdown-in-inline-code-p url-end)) -(let* (;; Markup part - (mp (list 'face 'markdown-markup-face - 'invisible 'markdown-markup - 'rear-nonsticky t - 'font-lock-multiline t)) - ;; URI part +(let* (;; URI part (up (list 'keymap markdown-mode-mouse-map 'face 'markdown-plain-url-face 'font-lock-multiline t))) (when markdown-mouse-follow-link (setq up (append up '(mouse-face markdown-highlight-face (dolist (g '(1 3)) -(add-text-properties (match-beginning g) (match-end g) mp)) +(add-text-properties (match-beginning g) (match-end g) markdown--markup-props)) (add-text-properties url-start url-end up) t)
[nongnu] elpa/markdown-mode cc33f7c73d 14/33: Update tests to reflect different font faces for wiki links and missing files
branch: elpa/markdown-mode
commit cc33f7c73dbd919e563fd83d5313d3986da4
Author: Joe Reinhart
Commit: Joe Reinhart
Update tests to reflect different font faces for wiki links and missing
files
---
markdown-mode.el | 8 +-
tests/markdown-test.el | 74 +-
tests/wiki-links.text | 2 +-
3 files changed, 39 insertions(+), 45 deletions(-)
diff --git a/markdown-mode.el b/markdown-mode.el
index 7bb891c7d2..adc1b49f48 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -262,7 +262,7 @@ This is the default search behavior of Ikiwiki."
:package-version '(markdown-mode . "2.2"))
(defcustom markdown-wiki-link-search-type nil
- "Searching type for markdown wiki link.
+ "A list of options for searching for markdown wiki links.
`sub-directories': search for wiki link targets in sub directories
`parent-directories': search for wiki link targets in parent directories
@@ -8386,6 +8386,11 @@ The location of the alias component depends on the value
of
(or (match-string-no-properties 5) (match-string-no-properties 3
(defun markdown--wiki-link-search-types ()
+ "Return a list of the currently selected search types.
+
+Due to deprecated variables, as of markdown-mode version 2.5, the return value
+of this function is the same as the value of the variable
+`markdown-wiki-link-search-type'."
(let ((ret (and markdown-wiki-link-search-type
(cl-copy-list markdown-wiki-link-search-type
(when (and markdown-wiki-link-search-subdirectories
@@ -8397,6 +8402,7 @@ The location of the alias component depends on the value
of
ret))
(defun markdown--project-root ()
+ "Try various approaches to find the project root."
(or (cl-loop for dir in '(".git" ".hg" ".svn")
when (locate-dominating-file default-directory dir)
return it)
diff --git a/tests/markdown-test.el b/tests/markdown-test.el
index 9505e4a52c..d5d032db34 100644
--- a/tests/markdown-test.el
+++ b/tests/markdown-test.el
@@ -151,7 +151,7 @@ This file is not saved."
(unless (eq vals value)
(throw 'fail loc))
(when fail-loc
- (message "Testing range (%d,%d) for property %s equal to %s."
+ (message "Testing that range (%d,%d) for property %s includes %s."
begin end prop value)
(message "Expected value (%s) not found in property (%s) at location %d"
value prop fail-loc)
(markdown-test-report-property-range begin end prop))
@@ -162,12 +162,12 @@ This file is not saved."
(let ((fail-loc
(catch 'fail
(dolist (loc (number-sequence begin end))
- (unless (eq (get-char-property loc prop) value)
+ (unless (equal (get-char-property loc prop) value)
(throw 'fail loc))
(when fail-loc
- (message "Testing range (%d,%d) for property %s equal to %s."
+ (message "Testing that range (%d,%d) for property %s equal to %s."
begin end prop value)
- (message "Expected value (%s) not found in property (%s) at location %d"
value prop fail-loc)
+ (message "Expected value (%s) does not equal property (%s) at location
%d" value prop fail-loc)
(markdown-test-report-property-range begin end prop))
(should-not fail-loc)))
@@ -5728,39 +5728,24 @@ http://example.com \"title\" )
(ert-deftest test-markdown-wiki-link/font-lock ()
"Test font lock faces for wiki links."
- ;; If `temporary-file-directory' contains an inaccessible
- ;; subdirectory, `markdown-fontify-buffer-wiki-links' fails because
- ;; it calls `directory-files-recursively' on the directory, which
- ;; fails because of
- ;; . To fix
- ;; this, we run the entire test in a new subdirectory of
- ;; `temporary-file-directory', which is guaranteed to not contain
- ;; any inaccessible directories.
- (let ((temporary-file-directory
- (file-name-as-directory (make-temp-file "markdown-test" :dir-flag
-(markdown-test-temp-file "wiki-links.text"
- (let* ((fn (concat (file-name-directory buffer-file-name)
- "inline.text"))
- (markdown-enable-wiki-links t))
-;; Create inline.text in the same temp directory, refontify
-(write-region "" nil fn nil 1)
-(markdown-fontify-buffer-wiki-links)
-;; Confirm location of first wiki link
-(should (eq (markdown-next-link) 8))
-;; First wiki link doesn't have a corresponding file
-(markdown-test-range-has-property 8 20 'font-lock-face
'markdown-missing-link-face)
-;; Second wiki link doesn't have a corresponding file
-(should (eq (markdown-next-link) 73))
-(markdown-test-range-has-property 73 88 'font-lock-face
'markdown-missing-link-face)
-;; Move to third wiki link, and create the missing file
-(should (eq (markdown-next-link) 155))
-
[nongnu] elpa/markdown-mode 606110f2d7 31/33: Add line to CHANGES.md references this PR
branch: elpa/markdown-mode commit 606110f2d757956af5c6f0709e13dd4bdc65b40f Author: Joe Reinhart Commit: Joe Reinhart Add line to CHANGES.md references this PR --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index b4171603c5..6e7fa116b2 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,7 @@ * Bug fixes: - `markdown-export` should not output stderr content to output file +- Hide wikilink markup as part of `markdown-toggle-markup-hiding` [GH-847][] * Improvements: - Support drag and drop features on Windows and multiple files' drag and drop
[nongnu] elpa/markdown-mode d1a20625a3 30/33: Fix byte compile warnings
branch: elpa/markdown-mode commit d1a20625a33b9157652c3f80b67416b27b9edbb6 Author: Shohei YOSHIDA Commit: Shohei YOSHIDA Fix byte compile warnings --- markdown-mode.el | 68 +++- 1 file changed, 38 insertions(+), 30 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index a0abf6776d..6987741a5b 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -3433,7 +3433,8 @@ the buffer)." (markdown-code-block-at-pos begin)) (progn (goto-char (min (1+ begin) last)) (when (< (point) last) - (markdown-match-wiki-link last))) + (with-no-warnings + (markdown-match-wiki-link last (set-match-data (list begin end)) t @@ -8579,11 +8580,12 @@ and highlight accordingly." (file-name (markdown-convert-wiki-link-to-filename (markdown-wiki-link-link - (if (condition-case nil (file-exists-p file-name) (error nil)) + (with-no-warnings +(if (condition-case nil (file-exists-p file-name) (error nil)) +(markdown-highlight-wiki-link + highlight-beginning highlight-end 'markdown-link-face) (markdown-highlight-wiki-link - highlight-beginning highlight-end 'markdown-link-face) -(markdown-highlight-wiki-link - highlight-beginning highlight-end 'markdown-missing-link-face))) + highlight-beginning highlight-end 'markdown-missing-link-face (defun markdown-extend-changed-region (from to) "Extend region given by FROM and TO so that we can fontify all links. @@ -8619,7 +8621,8 @@ newline after." ;; Extend the region to fontify so that it starts ;; and ends at safe places. (cl-multiple-value-bind (new-from new-to) - (markdown-extend-changed-region from to) + (with-no-warnings +(markdown-extend-changed-region from to)) (goto-char new-from) ;; Only refontify when the range contains text with a ;; wiki link face or if the wiki link regexp matches. @@ -8628,10 +8631,11 @@ newline after." '(markdown-link-face markdown-missing-link-face)) (re-search-forward markdown-regex-wiki-link new-to t)) - ;; Unfontify existing fontification (start from scratch) - (markdown-unfontify-region-wiki-links new-from new-to) - ;; Now do the fontification. - (markdown-fontify-region-wiki-links new-from new-to)) + (with-no-warnings + ;; Unfontify existing fontification (start from scratch) + (markdown-unfontify-region-wiki-links new-from new-to) + ;; Now do the fontification. + (markdown-fontify-region-wiki-links new-from new-to))) (cursor-intangible-mode -1) (and (not modified) (buffer-modified-p) @@ -8640,12 +8644,14 @@ newline after." (defun markdown-check-change-for-wiki-link-after-change (from to _) "Check region between FROM and TO for wiki links and re-fontify as needed. Designed to be used with the `after-change-functions' hook." - (markdown-check-change-for-wiki-link from to)) + (with-no-warnings +(markdown-check-change-for-wiki-link from to))) (defun markdown-fontify-buffer-wiki-links () "Refontify all wiki links in the buffer." (interactive) - (markdown-check-change-for-wiki-link (point-min) (point-max))) + (with-no-warnings +(markdown-check-change-for-wiki-link (point-min) (point-max (defun markdown-toggle-wiki-links (&optional arg) "Toggle support for wiki links. @@ -8665,24 +8671,26 @@ and disable it otherwise." "Add or remove hooks for fontifying wiki links. These are only enabled when `markdown-wiki-link-fontify-missing' is non-nil." ;; Anytime text changes make sure it gets fontified correctly - (if (and markdown-enable-wiki-links - markdown-wiki-link-fontify-missing) - (add-hook 'after-change-functions -#'markdown-check-change-for-wiki-link-after-change t t) -(remove-hook 'after-change-functions - #'markdown-check-change-for-wiki-link-after-change t)) - ;; If we left the buffer there is a really good chance we were - ;; creating one of the wiki link documents. Make sure we get - ;; refontified when we come back. - (if (and markdown-enable-wiki-links - markdown-wiki-link-fontify-missing) - (progn -(add-hook 'window-configuration-change-hook - #'markdown-fontify-buffer-wiki-links t t) -(markdown-fontify-buffer-wiki-links)) -(remove-hook 'window-configuration-change-hook - #'markdown-
[nongnu] elpa/markdown-mode f464a6fa68 32/33: Add issue link
branch: elpa/markdown-mode commit f464a6fa68f8f466757d2c41d1110156988c40db Author: Shohei YOSHIDA Commit: Shohei YOSHIDA Add issue link --- CHANGES.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGES.md b/CHANGES.md index 6e7fa116b2..38b24bfa5f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,7 @@ - Added cmark and cmark-gfm to the markdown command list. - Disable `imenu-submenus-on-top` by default [GH-882][] + [gh-847]: https://github.com/jrblevin/markdown-mode/issues/847 [gh-882]: https://github.com/jrblevin/markdown-mode/issues/882 [gh-891]: https://github.com/jrblevin/markdown-mode/issues/891
[nongnu] elpa/markdown-mode 5bebb44f7f 17/33: Pull in latest from master
branch: elpa/markdown-mode
commit 5bebb44f7ff29332839e7a79a2c6c0487b3935b9
Merge: 06b15337c9 e100778594
Author: Joe Reinhart
Commit: Joe Reinhart
Pull in latest from master
---
CHANGES.md | 3 +-
README.md | 7 +-
markdown-mode.el | 4 +-
tests/markdown-test.el | 227 ++---
4 files changed, 128 insertions(+), 113 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 50709e47bd..55e63f647d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -30,7 +30,7 @@
- Change temporary buffer name according to the Emacs naming convention
[GH-848][]
- Mark `markdown-css-paths` safe as file local variables [GH-834][]
- Resolve style sheets in `markdown-css-paths` relative to the Markdown
file
- [GH-855][]
+ (if the path starts with `./` or `../`) [GH-855][] [GH-870][]
[gh-780]: https://github.com/jrblevin/markdown-mode/issues/780
[gh-802]: https://github.com/jrblevin/markdown-mode/issues/802
@@ -43,6 +43,7 @@
[gh-845]: https://github.com/jrblevin/markdown-mode/issues/845
[gh-848]: https://github.com/jrblevin/markdown-mode/issues/848
[gh-855]: https://github.com/jrblevin/markdown-mode/issues/855
+ [gh-870]: https://github.com/jrblevin/markdown-mode/issues/870
# Markdown Mode 2.6
diff --git a/README.md b/README.md
index 41675ed989..b6bd29823a 100644
--- a/README.md
+++ b/README.md
@@ -178,8 +178,7 @@ tend to be associated with paired delimiters such as
M-{ and
M-} or C-c < and C-c >. Outline navigation
keybindings the
same as in `org-mode`. Finally, commands for running Markdown or
doing maintenance on an open file are grouped under the C-c C-c
-prefix. The most commonly used commands are described below. You
-can obtain a list of all keybindings by pressing C-c C-h.
+prefix. The most commonly used commands are described below.
* Links and Images: C-c C-l and C-c C-i
@@ -1086,13 +1085,13 @@ by `markdown-mode` and `gfm-mode` as described below.
```
* **Preview:** GFM-specific preview can be powered by setting
- `markdown-command` to use [Docter][]. This may also be
+ `markdown-command` to use [marked][]. This may also be
configured to work with [Marked 2][] for `markdown-open-command`.
[GFM]: http://github.github.com/github-flavored-markdown/
[GFM comments]: https://help.github.com/articles/writing-on-github/
[since 2014]: https://github.com/blog/1825-task-lists-in-all-markdown-documents
-[Docter]: https://github.com/alampros/Docter
+[marked]: https://marked.js.org/
## Acknowledgments
diff --git a/markdown-mode.el b/markdown-mode.el
index c081cb106b..a7c36b1276 100644
--- a/markdown-mode.el
+++ b/markdown-mode.el
@@ -7742,7 +7742,9 @@ Standalone XHTML output is identified by an occurrence of
(defun markdown-stylesheet-link-string (stylesheet-path)
(concat ""))
(defun markdown-escape-title (title)
diff --git a/tests/markdown-test.el b/tests/markdown-test.el
index b13eb87f6e..5b0c825388 100644
--- a/tests/markdown-test.el
+++ b/tests/markdown-test.el
@@ -5761,112 +5761,6 @@ http://example.com \"title\" )
(call-interactively 'markdown-kill-thing-at-point)
(should (string-equal (current-kill 0) (cdr test)))
-(ert-deftest test-markdown/wiki-link-rules ()
- "Test wiki link search rules and font lock for missing pages."
- (let ((markdown-enable-wiki-links t)
-(markdown-wiki-link-fontify-missing t)
-(markdown-wiki-link-search-type '(project)))
-(progn
- (find-file (expand-file-name "wiki/root" markdown-test-dir))
- (unwind-protect
- (progn
-(markdown-mode)
-(font-lock-ensure)
-;; search rules
-(should (string-match-p
- "/sub/foo$"
- (markdown-convert-wiki-link-to-filename "foo")))
-(should (string-equal
- (markdown-convert-wiki-link-to-filename "doesnotexist")
- "doesnotexist"))
-;; font lock
-(markdown-test-range-has-property 1 2 'face
'markdown-markup-face)
-(markdown-test-range-has-property 3 9 'face 'markdown-link-face)
-(markdown-test-range-has-property 10 11 'face
'markdown-markup-face)
-(markdown-test-range-has-property 16 31 'face
'markdown-missing-link-face)
-(markdown-test-range-has-property 38 40 'face 'markdown-link-face)
-(markdown-test-range-has-property 47 58 'face
'markdown-missing-link-face)
-(markdown-test-range-has-property 65 74 'face 'markdown-link-face))
-(kill-buffer)))
-(progn
- (find-file (expand-file-name "wiki/sub/foo" markdown-test-dir))
- (unwind-protect
- (progn
-(markdown-mode)
-(font-lock-ensure)
-;; search rules
-(should (string-match-p
- "/wiki/root$"
- (markdown-convert-wiki-link-to-filename "roo
[nongnu] elpa/markdown-mode updated (d2d960bec1 -> 9d2850ed58)
elpasync pushed a change to branch elpa/markdown-mode. from d2d960bec1 Merge pull request #892 from jrblevin/issue-891 new f8605b9ace Initial somewhat hacky method to enable wiki link markup hiding new f1447ef770 Proper faces are added to wiki links to allow for proper colorization new e015d8542a Propertize different sections of wiki links new a72dfa27a5 Add eldoc functionality for wiki links new 2120fc06d0 Removed unused bindings in markdown-eldoc-function new 85be4f1b68 Handle wiki links that don't have alias text new 2645b7fd14 Add markdown-missing-link-face when appropriate to parts of wiki links new 88f30a641c All tests are passing; still needs code cleanup new 847e7de1b1 Code cleanup new 92830999de Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links new f285a34115 Fix wiki link font properties and remove unnecessary wiki link-related code new 4d44c6a067 Fix lint warnings and byte compilation warnings new 8fd66014cc Use face to show missing wiki links when enabled; remove additional unused code new cc33f7c73d Update tests to reflect different font faces for wiki links and missing files new 085fa615d0 Update wiki links test to check for markup-markup-face; organize wiki link tests to be with other wiki link tests new 06b15337c9 Fix lint warning new 5bebb44f7f Pull in latest from master new 819ab2a212 Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links new eb4b02e40c Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links new 76a81fa6da Remove redundant mp for use of markdown--markup-props new 37863796c8 Remove tp for pre-calculated markdown--title-props new f85b3be32a Only set mouse-face when markdown-mouse-follow-link is t new c9c9ec6bcd Use markdown--markup-props instead of recreating as mp new e50a72a6cb Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links new 360abf5ff5 Reintroduce public functions that had been removed new f579bcc561 Merge branch 'master' of github.com:jrblevin/markdown-mode into jayemar/toggle-hiding-of-wiki-links new 244464388d Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links new 6f66ba336d Mark functions as obsolete new 11bac530de Update versions of obsoleted functions new d1a20625a3 Fix byte compile warnings new 606110f2d7 Add line to CHANGES.md references this PR new f464a6fa68 Add issue link new 9d2850ed58 Merge pull request #861 from jayemar/jayemar/toggle-hiding-of-wiki-links Summary of changes: CHANGES.md | 2 + README.md | 42 +--- markdown-mode.el | 288 + tests/markdown-test.el | 86 +++ tests/wiki-links.text | 2 +- 5 files changed, 264 insertions(+), 156 deletions(-)
[nongnu] elpa/markdown-mode eb4b02e40c 19/33: Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links
branch: elpa/markdown-mode commit eb4b02e40ca0b2a843d4424f20db49012e4598c4 Merge: 819ab2a212 ee9d6de1d2 Author: Joe Reinhart Commit: Joe Reinhart Merge branch 'master' into jayemar/toggle-hiding-of-wiki-links --- CHANGES.md | 4 markdown-mode.el | 61 ++ tests/markdown-test.el | 22 ++ 3 files changed, 73 insertions(+), 14 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 58748f5ace..1c71afbba7 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -24,6 +24,7 @@ and `markdown-fontify-code-blocks-natively` together [GH-766][] - Fix `markdown-fontify-whole-heading-line` regression [GH-848][] - Fix using fundamental-mode issue when editting code block [GH-868][] +- Fix highlighting URL in angle brackes[GH-822][] * Improvements: - Apply url-unescape against URL in an inline link [GH-805][] @@ -34,12 +35,14 @@ - Resolve style sheets in `markdown-css-paths` relative to the Markdown file (if the path starts with `./` or `../`) [GH-855][] [GH-870][] - Don't insert list item in code block [GH-841][] +- Don't set mouse face if `markdown-mouse-follow-link` is nil [GH-879][] [gh-780]: https://github.com/jrblevin/markdown-mode/issues/780 [gh-802]: https://github.com/jrblevin/markdown-mode/issues/802 [gh-804]: https://github.com/jrblevin/markdown-mode/issues/804 [gh-805]: https://github.com/jrblevin/markdown-mode/issues/805 [gh-817]: https://github.com/jrblevin/markdown-mode/issues/817 + [gh-822]: https://github.com/jrblevin/markdown-mode/issues/822 [gh-827]: https://github.com/jrblevin/markdown-mode/issues/827 [gh-834]: https://github.com/jrblevin/markdown-mode/issues/834 [gh-838]: https://github.com/jrblevin/markdown-mode/issues/838 @@ -50,6 +53,7 @@ [gh-855]: https://github.com/jrblevin/markdown-mode/issues/855 [gh-868]: https://github.com/jrblevin/markdown-mode/issues/868 [gh-870]: https://github.com/jrblevin/markdown-mode/issues/870 + [gh-879]: https://github.com/jrblevin/markdown-mode/issues/879 # Markdown Mode 2.6 diff --git a/markdown-mode.el b/markdown-mode.el index e9dd0c43e6..6e0313ca9d 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -1176,6 +1176,10 @@ escape character (see `markdown-match-escape').") If POS is not given, use point instead." (get-text-property (or pos (point)) 'markdown-comment)) +(defsubst markdown-in-inline-code-p (pos) + "Return non-nil if POS is in inline code." + (equal (get-text-property pos 'face) '(markdown-inline-code-face))) + (defun markdown--face-p (pos faces) "Return non-nil if face of POS contain FACES." (let ((face-prop (get-text-property pos 'face))) @@ -8195,7 +8199,26 @@ Translate filenames using `markdown-filename-translate-function'." (title-start (match-beginning 7)) (title-end (match-end 7)) (title (match-string-no-properties 7)) - (url-char (markdown--first-displayable markdown-url-compose-char))) + ;; Markup part + (mp (list 'invisible 'markdown-markup + 'rear-nonsticky t + 'font-lock-multiline t)) + ;; Link part (without face) + (lp (list 'keymap markdown-mode-mouse-map + 'font-lock-multiline t + 'help-echo (if title (concat title "\n" url) url))) + ;; URL part + (up (list 'keymap markdown-mode-mouse-map + 'invisible 'markdown-markup + 'font-lock-multiline t)) + ;; URL composition character + (url-char (markdown--first-displayable markdown-url-compose-char)) + ;; Title part + (tp (list 'invisible 'markdown-markup + 'font-lock-multiline t))) + (when markdown-mouse-follow-link +(setq lp (append lp '(mouse-face 'markdown-highlight-face))) +(setq up (append up '(mouse-face 'markdown-highlight-face (dolist (g '(1 2 4 5 8)) (when (match-end g) (add-text-properties (match-beginning g) (match-end g) markdown--markup-props) @@ -8223,7 +8246,6 @@ Translate filenames using `markdown-filename-translate-function'." (ref-end (match-end 6)) ;; Link properties (lp (list 'keymap markdown-mode-mouse-map - 'mouse-face 'markdown-highlight-face 'font-lock-multiline t 'help-echo (lambda (_ __ pos) (save-match-data @@ -8236,6 +8258,8 @@ Translate filenames using `markdown-filename-translate-function'." ;; Reference properties (rp (list 'invisible 'markdown-markup 'font-lock-multiline t))) + (when markdown-mouse-follow-link +(setq lp (append lp '(mouse-face markdown-highlight-face (dolist (g '(1 2 4 5 8)) (when (match-end g) (a
[nongnu] elpa/markdown-mode 360abf5ff5 25/33: Reintroduce public functions that had been removed
branch: elpa/markdown-mode commit 360abf5ff51b99a07d7ecde53b88090428f77acd Author: Joe Reinhart Commit: Joe Reinhart Reintroduce public functions that had been removed --- markdown-mode.el | 118 +++ 1 file changed, 118 insertions(+) diff --git a/markdown-mode.el b/markdown-mode.el index 063df8ed40..ba220d63a2 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -3395,6 +3395,23 @@ the buffer)." (defun markdown-match-yaml-metadata-key (last) (markdown-match-propertized-text 'markdown-metadata-key last)) +(defun markdown-match-wiki-link (last) + "Match wiki links from point to LAST." + (when (and markdown-enable-wiki-links + (not markdown-wiki-link-fontify-missing) + (markdown-match-inline-generic markdown-regex-wiki-link last)) +(let ((begin (match-beginning 1)) (end (match-end 1))) + (if (or (markdown-in-comment-p begin) + (markdown-in-comment-p end) + (markdown-inline-code-at-pos-p begin) + (markdown-inline-code-at-pos-p end) + (markdown-code-block-at-pos begin)) + (progn (goto-char (min (1+ begin) last)) + (when (< (point) last) + (markdown-match-wiki-link last))) +(set-match-data (list begin end)) +t + (defun markdown-match-inline-attributes (last) "Match inline attributes from point to LAST." ;; #428 re-search-forward markdown-regex-inline-attributes is very slow. @@ -8510,6 +8527,39 @@ See `markdown-wiki-link-p' and `markdown-follow-wiki-link'." (markdown-follow-wiki-link (markdown-wiki-link-link) arg) (user-error "Point is not at a Wiki Link"))) +(defun markdown-highlight-wiki-link (from to face) + "Highlight the wiki link in the region between FROM and TO using FACE." + (put-text-property from to 'font-lock-face face)) + +(defun markdown-unfontify-region-wiki-links (from to) + "Remove wiki link faces from the region specified by FROM and TO." + (interactive "*r") + (let ((modified (buffer-modified-p))) +(remove-text-properties from to '(font-lock-face markdown-link-face)) +(remove-text-properties from to '(font-lock-face markdown-missing-link-face)) +;; remove-text-properties marks the buffer modified in emacs 24.3, +;; undo that if it wasn't originally marked modified +(set-buffer-modified-p modified))) + +(defun markdown-fontify-region-wiki-links (from to) + "Search region given by FROM and TO for wiki links and fontify them. +If a wiki link is found check to see if the backing file exists +and highlight accordingly." + (goto-char from) + (save-match-data +(while (re-search-forward markdown-regex-wiki-link to t) + (when (not (markdown-code-block-at-point-p)) +(let ((highlight-beginning (match-beginning 1)) + (highlight-end (match-end 1)) + (file-name + (markdown-convert-wiki-link-to-filename +(markdown-wiki-link-link + (if (condition-case nil (file-exists-p file-name) (error nil)) + (markdown-highlight-wiki-link + highlight-beginning highlight-end 'markdown-link-face) +(markdown-highlight-wiki-link + highlight-beginning highlight-end 'markdown-missing-link-face))) + (defun markdown-extend-changed-region (from to) "Extend region given by FROM and TO so that we can fontify all links. The region is extended to the first newline before and the first @@ -8528,6 +8578,50 @@ newline after." (setq new-to (point))) (cl-values new-from new-to))) +(defun markdown-check-change-for-wiki-link (from to) + "Check region between FROM and TO for wiki links and re-fontify as needed." + (interactive "*r") + (let* ((modified (buffer-modified-p)) + (buffer-undo-list t) + (inhibit-read-only t) + deactivate-mark + buffer-file-truename) +(unwind-protect +(save-excursion + (save-match-data +(save-restriction + (cursor-intangible-mode +1) ;; inhibit-point-motion-hooks is obsoleted since Emacs 29 + ;; Extend the region to fontify so that it starts + ;; and ends at safe places. + (cl-multiple-value-bind (new-from new-to) + (markdown-extend-changed-region from to) +(goto-char new-from) +;; Only refontify when the range contains text with a +;; wiki link face or if the wiki link regexp matches. +(when (or (markdown-range-property-any + new-from new-to 'font-lock-face + '(markdown-link-face markdown-missing-link-face)) + (re-search-forward + markdown-regex-wiki-link new-to t)) + ;; Unfontify existing fontification (start from scratch) + (markdown-unfontify-region-wiki-l
[nongnu] elpa/markdown-mode 11bac530de 29/33: Update versions of obsoleted functions
branch: elpa/markdown-mode commit 11bac530de134494ca4e92783ab2d24f3ce74342 Author: Joe Reinhart Commit: Joe Reinhart Update versions of obsoleted functions --- markdown-mode.el | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 028aa4f9cc..a0abf6776d 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -278,15 +278,15 @@ This is the default search behavior of Ikiwiki." (make-obsolete-variable 'markdown-wiki-link-search-subdirectories 'markdown-wiki-link-search-type "2.5") (make-obsolete-variable 'markdown-wiki-link-search-parent-directories 'markdown-wiki-link-search-type "2.5") -(make-obsolete 'markdown-match-wiki-link nil "2.3") -(make-obsolete 'markdown-highlight-wiki-link nil "2.3") -(make-obsolete 'markdown-unfontify-region-wiki-links nil "2.3") -(make-obsolete 'markdown-fontify-region-wiki-links nil "2.3") -(make-obsolete 'markdown-extend-changed-region nil "2.3") -(make-obsolete 'markdown-check-change-for-wiki-link nil "2.3") -(make-obsolete 'markdown-check-change-for-wiki-link-after-change nil "2.3") -(make-obsolete 'markdown-fontify-buffer-wiki-links nil "2.3") -(make-obsolete 'markdown-setup-wiki-link-hooks nil "2.3") +(make-obsolete 'markdown-match-wiki-link nil "2.8") +(make-obsolete 'markdown-highlight-wiki-link nil "2.8") +(make-obsolete 'markdown-unfontify-region-wiki-links nil "2.8") +(make-obsolete 'markdown-fontify-region-wiki-links nil "2.8") +(make-obsolete 'markdown-extend-changed-region nil "2.8") +(make-obsolete 'markdown-check-change-for-wiki-link nil "2.8") +(make-obsolete 'markdown-check-change-for-wiki-link-after-change nil "2.8") +(make-obsolete 'markdown-fontify-buffer-wiki-links nil "2.8") +(make-obsolete 'markdown-setup-wiki-link-hooks nil "2.8") (defcustom markdown-wiki-link-fontify-missing nil "When non-nil, change wiki link face according to existence of target files.
[nongnu] elpa/markdown-mode 76a81fa6da 20/33: Remove redundant mp for use of markdown--markup-props
branch: elpa/markdown-mode commit 76a81fa6da00afac950b85194397921bf2b19e11 Author: Joe Reinhart Commit: Joe Reinhart Remove redundant mp for use of markdown--markup-props --- markdown-mode.el | 4 1 file changed, 4 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 6e0313ca9d..4e16a161fd 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -8199,10 +8199,6 @@ Translate filenames using `markdown-filename-translate-function'." (title-start (match-beginning 7)) (title-end (match-end 7)) (title (match-string-no-properties 7)) - ;; Markup part - (mp (list 'invisible 'markdown-markup - 'rear-nonsticky t - 'font-lock-multiline t)) ;; Link part (without face) (lp (list 'keymap markdown-mode-mouse-map 'font-lock-multiline t
[nongnu] elpa/markdown-mode 06b15337c9 16/33: Fix lint warning
branch: elpa/markdown-mode commit 06b15337c92d04f2383d4a4a6df83226b8db04b1 Author: Joe Reinhart Commit: Joe Reinhart Fix lint warning --- markdown-mode.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index adc1b49f48..c081cb106b 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -5211,8 +5211,7 @@ Otherwise, do normal delete by repeating (back-to-indentation) (unless (looking-at-p "[ \t]*$") (setq mincol (min mincol (current-column -(forward-line 1) -)) +(forward-line 1))) mincol)) (defun markdown-indent-region (beg end arg)
[elpa] externals/minuet 70cc351d6b 2/2: doc: fix ELPA badge link.
branch: externals/minuet commit 70cc351d6bf7f5181feb4e636cac58ea094603a8 Author: Milan Glacier Commit: Milan Glacier doc: fix ELPA badge link. --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8c1a464e9c..9496ab639d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -- [Minuet](#minuet)- [Minuet](#minuet) +- [Minuet](#minuet) - [Features](#features) - [Requirements](#requirements) - [Installation](#installation) @@ -31,11 +31,11 @@ # Minuet -[![GNU ELPA badge][elpa-badge]][elpa-link] +[![GNU ELPA badge][gnu-elpa-badge]][gnu-elpa-link] [![MELPA badge][melpa-badge]][melpa-link] [gnu-elpa-link]: https://elpa.gnu.org/packages/minuet.html -[gnu-elpa-link]: https://elpa.gnu.org/packages/minuet.svg +[gnu-elpa-badge]: https://elpa.gnu.org/packages/minuet.svg [melpa-link]: https://melpa.org/#/minuet [melpa-badge]: https://melpa.org/packages/minuet-badge.svg
[nongnu] elpa/markdown-mode 8fd66014cc 13/33: Use face to show missing wiki links when enabled; remove additional unused code
branch: elpa/markdown-mode
commit 8fd66014cc49bcb080bca5e8650c4452d8719efa
Author: Joe Reinhart
Commit: Joe Reinhart
Use face to show missing wiki links when enabled; remove additional unused
code
---
README.md| 42 +++---
markdown-mode.el | 34 --
2 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/README.md b/README.md
index f0b384243c..41675ed989 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,7 @@ using `package.el`. First, configure `package.el` and the
MELPA Stable
repository by adding the following to your `.emacs`, `init.el`,
or equivalent startup file:
-```lisp
+```emacs-lisp
(require 'package)
(add-to-list 'package-archives
'("melpa-stable" . "https://stable.melpa.org/packages/";))
@@ -79,7 +79,7 @@ then you can automatically install and configure
`markdown-mode` by
adding a declaration such as this one to your init file (as an
example; adjust settings as desired):
-```lisp
+```emacs-lisp
(use-package markdown-mode
:ensure t
:mode ("README\\.md\\'" . gfm-mode)
@@ -99,7 +99,7 @@ save the file where Emacs can find it (i.e., a directory in
your
`load-path`). You can then configure `markdown-mode` and `gfm-mode`
to load automatically by adding the following to your init file:
-```lisp
+```emacs-lisp
(autoload 'markdown-mode "markdown-mode"
"Major mode for editing Markdown files" t)
(add-to-list 'auto-mode-alist
@@ -133,7 +133,7 @@ repository as above or install markdown-mode from
If you clone the repository directly, then make sure that Emacs can
find it by adding the following line to your startup file:
-```lisp
+```emacs-lisp
(add-to-list 'load-path "/path/to/markdown-mode/repository")
```
@@ -351,7 +351,7 @@ can obtain a list of all keybindings by pressing C-c
C-h.
preview window to appear at the bottom or right, you can
customize `markdown-split-window-direction`.
- ```lisp
+ ```emacs-lisp
;; Set custom markdown preview function
(setq markdown-live-preview-window-function
#'my-markdown-preview-function)
@@ -950,18 +950,17 @@ customization screen.
[Marked 2]:
https://itunes.apple.com/us/app/marked-2/id890031187?mt=12&uo=4&at=11l5Vs&ct=mm
-## Extensions
-
+## Wiki Links Customization
Besides supporting the basic Markdown syntax, Markdown Mode also
includes syntax highlighting for `[[Wiki Links]]`. This can be
enabled by setting `markdown-enable-wiki-links` to a non-nil value.
-Wiki links may be followed by pressing C-c C-o when the point
-is at a wiki link. Use M-p and M-n to quickly jump to
the
-previous and next links (including links of other types).
+
Aliased or piped wiki links of the form `[[link text|PageName]]`
-are also supported. Since some wikis reverse these components, set
+are supported. Since some wikis reverse these components, set
`markdown-wiki-link-alias-first` to nil to treat them as
-`[[PageName|link text]]`. If `markdown-wiki-link-fontify-missing`
+`[[PageName|link text]]`.
+
+If `markdown-wiki-link-fontify-missing`
is also non-nil, Markdown Mode will highlight wiki links with
missing target file in a different color. By default, Markdown
Mode only searches for target files in the current directory.
@@ -972,18 +971,31 @@ This value type is a symbol list. Possible values are
- `parent-directories` : search in parent directories
- `project` : search under project root
-[SmartyPants][] support is possible by customizing `markdown-command`.
+## Extensions
+### SmartyPants
+
+[SmartyPants][] is a free tool for easily translating plain ASCII punctuation
+characters into "smart" typographic punctuation HTML entities. It can perform
+the following transformations:
+- straight quotes ( " and ' ) into “curly” quote HTML entities
+- backticks-style quotes (``like this'') into “curly” quote HTML entities
+- dashes (“--” and “---”) into en- and em-dash entities
+- three consecutive dots (“...”) into an ellipsis entity
+
+SmartyPants support is possible by customizing `markdown-command`.
If you install `SmartyPants.pl` at, say, `/usr/local/bin/smartypants`,
then you can set `markdown-command` to `"markdown | smartypants"`.
You can do this either by using M-x customize-group markdown
or by placing the following in your `.emacs` file:
-```lisp
+```emacs-lisp
(setq markdown-command "markdown | smartypants")
```
[SmartyPants]: http://daringfireball.net/projects/smartypants/
+### LaTeX Mathematical Expressions
+
Syntax highlighting for mathematical expressions written
in LaTeX (only expressions denoted by `$..$`, `$$..$$`, or `\[..\]`)
can be enabled by setting `markdown-enable-math` to a non-nil value,
@@ -1066,7 +1078,7 @@ by `markdown-mode` and `gfm-mode` as described below.
for line wrapping in buffers. You can do this with a
`gfm-mode-hook` as follows:
-```lisp
+```emacs-lisp
;; Use visual-line-mode in gfm-mode
(defun my-gfm-mode-hoo
[nongnu] elpa/markdown-mode 88f30a641c 08/33: All tests are passing; still needs code cleanup
branch: elpa/markdown-mode commit 88f30a641c2da5457a10dc97ededabad266dd538 Author: Joe Reinhart Commit: Joe Reinhart All tests are passing; still needs code cleanup --- markdown-mode.el | 171 ++- 1 file changed, 132 insertions(+), 39 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index bebcbc9396..d773e0ed12 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -1878,6 +1878,7 @@ to first convert to HTML or PDF (e.g,. using Pandoc)." :package-version '(markdown-mode . "2.3")) (make-variable-buffer-local 'markdown-hide-markup) +;; TODO: nil does not work to disable hiding, only 0 or -1 (defun markdown-toggle-markup-hiding (&optional arg) "Toggle the display or hiding of markup. With a prefix argument ARG, enable markup hiding if ARG is positive, @@ -2255,6 +2256,7 @@ Depending on your font, some reasonable choices are: (7 markdown-markup-properties))) (markdown-fontify-inline-links) (markdown-fontify-reference-links) +(markdown-fontify-wiki-links) (,markdown-regex-reference-definition . ((1 'markdown-markup-face) ; [ (2 'markdown-reference-face) ; label (3 'markdown-markup-face); ] @@ -2292,7 +2294,8 @@ Depending on your font, some reasonable choices are: (markdown-match-inline-attributes . ((0 markdown-markup-properties prepend))) (markdown-match-leanpub-sections . ((0 markdown-markup-properties))) (markdown-fontify-blockquotes) -(markdown-fontify-wiki-links)) +;; (markdown-fontify-wiki-links) +) "Syntax highlighting for Markdown files.") ;; Footnotes @@ -3286,6 +3289,7 @@ processed elements." ;; If no closing parenthesis in range, update continuation point (setq cont-point (min end-of-block second-begin (cond + ;; TODO: Is this why I enter an infinite loop? ;; On failure, continue searching at cont-point ((and cont-point (< cont-point last)) (goto-char cont-point) @@ -3387,9 +3391,23 @@ the buffer)." (markdown-match-inline-generic markdown-regex-wiki-link last)) (let* ((begin (match-beginning 1)) (end (match-end 1)) - (aliasp (string-equal (match-string-no-properties 4) "|")) + + ;; (beg1 (match-beginning 1)) + ;; (end1 (match-end 1)) + (beg2 (match-beginning 2)) + (end2 (match-end 2)) + (beg3 (match-beginning 3)) + (end3 (match-end 3)) + (beg4 (match-beginning 4)) + (end4 (match-end 4)) + (beg5 (match-beginning 5)) + (end5 (match-end 5)) + (beg6 (match-beginning 6)) + (end6 (match-end 6)) + (part1 (match-string-no-properties 3)) (part2 (match-string-no-properties 5)) + (aliasp (string-equal (match-string-no-properties 4) "|")) (file-name (markdown-convert-wiki-link-to-filename (markdown-wiki-link-link))) (file-missing-p (not (file-exists-p file-name (if (or (markdown-in-comment-p begin) @@ -3405,24 +3423,60 @@ the buffer)." (if aliasp (progn ;; Propertize pipe separating URL from link text -(add-text-properties (match-beginning 4) (match-end 4) markup-props) +(add-text-properties beg4 end4 markup-props) +(add-face-text-property beg4 end4 'markdown-markup-face) (if markdown-wiki-link-alias-first (progn (if (and file-missing-p markdown-wiki-link-fontify-missing) - (add-text-properties (match-beginning 3) (match-end 3) (missing-link-props part2)) -(add-text-properties (match-beginning 3) (match-end 3) (link-props part2))) - (add-text-properties (match-beginning 5) (match-end 5) url-props)) + (progn +(add-text-properties beg3 end3 (missing-link-props part2)) +;; (add-face-text-property beg3 end3 'markdown-missing-link-face) +(put-text-property beg3 end3 'font-lock-face 'markdown-missing-link-face) +;; (put-text-property beg3 end3 'face 'markdown-missing-link-face) +) +(progn + (add-text-properties beg3 end3 (link-props part2)) + ;; (add-face-text-property beg3 end3 'markdown-link-face) + (put-text-property beg3 end3 'font-lock-face 'markdown-link-face) + ;; (put-text-property beg3 end3 'face 'markdown-link-face) + )) + (progn +(add-text-properties beg5 end5 url-props) +
[nongnu] elpa/markdown-mode a72dfa27a5 04/33: Add eldoc functionality for wiki links
branch: elpa/markdown-mode commit a72dfa27a56126cfc5129f9cb59ae20ae936c738 Author: Joe Reinhart Commit: Joe Reinhart Add eldoc functionality for wiki links --- markdown-mode.el | 14 ++ 1 file changed, 14 insertions(+) diff --git a/markdown-mode.el b/markdown-mode.el index b9edf44476..3c884e69f8 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -10067,6 +10067,20 @@ rows and columns and the column alignment." (propertize link 'face 'markdown-reference-face) (propertize "]" 'face 'markdown-markup-face)) (propertize link 'face 'markdown-url-face) + ;; Hidden URL for wiki links + ((and (and markdown-enable-wiki-links + (thing-at-point-looking-at markdown-regex-wiki-link)) + (or markdown-hide-urls markdown-hide-markup)) +(let* ((imagep (string-equal (match-string 1) "!")) + (referencep (string-equal (match-string 5) "[")) + (part1 (match-string-no-properties 3)) + (part2 (match-string-no-properties 5)) + (link (if markdown-wiki-link-alias-first part2 part1)) + (edit-keys (markdown--substitute-command-keys + "\\[markdown-insert-wiki-link]")) + (edit-str (propertize edit-keys 'face 'font-lock-constant-face))) + (format "Hidden URL (%s to edit): %s" + edit-str (propertize link 'face 'markdown-reference-face ;; Hidden language name for fenced code blocks ((and (markdown-code-block-at-point-p) (not (get-text-property (point) 'markdown-pre))
[nongnu] elpa/markdown-mode 2645b7fd14 07/33: Add markdown-missing-link-face when appropriate to parts of wiki links
branch: elpa/markdown-mode commit 2645b7fd148eb8d5c2d141cf49ccbf1775275195 Author: Joe Reinhart Commit: Joe Reinhart Add markdown-missing-link-face when appropriate to parts of wiki links --- markdown-mode.el | 48 +--- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/markdown-mode.el b/markdown-mode.el index 4e9a184bfa..bebcbc9396 100644 --- a/markdown-mode.el +++ b/markdown-mode.el @@ -3384,13 +3384,14 @@ the buffer)." (defun markdown-fontify-wiki-links (last) "Add text properties to next wiki link from point to LAST." (when (and markdown-enable-wiki-links - (not markdown-wiki-link-fontify-missing) (markdown-match-inline-generic markdown-regex-wiki-link last)) -(let ((begin (match-beginning 1)) - (end (match-end 1)) - (aliasp (string-equal (match-string-no-properties 4) "|")) - (part1 (match-string-no-properties 3)) - (part2 (match-string-no-properties 5))) +(let* ((begin (match-beginning 1)) + (end (match-end 1)) + (aliasp (string-equal (match-string-no-properties 4) "|")) + (part1 (match-string-no-properties 3)) + (part2 (match-string-no-properties 5)) + (file-name (markdown-convert-wiki-link-to-filename (markdown-wiki-link-link))) + (file-missing-p (not (file-exists-p file-name (if (or (markdown-in-comment-p begin) (markdown-in-comment-p end) (markdown-inline-code-at-pos-p begin) @@ -3402,17 +3403,26 @@ the buffer)." ;; Add text properties for hiding markup (progn (if aliasp - (if markdown-wiki-link-alias-first + (progn +;; Propertize pipe separating URL from link text +(add-text-properties (match-beginning 4) (match-end 4) markup-props) +(if markdown-wiki-link-alias-first +(progn + (if (and file-missing-p markdown-wiki-link-fontify-missing) + (add-text-properties (match-beginning 3) (match-end 3) (missing-link-props part2)) +(add-text-properties (match-beginning 3) (match-end 3) (link-props part2))) + (add-text-properties (match-beginning 5) (match-end 5) url-props)) (progn -(add-text-properties (match-beginning 3) (match-end 3) (link-props part2)) -(add-text-properties (match-beginning 5) (match-end 5) url-props)) -(progn - (add-text-properties (match-beginning 3) (match-end 3) url-props) - (add-text-properties (match-beginning 5) (match-end 5) (link-props part1 -(add-text-properties (match-beginning 3) (match-end 3) (link-props part1))) +(add-text-properties (match-beginning 3) (match-end 3) url-props) +(if (and file-missing-p markdown-wiki-link-fontify-missing) +(add-text-properties (match-beginning 5) (match-end 5) (missing-link-props part1)) + (add-text-properties (match-beginning 5) (match-end 5) (link-props part1)) +(if (and file-missing-p markdown-wiki-link-fontify-missing) +(add-text-properties (match-beginning 3) (match-end 3) (missing-link-props part1)) + (add-text-properties (match-beginning 3) (match-end 3) (link-props part1 + ;; Propertize opening and closing brackets (add-text-properties (match-beginning 2) (match-end 2) markup-props) - (add-text-properties (match-beginning 6) (match-end 6) markup-props) - (add-text-properties (match-beginning 4) (match-end 4) markup-props)) + (add-text-properties (match-beginning 6) (match-end 6) markup-props)) (set-match-data (list begin end)) t @@ -8216,6 +8226,14 @@ Translate filenames using `markdown-filename-translate-function'." 'font-lock-multiline t 'help-echo echo-text))) +(defun missing-link-props (url) + "Return a property list for URL for file that doesn't exist." + (list 'face 'markdown-missing-link-face +'keymap 'markdown-mode-mouse-map +'mouse-face 'markdown-highlight-face +'font-lock-multiline t +'help-echo url)) + (defun markdown-fontify-inline-links (last) "Add text properties to next inline link from point to LAST." (when (markdown-match-generic-links last nil)
[nongnu] elpa/magit 993cdf0aa4 17/17: magit-{stage, unstage}-file: Rename to magit-{stage, unstage}-files
branch: elpa/magit
commit 993cdf0aa4e4fee150aa583d937a9f4d2dde2928
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-{stage,unstage}-file: Rename to magit-{stage,unstage}-files
Also no longer allow the FILES argument to be a single file instead
of a list of one or more files.
---
lisp/magit-apply.el | 19 +++
lisp/magit-diff.el | 8
lisp/magit-ediff.el | 2 +-
lisp/magit-files.el | 4 ++--
lisp/magit-mode.el | 4 ++--
lisp/magit-status.el| 2 +-
lisp/magit-submodule.el | 6 +++---
7 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 43986e5a98..566c80d1bb 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -303,10 +303,10 @@ at point, stage the file but not its content."
(`(staged,_ ,_) (user-error "Already staged"))
(`(committed ,_ ,_) (user-error "Cannot stage committed changes"))
(`(undefined ,_ ,_) (user-error "Cannot stage this change")))
-(call-interactively #'magit-stage-file)))
+(call-interactively #'magit-stage-files)))
;;;###autoload
-(defun magit-stage-file (files &optional force)
+(defun magit-stage-files (files &optional force)
"Read one or more files and stage all changes in those files.
With prefix argument FORCE, offer ignored files for completion."
(interactive
@@ -322,10 +322,7 @@ With prefix argument FORCE, offer ignored files for
completion."
choices nil t nil nil default)
current-prefix-arg)))
(magit-with-toplevel
-;; For backward compatibility, and because of
-;; the function's name, don't require a list.
-(magit-stage-1 (and force "--force")
- (ensure-list files
+(magit-stage-1 (and force "--force") files)))
;;;###autoload
(defun magit-stage-modified (&optional all)
@@ -395,7 +392,7 @@ ignored) files."
(defvar magit-post-stage-hook-commands
(list #'magit-stage
-#'magit-stage-file
+#'magit-stage-files
#'magit-stage-modified
'magit-file-stage))
@@ -432,7 +429,7 @@ ignored) files."
(`(undefined ,_ ,_) (user-error "Cannot unstage this change")
;;;###autoload
-(defun magit-unstage-file (files)
+(defun magit-unstage-files (files)
"Read one or more files and unstage all changes to those files."
(interactive
(let* ((choices (magit-staged-files))
@@ -442,9 +439,7 @@ ignored) files."
(list (magit-completing-read-multiple "Unstage file,s: " choices
nil t nil nil default
(magit-with-toplevel
-;; For backward compatibility, and because of
-;; the function's name, don't require a list.
-(magit-unstage-1 (ensure-list files
+(magit-unstage-1 files)))
(defun magit-unstage-1 (files)
(magit-wip-commit-before-change files " before unstage")
@@ -474,7 +469,7 @@ ignored) files."
(defvar magit-post-unstage-hook-commands
(list #'magit-unstage
-#'magit-unstage-file
+#'magit-unstage-files
#'magit-unstage-all
'magit-file-unstage))
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index 7e87fa5b33..cf1e365d9a 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -2125,8 +2125,8 @@ keymap is the parent of their keymaps."
" " #'magit-diff-visit-file
" " #'magit-reverse
" " #'magit-discard
- " " #'magit-unstage
- " " #'magit-stage
+ " "#'magit-unstage
+ " " #'magit-stage
" " #'magit-apply
"<8>" (magit-menu-item "Rename file" #'magit-file-rename
'(:enable (eq (magit-diff-scope) 'file)))
@@ -3107,7 +3107,7 @@ It the SECTION has a different type, then do nothing."
(defvar-keymap magit-unstaged-section-map
:doc "Keymap for the `unstaged' section."
" " #'magit-diff-unstaged
- " " #'magit-stage
+ " " #'magit-stage
" " #'magit-discard
"<3>" (magit-menu-item "Discard all" #'magit-discard)
"<2>" (magit-menu-item "Stage all" #'magit-stage)
@@ -3128,7 +3128,7 @@ It the SECTION has a different type, then do nothing."
:doc "Keymap for the `staged' section."
" " #'magit-reverse
" " #'magit-discard
- " " #'magit-unstage
+ " "#'magit-unstage
" " #'magit-diff-staged
"<4>" (magit-menu-item "Reverse all" #'magit-reverse)
"<3>" (magit-menu-item "Discard all" #'magit-discard)
diff --git a/lisp/magit-ediff.el b/lisp/magit-ediff.el
index da78e55e15..16e38b78ae 100644
--- a/lisp/magit-ediff.el
+++ b/lisp/magit-ediff.el
@@ -265,7 +265,7 @@ and alternative commands."
(save-excursion
(goto-char (point-min))
(unless (re-search-forward "^<<< " nil t)
- (magit-stage-file file
+ (magit-stage-files (list file)
(if fileC
(magit-ediff-buffers
[nongnu] elpa/magit updated (bec296e8d7 -> 993cdf0aa4)
tarsius pushed a change to branch elpa/magit.
from bec296e8d7 magit-push: Add --follow-tags and --tags
new 6aec967ee4 Move Ido kludges to a new package magit-ido
new aa0166c92a magit-submodule.el: Do not declare x-stretch-cursor
new e4ea6f97be readme: Add super badge
new c7147bb800 magit-git-insert: Fix docstring typo
new 40220d6fff magit-git-{lines,items}: Fix docstring pastos
new 65437016c2 magit-git-executable: Change name of output buffer
new ce9f1a5427 magit-toggle-git-debug: Fix key binding in docstring
new 69cd033e82 magit-git-debug: Rename value all to include-success
new 88464b5363 magit-git-debug: Add docstring
new 4255895657 magit-git-wash: Always keep error output
new 64e69ea809 magit--git-insert: Do not return empty string as error
message
new 4fed8d67a5 magit-rebase-autosquash: With a prefix allow selecting
beginning
new 895e4feced magit-file-{rename,untrack,delete}: Autoload
new 3dcff7ece5 magit-file-untrack: Move definition
new 0a74fb0a60 magit-{stage,unstage}-buffer-file: Move definitions
new bf920b7ff7 magit-{stage,unstage}-buffer-file: Rename to
magit-file-{stage,unstage}
new 993cdf0aa4 magit-{stage,unstage}-file: Rename to
magit-{stage,unstage}-files
Summary of changes:
README.md | 1 +
docs/magit.org | 5
lisp/magit-apply.el | 49 ---
lisp/magit-base.el | 43 +++
lisp/magit-diff.el | 10
lisp/magit-ediff.el | 2 +-
lisp/magit-extras.el| 15 ---
lisp/magit-files.el | 68 -
lisp/magit-git.el | 55 ++-
lisp/magit-mode.el | 4 +--
lisp/magit-sequence.el | 33 +---
lisp/magit-status.el| 2 +-
lisp/magit-submodule.el | 30 --
lisp/magit-subtree.el | 1 -
14 files changed, 151 insertions(+), 167 deletions(-)
[nongnu] elpa/magit aa0166c92a 02/17: magit-submodule.el: Do not declare x-stretch-cursor
branch: elpa/magit commit aa0166c92a8e70d6e28450fe2fbcac1847045280 Author: Jonas Bernoulli Commit: Jonas Bernoulli magit-submodule.el: Do not declare x-stretch-cursor It's not used in this file. --- lisp/magit-submodule.el | 2 -- 1 file changed, 2 deletions(-) diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el index 18eb9dab7d..0095c297bc 100644 --- a/lisp/magit-submodule.el +++ b/lisp/magit-submodule.el @@ -30,8 +30,6 @@ (require 'magit) -(defvar x-stretch-cursor) - ;;; Options (defcustom magit-module-sections-hook
[nongnu] elpa/magit 0a74fb0a60 15/17: magit-{stage, unstage}-buffer-file: Move definitions
branch: elpa/magit
commit 0a74fb0a60c1b30c485f9b68c660f11768b1e2dc
Author: Jonas Bernoulli
Commit: Jonas Bernoulli
magit-{stage,unstage}-buffer-file: Move definitions
Move them next to the definitions of the related `magit-file-*'
commands.
---
lisp/magit-apply.el | 30 --
lisp/magit-files.el | 22 ++
2 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 25a62860c4..3a3621dd7a 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -305,19 +305,6 @@ at point, stage the file but not its content."
(`(undefined ,_ ,_) (user-error "Cannot stage this change")))
(call-interactively #'magit-stage-file)))
-;;;###autoload
-(defun magit-stage-buffer-file ()
- "Stage all changes to the file being visited in the current buffer."
- (interactive)
- (unless buffer-file-name
-(user-error "Not visiting a file"))
- (magit-with-toplevel
-(magit-stage-1 (and (magit-file-ignored-p buffer-file-name)
-(if (y-or-n-p "Visited file is ignored; stage anyway?")
-"--force"
- (user-error "Abort")))
- (list (magit-file-relative-name)
-
;;;###autoload
(defun magit-stage-file (files &optional force)
"Read one or more files and stage all changes in those files.
@@ -408,9 +395,9 @@ ignored) files."
(defvar magit-post-stage-hook-commands
(list #'magit-stage
-#'magit-stage-buffer-file
#'magit-stage-file
-#'magit-stage-modified))
+#'magit-stage-modified
+'magit-stage-buffer-file))
(defun magit-run-post-stage-hook ()
(when (memq this-command magit-post-stage-hook-commands)
@@ -444,15 +431,6 @@ ignored) files."
(user-error "Cannot unstage committed
changes")))
(`(undefined ,_ ,_) (user-error "Cannot unstage this change")
-;;;###autoload
-(defun magit-unstage-buffer-file ()
- "Unstage all changes to the file being visited in the current buffer."
- (interactive)
- (unless buffer-file-name
-(user-error "Not visiting a file"))
- (magit-with-toplevel
-(magit-unstage-1 (list (magit-file-relative-name)
-
;;;###autoload
(defun magit-unstage-file (files)
"Read one or more files and unstage all changes to those files."
@@ -496,9 +474,9 @@ ignored) files."
(defvar magit-post-unstage-hook-commands
(list #'magit-unstage
-#'magit-unstage-buffer-file
#'magit-unstage-file
-#'magit-unstage-all))
+#'magit-unstage-all
+'magit-unstage-buffer-file))
(defun magit-run-post-unstage-hook ()
(when (memq this-command magit-post-unstage-hook-commands)
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 2519d302df..506ee27e3c 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -419,6 +419,28 @@ the same location in the respective file in the working
tree."
;;; File Commands
+;;;###autoload
+(defun magit-stage-buffer-file ()
+ "Stage all changes to the file being visited in the current buffer."
+ (interactive)
+ (unless buffer-file-name
+(user-error "Not visiting a file"))
+ (magit-with-toplevel
+(magit-stage-1 (and (magit-file-ignored-p buffer-file-name)
+(if (y-or-n-p "Visited file is ignored; stage anyway?")
+"--force"
+ (user-error "Abort")))
+ (list (magit-file-relative-name)
+
+;;;###autoload
+(defun magit-unstage-buffer-file ()
+ "Unstage all changes to the file being visited in the current buffer."
+ (interactive)
+ (unless buffer-file-name
+(user-error "Not visiting a file"))
+ (magit-with-toplevel
+(magit-unstage-1 (list (magit-file-relative-name)
+
;;;###autoload
(defun magit-file-untrack (files &optional force)
"Untrack the selected FILES or one file read in the minibuffer.
