daniel/emacs
1
2
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

update packages

Browse Source
This commit is contained in:
Daniel Weschke
2022-01-04 21:35:17 +01:00
parent 1d5275c946
commit 8de00e5202
700 changed files with 42441 additions and 85378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
lisp/polymode/polymode-compat.el
View File

@@ -111,8 +111,9 @@ Return new name (symbol). FUN is an unquoted name of a function."
(defun pm-override-output-position (orig-fun &rest args)
"Restrict returned value of ORIG-FUN to fall into the current span.
*span* in `pm-map-over-spans` has precedence over span at point.
ARGS are passed to ORIG-FUN."
When this function is called from within `pm-map-over-spans' the
dynamic variable *span* has precedence over the span at point.
ARGS are passed to ORIG-FUN."
(if (and polymode-mode pm/polymode)
(let ((range (or (pm-span-to-range *span*)
(pm-innermost-range)))
@@ -124,9 +125,10 @@ Return new name (symbol). FUN is an unquoted name of a function."
(defun pm-override-output-cons (orig-fun &rest args)
"Restrict returned (beg . end) of ORIG-FUN to fall into the current span.
*span* in `pm-map-over-spans` has precedence over span at point.
This will break badly if (point) is not inside expected range.
ARGS are passed to ORIG-FUN."
When this function is called from within `pm-map-over-spans' the
dynamic variable *span* has precedence over span at point. This
will break badly if (point) is not inside expected range. ARGS
are passed to ORIG-FUN."
(if (and polymode-mode pm/polymode)
(let ((range (or (pm-span-to-range *span*)
(pm-innermost-range)))
@@ -143,9 +145,10 @@ ARGS are passed to ORIG-FUN."
(defun pm-narrowed-override-output-cons (orig-fun &rest args)
"Restrict returned (beg . end) of ORIG-FUN to fall into the current span.
Run ORIG-FUN with buffer narrowed to span. *span* in
`pm-map-over-spans` has precedence over span at point. ARGS are
passed to ORIG-FUN."
Run ORIG-FUN with buffer narrowed to span. When this function is
called from within `pm-map-over-spans' the dynamic variable
*span* has precedence over span at point. ARGS are passed to
ORIG-FUN."
(if (and polymode-mode pm/polymode)
(let ((*span* (or *span* (pm-innermost-span))))
(pm-with-narrowed-to-span *span*
@@ -154,7 +157,8 @@ passed to ORIG-FUN."
(defun pm-substitute-beg-end (orig-fun beg end &rest args)
"Execute ORIG-FUN with first BEG and END arguments limited to current span.
*span* in `pm-map-over-spans` has precedence over span at point.
When this function is called from within `pm-map-over-spans' the
dynamic variable *span* has precedence over span at point.
ARGS are passed to ORIG-FUN."
(if (and polymode-mode pm/polymode)
(let* ((pos (if (and (<= (point) end) (>= (point) beg))
@@ -169,8 +173,9 @@ passed to ORIG-FUN."
(defun pm-execute-narrowed-to-span (orig-fun &rest args)
"Execute ORIG-FUN narrowed to the current span.
*span* in `pm-map-over-spans` has precedence over span at point.
ARGS are passed to ORIG-FUN."
When this function is called from within `pm-map-over-spans' the
dynamic variable *span* has precedence over span at point. ARGS
are passed to ORIG-FUN."
(if (and polymode-mode pm/polymode)
(pm-with-narrowed-to-span *span*
(pm-apply-protected orig-fun args))

27
lisp/polymode/polymode-core.el
View File

@@ -166,9 +166,18 @@ than the input file."
(define-obsolete-variable-alias 'polymode-mode-name-override-alist 'polymode-mode-name-aliases "2018-08")
(define-obsolete-variable-alias 'polymode-mode-name-alias-alist 'polymode-mode-name-aliases "2019-04")
(defcustom polymode-mode-name-aliases
'((elisp . emacs-lisp)
(el . emacs-lisp)
(bash . sh-mode))
'(
(asymptote . asy-mode)
(bash . sh-mode)
(cpp . c++-mode)
(ditaa . artist-mode)
(el . emacs-lisp)
(elisp . emacs-lisp)
(ocaml . tuareg)
(screen . shell-script-mode)
(shell . sh-mode)
(sqlite . sql-mode)
)
"An alist of inner mode overrides.
When inner mode is automatically detected from the header of the
inner chunk (such as in markdown mode), the detected symbol might
@@ -875,10 +884,10 @@ TYPE is either a symbol or a list of symbols of span types."
(set mm old-state))))
(pm--collect-parent-slots pm/polymode '-minor-mode))))
(defun pm--run-init-hooks (object type &optional emacs-hook)
(defun pm--run-init-hooks (object type &optional global-hook)
(unless pm-initialization-in-progress
(when emacs-hook
(run-hooks emacs-hook))
(when global-hook
(run-hooks global-hook))
(pm--run-hooks object :init-functions (or type 'host))))
(defun pm--collect-parent-slots (object slot &optional do-when inclusive)
@@ -2090,14 +2099,14 @@ Elements of LIST can be either strings or symbols."
(stringp pm--output-file)
(pm--file-mod-time pm--output-file)))
(imt (and omt (pm--file-mod-time pm--input-file)))
(action (if is-exporter "exporting" "weaving"))
(ofile (if (and imt (time-less-p imt omt))
(progn
(message "Not re-%s as input file '%s' hasn't changed"
(file-name-nondirectory ifile) action)
(if is-exporter "exporting" "weaving")
(file-name-nondirectory ifile))
pm--output-file)
(message "%s '%s' with '%s' ..."
(capitalize action)
(if is-exporter "EXPORTING" "WEAVING")
(file-name-nondirectory ifile)
(eieio-object-name processor))
(let ((fn (with-no-warnings

3
lisp/polymode/polymode-debug.el
View File

@@ -100,7 +100,8 @@ Key bindings:
(pm-debug-minor-mode t)))
;;;###autoload
(define-globalized-minor-mode pm-debug-mode pm-debug-minor-mode pm-debug-minor-mode-on)
(define-globalized-minor-mode pm-debug-mode pm-debug-minor-mode pm-debug-minor-mode-on
:group 'polymode)
;;; INFO

4
lisp/polymode/polymode-methods.el
View File

@@ -165,12 +165,12 @@ initialized. Return the buffer."
;; INDENTATION
(setq-local pm--indent-line-function-original
(if (memq indent-line-function '(indent-relative indent-relative-maybe))
(if (memq indent-line-function '(indent-relative indent-relative-maybe pm-indent-line-dispatcher))
#'pm--indent-line-basic
indent-line-function))
(setq-local indent-line-function #'pm-indent-line-dispatcher)
(setq-local pm--indent-region-function-original
(if (memq indent-region-function '(nil indent-region-line-by-line))
(if (memq indent-region-function '(nil indent-region-line-by-line pm-indent-region))
#'pm--indent-region-line-by-line
indent-region-function))
(setq-local indent-region-function #'pm-indent-region)

8
lisp/polymode/polymode-pkg.el
View File

@@ -1,11 +1,11 @@
(define-package "polymode" "20200606.1106" "Extensible framework for multiple major modes"
(define-package "polymode" "20211124.913" "Extensible framework for multiple major modes"
'((emacs "25"))
:commit "3284ff10017d280ba82f27dc20fe5223b0df709c" :keywords
'("languages" "multi-modes" "processes")
:authors
:commit "47a7b6541a1e1cea9c22052fa202b7fdb715f03b" :authors
'(("Vitalie Spinu"))
:maintainer
'("Vitalie Spinu")
:keywords
'("languages" "multi-modes" "processes")
:url "https://github.com/polymode/polymode")
;; Local Variables:
;; no-byte-compile: t

8
lisp/polymode/polymode.el
View File

@@ -551,10 +551,10 @@ most frequently used slots are:
(while (keywordp (setq keyw (car body)))
(setq body (cdr body))
(pcase keyw
(`:lighter (setq lighter (purecopy (pop body))))
(`:keymap (setq keymap (pop body)))
(`:after-hook (setq after-hook (pop body)))
(`:keylist (setq keylist (pop body)))
(:lighter (setq lighter (purecopy (pop body))))
(:keymap (setq keymap (pop body)))
(:after-hook (setq after-hook (pop body)))
(:keylist (setq keylist (pop body)))
(_ (push (pop body) slots) (push keyw slots))))